March 2020 - Wine-devel - list.winehq.org

[PATCH 2/7] d3d9/tests: Fix possible test failures.
by Zhiyi Zhang 30 Mar '20

30 Mar '20

expect_messages points to a local variable. When it goes out of scope, it reads into random memory, causing failures. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 839c030185..24e0670b61 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4258,6 +4258,7 @@ static void test_wndproc(void) flush_events(); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + expect_messages = NULL; /* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */ device_style = GetWindowLongA(device_window, GWL_STYLE); @@ -4277,6 +4278,7 @@ static void test_wndproc(void) flush_events(); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + expect_messages = NULL; if (!(tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES)) { -- 2.20.1

1 0

[PATCH v3] comctl32: Correctly draw disabled toolbar button which contains 32 bpp bitmap with alpha channel.
by Ziqing Hui 30 Mar '20

30 Mar '20

Sorry for sending this patch too late. I moved to a new apartment last week and not able to use internet in my new apartment. v3: * Move imagelist_has_alpha() declaration to dlls/comctl32/comctl32.h * Use ImageList_DrawIndirect() to replace ImageList_DrawEx() Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24784 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/imagelist.c | 5 +++++ dlls/comctl32/toolbar.c | 26 ++++++++++++++++++++++---- 3 files changed, 28 insertions(+), 4 deletions(-)

1 0

[PATCH] include: Remove remaining '&& !defined(CINTERFACE)' in guiddef.h.
by Serge Gautherie 30 Mar '20

30 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Per S2003R2 PSDK and 10 SDK. Addendum to https://source.winehq.org/git/wine.git/commit/4626db2bb2a61cdceb00e0e346628… https://source.winehq.org/git/wine.git/commit/54f58769fee73a55675d503e0281e… NB: '#include <string.h>' seems misplaced, but out of scope of this patch. --- include/guiddef.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 9fc40c7..1871910 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -145,14 +145,14 @@ typedef GUID FMTID,*LPFMTID; #define REFCLSID const CLSID & #define REFIID const IID & #define REFFMTID const FMTID & -#else /* !defined(__cplusplus) */ +#else #define REFGUID const GUID* __MIDL_CONST #define REFCLSID const CLSID* __MIDL_CONST #define REFIID const IID* __MIDL_CONST #define REFFMTID const FMTID* __MIDL_CONST -#endif /* !defined(__cplusplus) */ +#endif -#if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef __cplusplus #define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID))) inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) { @@ -161,16 +161,16 @@ inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) ((ULONG *)&rguid1)[2] == ((ULONG *)&rguid2)[2] && ((ULONG *)&rguid1)[3] == ((ULONG *)&rguid2)[3]); } -#else /* defined(__cplusplus) && !defined(CINTERFACE) */ +#else #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) #define InlineIsEqualGUID(rguid1, rguid2) \ (((ULONG *)rguid1)[0] == ((ULONG *)rguid2)[0] && \ ((ULONG *)rguid1)[1] == ((ULONG *)rguid2)[1] && \ ((ULONG *)rguid1)[2] == ((ULONG *)rguid2)[2] && \ ((ULONG *)rguid1)[3] == ((ULONG *)rguid2)[3]) -#endif /* defined(__cplusplus) && !defined(CINTERFACE) */ +#endif -#if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef __cplusplus #include <string.h> inline bool operator==(const GUID& guidOne, const GUID& guidOther) { -- 2.10.0.windows.1

1 0

[PATCH] server: Check whether the new file name is executable.
by Zebediah Figura 30 Mar '20

30 Mar '20

Fixes: 4a43546b341917072fd0faa60abd2360203ae533 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/fd.c b/server/fd.c index 5019ae2da00..d4584f73268 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2438,7 +2438,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, if (is_file_executable( fd->unix_name ) != is_file_executable( name ) && !fstat( fd->unix_fd, &st )) { - if (is_file_executable( fd->unix_name )) + if (is_file_executable( name )) /* set executable bit where read bit is set */ st.st_mode |= (st.st_mode & 0444) >> 2; else -- 2.25.1

1 0

[PATCH v5] winevulkan: Create JSON manifest and registry entry used by official Vulkan loader.
by Brendan Shanks 29 Mar '20

29 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47109 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v5: Write an absolute path to the library in the JSON file, clean up error handling, and remove incorrect error handling in Unregister. dlls/winevulkan/Makefile.in | 2 +- dlls/winevulkan/make_vulkan | 3 + dlls/winevulkan/vulkan.c | 104 ++++++++++++++++++++++++++++++++ dlls/winevulkan/winevulkan.spec | 2 + loader/wine.inf.in | 1 + 5 files changed, 111 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index e0bca6fad7..2ffff40c3a 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,6 +1,6 @@ MODULE = winevulkan.dll IMPORTLIB = winevulkan -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 advapi32 C_SRCS = \ vulkan.c \ diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e0b94a06cb..bccfa6a6d6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2509,6 +2509,9 @@ class VkGenerator(object): else: f.write("@ stub {0}\n".format(func.name)) + f.write("@ stdcall -private DllRegisterServer()\n") + f.write("@ stdcall -private DllUnregisterServer()\n") + def generate_vulkan_loader_spec(self, f): self._generate_copyright(f, spec_file=True) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 59472bcef8..257416ab14 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "winuser.h" #include "vulkan_private.h" @@ -50,6 +51,7 @@ static void *wine_vk_find_struct_(void *s, VkStructureType t) static void *wine_vk_get_global_proc_addr(const char *name); +static HINSTANCE hinstance; static const struct vulkan_funcs *vk_funcs; static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); @@ -1268,6 +1270,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: + hinstance = hinst; DisableThreadLibraryCalls(hinst); return wine_vk_init(); } @@ -1307,3 +1310,104 @@ void *native_vkGetInstanceProcAddrWINE(VkInstance instance, const char *name) { return vk_funcs->p_vkGetInstanceProcAddr(instance, name); } + + +static const WCHAR winevulkan_jsonW[] = {'\\','w','i','n','e','v','u','l','k','a','n','.','j','s','o','n',0}; +static const WCHAR vulkan_driversW[] = {'S','o','f','t','w','a','r','e','\\','K','h','r','o','n','o','s','\\', + 'V','u','l','k','a','n','\\','D','r','i','v','e','r','s',0}; +static BOOL writestr(HANDLE handle, const char *str) +{ + DWORD written; + return WriteFile(handle, str, strlen(str), &written, NULL); +} + +HRESULT WINAPI DllRegisterServer(void) +{ + WCHAR json_path[MAX_PATH]; + char dll_path[MAX_PATH], dll_path_escaped[MAX_PATH*2], vk_version[20]; + UINT i, j; + HANDLE file; + HKEY key; + DWORD zero = 0; + + /* Create the JSON manifest and registry key to register this ICD with the official Vulkan loader. */ + TRACE("\n"); + GetSystemDirectoryW(json_path, ARRAY_SIZE(json_path)); + lstrcatW(json_path, winevulkan_jsonW); + file = CreateFileW(json_path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + { + ERR("Unable to create JSON manifest.\n"); + return E_UNEXPECTED; + } + + if (!GetModuleFileNameA(hinstance, dll_path, ARRAY_SIZE(dll_path))) + { + ERR("Unable to get DLL path.\n"); + CloseHandle(file); + return E_UNEXPECTED; + } + /* Backslashes in the path need to be escaped for JSON */ + for (i = 0, j = 0; i < strlen(dll_path) + 1; i++, j++) + { + if (dll_path[i] == '\\') + dll_path_escaped[j++] = '\\'; + + dll_path_escaped[j] = dll_path[i]; + } + + snprintf(vk_version, sizeof(vk_version), "%u.%u.%u", + VK_VERSION_MAJOR(VK_HEADER_VERSION_COMPLETE), + VK_VERSION_MINOR(VK_HEADER_VERSION_COMPLETE), + VK_VERSION_PATCH(VK_HEADER_VERSION_COMPLETE)); + + writestr(file, "{\r\n"); + writestr(file, " \"file_format_version\": \"1.0.0\",\r\n"); + writestr(file, " \"ICD\": {\r\n"); + writestr(file, " \"library_path\": \""); + writestr(file, dll_path_escaped); + writestr(file, "\",\r\n"); + writestr(file, " \"api_version\": \""); + writestr(file, vk_version); + writestr(file, "\"\r\n"); + writestr(file, " }\r\n"); + writestr(file, "}\r\n"); + CloseHandle(file); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, vulkan_driversW, 0, NULL, 0, KEY_SET_VALUE, + NULL, &key, NULL) != ERROR_SUCCESS) + { + ERR("Unable to create registry key.\n"); + return E_UNEXPECTED; + } + + if (RegSetValueExW(key, json_path, 0, REG_DWORD, (const BYTE *)&zero, sizeof(zero)) != ERROR_SUCCESS) + { + ERR("Unable to set registry value.\n"); + RegCloseKey(key); + return E_UNEXPECTED; + } + + RegCloseKey(key); + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + WCHAR json_path[MAX_PATH]; + HKEY key; + + /* Remove the JSON manifest and registry key */ + TRACE("\n"); + GetSystemDirectoryW(json_path, ARRAY_SIZE(json_path)); + lstrcatW(json_path, winevulkan_jsonW); + DeleteFileW(json_path); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, vulkan_driversW, 0, KEY_SET_VALUE, &key) == ERROR_SUCCESS) + { + RegDeleteValueW(key, json_path); + RegCloseKey(key); + } + + return S_OK; +} diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index c02af5aeaa..e024a43586 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -239,3 +239,5 @@ @ stdcall -private wine_vkUpdateDescriptorSets(ptr long ptr long ptr) @ stdcall -private wine_vkWaitForFences(ptr long ptr long int64) @ stdcall -private wine_vkWaitSemaphores(ptr ptr int64) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 6e0cb21253..d0b156eb77 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2569,6 +2569,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 11,,wineqtdecoder.dll,1 +11,,winevulkan.dll,1 11,,wintrust.dll,1 11,,iexplore.exe,1 -- 2.24.1

2 1

[PATCH 1/3] loader: Add Chatham Islands Standard Time Zone.
by Daniel Lehman 29 Mar '20

29 Mar '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/tzres/tzres.rc | 2 ++ loader/wine.inf.in | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/tzres/tzres.rc b/dlls/tzres/tzres.rc index 975590c998..b3d11c082a 100644 --- a/dlls/tzres/tzres.rc +++ b/dlls/tzres/tzres.rc @@ -80,6 +80,8 @@ STRINGTABLE 17457 "Central Daylight Time" 32800 "Central Standard Time (Mexico)" 32801 "Central Daylight Time (Mexico)" + 62304 "Chatham Islands Standard Time" + 62305 "Chatham Islands Daylight Time" 160 "China Standard Time" 161 "China Daylight Time" 50384 "Dateline Standard Time" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ad79c084dd..e4131c7a9f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2909,6 +2909,17 @@ HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"MUI_Dlt",,"@t HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"MUI_Std",,"@tzres.dll,-32800" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"Std",,"Central Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Central Standard Time (Mexico),"TZI",1,68,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"Display",,"Pacific/Chatham" +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"Dlt",,"Chatham Islands Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"MUI_Dlt",,"@tzres.dll,-62305" +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"MUI_Std",,"@tzres.dll,-62304" +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"Std",,"Chatham Islands Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time,"TZI",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,2d,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2006",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2007",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,03,00,2d,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"2008",1,03,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,03,00,2d,00,00,00,00,00,00,00,09,00,00,00,05,00,02,00,2d,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"FirstEntry",0x10001,"2006" +HKLM,%CurrentVersionNT%\Time Zones\Chatham Islands Standard Time\Dynamic DST,"LastEntry",0x10001,"2008" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Display",,"Asia/Shanghai" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"Dlt",,"China Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\China Standard Time,"MUI_Dlt",,"@tzres.dll,-161" -- 2.17.1

1 2

[PATCH] wldap32: Fix compilation without LDAP installed.
by Dmitry Timoshkov 29 Mar '20

29 Mar '20

From: harry+winehq(a)unheit.net Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48838 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/bind.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 63d4208eef..46b866fd31 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -179,7 +179,7 @@ exit: return ret; } -#ifdef HAVE_LDAP_H +#ifdef HAVE_LDAP static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) { @@ -219,7 +219,7 @@ static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *intera #endif /* HAVE_SASL_SASL_H */ } -#endif /* HAVE_LDAP_H */ +#endif /* HAVE_LDAP */ /*********************************************************************** * ldap_bind_sW (WLDAP32.@) -- 2.25.1

1 0

[PATCH] winmm: Use _lopen instead of OpenFile.
by Alistair Leslie-Hughes 29 Mar '20

29 Mar '20

OpenFile has a filpath limit of 128. Use _lopen which calls through to CreateFile which doesn't have this limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48832 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27324 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winmm/mmio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 6f14301975..30adcd0f22 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -76,8 +76,7 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, /* if filename NULL, assume open file handle in adwInfo[0] */ if (szFileName) { - OFSTRUCT ofs; - lpmmioinfo->adwInfo[0] = OpenFile(szFileName, &ofs, lpmmioinfo->dwFlags & 0xFFFF); + lpmmioinfo->adwInfo[0] = _lopen(szFileName, lpmmioinfo->dwFlags); } if (lpmmioinfo->adwInfo[0] == HFILE_ERROR) ret = MMIOERR_FILENOTFOUND; -- 2.25.1

2 1

[PATCH 8/8] dbghelp: Fix misleading indentation warning.
by Jacek Caban 29 Mar '20

29 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/dwarf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 7/8] dbghelp: Pass stab size to stabs_parse.
by Jacek Caban 29 Mar '20

29 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- dlls/dbghelp/stabs.c | 15 ++------------- 5 files changed, 6 insertions(+), 17 deletions(-)

1 0