wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Piotr Caban : msvcp90: Added basic_string<{char, wchar_t}>. data implementation.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 168dabf063962edd5f009014dd1bbe2b53b309bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=168dabf063962edd5f009014d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 2 00:34:02 2010 +0200 msvcp90: Added basic_string<{char, wchar_t}>.data implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 0c522c5..4097ba7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3198,12 +3198,12 @@ @ stub -arch=win64 ?curr_symbol@?$_Mpunct@G@std@@QEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ @ stub -arch=win32 ?curr_symbol@?$_Mpunct@_W@std@@QBE?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ @ stub -arch=win64 ?curr_symbol@?$_Mpunct@_W@std@@QEBA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ -@ stub -arch=win32 ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ -@ stub -arch=win64 ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ +@ thiscall -arch=win32 ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ(ptr) MSVCP_basic_string_char_c_str +@ cdecl -arch=win64 ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ(ptr) MSVCP_basic_string_char_c_str @ stub -arch=win32 ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPBGXZ @ stub -arch=win64 ?data@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBAPEBGXZ -@ stub -arch=win32 ?data@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEPB_WXZ -@ stub -arch=win64 ?data@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAPEB_WXZ +@ thiscall -arch=win32 ?data@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEPB_WXZ(ptr) MSVCP_basic_string_wchar_c_str +@ cdecl -arch=win64 ?data@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAPEB_WXZ(ptr) MSVCP_basic_string_wchar_c_str @ stub -arch=win32 ?date_order@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QBE?AW4dateorder@time_base@2@XZ @ stub -arch=win64 ?date_order@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@QEBA?AW4dateorder@time_base@2@XZ @ stub -arch=win32 ?date_order@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@QBE?AW4dateorder@time_base@2@XZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 15ff025..5b4b11f 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -687,6 +687,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign_cstr( /* ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ */ /* ?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ */ +/* ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ */ +/* ?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_c_str, 4) const char* __thiscall MSVCP_basic_string_char_c_str(basic_string_char *this) { @@ -933,6 +935,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr( /* ?c_str@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEPB_WXZ */ /* ?c_str@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAPEB_WXZ */ +/* ?data@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEPB_WXZ */ +/* ?data@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAPEB_WXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_c_str, 4) const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(basic_string_wchar *this) {

1 0

Jacek Caban : mshtml: Added file protocol's IInternetProtocolEx tests.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 2e7fc004e3f6dcf212879da94eb436005af8e8f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e7fc004e3f6dcf212879da94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 00:27:13 2010 +0200 mshtml: Added file protocol's IInternetProtocolEx tests. --- dlls/urlmon/tests/protocol.c | 163 +++++++++++++++++++++++++----------------- 1 files changed, 97 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e7fc004e3f6dcf212879…

1 0

Jacek Caban : urlmon: Use StartEx in file protocol handler' s Start implementation.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 6db2cf1bf5ec68eeffceac6a8e55f07e0e9b9e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db2cf1bf5ec68eeffceac6a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 00:26:39 2010 +0200 urlmon: Use StartEx in file protocol handler's Start implementation. --- dlls/urlmon/file.c | 100 ++++------------------------------------------------ 1 files changed, 7 insertions(+), 93 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 62c20d3..a190156 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -102,107 +102,21 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szU DWORD grfPI, HANDLE_PTR dwReserved) { FileProtocol *This = PROTOCOL_THIS(iface); - BINDINFO bindinfo; - DWORD grfBINDF = 0; - LARGE_INTEGER size; - DWORD len; - LPWSTR url, mime = NULL, file_name; - WCHAR null_char = 0; - BOOL first_call = FALSE; + IUri *uri; HRESULT hres; - static const WCHAR wszFile[] = {'f','i','l','e',':'}; - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); - if(!szUrl || strlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR) - || memcmp(szUrl, wszFile, sizeof(wszFile))) - return E_INVALIDARG; - - memset(&bindinfo, 0, sizeof(bindinfo)); - bindinfo.cbSize = sizeof(BINDINFO); - hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); - if(FAILED(hres)) { - WARN("GetBindInfo failed: %08x\n", hres); - return hres; - } - - ReleaseBindInfo(&bindinfo); - - len = lstrlenW(szUrl)+16; - url = heap_alloc(len*sizeof(WCHAR)); - hres = CoInternetParseUrl(szUrl, PARSE_ENCODE, 0, url, len, &len, 0); - if(FAILED(hres)) { - heap_free(url); + hres = CreateUri(szUrl, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); + if(FAILED(hres)) return hres; - } - - if(!(grfBINDF & BINDF_FROMURLMON)) - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); - - if(This->file == INVALID_HANDLE_VALUE) { - WCHAR *ptr; - - first_call = TRUE; - - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); - file_name = url+sizeof(wszFile)/sizeof(WCHAR); + hres = IInternetProtocolEx_StartEx(PROTOCOLEX(This), uri, pOIProtSink, pOIBindInfo, + grfPI, (HANDLE*)dwReserved); - /* Strip both forward and back slashes */ - if( (file_name[0] == '/' && file_name[1] == '/') || - (file_name[0] == '\\' && file_name[1] == '\\')) - file_name += 2; - if(*file_name == '/') - file_name++; - - for(ptr = file_name; *ptr; ptr++) { - if(*ptr == '?' || *ptr == '#') { - *ptr = 0; - break; - } - } - - if(file_name[1] == '|') - file_name[1] = ':'; - - This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - - if(This->file == INVALID_HANDLE_VALUE) { - IInternetProtocolSink_ReportResult(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, - GetLastError(), NULL); - heap_free(url); - return INET_E_RESOURCE_NOT_FOUND; - } - - IInternetProtocolSink_ReportProgress(pOIProtSink, - BINDSTATUS_CACHEFILENAMEAVAILABLE, file_name); - - hres = FindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); - if(SUCCEEDED(hres)) { - IInternetProtocolSink_ReportProgress(pOIProtSink, - (grfBINDF & BINDF_FROMURLMON) ? - BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE : BINDSTATUS_MIMETYPEAVAILABLE, - mime); - CoTaskMemFree(mime); - } - } - - heap_free(url); - - if(GetFileSizeEx(This->file, &size)) { - This->size = size.u.LowPart; - IInternetProtocolSink_ReportData(pOIProtSink, - BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION, - This->size, This->size); - } - - if(first_call) - IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); - - return S_OK; + IUri_Release(uri); + return hres; } static HRESULT WINAPI FileProtocol_Continue(IInternetProtocolEx *iface, PROTOCOLDATA *pProtocolData)

