October 2011 - Wine-commits

Henri Verbeet : wined3d: Make the device parameter to wined3d_event_query_test() const.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: eebad6a17aebebecea9dc09f9be4699f0a10e750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebad6a17aebebecea9dc09f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:27 2011 +0200 wined3d: Make the device parameter to wined3d_event_query_test() const. --- dlls/wined3d/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index b26fc26..ae03479 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -36,7 +36,7 @@ void wined3d_event_query_destroy(struct wined3d_event_query *query) } static enum wined3d_event_query_result wined3d_event_query_test(const struct wined3d_event_query *query, - struct wined3d_device *device) + const struct wined3d_device *device) { struct wined3d_context *context; const struct wined3d_gl_info *gl_info;

1 0

Nikolay Sivov : msxml3: Block attempt to modify namespace definition with setAttribute().
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: fe1f692d91498b221e32b55313a30d4fe7da316e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1f692d91498b221e32b5531… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 27 20:30:45 2011 +0400 msxml3: Block attempt to modify namespace definition with setAttribute(). --- dlls/msxml3/element.c | 20 ++++++++- dlls/msxml3/tests/domdoc.c | 99 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 106 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 6cd3a6d..834f39b 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1097,8 +1097,8 @@ static HRESULT WINAPI domelem_setAttribute( BSTR name, VARIANT value) { domelem *This = impl_from_IXMLDOMElement( iface ); + xmlChar *xml_name, *xml_value, *local, *prefix; xmlNodePtr element; - xmlChar *xml_name, *xml_value; HRESULT hr; VARIANT var; @@ -1119,7 +1119,23 @@ static HRESULT WINAPI domelem_setAttribute( xml_name = xmlchar_from_wchar( name ); xml_value = xmlchar_from_wchar( V_BSTR(&var) ); - if(!xmlSetNsProp(element, NULL, xml_name, xml_value)) + if ((local = xmlSplitQName2(xml_name, &prefix))) + { + static const xmlChar* xmlnsA = (const xmlChar*)"xmlns"; + xmlNsPtr ns = NULL; + + /* it's not allowed to modify existing namespace definition */ + if (xmlStrEqual(prefix, xmlnsA)) + ns = xmlSearchNs(element->doc, element, local); + + xmlFree(prefix); + xmlFree(local); + + if (ns) + return xmlStrEqual(ns->href, xml_value) ? S_OK : E_INVALIDARG; + } + + if (!xmlSetNsProp(element, NULL, xml_name, xml_value)) hr = E_FAIL; heap_free(xml_value); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0acfa25..62ccb4e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6995,19 +6995,22 @@ static void test_testTransforms(void) static void test_Namespaces(void) { + static const CHAR szNamespacesXML[] = + "<?xml version=\"1.0\"?>\n" + "<XMI xmi.version=\"1.1\" xmlns:Model=\"http://omg.org/mof.Model/1.3\">" + " <XMI.content>" + " <Model:Package name=\"WinePackage\" />" + " </XMI.content>" + "</XMI>"; + IXMLDOMDocument *doc; - IXMLDOMNode *pNode; + IXMLDOMElement *elem; + IXMLDOMNode *node; IXMLDOMNode *pNode2 = NULL; VARIANT_BOOL bSucc; + VARIANT var; HRESULT hr; BSTR str; - static const CHAR szNamespacesXML[] = -"<?xml version=\"1.0\"?>\n" -"<XMI xmi.version=\"1.1\" xmlns:Model=\"http://omg.org/mof.Model/1.3\">" -" <XMI.content>" -" <Model:Package name=\"WinePackage\" />" -" </XMI.content>" -"</XMI>"; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; @@ -7016,11 +7019,11 @@ static void test_Namespaces(void) ok(hr == S_OK, "ret %08x\n", hr ); ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n"); - hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("//XMI.content"), &pNode ); + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("//XMI.content"), &node ); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { - hr = IXMLDOMNode_get_firstChild( pNode, &pNode2 ); + hr = IXMLDOMNode_get_firstChild( node, &pNode2 ); ok( hr == S_OK, "ret %08x\n", hr ); ok( pNode2 != NULL, "pNode2 == NULL\n"); @@ -7050,11 +7053,85 @@ static void test_Namespaces(void) SysFreeString(str); IXMLDOMNode_Release(pNode2); - IXMLDOMNode_Release(pNode); + IXMLDOMNode_Release(node); } IXMLDOMDocument_Release(doc); + /* create on element and try to alter namespace after that */ + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + V_VT(&var) = VT_I2; + V_I2(&var) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri2"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, E_INVALIDARG); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_xml(elem, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + + /* create on element and try to alter namespace after that */ + doc = create_document_version(60, &IID_IXMLDOMDocument); + if (!doc) return; + + V_VT(&var) = VT_I2; + V_I2(&var) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + /* try same prefix, different uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri2"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, E_INVALIDARG); + + /* try same prefix and uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_xml(elem, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); }

1 0

Charles Davis : schannel: Don't use SSLCopyPeerCertificates on Mac OS 10.4.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 65634bca0be94c65e739bb00c7469c9ba27c6840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65634bca0be94c65e739bb00c… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Wed Oct 26 22:57:30 2011 -0600 schannel: Don't use SSLCopyPeerCertificates on Mac OS 10.4. --- configure | 14 ++++++++++++++ configure.ac | 5 +++++ dlls/secur32/schannel_macosx.c | 16 ++++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 38 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 48978ca..07c4ef2 100755 --- a/configure +++ b/configure @@ -6499,6 +6499,20 @@ fi then SECURITYLIB="-framework Security -framework CoreFoundation" + ac_save_LIBS="$LIBS" + LIBS="$LIBS $SECURITYLIB" + for ac_func in SSLCopyPeerCertificates +do : + ac_fn_c_check_func "$LINENO" "SSLCopyPeerCertificates" "ac_cv_func_SSLCopyPeerCertificates" +if test "x$ac_cv_func_SSLCopyPeerCertificates" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SSLCOPYPEERCERTIFICATES 1 +_ACEOF + +fi +done + + LIBS="$ac_save_LIBS" with_gnutls=${with_gnutls:-no} fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" diff --git a/configure.ac b/configure.ac index ad4f36f..c4e44af 100644 --- a/configure.ac +++ b/configure.ac @@ -720,6 +720,11 @@ case $host_os in if test "$ac_cv_header_Security_Security_h" = "yes" then AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation") + dnl Check for the SSLCopyPeerCertificates function + ac_save_LIBS="$LIBS" + LIBS="$LIBS $SECURITYLIB" + AC_CHECK_FUNCS(SSLCopyPeerCertificates) + LIBS="$ac_save_LIBS" with_gnutls=${with_gnutls:-no} fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 1158b14..01493b1 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -670,6 +670,13 @@ SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, return SEC_E_OK; } +#ifndef HAVE_SSLCOPYPEERCERTIFICATES +static void schan_imp_cf_release(const void *arg, void *ctx) +{ + CFRelease(arg); +} +#endif + SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, PCCERT_CONTEXT *cert) { @@ -680,7 +687,11 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session TRACE("(%p/%p, %p)\n", s, s->context, cert); +#ifdef HAVE_SSLCOPYPEERCERTIFICATES status = SSLCopyPeerCertificates(s->context, &certs); +#else + status = SSLGetPeerCertificates(s->context, &certs); +#endif if (status == noErr && certs) { SecCertificateRef mac_cert; @@ -702,6 +713,11 @@ SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session } else WARN("Couldn't extract certificate data\n"); +#ifndef HAVE_SSLCOPYPEERCERTIFICATES + /* This is why SSLGetPeerCertificates was deprecated */ + CFArrayApplyFunction(certs, CFRangeMake(0, CFArrayGetCount(certs)), + schan_imp_cf_release, NULL); +#endif CFRelease(certs); } else diff --git a/include/config.h.in b/include/config.h.in index f70e354..bb13463 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -746,6 +746,9 @@ /* Define to 1 if the system has the type `ssize_t'. */ #undef HAVE_SSIZE_T +/* Define to 1 if you have the `SSLCopyPeerCertificates' function. */ +#undef HAVE_SSLCOPYPEERCERTIFICATES + /* Define to 1 if you have the `statfs' function. */ #undef HAVE_STATFS

1 0

Alexandre Julliard : gdi32: Add a helper function to copy BITMAPINFO structures to avoid copying uninitialized data .
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: bb21ac85b33e21971899b1b4a9a0b8cd73daeb5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb21ac85b33e21971899b1b4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 27 14:19:44 2011 +0200 gdi32: Add a helper function to copy BITMAPINFO structures to avoid copying uninitialized data. --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/dib.c | 9 +++++---- dlls/gdi32/gdi_private.h | 7 +++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 486266a..cf5b359 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -245,7 +245,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err) return FALSE; dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); if (err == ERROR_BAD_FORMAT) { @@ -288,7 +288,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err == ERROR_TRANSFORM_NOT_SUPPORTED && ((src->width != dst->width) || (src->height != dst->height))) { - memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( src_info, dst_info ); err = stretch_bits( src_info, src, dst_info, dst, &bits, GetStretchBltMode( dst_dev->hdc )); if (!err) err = dst_dev->funcs->pPutImage( dst_dev, 0, 0, dst_info, &bits, src, dst, rop ); } @@ -316,7 +316,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err) goto done; dst_dev = GET_DC_PHYSDEV( dc_dst, pBlendImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); if (err == ERROR_BAD_FORMAT) { @@ -341,7 +341,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (err == ERROR_TRANSFORM_NOT_SUPPORTED && ((src->width != dst->width) || (src->height != dst->height))) { - memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( src_info, dst_info ); err = stretch_bits( src_info, src, dst_info, dst, &bits, COLORONCOLOR ); if (!err) err = dst_dev->funcs->pBlendImage( dst_dev, dst_info, &bits, src, dst, func ); } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 8eba236..7cc24a6 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -184,6 +184,7 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * { /* bitfields are always at bmiColors even in larger structures */ memcpy( dst->bmiColors, info->bmiColors, 3 * sizeof(DWORD) ); + dst->bmiHeader.biClrUsed = 0; } else if (colors) { @@ -497,7 +498,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (clip) OffsetRgn( clip, dst.x - src.x, dst.y - src.y ); dev = GET_DC_PHYSDEV( dc, pPutImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, rop ); if (err == ERROR_BAD_FORMAT) { @@ -523,7 +524,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (err == ERROR_TRANSFORM_NOT_SUPPORTED) { - memcpy( src_info, dst_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( src_info, dst_info ); err = stretch_bits( src_info, &src, dst_info, &dst, &src_bits, GetStretchBltMode( dev->hdc ) ); if (!err) err = dev->funcs->pPutImage( dev, 0, NULL, dst_info, &src_bits, &src, &dst, rop ); } @@ -678,7 +679,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, dst.width = dst.visrect.right - dst.visrect.left; dst.height = dst.visrect.bottom - dst.visrect.top; - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); if (err == ERROR_BAD_FORMAT) @@ -809,7 +810,7 @@ INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWOR if (clip) OffsetRgn( clip, dst.x - src.x, dst.y - src.y ); dev = GET_DC_PHYSDEV( dc, pPutImage ); - memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + copy_bitmapinfo( dst_info, src_info ); err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, SRCCOPY ); if (err == ERROR_BAD_FORMAT) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 93842a5..cc8022d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -482,6 +482,13 @@ static inline int get_dib_num_of_colors( const BITMAPINFO *info ) return info->bmiHeader.biBitCount > 8 ? 0 : 1 << info->bmiHeader.biBitCount; } +static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) +{ + unsigned int size = FIELD_OFFSET( BITMAPINFO, bmiColors[get_dib_num_of_colors( src )] ); + if (src->bmiHeader.biCompression == BI_BITFIELDS) size += 3 * sizeof(DWORD); + memcpy( dst, src, size ); +} + static inline const struct gdi_dc_funcs *get_bitmap_funcs( const BITMAPOBJ *bitmap ) { if( bitmap->dib ) return &dib_driver;

1 0

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 9b5ed14bd8843c124af88ac75283de5f08265427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5ed14bd8843c124af88ac75… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 27 12:30:02 2011 +0200 d3dx9_36/tests: Add a trailing '\n' to an ok() call. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 1ccabb5..f596daf 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -9792,7 +9792,7 @@ static void test_clone_mesh(void) for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++) { ok(memcmp(&tc[i].new_declaration[j], &new_declaration[j], sizeof(*new_declaration)) == 0, - "Test case %d failed. Declaration element %d did not match.", i, j); + "Test case %d failed. Declaration element %d did not match.\n", i, j); } /* Check declaration length */

