October 2010 - Wine-commits

Henri Verbeet : wined3d: Access reg_maps though ins-> ctx in shader_arb_get_register_name().
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 6c5caf7a8ba81b37c79f6c35a2cf30c70915e0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5caf7a8ba81b37c79f6c35a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 28 11:49:57 2010 +0200 wined3d: Access reg_maps though ins->ctx in shader_arb_get_register_name(). --- dlls/wined3d/arb_program_shader.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 49263c0..3193534 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -933,7 +933,8 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction /* oPos, oFog and oPts in D3D */ static const char * const rastout_reg_names[] = {"TMP_OUT", "result.fogcoord", "result.pointsize"}; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - BOOL pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); + const struct shader_reg_maps *reg_maps = ins->ctx->reg_maps; + BOOL pshader = shader_is_pshader_version(reg_maps->shader_version.type); struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; *is_color = FALSE; @@ -947,7 +948,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction case WINED3DSPR_INPUT: if (pshader) { - if(This->baseShader.reg_maps.shader_version.major < 3) + if (reg_maps->shader_version.major < 3) { if (!reg->idx) strcpy(register_name, "fragment.color.primary"); else strcpy(register_name, "fragment.color.secondary"); @@ -972,7 +973,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction sprintf(register_name, "out_of_bounds_%u", idx); } } - else if(This->baseShader.reg_maps.input_registers & 0x0300) + else if (reg_maps->input_registers & 0x0300) { /* There are two ways basically: * @@ -1036,7 +1037,8 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction BOOL aL = FALSE; char rel_reg[50]; UINT rel_offset = ((IWineD3DVertexShaderImpl *)This)->rel_offset; - if(This->baseShader.reg_maps.shader_version.major < 2) { + if (reg_maps->shader_version.major < 2) + { sprintf(rel_reg, "A0.x"); } else { shader_arb_get_src_param(ins, reg->rel_addr, 0, rel_reg); @@ -1059,7 +1061,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if (This->baseShader.reg_maps.usesrelconstF) + if (reg_maps->usesrelconstF) sprintf(register_name, "C[%u]", reg->idx); else sprintf(register_name, "C%u", reg->idx); @@ -1067,9 +1069,11 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction break; case WINED3DSPR_TEXTURE: /* case WINED3DSPR_ADDR: */ - if (pshader) { - if(This->baseShader.reg_maps.shader_version.major == 1 && - This->baseShader.reg_maps.shader_version.minor <= 3) { + if (pshader) + { + if (reg_maps->shader_version.major == 1 + && reg_maps->shader_version.minor <= 3) + { /* In ps <= 1.3, Tx is a temporary register as destination to all instructions, * and as source to most instructions. For some instructions it is the texcoord * input. Those instructions know about the special use @@ -1082,7 +1086,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if(This->baseShader.reg_maps.shader_version.major == 1 || ctx->target_version >= NV2) + if (reg_maps->shader_version.major == 1 || ctx->target_version >= NV2) { sprintf(register_name, "A%u", reg->idx); } @@ -1101,7 +1105,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction else { if(ctx->cur_ps_args->super.srgb_correction) FIXME("sRGB correction on higher render targets\n"); - if(This->baseShader.reg_maps.highest_render_target > 0) + if (reg_maps->highest_render_target > 0) { sprintf(register_name, "result.color[%u]", reg->idx); } @@ -1134,7 +1138,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if(This->baseShader.reg_maps.shader_version.major < 3) + if (reg_maps->shader_version.major < 3) { strcpy(register_name, ctx->texcrd_output[reg->idx]); }

1 0

Alexandre Julliard : qcap: Define a real DllGetClassObject function.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 6b746e196ca4802e97c5fec4f0d443c12674c148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b746e196ca4802e97c5fec4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 28 11:42:35 2010 +0200 qcap: Define a real DllGetClassObject function. --- dlls/qcap/qcap.spec | 2 +- dlls/qcap/qcap_main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/qcap.spec b/dlls/qcap/qcap.spec index 6bdfdf6..b16365d 100644 --- a/dlls/qcap/qcap.spec +++ b/dlls/qcap/qcap.spec @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) STRMBASE_DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 422eee7..d89aafe 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -156,6 +156,14 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) } /*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + return STRMBASE_DllGetClassObject( rclsid, riid, ppv ); +} + +/*********************************************************************** * DllRegisterServer (QCAP.@) */ HRESULT WINAPI DllRegisterServer(void)

1 0

Alexandre Julliard : winegstreamer: Define real DllCanUnloadNow and DllGetClassObject functions.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 800cdcfe49abc493c8b49095a6aed4a61a714096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=800cdcfe49abc493c8b49095a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 28 11:42:52 2010 +0200 winegstreamer: Define real DllCanUnloadNow and DllGetClassObject functions. --- dlls/winegstreamer/main.c | 16 ++++++++++++++++ dlls/winegstreamer/winegstreamer.spec | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 57ab39b..1fafc35 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -112,6 +112,22 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return STRMBASE_DllMain(hInstDLL, fdwReason, lpv); } +/*********************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return STRMBASE_DllCanUnloadNow(); +} + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + return STRMBASE_DllGetClassObject( rclsid, riid, ppv ); +} + /* GStreamer common functions */ void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) diff --git a/dlls/winegstreamer/winegstreamer.spec b/dlls/winegstreamer/winegstreamer.spec index f011ea8..d96cb87 100644 --- a/dlls/winegstreamer/winegstreamer.spec +++ b/dlls/winegstreamer/winegstreamer.spec @@ -1,5 +1,5 @@ @ stdcall -private DllMain(long long ptr) -@ stdcall -private DllCanUnloadNow() STRMBASE_DllCanUnloadNow -@ stdcall -private DllGetClassObject(ptr ptr ptr) STRMBASE_DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Alexandre Julliard : winegcc: Fix the lib dir detection.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 62f9966fdc8e37720d9ad60a87592b0a593a03a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f9966fdc8e37720d9ad60a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 28 11:45:05 2010 +0200 winegcc: Fix the lib dir detection. Spotted by André Hentschel. --- tools/winegcc/winegcc.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index bec4be3..dcfe778 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -340,28 +340,36 @@ static int check_platform( struct options *opts, const char *file ) static char *get_lib_dir( struct options *opts ) { static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; + static const char libwine[] = "/libwine.so"; unsigned int i; for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) { - char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + sizeof("32/libwine.so") ); + char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen(libwine) + 3 ); strcpy( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; - strcpy( p, "/libwine.so" ); - if (check_platform( opts, buffer )) return buffer; + strcpy( p, libwine ); + if (check_platform( opts, buffer )) goto found; if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2; if (opts->force_pointer_size == 4 || (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64)) { - strcpy( p, "32/libwine.so" ); - if (check_platform( opts, buffer )) return buffer; + strcpy( p, "32" ); + strcat( p, libwine ); + if (check_platform( opts, buffer )) goto found; } if (opts->force_pointer_size == 8 || (!opts->force_pointer_size && opts->target_cpu == CPU_x86_64)) { - strcpy( p, "64/libwine.so" ); - if (check_platform( opts, buffer )) return buffer; + strcpy( p, "64" ); + strcat( p, libwine ); + if (check_platform( opts, buffer )) goto found; } free( buffer ); + continue; + + found: + buffer[strlen(buffer) - strlen(libwine)] = 0; + return buffer; } return xstrdup( LIBDIR ); }

1 0

Adam Martinson : msxml3: libxml2 error/warning callback functions.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: fec2199f4f49de076a129dc159a65556cd2d54a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec2199f4f49de076a129dc15… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 27 09:35:56 2010 -0500 msxml3: libxml2 error/warning callback functions. --- dlls/msxml3/domdoc.c | 53 ++++++++++++++++++++++++++++++++++++------ dlls/msxml3/main.c | 44 ++++++++++++++++++++++++++++++++++- dlls/msxml3/msxml_private.h | 17 +++++++++++++ dlls/msxml3/queryresult.c | 8 +++++- 4 files changed, 112 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 78500e6..8a21402 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -356,6 +356,27 @@ static void sax_characters(void *ctx, const xmlChar *ch, int len) xmlSAX2Characters(ctx, ch, len); } +static void LIBXML2_LOG_CALLBACK sax_error(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_ERR(doparse, msg, ap); + va_end(ap); +} + +static void LIBXML2_LOG_CALLBACK sax_warning(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_WARN(doparse, msg, ap); + va_end(ap); +} + +static void sax_serror(void* ctx, xmlErrorPtr err) +{ + LIBXML2_CALLBACK_SERROR(doparse, err); +} + static xmlDocPtr doparse(domdoc* This, char *ptr, int len, xmlChar const* encoding) { xmlDocPtr doc = NULL; @@ -382,9 +403,9 @@ static xmlDocPtr doparse(domdoc* This, char *ptr, int len, xmlChar const* encodi sax_characters, /* ignorableWhitespace */ xmlSAX2ProcessingInstruction, /* processingInstruction */ xmlSAX2Comment, /* comment */ - NULL, /* TODO: warning */ - NULL, /* TODO: error */ - NULL, /* TODO: fatalError */ + sax_warning, /* warning */ + sax_error, /* error */ + sax_error, /* fatalError */ xmlSAX2GetParameterEntity, /* getParameterEntity */ xmlSAX2CDataBlock, /* cdataBlock */ xmlSAX2ExternalSubset, /* externalSubset */ @@ -392,7 +413,7 @@ static xmlDocPtr doparse(domdoc* This, char *ptr, int len, xmlChar const* encodi NULL, /* _private */ xmlSAX2StartElementNs, /* startElementNs */ xmlSAX2EndElementNs, /* endElementNs */ - NULL /* TODO: serror */ + sax_serror /* serror */ }; xmlInitParser(); @@ -403,9 +424,9 @@ static xmlDocPtr doparse(domdoc* This, char *ptr, int len, xmlChar const* encodi return NULL; } - if (pctx->sax) xmlFree(pctx->sax); + if (pctx->sax) xmlFree(pctx->sax); pctx->sax = &sax_handler; - pctx->_private = This; + pctx->_private = This; pctx->recovery = 0; pctx->encoding = xmlStrdup(encoding); xmlParseDocument(pctx); @@ -2417,6 +2438,22 @@ static HRESULT WINAPI domdoc_putref_schemas( return hr; } +static void LIBXML2_LOG_CALLBACK validate_error(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_ERR(domdoc_validate, msg, ap); + va_end(ap); +} + +static void LIBXML2_LOG_CALLBACK validate_warning(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_WARN(domdoc_validate, msg, ap); + va_end(ap); +} + static HRESULT WINAPI domdoc_validate( IXMLDOMDocument3* iface, IXMLDOMParseError** err) @@ -2435,8 +2472,8 @@ static HRESULT WINAPI domdoc_validate( } vctx = xmlNewValidCtxt(); - vctx->error = NULL; /* TODO: error callback */ - vctx->warning = NULL; /* TODO: warning callback */ + vctx->error = validate_error; + vctx->warning = validate_warning; if (xmlValidateDocument(vctx, get_doc(This))) { diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index a7c35f9..133a914 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -42,6 +42,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap) +{ + char* buf = NULL; + int len = 32, needed; + enum __wine_debug_class dbcl = __WINE_DBCL_ERR; + switch (lvl) + { + case XML_ERR_NONE: + dbcl = __WINE_DBCL_TRACE; + break; + case XML_ERR_WARNING: + dbcl = __WINE_DBCL_WARN; + break; + default: + break; + } + + if (ap) + { + do + { + heap_free(buf); + buf = heap_alloc(len); + needed = vsnprintf(buf, len, msg, ap); + if (needed == -1) + len *= 2; + else if (needed >= len) + len = needed + 1; + else + needed = 0; + } + while (needed); + + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, buf); + heap_free(buf); + } + else + { + wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, msg); + } +} + /* Support for loading xml files from a Wine Windows drive */ static int wineXmlMatchCallback (char const * filename) { @@ -115,7 +157,7 @@ DECL_FUNCPTR(xsltApplyStylesheet); DECL_FUNCPTR(xsltCleanupGlobals); DECL_FUNCPTR(xsltFreeStylesheet); DECL_FUNCPTR(xsltParseStylesheetDoc); -# undef MAKE_FUNCPTR +# undef DECL_FUNCPTR #endif static void init_libxslt(void) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index bccce1c..7fcfea7 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -106,6 +106,8 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**); #include <libxml/parser.h> #endif +#include <libxml/xmlerror.h> + /* constructors */ extern IUnknown *create_domdoc( xmlNodePtr document ); extern IUnknown *create_xmldoc( void ); @@ -140,6 +142,21 @@ extern xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc); extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj, BOOL own ); +extern void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap); + +#define LIBXML2_LOG_CALLBACK __WINE_PRINTF_ATTR(2,3) + +#define LIBXML2_CALLBACK_TRACE(caller, msg, ap) \ + wineXmlCallbackLog(#caller, XML_ERR_NONE, msg, ap) + +#define LIBXML2_CALLBACK_WARN(caller, msg, ap) \ + wineXmlCallbackLog(#caller, XML_ERR_WARNING, msg, ap) + +#define LIBXML2_CALLBACK_ERR(caller, msg, ap) \ + wineXmlCallbackLog(#caller, XML_ERR_ERROR, msg, ap) + +#define LIBXML2_CALLBACK_SERROR(caller, err) \ + wineXmlCallbackLog(#caller, err->level, err->message, NULL) /* IXMLDOMNode Internal Structure */ typedef struct _xmlnode diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index ffb16fc..70848d4 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -491,6 +491,11 @@ void XSLPattern_OP_IGEq(xmlXPathParserContextPtr pctx, int nargs) xmlFree(arg2); } +static void query_serror(void* ctx, xmlErrorPtr err) +{ + LIBXML2_CALLBACK_SERROR(queryresult_create, err); +} + HRESULT queryresult_create(xmlNodePtr node, LPCWSTR szQuery, IXMLDOMNodeList **out) { queryresult *This = heap_alloc_zero(sizeof(queryresult)); @@ -513,6 +518,7 @@ HRESULT queryresult_create(xmlNodePtr node, LPCWSTR szQuery, IXMLDOMNodeList **o This->node = node; xmldoc_add_ref(This->node->doc); + ctxt->error = query_serror; ctxt->node = node; registerNamespaces(ctxt); @@ -545,7 +551,7 @@ HRESULT queryresult_create(xmlNodePtr node, LPCWSTR szQuery, IXMLDOMNodeList **o xmlXPathRegisterFunc(ctxt, (xmlChar const*)"OP_IGEq", XSLPattern_OP_IGEq); } - This->result = xmlXPathEval(str, ctxt); + This->result = xmlXPathEvalExpression(str, ctxt); if (!This->result || This->result->type != XPATH_NODESET) { hr = E_FAIL;

1 0

Adam Martinson : msxml3/tests: Add namespace-related XSLPattern tests.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 35643b73e352f61b0b98f5da087e0509a58dc647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35643b73e352f61b0b98f5da0… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Oct 27 09:37:36 2010 -0500 msxml3/tests: Add namespace-related XSLPattern tests. --- dlls/msxml3/tests/domdoc.c | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 80557f3..039d9cd 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6481,6 +6481,64 @@ static void test_XSLPattern(void) if (len) expect_list_and_release(list, "E2.E2.D1 E3.E2.D1"); + /* namespace handling */ + /* no registered namespaces */ + ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_(""))); + list = NULL; + + /* prefixes don't need to be registered, you may use them as they are in the doc */ + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//bar:x"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "E5.E1.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1"); + } + + /* prefixes must be explicitly specified in the name */ + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//foo:elem"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len == 0, "expected empty list\n"); + if (len) + IXMLDOMNodeList_Release(list); + } + + todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//foo:c"), &list)); + if (list) + { + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + todo_wine ok(len != 0, "expected filled list\n"); + if (len) + todo_wine expect_list_and_release(list, "E3.E4.E2.D1"); + } + + /* explicitly register prefix foo */ + ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'"))); + + /* now we get the same behavior as XPath */ + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//foo:c"), &list)); + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + ok(len != 0, "expected filled list\n"); + if (len) + expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); + + /* set prefix foo to some non-existant namespace */ + ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:foo='urn:non-existant-foo'"))); + + /* the registered prefix takes precedence */ + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//foo:c"), &list)); + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + ok(len == 0, "expected empty list\n"); + if (len) + IXMLDOMNodeList_Release(list); IXMLDOMDocument2_Release(doc); free_bstrs();

