July 2018 - Wine-devel - list.winehq.org

[PATCH 1/3] kernel32: Add SearchPath test showing working directory priority.
by Erich E. Hoover 27 Jul '18

27 Jul '18

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> --- dlls/kernel32/tests/path.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index ca1cbf30ec..ce75f99b63 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1806,10 +1806,11 @@ static void test_SearchPathA(void) static const CHAR testdeprelA[] = "./testdep.dll"; static const CHAR kernel32A[] = "kernel32.dll"; static const CHAR fileA[] = ""; - CHAR pathA[MAX_PATH], buffA[MAX_PATH], path2A[MAX_PATH]; - CHAR *ptrA = NULL; + CHAR pathA[MAX_PATH], buffA[MAX_PATH], path2A[MAX_PATH], path3A[MAX_PATH], curdirA[MAX_PATH]; + CHAR tmpdirA[MAX_PATH], *ptrA = NULL; ULONG_PTR cookie; HANDLE handle; + BOOL bret; DWORD ret; if (!pSearchPathA) @@ -1883,6 +1884,28 @@ static void test_SearchPathA(void) ret = pDeactivateActCtx(0, cookie); ok(ret, "failed to deactivate context, %u\n", GetLastError()); pReleaseActCtx(handle); + + /* test the search path priority of the working directory */ + GetTempPathA(sizeof(tmpdirA), tmpdirA); + ret = GetCurrentDirectoryA(MAX_PATH, curdirA); + ok(ret, "failed to obtain working directory.\n"); + sprintf(pathA, "%s\\%s", tmpdirA, kernel32A); + ret = pSearchPathA(NULL, kernel32A, NULL, sizeof(path2A)/sizeof(CHAR), path2A, NULL); + ok(ret && ret == strlen(path2A), "got %d\n", ret); + bret = CopyFileA(path2A, pathA, FALSE); + ok(bret != 0, "failed to copy test executable to temp directory, %u\n", GetLastError()); + sprintf(path3A, "%s%s%s", curdirA, curdirA[strlen(curdirA)-1] != '\\' ? "\\" : "", kernel32A); + bret = CopyFileA(path2A, path3A, FALSE); + ok(bret != 0, "failed to copy test executable to launch directory, %u\n", GetLastError()); + bret = SetCurrentDirectoryA(tmpdirA); + ok(bret, "failed to change working directory\n"); + ret = pSearchPathA(NULL, kernel32A, ".exe", sizeof(buffA), buffA, NULL); + ok(ret && ret == strlen(buffA), "got %d\n", ret); + ok(strcmp(buffA, path3A) == 0, "expected %s, got %s\n", path3A, buffA); + bret = SetCurrentDirectoryA(curdirA); + ok(bret, "failed to reset working directory\n"); + DeleteFileA(path3A); + DeleteFileA(pathA); } static void test_SearchPathW(void) -- 2.14.1

1 2

[PATCH] odbc32: Rename functions to avoid conflicts with native drivers.
by Daniel Lehman 27 Jul '18

27 Jul '18

supercedes https://urldefense.proofpoint.com/v2/url?u=https-3A__source.winehq.org_patc…

1 0

[PATCH 1/2] winevulkan: Expose driver vkGetInstanceProcAddr via winevulkan exports.
by Jacek Caban 27 Jul '18

27 Jul '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 10 ++++++++++ dlls/winevulkan/winevulkan.spec | 1 + 3 files changed, 12 insertions(+)

2 2

[PATCH] mscoree: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 26 Jul '18