1 0

Francois Gouget : msvcp90: Add a space before an implementation function name in the spec file.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 23e0ae83c26d25b4ca98be2701086bf036cd7779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e0ae83c26d25b4ca98be270… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 27 12:31:10 2011 +0200 msvcp90: Add a space before an implementation function name in the spec file. --- dlls/msvcp90/msvcp90.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 33d5619..d137cd5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5121,7 +5121,7 @@ @ cdecl -arch=win64 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0AEBV12@@Z(ptr long long ptr) basic_string_char_replace @ thiscall -arch=win32 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0PBD@Z(ptr ptr ptr ptr ptr str) basic_string_char_replace_iter_cstr @ cdecl -arch=win64 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0PEBD0@Z(ptr long long ptr long) basic_string_char_replace_cstr_len -@ thiscall -arch=win32 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0PBDI@Z(ptr ptr ptr ptr ptr str long)basic_string_char_replace_iter_cstr_len +@ thiscall -arch=win32 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0PBDI@Z(ptr ptr ptr ptr ptr str long) basic_string_char_replace_iter_cstr_len @ cdecl -arch=win64 ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0PEBD@Z(ptr long long ptr) basic_string_char_replace_cstr @ stub -arch=win32 ?replace@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)IIABV12@@Z @ stub -arch=win64 ?replace@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)000@Z