1 0

Aric Stewart : winegstreamer: Add structure for gstreamer transform filters .
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: aeb19307c7842451c88def79bcffb1fc451fc569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb19307c7842451c88def79b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 27 13:14:06 2010 -0500 winegstreamer: Add structure for gstreamer transform filters. --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gsttffilter.c | 475 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 476 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aeb19307c7842451c88de…

1 0

Aric Stewart : winegstreamer: Add gstreamer YUV->RGB transform filter.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 82a232d1544eb71e3db3e94d0f88a63e7968fe4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a232d1544eb71e3db3e94d0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 27 13:14:15 2010 -0500 winegstreamer: Add gstreamer YUV->RGB transform filter. --- dlls/winegstreamer/gst_guids.h | 1 + dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gsttffilter.c | 124 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/main.c | 35 +++++++++++ 4 files changed, 161 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gst_guids.h b/dlls/winegstreamer/gst_guids.h index 8997d94..4445578 100644 --- a/dlls/winegstreamer/gst_guids.h +++ b/dlls/winegstreamer/gst_guids.h @@ -24,3 +24,4 @@ DEFINE_GUID(CLSID_Gstreamer_Splitter, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); DEFINE_GUID(WINESUBTYPE_Gstreamer, 0xffffffff, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); +DEFINE_GUID(CLSID_Gstreamer_YUV, 0x2d5507df, 0x5ac9, 0x4bb9, 0x9c, 0x09, 0xb2, 0x80, 0xfc, 0x0b, 0xce, 0x01); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 6838419..a11e8ae 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -40,6 +40,7 @@ /* enum media */ void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); +IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr); void g_thread_impl_init(void); diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index f5093b4..7a13e6f 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -441,6 +441,130 @@ static HRESULT Gstreamer_transform_create(IUnknown *punkout, const CLSID *clsid, return S_OK; } +static HRESULT WINAPI Gstreamer_YUV_QueryConnect(TransformFilter *iface, const AM_MEDIA_TYPE *amt) { + GstTfImpl *This = (GstTfImpl*)iface; + TRACE("%p %p\n", This, amt); + dump_AM_MEDIA_TYPE(amt); + + if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Video) || + (!IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo) && + !IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo2))) + return S_FALSE; + if (memcmp(&amt->subtype.Data2, &MEDIATYPE_Video.Data2, sizeof(GUID) - sizeof(amt->subtype.Data1))) + return S_FALSE; + switch (amt->subtype.Data1) { + case mmioFOURCC('I','4','2','0'): + case mmioFOURCC('Y','V','1','2'): + case mmioFOURCC('N','V','1','2'): + case mmioFOURCC('N','V','2','1'): + case mmioFOURCC('Y','U','Y','2'): + case mmioFOURCC('Y','V','Y','U'): + return S_OK; + default: + WARN("Unhandled fourcc %s\n", debugstr_an((char*)&amt->subtype.Data1, 4)); + return S_FALSE; + } +} + +static HRESULT WINAPI Gstreamer_YUV_ConnectInput(TransformFilter *tf, PIN_DIRECTION dir, IPin *pin) +{ + return S_OK; +} + +static HRESULT WINAPI Gstreamer_YUV_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) { + GstTfImpl *This = (GstTfImpl*)tf; + GstCaps *capsin, *capsout; + AM_MEDIA_TYPE *outpmt = &This->tf.pmt; + HRESULT hr; + int avgtime; + DWORD width, height; + + if (dir != PINDIR_INPUT) + return S_OK; + + if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) + return E_FAIL; + + FreeMediaType(outpmt); + CopyMediaType(outpmt, amt); + + if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo)) { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER*)outpmt->pbFormat; + avgtime = vih->AvgTimePerFrame; + width = vih->bmiHeader.biWidth; + height = vih->bmiHeader.biHeight; + if ((LONG)vih->bmiHeader.biHeight > 0) + vih->bmiHeader.biHeight = -vih->bmiHeader.biHeight; + vih->bmiHeader.biBitCount = 24; + vih->bmiHeader.biCompression = BI_RGB; + } else { + VIDEOINFOHEADER2 *vih = (VIDEOINFOHEADER2*)outpmt->pbFormat; + avgtime = vih->AvgTimePerFrame; + width = vih->bmiHeader.biWidth; + height = vih->bmiHeader.biHeight; + if ((LONG)vih->bmiHeader.biHeight > 0) + vih->bmiHeader.biHeight = -vih->bmiHeader.biHeight; + vih->bmiHeader.biBitCount = 24; + vih->bmiHeader.biCompression = BI_RGB; + } + if (!avgtime) + avgtime = 10000000 / 30; + + outpmt->subtype = MEDIASUBTYPE_RGB24; + + capsin = gst_caps_new_simple("video/x-raw-yuv", + "format", GST_TYPE_FOURCC, amt->subtype.Data1, + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + "framerate", GST_TYPE_FRACTION, 10000000, avgtime, + NULL); + capsout = gst_caps_new_simple("video/x-raw-rgb", + "endianness", G_TYPE_INT, 4321, + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + "framerate", GST_TYPE_FRACTION, 10000000, avgtime, + "bpp", G_TYPE_INT, 24, + "depth", G_TYPE_INT, 24, + "red_mask", G_TYPE_INT, 0xff, + "green_mask", G_TYPE_INT, 0xff00, + "blue_mask", G_TYPE_INT, 0xff0000, + NULL); + + hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); + gst_caps_unref(capsin); + gst_caps_unref(capsout); + + This->cbBuffer = width * height * 4; + return hr; +} + +static const TransformFilterFuncTable Gstreamer_YUV_vtbl = { + Gstreamer_transform_DecideBufferSize, + Gstreamer_transform_ProcessBegin, + Gstreamer_transform_ProcessData, + Gstreamer_transform_ProcessEnd, + Gstreamer_YUV_QueryConnect, + Gstreamer_YUV_SetMediaType, + Gstreamer_YUV_ConnectInput, + Gstreamer_transform_Cleanup, + Gstreamer_transform_EndOfStream, + Gstreamer_transform_BeginFlush, + Gstreamer_transform_EndFlush, + Gstreamer_transform_NewSegment +}; + +IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *punkout, HRESULT *phr) +{ + IUnknown *obj = NULL; + if (!Gstreamer_init()) + { + *phr = E_FAIL; + return NULL; + } + *phr = Gstreamer_transform_create(punkout, &CLSID_Gstreamer_YUV, "ffmpegcolorspace", &Gstreamer_YUV_vtbl, (LPVOID*)&obj); + return obj; +} + HRESULT WINAPI GSTTf_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { HRESULT hr; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 1fafc35..dba15c5 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); static const WCHAR wGstreamer_Splitter[] = {'G','S','t','r','e','a','m','e','r',' ','s','p','l','i','t','t','e','r',' ','f','i','l','t','e','r',0}; +static const WCHAR wGstreamer_YUV[] = +{'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','f','i','l','t','e','r',0}; static WCHAR wNull[] = {'\0'}; @@ -93,6 +95,32 @@ static const AMOVIESETUP_FILTER amfSplitter = amfSplitPin }; +static const AMOVIESETUP_PIN amfYUVPin[] = +{ { wNull, + FALSE, FALSE, FALSE, FALSE, + &GUID_NULL, + NULL, + 1, + amfMTvideo + }, + { + wNull, + FALSE, TRUE, FALSE, FALSE, + &GUID_NULL, + NULL, + 1, + amfMTvideo + }, +}; + +static const AMOVIESETUP_FILTER amfYUV = +{ &CLSID_Gstreamer_YUV, + wGstreamer_YUV, + MERIT_UNLIKELY, + 2, + amfYUVPin +}; + FactoryTemplate const g_Templates[] = { { wGstreamer_Splitter, @@ -101,6 +129,13 @@ FactoryTemplate const g_Templates[] = { NULL, &amfSplitter, }, + { + wGstreamer_YUV, + &CLSID_Gstreamer_YUV, + Gstreamer_YUV_create, + NULL, + &amfYUV, + }, }; const int g_cTemplates = sizeof(g_Templates) / sizeof (g_Templates[0]);

1 0

Austin Lund : comdlg32/tests: Fixed up handling of temporary file in printdlg tests.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: 5f98620c052040f3d853c1a7f11a2ca9e6109d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f98620c052040f3d853c1a7f… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Oct 27 10:32:35 2010 +1000 comdlg32/tests: Fixed up handling of temporary file in printdlg tests. --- dlls/comdlg32/tests/printdlg.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index f021b01..cad080d 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -320,18 +320,14 @@ static void test_abort_proc(void) if (!PrintDlgA(&pd)) { skip("No default printer available.\n"); - ok(DeleteFileA(filename), "Failed to delete temporary file\n"); - return; + goto end; } GlobalFree(pd.hDevMode); GlobalFree(pd.hDevNames); ok(pd.hDC != NULL, "PrintDlg didn't return a DC.\n"); if (!(print_dc = pd.hDC)) - { - ok(DeleteFileA(filename), "Failed to delete temporary file\n"); - return; - } + goto end; ok(SetAbortProc(print_dc, abort_proc) > 0, "SetAbortProc failed\n"); ok(!abort_proc_called, "AbortProc got called unexpectedly by SetAbortProc.\n"); @@ -371,7 +367,9 @@ static void test_abort_proc(void) abort_proc_called = FALSE; end: - ok(DeleteFileA(filename), "Failed to delete temporary file\n"); + SetLastError(0xdeadbeef); + if(!DeleteFileA(filename)) + trace("Failed to delete temporary file (err = %x)\n", GetLastError()); } /* ########################### */