1 0

Jacek Caban : urlmon: Return E_INVALIDARG for empty pwzURI in CreateUri.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: d8bfb7f8dbe80d8b58f27f06bde9a6484dda1c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8bfb7f8dbe80d8b58f27f06b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 00:26:13 2010 +0200 urlmon: Return E_INVALIDARG for empty pwzURI in CreateUri. --- dlls/urlmon/tests/uri.c | 6 ++++++ dlls/urlmon/uri.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index d6bff96..09cc3b6 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4492,6 +4492,7 @@ static void test_CreateUri_InvalidArgs(void) { IUri *uri = (void*) 0xdeadbeef; const WCHAR invalidW[] = {'i','n','v','a','l','i','d',0}; + static const WCHAR emptyW[] = {0}; hr = pCreateUri(http_urlW, 0, 0, NULL); ok(hr == E_INVALIDARG, "Error: CreateUri returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG); @@ -4504,6 +4505,11 @@ static void test_CreateUri_InvalidArgs(void) { hr = pCreateUri(invalidW, 0, 0, &uri); ok(hr == E_INVALIDARG, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); ok(uri == NULL, "Error: Expected the IUri to be NULL, but it was %p instead\n", uri); + + uri = (void*) 0xdeadbeef; + hr = pCreateUri(emptyW, 0, 0, &uri); + ok(hr == E_INVALIDARG, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + ok(uri == NULL, "Error: Expected the IUri to be NULL, but it was %p instead\n", uri); } static void test_CreateUri_InvalidUri(void) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e2bec70..4377548 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4058,7 +4058,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU if(!ppURI) return E_INVALIDARG; - if(!pwzURI) { + if(!pwzURI || !*pwzURI) { *ppURI = NULL; return E_INVALIDARG; }

1 0

Jacek Caban : urlmon: Added IInternetProtocolEx implementation for file protocol.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 77a046e863f31ee430a0e67dd65a6f4622f03234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a046e863f31ee430a0e67dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 00:25:46 2010 +0200 urlmon: Added IInternetProtocolEx implementation for file protocol. --- dlls/urlmon/file.c | 171 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 143 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77a046e863f31ee430a0e…

1 0

Jacek Caban : urlmon: Store file size in FileProtocol object.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: c320a06e150a2c434ae7eee9dd8e6303c98ed941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c320a06e150a2c434ae7eee9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 00:24:19 2010 +0200 urlmon: Store file size in FileProtocol object. --- dlls/urlmon/file.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 3fde45f..0336893 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -26,6 +26,7 @@ typedef struct { const IInternetPriorityVtbl *lpInternetPriorityVtbl; HANDLE file; + ULONG size; LONG priority; LONG ref; @@ -184,10 +185,12 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl heap_free(url); - if(GetFileSizeEx(This->file, &size)) + if(GetFileSizeEx(This->file, &size)) { + This->size = size.u.LowPart; IInternetProtocolSink_ReportData(pOIProtSink, BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION, - size.u.LowPart, size.u.LowPart); + This->size, This->size); + } if(first_call) IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL);

1 0

Jacek Caban : urlmon: Use INVALID_HANDLE_VALUE instead of NULL for uninitialized file handle in file protocol handler .
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: d442442e3e7f66a09cb16c2772f8568f4db9bdb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d442442e3e7f66a09cb16c277… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 00:23:35 2010 +0200 urlmon: Use INVALID_HANDLE_VALUE instead of NULL for uninitialized file handle in file protocol handler. --- dlls/urlmon/file.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index a517d94..3fde45f 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -79,7 +79,7 @@ static ULONG WINAPI FileProtocol_Release(IInternetProtocol *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->file) + if(This->file != INVALID_HANDLE_VALUE) CloseHandle(This->file); heap_free(This); @@ -133,7 +133,7 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl if(!(grfBINDF & BINDF_FROMURLMON)) IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); - if(!This->file) { + if(This->file == INVALID_HANDLE_VALUE) { WCHAR *ptr; first_call = TRUE; @@ -163,7 +163,6 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(This->file == INVALID_HANDLE_VALUE) { - This->file = NULL; IInternetProtocolSink_ReportResult(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, GetLastError(), NULL); heap_free(url); @@ -245,7 +244,7 @@ static HRESULT WINAPI FileProtocol_Read(IInternetProtocol *iface, void *pv, if (pcbRead) *pcbRead = 0; - if(!This->file) + if(This->file == INVALID_HANDLE_VALUE) return INET_E_DATA_NOT_AVAILABLE; if (!ReadFile(This->file, pv, cb, &read, NULL)) @@ -364,7 +363,7 @@ HRESULT FileProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ret->lpIInternetProtocolVtbl = &FileProtocolVtbl; ret->lpInternetPriorityVtbl = &FilePriorityVtbl; - ret->file = NULL; + ret->file = INVALID_HANDLE_VALUE; ret->priority = 0; ret->ref = 1;

1 0

Vincent Povirk : gdiplus: Set flags and dpi when images are loaded.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 77a5b635aa011bace81bb18fd103f0abd7860342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a5b635aa011bace81bb18fd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 2 17:39:17 2010 -0400 gdiplus: Set flags and dpi when images are loaded. --- dlls/gdiplus/image.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bcee1aa..4ed226d 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2606,6 +2606,18 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, GpImage **imag *image = NULL; GdipDisposeImage((GpImage*)bitmap); } + + if (SUCCEEDED(hr) && status == Ok) + { + double dpix, dpiy; + hr = IWICBitmapSource_GetResolution(source, &dpix, &dpiy); + if (SUCCEEDED(hr)) + { + bitmap->image.xres = dpix; + bitmap->image.yres = dpiy; + } + hr = S_OK; + } } IWICBitmapSource_Release(source); @@ -2621,6 +2633,12 @@ end: if (FAILED(hr) && status == Ok) status = hresult_to_status(hr); + if (status == Ok) + { + /* Native GDI+ used to be smarter, but since Win7 it just sets these flags. */ + bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI|ImageFlagsColorSpaceRGB; + } + return status; }

1 0

Nikolay Sivov : msxml3: Fix IXMLDOMDocument::getElementsByTagName() for some special cases.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 1ce8be01f2e8e381ae895f3af1c0da878430a1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce8be01f2e8e381ae895f3af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 2 00:29:18 2010 +0400 msxml3: Fix IXMLDOMDocument::getElementsByTagName() for some special cases. --- dlls/msxml3/domdoc.c | 38 ++++++++++++++++++++++++++------------ dlls/msxml3/msxml_private.h | 4 ++-- dlls/msxml3/nodemap.c | 2 +- dlls/msxml3/queryresult.c | 2 +- dlls/msxml3/tests/domdoc.c | 27 +++++++++++++++++++++++---- 5 files changed, 53 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 12672a5..9a50366 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1361,28 +1361,42 @@ static HRESULT WINAPI domdoc_getElementsByTagName( BSTR tagName, IXMLDOMNodeList** resultList ) { - static const WCHAR xpathformat[] = - { '/','/','*','[','l','o','c','a','l','-','n','a','m','e','(',')','=','\'','%','s','\'',']',0 }; domdoc *This = impl_from_IXMLDOMDocument3( iface ); - LPWSTR szPattern; HRESULT hr; + TRACE("(%p)->(%s %p)\n", This, debugstr_w(tagName), resultList); + if (!tagName || !resultList) return E_INVALIDARG; + if (tagName[0] == '*' && tagName[1] == 0) { - szPattern = heap_alloc(sizeof(WCHAR)*4); - szPattern[0] = szPattern[1] = '/'; - szPattern[2] = '*'; - szPattern[3] = 0; + static const WCHAR formatallW[] = {'/','/','*',0}; + hr = queryresult_create((xmlNodePtr)get_doc(This), formatallW, resultList); } else { - szPattern = heap_alloc(sizeof(WCHAR)*(20+lstrlenW(tagName)+1)); - wsprintfW(szPattern, xpathformat, tagName); - } + static const WCHAR xpathformat[] = + { '/','/','*','[','l','o','c','a','l','-','n','a','m','e','(',')','=','\'' }; + static const WCHAR closeW[] = { '\'',']',0 }; + + LPWSTR pattern; + WCHAR *ptr; + INT length; - hr = queryresult_create((xmlNodePtr)get_doc(This), szPattern, resultList); - heap_free(szPattern); + length = lstrlenW(tagName); + + /* without two WCHARs from format specifier */ + ptr = pattern = heap_alloc(sizeof(xpathformat) + length*sizeof(WCHAR) + sizeof(closeW)); + + memcpy(ptr, xpathformat, sizeof(xpathformat)); + ptr += sizeof(xpathformat)/sizeof(WCHAR); + memcpy(ptr, tagName, length*sizeof(WCHAR)); + ptr += length; + memcpy(ptr, closeW, sizeof(closeW)); + + hr = queryresult_create((xmlNodePtr)get_doc(This), pattern, resultList); + heap_free(pattern); + } return hr; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 00957c0..2210574 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -122,13 +122,13 @@ extern IUnknown *create_doc_Implementation(void); extern IUnknown *create_doc_fragment( xmlNodePtr fragment ); extern IUnknown *create_doc_entity_ref( xmlNodePtr entity ); -extern HRESULT queryresult_create( xmlNodePtr, LPWSTR, IXMLDOMNodeList ** ); +extern HRESULT queryresult_create( xmlNodePtr, LPCWSTR, IXMLDOMNodeList ** ); /* data accessors */ xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ); /* helpers */ -extern xmlChar *xmlChar_from_wchar( LPWSTR str ); +extern xmlChar *xmlChar_from_wchar( LPCWSTR str ); extern LONG xmldoc_add_ref( xmlDocPtr doc ); extern LONG xmldoc_release( xmlDocPtr doc ); diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 4b7b233..3f2ee47 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -185,7 +185,7 @@ static HRESULT WINAPI xmlnodemap_Invoke( return hr; } -xmlChar *xmlChar_from_wchar( LPWSTR str ) +xmlChar *xmlChar_from_wchar( LPCWSTR str ) { DWORD len; xmlChar *xmlstr; diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index ef337a6..33a2f41 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -372,7 +372,7 @@ static dispex_static_data_t queryresult_dispex = { queryresult_iface_tids }; -HRESULT queryresult_create(xmlNodePtr node, LPWSTR szQuery, IXMLDOMNodeList **out) +HRESULT queryresult_create(xmlNodePtr node, LPCWSTR szQuery, IXMLDOMNodeList **out) { queryresult *This = heap_alloc_zero(sizeof(queryresult)); xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7104afb..7a7f4cd 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2269,12 +2269,13 @@ static void test_create(void) static void test_getElementsByTagName(void) { - HRESULT r; - BSTR str; - VARIANT_BOOL b; - IXMLDOMDocument *doc; IXMLDOMNodeList *node_list; + IXMLDOMDocument *doc; + WCHAR buff[100]; + VARIANT_BOOL b; + HRESULT r; LONG len; + BSTR str; r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); @@ -2289,6 +2290,13 @@ static void test_getElementsByTagName(void) SysFreeString( str ); str = SysAllocString( szstar ); + + /* null arguments cases */ + r = IXMLDOMDocument_getElementsByTagName(doc, NULL, &node_list); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + r = IXMLDOMDocument_getElementsByTagName(doc, str, NULL); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); ok( r == S_OK, "ret %08x\n", r ); r = IXMLDOMNodeList_get_length( node_list, &len ); @@ -2300,6 +2308,17 @@ static void test_getElementsByTagName(void) IXMLDOMNodeList_Release( node_list ); SysFreeString( str ); + /* broken query BSTR */ + memcpy(&buff[2], szstar, sizeof(szstar)); + /* just a big length */ + *(DWORD*)buff = 0xf0f0; + r = IXMLDOMDocument_getElementsByTagName(doc, &buff[2], &node_list); + ok( r == S_OK, "ret %08x\n", r ); + r = IXMLDOMNodeList_get_length( node_list, &len ); + ok( r == S_OK, "ret %08x\n", r ); + ok( len == 6, "len %d\n", len ); + IXMLDOMNodeList_Release( node_list ); + str = SysAllocString( szbs ); r = IXMLDOMDocument_getElementsByTagName(doc, str, &node_list); ok( r == S_OK, "ret %08x\n", r );

1 0

Octavian Voicu : winmm: Replace command ids with symbolic constants in mci command resources.
by Alexandre Julliard 02 Sep '10

02 Sep '10

Module: wine Branch: master Commit: 7f5e835c14fa7904a19720f57f979d28631b7836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5e835c14fa7904a19720f57… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Sep 1 20:07:09 2010 +0300 winmm: Replace command ids with symbolic constants in mci command resources. --- dlls/mciavi32/mciavi_res.rc | 76 +++++++++++++------------- dlls/mciqtz32/mciavi_res.rc | 76 +++++++++++++------------- dlls/winmm/winmm_res.rc | 124 +++++++++++++++++++++--------------------- 3 files changed, 138 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f5e835c14fa7904a1972…

1 0

← Newer
1
...
78
79
80
81
82
83
84
85
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010