1 0

Francois Gouget : winealsa.drv: Give a name to the mmdevapi critical sections.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 39e12238e95c0e793adae70e187e90a41fab08f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e12238e95c0e793adae70e1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 27 12:36:01 2011 +0200 winealsa.drv: Give a name to the mmdevapi critical sections. Also statically initialize g_sessions_lock. --- dlls/winealsa.drv/mmdevdrv.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 29c3f72..ac5be34 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -142,6 +142,13 @@ typedef struct _SessionMgr { static HANDLE g_timer_q; static CRITICAL_SECTION g_sessions_lock; +static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = +{ + 0, 0, &g_sessions_lock, + { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } +}; +static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; @@ -216,8 +223,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; - - InitializeCriticalSection(&g_sessions_lock); } return TRUE; @@ -586,6 +591,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(const char *key, IMMDevice *dev, } InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ACImpl.lock"); This->parent = dev; IMMDevice_AddRef(This->parent); @@ -632,6 +638,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) if(!ref){ IAudioClient_Stop(iface); IMMDevice_Release(This->parent); + This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); snd_pcm_drop(This->pcm_handle); snd_pcm_close(This->pcm_handle); @@ -744,6 +751,7 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); InitializeCriticalSection(&ret->lock); + ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); session_init_vols(ret, num_channels);