1 0

Vincent Povirk : mscoree: Add tests for LoadLibraryShim.
by Alexandre Julliard 28 Oct '10

28 Oct '10

Module: wine Branch: master Commit: a96941a3bfa5d01029efd665a7ad8d41d8f30832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96941a3bfa5d01029efd665a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 26 14:37:28 2010 -0500 mscoree: Add tests for LoadLibraryShim. --- dlls/mscoree/tests/mscoree.c | 130 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 129 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index a50ce97..cafd8d8 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -25,6 +25,25 @@ static HMODULE hmscoree; static HRESULT (WINAPI *pGetCORVersion)(LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pGetRequestedRuntimeInfo)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD, DWORD*, LPWSTR, DWORD, DWORD*); +static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*); + +static WCHAR tolowerW( WCHAR ch ) +{ + if (ch >= 'A' && ch <= 'Z') return ch|32; + else return ch; +} + +static WCHAR *strstriW( const WCHAR *str, const WCHAR *sub ) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && tolowerW(*p1) == tolowerW(*p2)) { p1++; p2++; } + if (!*p2) return (WCHAR *)str; + str++; + } + return NULL; +} static BOOL init_functionpointers(void) { @@ -39,8 +58,9 @@ static BOOL init_functionpointers(void) pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); pGetCORSystemDirectory = (void *)GetProcAddress(hmscoree, "GetCORSystemDirectory"); pGetRequestedRuntimeInfo = (void *)GetProcAddress(hmscoree, "GetRequestedRuntimeInfo"); + pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); - if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo) + if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo || !pLoadLibraryShim) { win_skip("functions not available\n"); FreeLibrary(hmscoree); @@ -129,12 +149,120 @@ static void test_versioninfo(void) ok(!lstrcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); } +static void test_loadlibraryshim(void) +{ + const WCHAR v4_0[] = {'v','4','.','0','.','3','0','3','1','9',0}; + const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; + const WCHAR v1_1[] = {'v','1','.','1','.','4','3','2','2',0}; + const WCHAR vbogus[] = {'v','b','o','g','u','s',0}; + const WCHAR fusion[] = {'f','u','s','i','o','n',0}; + const WCHAR fusiondll[] = {'f','u','s','i','o','n','.','d','l','l',0}; + const WCHAR nosuchdll[] = {'j','n','v','n','l','.','d','l','l',0}; + const WCHAR gdipdll[] = {'g','d','i','p','l','u','s','.','d','l','l',0}; + const WCHAR gdidll[] = {'g','d','i','3','2','.','d','l','l',0}; + HRESULT hr; + const WCHAR *latest = NULL; + HMODULE hdll; + WCHAR dllpath[MAX_PATH]; + + hr = pLoadLibraryShim(fusion, v1_1, NULL, &hdll); + ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + latest = v1_1; + + GetModuleFileNameW(hdll, dllpath, MAX_PATH); + + todo_wine ok(strstriW(dllpath, v1_1) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + ok(strstriW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + + FreeLibrary(hdll); + } + + hr = pLoadLibraryShim(fusion, v2_0, NULL, &hdll); + ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + latest = v2_0; + + GetModuleFileNameW(hdll, dllpath, MAX_PATH); + + todo_wine ok(strstriW(dllpath, v2_0) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + ok(strstriW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + + FreeLibrary(hdll); + } + + hr = pLoadLibraryShim(fusion, v4_0, NULL, &hdll); + ok(hr == S_OK || hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + /* LoadLibraryShim with a NULL version prefers 2.0 and earlier */ + if (!latest) + latest = v4_0; + + GetModuleFileNameW(hdll, dllpath, MAX_PATH); + + todo_wine ok(strstriW(dllpath, v4_0) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + ok(strstriW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + + FreeLibrary(hdll); + } + + hr = pLoadLibraryShim(fusion, vbogus, NULL, &hdll); + todo_wine ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + FreeLibrary(hdll); + + hr = pLoadLibraryShim(fusion, NULL, NULL, &hdll); + ok(hr == S_OK, "LoadLibraryShim failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + GetModuleFileNameW(hdll, dllpath, MAX_PATH); + + if (latest) + todo_wine ok(strstriW(dllpath, latest) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + ok(strstriW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + + FreeLibrary(hdll); + } + + hr = pLoadLibraryShim(fusiondll, NULL, NULL, &hdll); + ok(hr == S_OK, "LoadLibraryShim failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + GetModuleFileNameW(hdll, dllpath, MAX_PATH); + + if (latest) + todo_wine ok(strstriW(dllpath, latest) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + ok(strstriW(dllpath, fusiondll) != 0, "incorrect fusion.dll path %s\n", wine_dbgstr_w(dllpath)); + + FreeLibrary(hdll); + } + + hr = pLoadLibraryShim(nosuchdll, latest, NULL, &hdll); + todo_wine ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + FreeLibrary(hdll); + + hr = pLoadLibraryShim(gdipdll, latest, NULL, &hdll); + todo_wine ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + FreeLibrary(hdll); + + hr = pLoadLibraryShim(gdidll, latest, NULL, &hdll); + todo_wine ok(hr == E_HANDLE, "LoadLibraryShim failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + FreeLibrary(hdll); +} + START_TEST(mscoree) { if (!init_functionpointers()) return; test_versioninfo(); + test_loadlibraryshim(); FreeLibrary(hmscoree); }

1 0