March 2012 - Wine-Commits - list.winehq.org

Christian Costa : d3dxof: Make SaveTemplates stub return DXFILE_OK.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: 2f75ed48ff6a0c8167ec12da4758c4823cf032b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f75ed48ff6a0c8167ec12da4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 8 09:16:29 2012 +0100 d3dxof: Make SaveTemplates stub return DXFILE_OK. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 2b0770f..7ce8208 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1167,7 +1167,7 @@ static HRESULT WINAPI IDirectXFileSaveObjectImpl_SaveTemplates(IDirectXFileSaveO FIXME("(%p/%p)->(%d,%p) stub!\n", This, iface, cTemplates, ppguidTemplates); - return DXFILEERR_BADVALUE; + return DXFILE_OK; } static HRESULT WINAPI IDirectXFileSaveObjectImpl_CreateDataObject(IDirectXFileSaveObject* iface, REFGUID rguidTemplate, LPCSTR szName, const GUID* pguid, DWORD cbSize, LPVOID pvData, LPDIRECTXFILEDATA* ppDataObj)

1 0

André Hentschel : iphlpapi: Make GetAdaptersAddresses hotpatchable.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: b93c3905b037b3355a91f6f24e4d6cd1e42c34dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93c3905b037b3355a91f6f24… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 15:05:54 2012 +0100 iphlpapi: Make GetAdaptersAddresses hotpatchable. --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2a3285f..a569041 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1032,8 +1032,8 @@ static ULONG get_dns_suffix(WCHAR *suffix, ULONG *len) return ERROR_SUCCESS; } -ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, - PIP_ADAPTER_ADDRESSES aa, PULONG buflen) +ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, + PIP_ADAPTER_ADDRESSES aa, PULONG buflen) { InterfaceIndexTable *table; ULONG i, size, dns_server_size, dns_suffix_size, total_size, ret = ERROR_NO_DATA;

1 0

Piotr Caban : urlmon: Use CopyBindInfo in InternetBindInfo_GetBindInfo.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: bb06ec7789367ac2a2465b6b5dca12a2e18c781b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb06ec7789367ac2a2465b6b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 8 13:45:51 2012 +0100 urlmon: Use CopyBindInfo in InternetBindInfo_GetBindInfo. --- dlls/urlmon/binding.c | 14 +------------- dlls/urlmon/tests/url.c | 5 +++++ dlls/urlmon/urlmon_main.h | 2 ++ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 5504f6f..c969eae 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1150,19 +1150,7 @@ static HRESULT WINAPI InternetBindInfo_GetBindInfo(IInternetBindInfo *iface, TRACE("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); *grfBINDF = This->bindf; - - *pbindinfo = This->bindinfo; - - if(pbindinfo->szExtraInfo || pbindinfo->szCustomVerb) - FIXME("copy strings\n"); - - if(pbindinfo->stgmedData.pUnkForRelease) - IUnknown_AddRef(pbindinfo->stgmedData.pUnkForRelease); - - if(pbindinfo->pUnk) - IUnknown_AddRef(pbindinfo->pUnk); - - return S_OK; + return CopyBindInfo(&This->bindinfo, pbindinfo); } static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface, diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index b9291ac..f9e7cb5 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -641,6 +641,11 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, } memset(&bindinfo, 0, sizeof(bindinfo)); + bindinfo.cbSize = 0; + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bind_info, &bindinfo); + ok(hres == E_INVALIDARG, "GetBindInfo returned: %08x, expected E_INVALIDARG\n", hres); + + memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(bindinfo); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bind_info, &bindinfo); ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 28723e1..391b1b3 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -79,6 +79,8 @@ HRESULT bind_to_object(IMoniker*,IUri*,IBindCtx*,REFIID,void**ppv) DECLSPEC_HIDD HRESULT create_default_callback(IBindStatusCallback**) DECLSPEC_HIDDEN; HRESULT wrap_callback(IBindStatusCallback*,IBindStatusCallback**) DECLSPEC_HIDDEN; +HRESULT WINAPI CopyBindInfo(const BINDINFO *pcbiSrc, BINDINFO *pcbiDest) DECLSPEC_HIDDEN; + typedef struct ProtocolVtbl ProtocolVtbl; typedef struct {

1 0

André Hentschel : kernel32: Make Sleep hotpatchable.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: 00efe754f5af37a9a2a16e550197121fbdfed7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=00efe754f5af37a9a2a16e550… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 15:00:29 2012 +0100 kernel32: Make Sleep hotpatchable. --- dlls/kernel32/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 7d5d45c..acbfab0 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -92,7 +92,7 @@ static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, DWORD timeout /*********************************************************************** * Sleep (KERNEL32.@) */ -VOID WINAPI Sleep( DWORD timeout ) +VOID WINAPI DECLSPEC_HOTPATCH Sleep( DWORD timeout ) { SleepEx( timeout, FALSE ); }

1 0

Piotr Caban : urlmon: Added CopyBindInfo implementation.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: 7f0b7c5ce33f8082bd74a5f77469db8447b1e0f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0b7c5ce33f8082bd74a5f77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 8 13:45:12 2012 +0100 urlmon: Added CopyBindInfo implementation. --- dlls/urlmon/urlmon.spec | 2 +- dlls/urlmon/urlmon_main.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 575bdc0..72bd21d 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -28,7 +28,7 @@ @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) @ stdcall CoInternetSetFeatureEnabled(long long long) @ stdcall CompareSecurityIds(ptr long ptr long long) -@ stub CopyBindInfo +@ stdcall CopyBindInfo(ptr ptr) @ stdcall CopyStgMedium(ptr ptr) @ stdcall CreateAsyncBindCtx(long ptr ptr ptr) @ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index a3d1c10..94c4b44 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -533,6 +533,8 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) if(src->u.lpszFileName && !src->pUnkForRelease) { DWORD size = (strlenW(src->u.lpszFileName)+1)*sizeof(WCHAR); dst->u.lpszFileName = CoTaskMemAlloc(size); + if(!dst->u.lpszFileName) + return E_OUTOFMEMORY; memcpy(dst->u.lpszFileName, src->u.lpszFileName, size); } break; @@ -554,6 +556,69 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) return S_OK; } +/*********************************************************************** + * CopyBindInfo (URLMON.@) + */ +HRESULT WINAPI CopyBindInfo(const BINDINFO *pcbiSrc, BINDINFO *pcbiDest) +{ + DWORD size; + HRESULT hres; + + TRACE("(%p %p)\n", pcbiSrc, pcbiDest); + + if(!pcbiSrc || !pcbiDest) + return E_POINTER; + if(!pcbiSrc->cbSize || !pcbiDest->cbSize) + return E_INVALIDARG; + + size = pcbiDest->cbSize; + if(size > pcbiSrc->cbSize) { + memcpy(pcbiDest, pcbiSrc, pcbiSrc->cbSize); + memset((char*)pcbiDest+pcbiSrc->cbSize, 0, size-pcbiSrc->cbSize); + } else { + memcpy(pcbiDest, pcbiSrc, size); + } + pcbiDest->cbSize = size; + + size = FIELD_OFFSET(BINDINFO, szExtraInfo)+sizeof(void*); + if(pcbiSrc->cbSize>=size && pcbiDest->cbSize>=size && pcbiSrc->szExtraInfo) { + size = (strlenW(pcbiSrc->szExtraInfo)+1)*sizeof(WCHAR); + pcbiDest->szExtraInfo = CoTaskMemAlloc(size); + if(!pcbiDest->szExtraInfo) + return E_OUTOFMEMORY; + memcpy(pcbiDest->szExtraInfo, pcbiSrc->szExtraInfo, size); + } + + size = FIELD_OFFSET(BINDINFO, stgmedData)+sizeof(STGMEDIUM); + if(pcbiSrc->cbSize>=size && pcbiDest->cbSize>=size) { + hres = CopyStgMedium(&pcbiSrc->stgmedData, &pcbiDest->stgmedData); + if(FAILED(hres)) { + CoTaskMemFree(pcbiDest->szExtraInfo); + return hres; + } + } + + size = FIELD_OFFSET(BINDINFO, szCustomVerb)+sizeof(void*); + if(pcbiSrc->cbSize>=size && pcbiDest->cbSize>=size && pcbiSrc->szCustomVerb) { + size = (strlenW(pcbiSrc->szCustomVerb)+1)*sizeof(WCHAR); + pcbiDest->szCustomVerb = CoTaskMemAlloc(size); + if(!pcbiDest->szCustomVerb) { + CoTaskMemFree(pcbiDest->szExtraInfo); + ReleaseStgMedium(&pcbiDest->stgmedData); + return E_OUTOFMEMORY; + } + } + + size = FIELD_OFFSET(BINDINFO, securityAttributes)+sizeof(SECURITY_ATTRIBUTES); + if(pcbiDest->cbSize >= size) + memset(&pcbiDest->securityAttributes, 0, sizeof(SECURITY_ATTRIBUTES)); + + if(pcbiSrc->pUnk) + IUnknown_AddRef(pcbiDest->pUnk); + + return S_OK; +} + static BOOL text_richtext_filter(const BYTE *b, DWORD size) { return size > 5 && !memcmp(b, "{\\rtf", 5);

1 0

Christian Costa : d3dxof: Make sure the returned object pointer is null when there are no more children .
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: bf71205b485ab512adeee603b40192e2bcacede2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf71205b485ab512adeee603b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 8 09:16:38 2012 +0100 d3dxof: Make sure the returned object pointer is null when there are no more children. --- dlls/d3dxof/d3dxof.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 7ce8208..3ba92e2 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -661,11 +661,15 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface TRACE("(%p/%p)->(%p)\n", This, iface, ppChildObj); if (This->cur_enum_object >= This->pobj->nb_children) + { + *ppChildObj = NULL; return DXFILEERR_NOMOREOBJECTS; + } if (This->from_ref && (This->level >= 1)) { /* Only 2 levels can be enumerated if the object is obtained from a reference */ + *ppChildObj = NULL; return DXFILEERR_NOMOREOBJECTS; }

1 0

Jacek Caban : widl: Make headers guards compatible with midl.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: 718adc91fcfb2c288be7d9f337aad62fa0acb9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718adc91fcfb2c288be7d9f33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 14:52:21 2012 +0100 widl: Make headers guards compatible with midl. --- include/audioclient.idl | 5 ----- include/audiopolicy.idl | 5 ----- include/devicetopology.idl | 5 ----- include/htmlhelp.h | 4 ++-- tools/widl/header.c | 6 +++--- tools/widl/widl.c | 2 +- 6 files changed, 6 insertions(+), 21 deletions(-) diff --git a/include/audioclient.idl b/include/audioclient.idl index cb1880b..8050ea6 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -19,9 +19,6 @@ * */ -cpp_quote("#ifndef __audioclient_h__") -cpp_quote("#define __audioclient_h__") - import "wtypes.idl"; import "unknwn.idl"; import "audiosessiontypes.h"; @@ -322,5 +319,3 @@ cpp_quote("#define AUDCLNT_E_INVALID_DEVICE_PERIOD AUDCLNT_ERR(0x20)") cpp_quote("#define AUDCLNT_S_BUFFER_EMPTY AUDCLNT_SUCCESS(0x1)") cpp_quote("#define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x2)") cpp_quote("#define AUDCLNT_S_POSITION_STALLED AUDCLNT_SUCCESS(0x3)") - -cpp_quote("#endif /*__audioclient_h__*/") diff --git a/include/audiopolicy.idl b/include/audiopolicy.idl index 53655bc..d1832bb 100644 --- a/include/audiopolicy.idl +++ b/include/audiopolicy.idl @@ -19,9 +19,6 @@ * */ -cpp_quote("#ifndef __audiopolicy_h__") -cpp_quote("#define __audiopolicy_h__") - import "oaidl.idl"; import "ocidl.idl"; import "propidl.idl"; @@ -241,5 +238,3 @@ interface IAudioSessionManager2 : IAudioSessionManager [in] IAudioVolumeDuckNotification *duckNotification ); }; - -cpp_quote("#endif /*__audiopolicy_h__*/") diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 18bfa50..c58a5e7 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -19,9 +19,6 @@ * */ -cpp_quote("#ifndef __devicetopology_h__") -cpp_quote("#define __devicetopology_h__") - interface IPart; interface IControlInterface; interface IDeviceTopology; @@ -737,5 +734,3 @@ library DevTopologyLib interface IDeviceTopology; } } - -cpp_quote("#endif /*__devicetopology_h__*/") diff --git a/include/htmlhelp.h b/include/htmlhelp.h index bd7d708..0251765 100644 --- a/include/htmlhelp.h +++ b/include/htmlhelp.h @@ -435,7 +435,7 @@ typedef enum tagHH_GPROPID { HH_GPROPID_CONTENT_LANGUAGE = 5 } HH_GPROPID; -#ifdef __WIDL_OAIDL_H +#ifdef __oaidl_h__ typedef struct tagHH_GLOBAL_PROPERTY { @@ -443,7 +443,7 @@ typedef struct tagHH_GLOBAL_PROPERTY VARIANT var; } HH_GLOBAL_PROPERTY ; -#endif /* __WIDL_OAIDL_H */ +#endif /* __oaidl_h__ */ #ifdef __cplusplus } diff --git a/tools/widl/header.c b/tools/widl/header.c index 00d6e76..06c6f1e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1371,8 +1371,8 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#include <ole2.h>\n"); fprintf(header, "#endif\n\n"); - fprintf(header, "#ifndef __WIDL_%s\n", header_token); - fprintf(header, "#define __WIDL_%s\n\n", header_token); + fprintf(header, "#ifndef __%s__\n", header_token); + fprintf(header, "#define __%s__\n\n", header_token); fprintf(header, "/* Forward declarations */\n\n"); write_forward_decls(header, stmts); @@ -1394,7 +1394,7 @@ void write_header(const statement_list_t *stmts) fprintf(header, "\n"); end_cplusplus_guard(header); - fprintf(header, "#endif /* __WIDL_%s */\n", header_token); + fprintf(header, "#endif /* __%s__ */\n", header_token); fclose(header); } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1c9a94b..b0e2b67 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -197,7 +197,7 @@ static char *make_token(const char *name) token = xstrdup(name); for (i=0; token[i]; i++) { if (!isalnum(token[i])) token[i] = '_'; - else token[i] = toupper(token[i]); + else token[i] = tolower(token[i]); } return token; }