26 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/config.c | 18 +++++++----------- dlls/mscoree/corruntimehost.c | 6 +++--- dlls/mscoree/mscoree_main.c | 4 ++-- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 48f12f4d53..a5c0666904 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -417,7 +417,7 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, TRACE("%s %s %s\n", debugstr_wn(pNamespaceUri,nNamespaceUri), debugstr_wn(pLocalName,nLocalName), debugstr_wn(pQName,nQName)); - if (This->statenum == sizeof(This->states) / sizeof(This->states[0]) - 1) + if (This->statenum == ARRAY_SIZE(This->states) - 1) { ERR("file has too much nesting\n"); return E_FAIL; @@ -426,8 +426,7 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, switch (This->states[This->statenum]) { case STATE_ROOT: - if (nLocalName == sizeof(configuration)/sizeof(WCHAR)-1 && - lstrcmpW(pLocalName, configuration) == 0) + if (nLocalName == ARRAY_SIZE(configuration) - 1 && lstrcmpW(pLocalName, configuration) == 0) { This->states[++This->statenum] = STATE_CONFIGURATION; break; @@ -435,15 +434,13 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, else goto unknown; case STATE_CONFIGURATION: - if (nLocalName == sizeof(startup)/sizeof(WCHAR)-1 && - lstrcmpW(pLocalName, startup) == 0) + if (nLocalName == ARRAY_SIZE(startup) - 1 && lstrcmpW(pLocalName, startup) == 0) { hr = parse_startup(This, pAttr); This->states[++This->statenum] = STATE_STARTUP; break; } - else if (nLocalName == sizeof(runtime)/sizeof(WCHAR)-1 && - lstrcmpW(pLocalName, runtime) == 0) + else if (nLocalName == ARRAY_SIZE(runtime) - 1 && lstrcmpW(pLocalName, runtime) == 0) { This->states[++This->statenum] = STATE_RUNTIME; break; @@ -451,7 +448,7 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, else goto unknown; case STATE_RUNTIME: - if (nLocalName == sizeof(assemblyBinding)/sizeof(WCHAR)-1 && + if (nLocalName == ARRAY_SIZE(assemblyBinding) - 1 && lstrcmpW(pLocalName, assemblyBinding) == 0) { This->states[++This->statenum] = STATE_ASSEMBLY_BINDING; @@ -460,8 +457,7 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, else goto unknown; case STATE_ASSEMBLY_BINDING: - if (nLocalName == sizeof(probing)/sizeof(WCHAR)-1 && - lstrcmpW(pLocalName, probing) == 0) + if (nLocalName == ARRAY_SIZE(probing) - 1 && lstrcmpW(pLocalName, probing) == 0) { hr = parse_probing(This, pAttr); This->states[++This->statenum] = STATE_PROBING; @@ -470,7 +466,7 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, else goto unknown; case STATE_STARTUP: - if (nLocalName == sizeof(supportedRuntime)/sizeof(WCHAR)-1 && + if (nLocalName == ARRAY_SIZE(supportedRuntime) - 1 && lstrcmpW(pLocalName, supportedRuntime) == 0) { hr = parse_supported_runtime(This, pAttr); diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 0c933cac29..5c4e7f1d6e 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -138,7 +138,7 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf if (!config_path) { - DWORD len = sizeof(config_dir)/sizeof(*config_dir); + DWORD len = ARRAY_SIZE(config_dir); static const WCHAR machine_configW[] = {'\\','C','O','N','F','I','G','\\','m','a','c','h','i','n','e','.','c','o','n','f','i','g',0}; @@ -159,7 +159,7 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf goto end; } - GetModuleFileNameW(NULL, base_dir, sizeof(base_dir) / sizeof(*base_dir)); + GetModuleFileNameW(NULL, base_dir, ARRAY_SIZE(base_dir)); base_dirA = WtoA(base_dir); if (!base_dirA) { @@ -1674,7 +1674,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) if (res != ERROR_SUCCESS || numKeys == 0) goto cleanup; numKeys--; - keyLength = sizeof(subkeyName) / sizeof(WCHAR); + keyLength = ARRAY_SIZE(subkeyName); res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); if (res != ERROR_SUCCESS) goto cleanup; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index eda380a1ca..5612ff6b89 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -751,7 +751,7 @@ static BOOL install_wine_mono(void) } } - len = GetSystemDirectoryW(app, MAX_PATH-sizeof(controlW)/sizeof(WCHAR)); + len = GetSystemDirectoryW(app, MAX_PATH - ARRAY_SIZE(controlW)); memcpy(app+len, controlW, sizeof(controlW)); args = HeapAlloc(GetProcessHeap(), 0, (len*sizeof(WCHAR) + sizeof(controlW) + sizeof(argsW))); @@ -759,7 +759,7 @@ static BOOL install_wine_mono(void) return FALSE; memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); - memcpy(args + len + sizeof(controlW)/sizeof(WCHAR)-1, argsW, sizeof(argsW)); + memcpy(args + len + ARRAY_SIZE(controlW) - 1, argsW, sizeof(argsW)); TRACE("starting %s\n", debugstr_w(args)); -- 2.14.4

2 1

[PATCH] msvcp90: Fix EOF delimiter handling in basic_istream<char>::ignore.
by Piotr Caban 26 Jul '18

26 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45495 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp90/ios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH v5 1/2] kernel32: resource: Changed QUEUEDUPDATES to match MS offset
by Jon Doron 26 Jul '18

26 Jul '18

The utility muirct.exe for some reason accesses the opaque HANDLE that is returned by BeginUpdateResource, it assumes a certain structure in which (on 32bit systems) there is a pointer to the wide repesentation of the file name in offset 0x18 (0x30 on 64bit). Refer to: muirct!BldToolsEndUpdateResourceW called from muirct!CopyChecksumToFile Sample execution: MUIRCT.EXE -c "ui.exe" -e "de-DE\ui.exe.mui" Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/resource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 73f3cca363..dda3a5c3a2 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -635,6 +635,7 @@ DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) typedef struct { + void *Unknown[6]; LPWSTR pFileName; BOOL bDeleteExistingResources; struct list root; -- 2.17.1

1 1

[PATCH] msvideo.dll16: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Jul '18

25 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvideo.dll16/msvideo16.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index d390020ecc..bc239a8ab3 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -889,7 +889,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len, RegQueryInfoKeyA( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0); for (i = 0; i < cnt; i++) { - bufLen = sizeof(buf) / sizeof(buf[0]); + bufLen = ARRAY_SIZE(buf); lRet = RegEnumKeyExA(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite); if (lRet != ERROR_SUCCESS) continue; if (strncasecmp(buf, "vid", 3)) continue; -- 2.14.4

1 0

[PATCH] storage.dll16: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Jul '18

25 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/storage.dll16/storage.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 865411f9cb..23e88b42d1 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -776,8 +776,8 @@ STORAGE_init_storage(stream_access16 *str) { /* block 1 is the root directory entry */ memset(block,0x00,sizeof(block)); stde = (struct storage_pps_entry*)block; - MultiByteToWideChar( CP_ACP, 0, "RootEntry", -1, stde->pps_rawname, - sizeof(stde->pps_rawname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, "RootEntry", -1, stde->pps_rawname, + ARRAY_SIZE(stde->pps_rawname)); stde->pps_sizeofname = (strlenW(stde->pps_rawname)+1) * sizeof(WCHAR); stde->pps_type = 5; stde->pps_dir = -1; @@ -1750,8 +1750,8 @@ HRESULT CDECL IStorage16_fnCreateStorage(IStorage16 *iface, LPCOLESTR16 pwcsName assert(ret); nPPSEntries = STORAGE_get_pps_entry(&lpstg->str,ppsent,&(lpstg->stde)); assert(nPPSEntries == 1); - MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, lpstg->stde.pps_rawname, - sizeof(lpstg->stde.pps_rawname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pwcsName, -1, lpstg->stde.pps_rawname, + ARRAY_SIZE(lpstg->stde.pps_rawname)); lpstg->stde.pps_sizeofname = (strlenW(lpstg->stde.pps_rawname)+1)*sizeof(WCHAR); lpstg->stde.pps_next = -1; lpstg->stde.pps_prev = -1; @@ -1813,8 +1813,8 @@ HRESULT CDECL IStorage16_fnCreateStream(IStorage16 *iface, LPCOLESTR16 pwcsName, assert(ret); nPPSEntries = STORAGE_get_pps_entry(&lpstr->str,ppsent,&(lpstr->stde)); assert(nPPSEntries == 1); - MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, lpstr->stde.pps_rawname, - sizeof(lpstr->stde.pps_rawname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pwcsName, -1, lpstr->stde.pps_rawname, + ARRAY_SIZE(lpstr->stde.pps_rawname)); lpstr->stde.pps_sizeofname = (strlenW(lpstr->stde.pps_rawname)+1) * sizeof(WCHAR); lpstr->stde.pps_next = -1; lpstr->stde.pps_prev = -1; @@ -1855,7 +1855,7 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, lpstg->str.lockbytes = This->str.lockbytes; _ilockbytes16_addref(This->str.lockbytes); } - MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, name, sizeof(name)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pwcsName, -1, name, ARRAY_SIZE(name)); newpps = STORAGE_look_for_named_pps(&lpstg->str,This->stde.pps_dir,name); if (newpps==-1) { IStorage16_fnRelease(&lpstg->IStorage16_iface); @@ -1897,7 +1897,7 @@ HRESULT CDECL IStorage16_fnOpenStream(IStorage16 *iface, LPCOLESTR16 pwcsName, v lpstr->str.lockbytes = This->str.lockbytes; _ilockbytes16_addref(This->str.lockbytes); } - MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, name, sizeof(name)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pwcsName, -1, name, ARRAY_SIZE(name)); newpps = STORAGE_look_for_named_pps(&lpstr->str,This->stde.pps_dir,name); if (newpps==-1) { IStream16_fnRelease(&lpstr->IStream16_iface); -- 2.14.4

1 0

[PATCH] scrobj: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Jul '18

25 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrobj/scrobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 3e6535a607..989a648370 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -102,7 +102,7 @@ static void release_typelib(void) if (!typelib) return; - for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if (typeinfos[i]) ITypeInfo_Release(typeinfos[i]); @@ -369,7 +369,7 @@ static HRESULT WINAPI scriptlet_typelib_get_GUID(IGenScriptletTLib *iface, BSTR if (FAILED(hr)) return hr; - hr = StringFromGUID2(&guid, guidW, sizeof(guidW)/sizeof(guidW[0])); + hr = StringFromGUID2(&guid, guidW, ARRAY_SIZE(guidW)); if (FAILED(hr)) return hr; -- 2.14.4

1 0

[PATCH] msrle32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Jul '18

25 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msrle32/msrle32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 66880408d4..5bcfa86f97 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1183,8 +1183,8 @@ static LRESULT GetInfo(const CodecInfo *pi, ICINFO *icinfo, DWORD dwSize) icinfo->dwVersion = ICVERSION; icinfo->dwVersionICM = ICVERSION; - LoadStringW(MSRLE32_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR)); - LoadStringW(MSRLE32_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR)); + LoadStringW(MSRLE32_hModule, IDS_NAME, icinfo->szName, ARRAY_SIZE(icinfo->szName)); + LoadStringW(MSRLE32_hModule, IDS_DESCRIPTION, icinfo->szDescription, ARRAY_SIZE(icinfo->szDescription)); return sizeof(ICINFO); } @@ -1206,8 +1206,8 @@ static LRESULT About(CodecInfo *pi, HWND hWnd) /* pre-condition */ assert(MSRLE32_hModule != 0); - LoadStringW(MSRLE32_hModule, IDS_NAME, szTitle, sizeof(szTitle)/sizeof(szTitle[0])); - LoadStringW(MSRLE32_hModule, IDS_ABOUT, szAbout, sizeof(szAbout)/sizeof(szAbout[0])); + LoadStringW(MSRLE32_hModule, IDS_NAME, szTitle, ARRAY_SIZE(szTitle)); + LoadStringW(MSRLE32_hModule, IDS_ABOUT, szAbout, ARRAY_SIZE(szAbout)); MessageBoxW(hWnd, szAbout, szTitle, MB_OK|MB_ICONINFORMATION); -- 2.14.4

1 0