1 0

Francois Gouget : services: Give a name to the scmdatabase critical section .
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 97ab9cc7e537a0a042b3f128fcfefb0021f49924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ab9cc7e537a0a042b3f128f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 27 12:36:16 2011 +0200 services: Give a name to the scmdatabase critical section. --- programs/services/services.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 2aa3683..7134ae7 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -405,6 +405,7 @@ static DWORD scmdatabase_create(struct scmdatabase **db) list_init(&(*db)->services); InitializeCriticalSection(&(*db)->cs); + (*db)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": scmdatabase"); err = RegCreateKeyExW(HKEY_LOCAL_MACHINE, SZ_SERVICES_KEY, 0, NULL, REG_OPTION_NON_VOLATILE, MAXIMUM_ALLOWED, NULL, @@ -418,6 +419,7 @@ static DWORD scmdatabase_create(struct scmdatabase **db) static void scmdatabase_destroy(struct scmdatabase *db) { RegCloseKey(db->root_key); + db->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&db->cs); HeapFree(GetProcessHeap(), 0, db); }

1 0

Francois Gouget : wineconsole: Give a name to the curses backend critical section.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: fc2b645d296cd5d3559e17e1977a2f7169c8be30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2b645d296cd5d3559e17e19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 27 12:36:27 2011 +0200 wineconsole: Give a name to the curses backend critical section. --- programs/wineconsole/curses.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 013a062..1f68d8d 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -985,6 +985,7 @@ static void WCCURSES_DeleteBackend(struct inner_data* data) WaitForSingleObject( PRIVATE(data)->input_thread, INFINITE ); CloseHandle( PRIVATE(data)->input_thread ); } + PRIVATE(data)->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&PRIVATE(data)->lock); delwin(PRIVATE(data)->pad); @@ -1103,6 +1104,7 @@ enum init_return WCCURSES_InitBackend(struct inner_data* data) } #endif InitializeCriticalSection(&PRIVATE(data)->lock); + PRIVATE(data)->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": curses"); return init_success; }

1 0

Jacek Caban : mshtml: Reimplement nsIURL:: GetFileExtension on top of IUri API.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: d1e49da2f5e99ccbdf87e4992b14c47ea07ad70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e49da2f5e99ccbdf87e4992… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 27 13:08:11 2011 +0200 mshtml: Reimplement nsIURL::GetFileExtension on top of IUri API. --- dlls/mshtml/nsio.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0571659..f127bbc 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2492,11 +2492,7 @@ static nsresult NSAPI nsURL_GetFileExtension(nsIURL *iface, nsACString *aFileExt TRACE("(%p)->(%p)\n", This, aFileExtension); - if(This->nsurl) - return nsIURL_GetFileExtension(This->nsurl, aFileExtension); - - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return get_uri_string(This, Uri_PROPERTY_EXTENSION, aFileExtension); } static nsresult NSAPI nsURL_SetFileExtension(nsIURL *iface, const nsACString *aFileExtension)

1 0