1 0

André Hentschel : kernel32: Make GetModuleHandleA hotpatchable.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: 6d66de583fe218d37c90a69e45977f4764e2ab70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d66de583fe218d37c90a69e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 15:00:25 2012 +0100 kernel32: Make GetModuleHandleA hotpatchable. --- dlls/kernel32/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 1b0b23f..7d4d93b 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -558,7 +558,7 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) * Success: A handle to the loaded dll. * Failure: A NULL handle. Use GetLastError() to determine the cause. */ -HMODULE WINAPI GetModuleHandleA(LPCSTR module) +HMODULE WINAPI DECLSPEC_HOTPATCH GetModuleHandleA(LPCSTR module) { HMODULE ret;

1 0

Piotr Caban : shlwapi: Lowercase schemes in UrlCombine function.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: 3f6142e00db45504c687773ff60440279aed6699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6142e00db45504c687773ff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 8 13:48:01 2012 +0100 shlwapi: Lowercase schemes in UrlCombine function. --- dlls/shlwapi/tests/url.c | 4 ++-- dlls/shlwapi/url.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 29d0cff..949aaa0 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -343,7 +343,7 @@ static const TEST_URL_COMBINE TEST_COMBINE[] = { {"foo:today", "foo:calendar", 0, S_OK, "foo:calendar"}, {"foo:today", "bar:calendar", 0, S_OK, "bar:calendar"}, {"foo:/today", "foo:calendar", 0, S_OK, "foo:/calendar"}, - {"foo:/today/", "foo:calendar", 0, S_OK, "foo:/today/calendar"}, + {"Foo:/today/", "fOo:calendar", 0, S_OK, "foo:/today/calendar"}, {"mk:@MSITStore:dir/test.chm::dir/index.html", "image.jpg", 0, S_OK, "mk:@MSITStore:dir/test.chm::dir/image.jpg"}, {"mk:@MSITStore:dir/test.chm::dir/dir2/index.html", "../image.jpg", 0, S_OK, "mk:@MSITStore:dir/test.chm::dir/image.jpg"}, /* UrlCombine case 2 tests. Schemes do not match */ @@ -365,7 +365,7 @@ static const TEST_URL_COMBINE TEST_COMBINE[] = { {"outbind://xxxxxxxxx/","http:wine16/dir",0, S_OK,"http:wine16/dir"}, {"http://xxxxxxxxx","outbind:wine17/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"outbind:wine17/dir"}, {"xxx://xxxxxxxxx","ftp:wine18/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"ftp:wine18/dir"}, - {"ftp://xxxxxxxxx/","xxx:wine19/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"xxx:wine19/dir"}, + {"ftp://xxxxxxxxx/","xXx:wine19/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"xxx:wine19/dir"}, {"outbind://xxxxxxxxx/","http:wine20/dir",URL_PLUGGABLE_PROTOCOL, S_OK,"http:wine20/dir"}, {"file:///c:/dir/file.txt","index.html?test=c:/abc",URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO,S_OK,"file:///c:/dir/index.html?test=c:/abc"} }; diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index d43bea5..54b1b10 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -662,7 +662,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, { PARSEDURLW base, relative; DWORD myflags, sizeloc = 0; - DWORD len, res1, res2, process_case = 0; + DWORD i, len, res1, res2, process_case = 0; LPWSTR work, preliminary, mbase, mrelative; static const WCHAR myfilestr[] = {'f','i','l','e',':','/','/','/','\0'}; HRESULT ret; @@ -703,6 +703,10 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, else do { BOOL manual_search = FALSE; + work = (LPWSTR)base.pszProtocol; + for(i=0; i<base.cchProtocol; i++) + work[i] = tolowerW(work[i]); + /* mk is a special case */ if(base.nScheme == URL_SCHEME_MK) { static const WCHAR wsz[] = {':',':',0}; @@ -826,7 +830,11 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, } process_case = (*base.pszSuffix == '/' || base.nScheme == URL_SCHEME_MK) ? 5 : 3; break; - } + }else { + work = (LPWSTR)relative.pszProtocol; + for(i=0; i<relative.cchProtocol; i++) + work[i] = tolowerW(work[i]); + } /* handle cases where pszRelative has scheme */ if ((base.cchProtocol == relative.cchProtocol) &&

1 0

Piotr Caban : urlmon/tests: Added CopyBindInfo tests.
by Alexandre Julliard March 8, 2012

March 8, 2012

Module: wine Branch: master Commit: 058b9dfbe2f0adab04586e11656327fc7938a1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=058b9dfbe2f0adab04586e116… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 8 13:45:29 2012 +0100 urlmon/tests: Added CopyBindInfo tests. --- dlls/urlmon/tests/misc.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index bbb657f..ad0edf6 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -69,6 +69,7 @@ static HRESULT (WINAPI *pCoInternetGetSession)(DWORD, IInternetSession **, DWORD static HRESULT (WINAPI *pCoInternetParseUrl)(LPCWSTR, PARSEACTION, DWORD, LPWSTR, DWORD, DWORD *, DWORD); static HRESULT (WINAPI *pCoInternetQueryInfo)(LPCWSTR, QUERYOPTION, DWORD, LPVOID, DWORD, DWORD *, DWORD); static HRESULT (WINAPI *pCopyStgMedium)(const STGMEDIUM *, STGMEDIUM *); +static HRESULT (WINAPI *pCopyBindInfo)(const BINDINFO *, BINDINFO *); static HRESULT (WINAPI *pFindMimeFromData)(LPBC, LPCWSTR, LPVOID, DWORD, LPCWSTR, DWORD, LPWSTR*, DWORD); static HRESULT (WINAPI *pObtainUserAgentString)(DWORD, LPSTR, DWORD*); @@ -1238,6 +1239,117 @@ static void test_CopyStgMedium(void) ok(hres == E_POINTER, "CopyStgMedium failed: %08x, expected E_POINTER\n", hres); } +static void test_CopyBindInfo(void) +{ + BINDINFO src[2], dest[2]; + SECURITY_DESCRIPTOR sec_desc; + HRESULT hres; + int i; + + hres = pCopyBindInfo(NULL, NULL); + ok(hres == E_POINTER, "CopyBindInfo returned %08x, expected E_POINTER\n", hres); + + memset(src, 0, sizeof(BINDINFO[2])); + memset(dest, 0xde, sizeof(BINDINFO[2])); + hres = pCopyBindInfo(src, dest); + ok(hres == E_INVALIDARG, "CopyBindInfo retuned: %08x, expected E_INVALIDARG\n", hres); + + memset(src, 0, sizeof(BINDINFO[2])); + memset(dest, 0xde, sizeof(BINDINFO[2])); + src[0].cbSize = sizeof(BINDINFO); + dest[0].cbSize = 0; + hres = pCopyBindInfo(src, dest); + ok(hres == E_INVALIDARG, "CopyBindInfo retuned: %08x, expected E_INVALIDARG\n", hres); + + memset(src, 0, sizeof(BINDINFO[2])); + memset(dest, 0xde, sizeof(BINDINFO[2])); + src[0].cbSize = 1; + dest[0].cbSize = sizeof(BINDINFO)+sizeof(DWORD); + hres = pCopyBindInfo(src, dest); + ok(hres == S_OK, "CopyBindInfo failed: %08x\n", hres); + ok(dest[0].cbSize == sizeof(BINDINFO)+sizeof(DWORD), "incorrect cbSize: %d\n", dest[0].cbSize); + for(i=1; i<dest[0].cbSize/sizeof(int); i++) + ok(((int*)dest)[i] == 0, "unset values should be set to 0, got %d on %d\n", ((int*)dest)[i], i); + + memset(src, 0, sizeof(BINDINFO[2])); + memset(dest, 0xde, sizeof(BINDINFO[2])); + src[0].cbSize = sizeof(BINDINFO)+2*sizeof(DWORD); + dest[0].cbSize = sizeof(BINDINFO)+sizeof(DWORD); + hres = pCopyBindInfo(src, dest); + ok(hres == S_OK, "CopyBindInfo failed: %08x\n", hres); + ok(dest[1].cbSize == src[1].cbSize, "additional data should be copied\n"); + ok(dest[1].szExtraInfo != src[1].szExtraInfo, + "data not fitting in destination buffer should not be copied\n"); + + memset(src, 0xf0, sizeof(BINDINFO[2])); + memset(dest, 0xde, sizeof(BINDINFO[2])); + src[0].cbSize = sizeof(BINDINFO); + src[0].szExtraInfo = CoTaskMemAlloc(sizeof(WCHAR)); + src[0].szExtraInfo[0] = 0; + src[0].szCustomVerb = NULL; + src[0].pUnk = NULL; + src[0].stgmedData.tymed = TYMED_NULL; + src[0].stgmedData.pUnkForRelease = NULL; + dest[0].cbSize = sizeof(BINDINFO); + hres = pCopyBindInfo(src, dest); + ok(hres == S_OK, "CopyBindInfo failed: %08x\n", hres); + + ok(dest[0].cbSize == sizeof(BINDINFO), "incorrect cbSize: %d\n", dest[0].cbSize); + ok(dest[0].szExtraInfo && !dest[0].szExtraInfo[0] && dest[0].szExtraInfo!=src[0].szExtraInfo, + "incorrect szExtraInfo: (%p!=%p) %d\n", dest[0].szExtraInfo, + src[0].szExtraInfo, dest[0].szExtraInfo[0]); + ok(!memcmp(&dest[0].stgmedData, &src[0].stgmedData, sizeof(STGMEDIUM)), + "incorrect stgmedData value\n"); + ok(src[0].grfBindInfoF == dest[0].grfBindInfoF, "grfBindInfoF = %x, expected %x\n", + dest[0].grfBindInfoF, src[0].grfBindInfoF); + ok(src[0].dwBindVerb == dest[0].dwBindVerb, "dwBindVerb = %x, expected %x\n", + dest[0].dwBindVerb, src[0].dwBindVerb); + ok(!dest[0].szCustomVerb, "szCustmoVerb != NULL\n"); + ok(src[0].cbstgmedData == dest[0].cbstgmedData, "cbstgmedData = %x, expected %x\n", + dest[0].cbstgmedData, src[0].cbstgmedData); + ok(src[0].dwOptions == dest[0].dwOptions, "dwOptions = %x, expected %x\n", + dest[0].dwOptions, src[0].dwOptions); + ok(src[0].dwOptionsFlags == dest[0].dwOptionsFlags, "dwOptionsFlags = %x, expected %x\n", + dest[0].dwOptionsFlags, src[0].dwOptionsFlags); + ok(src[0].dwCodePage == dest[0].dwCodePage, "dwCodePage = %x, expected %x\n", + dest[0].dwCodePage, src[0].dwCodePage); + ok(!dest[0].securityAttributes.nLength, + "unexpected securityAttributes.nLength value: %d\n", + dest[0].securityAttributes.nLength); + ok(!dest[0].securityAttributes.lpSecurityDescriptor, + "unexpected securityAttributes.lpSecurityDescriptor value: %p\n", + dest[0].securityAttributes.lpSecurityDescriptor); + ok(!dest[0].securityAttributes.bInheritHandle, + "unexpected securityAttributes.bInheritHandle value: %d\n", + dest[0].securityAttributes.bInheritHandle); + ok(!memcmp(&dest[0].iid, &src[0].iid, sizeof(IID)), + "incorrect iid value\n"); + ok(!dest[0].pUnk, "pUnk != NULL\n"); + ok(src[0].dwReserved == dest[0].dwReserved, "dwReserved = %x, expected %x\n", + dest[0].dwReserved, src[0].dwReserved); + + CoTaskMemFree(src[0].szExtraInfo); + CoTaskMemFree(dest[0].szExtraInfo); + + src[0].szExtraInfo = NULL; + src[0].securityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); + ok(InitializeSecurityDescriptor(&sec_desc, SECURITY_DESCRIPTOR_REVISION), + "InitializeSecurityDescriptor failed\n"); + src[0].securityAttributes.lpSecurityDescriptor = (void*)&sec_desc; + src[0].securityAttributes.bInheritHandle = TRUE; + hres = pCopyBindInfo(src, dest); + ok(hres == S_OK, "CopyBindInfo failed: %08x\n", hres); + ok(!dest[0].securityAttributes.nLength, + "unexpected securityAttributes.nLength value: %d\n", + dest[0].securityAttributes.nLength); + ok(!dest[0].securityAttributes.lpSecurityDescriptor, + "unexpected securityAttributes.lpSecurityDescriptor value: %p\n", + dest[0].securityAttributes.lpSecurityDescriptor); + ok(!dest[0].securityAttributes.bInheritHandle, + "unexpected securityAttributes.bInheritHandle value: %d\n", + dest[0].securityAttributes.bInheritHandle); +} + static void test_UrlMkGetSessionOption(void) { DWORD encoding, size; @@ -1760,6 +1872,7 @@ START_TEST(misc) pCoInternetParseUrl = (void*) GetProcAddress(hurlmon, "CoInternetParseUrl"); pCoInternetQueryInfo = (void*) GetProcAddress(hurlmon, "CoInternetQueryInfo"); pCopyStgMedium = (void*) GetProcAddress(hurlmon, "CopyStgMedium"); + pCopyBindInfo = (void*) GetProcAddress(hurlmon, "CopyBindInfo"); pFindMimeFromData = (void*) GetProcAddress(hurlmon, "FindMimeFromData"); pObtainUserAgentString = (void*) GetProcAddress(hurlmon, "ObtainUserAgentString"); pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo"); @@ -1789,6 +1902,7 @@ START_TEST(misc) test_MimeFilter(); test_ReleaseBindInfo(); test_CopyStgMedium(); + test_CopyBindInfo(); test_UrlMkGetSessionOption(); test_user_agent(); test_MkParseDisplayNameEx();

1 0