May 2019 - Wine-Commits - list.winehq.org

Paul Gofman : kernel32: Add DECLSPEC_HOTPATCH to FindClose().
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: ea33e9e51b5dd827e71156f301c4a2ab6270fab1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea33e9e51b5dd827e71156f3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 5 11:26:28 2019 +0300 kernel32: Add DECLSPEC_HOTPATCH to FindClose(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28140 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d62187105e37c0729775ae45d161ba74302ce5a5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 3214d72..c66073b 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2236,7 +2236,7 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) /************************************************************************* * FindClose (KERNEL32.@) */ -BOOL WINAPI FindClose( HANDLE handle ) +BOOL WINAPI DECLSPEC_HOTPATCH FindClose( HANDLE handle ) { FIND_FIRST_INFO *info = handle;

1 0

Gijs Vermeulen : kernel32: Add DECLSPEC_HOTPATCH to SizeofResource().
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 97b0486be70acab50725cb1ee89afd15a7329ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97b0486be70acab50725cb1e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Apr 2 18:46:15 2019 +0200 kernel32: Add DECLSPEC_HOTPATCH to SizeofResource(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28140 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 002a19599be273b9f947425a820897816317c378) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index a04fe62..5c9383d 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -617,7 +617,7 @@ BOOL WINAPI FreeResource( HGLOBAL handle ) /********************************************************************** * SizeofResource (KERNEL32.@) */ -DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) +DWORD WINAPI DECLSPEC_HOTPATCH SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) { if (!hRsrc) return 0; return ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->Size;

1 0

Zhiyi Zhang : user32: Fix a memory leak.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: f0b022bdf5cef3adb3f787467aac2a9d4b58138d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0b022bdf5cef3adb3f78746… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 23 23:34:12 2019 +0800 user32: Fix a memory leak. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c8cf96e9cb88cdec3d3a8ec862b257452effd42) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/rawinput.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 4bfccdf..b247c15 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -172,6 +172,7 @@ static void find_hid_devices(void) done: LeaveCriticalSection(&hid_devices_cs); + SetupDiDestroyDeviceInfoList(set); heap_free(detail); }

1 0

Alexandre Julliard : dinput: Add error check to silence a compiler warning.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 7973e1374a7c8e3b022b32c0e89be5a7309f0792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7973e1374a7c8e3b022b32c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 19:38:36 2019 +0100 dinput: Add error check to silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6925fb0bb6e9dfdc641295908cc6ed68f69f2e28) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/config.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 885f1f4..db5878b 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -298,10 +298,11 @@ static void assign_action(HWND dialog) int obj = lv_get_cur_item(dialog); int old_action = lv_get_item_data(dialog, obj); int used_obj; - - DIDEVICEOBJECTINSTANCEW ddo = device->ddo[obj]; + DWORD type; if (old_action == action) return; + if (obj < 0) return; + type = device->ddo[obj].dwType; /* Clear old action */ if (old_action != -1) @@ -320,7 +321,7 @@ static void assign_action(HWND dialog) lv_set_action(dialog, used_obj, -1, lpdiaf); /* Set new action */ - lpdiaf->rgoAction[action].dwObjID = ddo.dwType; + lpdiaf->rgoAction[action].dwObjID = type; lpdiaf->rgoAction[action].guidInstance = device->ddi.guidInstance; lpdiaf->rgoAction[action].dwHow = DIAH_USERCONFIG;

1 0

Zhiyi Zhang : d3d8: Fix building on Mac.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: d76718e438760a6f7bd7d56ca374b3fb89505ef6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d76718e438760a6f7bd7d56c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 30 22:25:07 2019 +0800 d3d8: Fix building on Mac. bool is a reserved word in c99. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 13cca44d20239612a23fa9b3fe51e072a2073a60) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/d3d8_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 92c5032..6165971 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -60,16 +60,16 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) * ValidateVertexShader (D3D8.@) * * I've seen reserved1 and reserved2 always passed as 0's - * bool seems always passed as 0 or 1, but other values work as well... + * boolean seems always passed as 0 or 1, but other values work as well... * toto result? */ -HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) +HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL boolean, DWORD* toto) { HRESULT ret; static BOOL warned; if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); + FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, boolean, toto); warned = TRUE; } @@ -98,13 +98,13 @@ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD * PARAMS * toto result? */ -HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto) +HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL boolean, DWORD* toto) { HRESULT ret; static BOOL warned; if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); + FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, boolean, toto); warned = TRUE; }

1 0

Dmitry Timoshkov : wpcap: Fix compilation with recent pcap/ pcap.h versions.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 2a532f4809fc0328877c1f8219609c526daaba8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a532f4809fc0328877c1f82… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 28 20:37:47 2019 +0300 wpcap: Fix compilation with recent pcap/pcap.h versions. Recent libpcap versions have added inclusion of pcap/socket.h to pcap.h that includes sys/socket.h and other system .h files that lead to conflicts with winsock2.h. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 40c9b46500c3606e966d5404d45b68a48609b6ea) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wpcap/wpcap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index e7908cd..f163235 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -24,6 +24,7 @@ #undef SOCKET #undef INVALID_SOCKET +#define USE_WS_PREFIX #include "winsock2.h" #include "windef.h" #include "winbase.h"

1 0

Sveinar Søpler : wined3d: Add GPU information for the NVIDIA RTX series.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 1ad3a179f6da9656364eaa227ddcb7e837d90a9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ad3a179f6da9656364eaa22… Author: Sveinar Søpler <cybermax(a)dexter.no> Date: Sat Mar 30 00:52:34 2019 +0430 wined3d: Add GPU information for the NVIDIA RTX series. Signed-off-by: Sveinar Søpler <cybermax(a)dexter.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ad907fd12ee48b3558a7e499d289cef21e920a08) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ++++ dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index af0db3e..5b37477 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1301,6 +1301,10 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"RTX 2080 Ti", CARD_NVIDIA_GEFORCE_RTX2080TI}, /* GeForce 2000 - highend */ + {"RTX 2080", CARD_NVIDIA_GEFORCE_RTX2080}, /* GeForce 2000 - highend */ + {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ + {"RTX 2060", CARD_NVIDIA_GEFORCE_RTX2060}, /* GeForce 2000 - highend */ {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aaafd31..51320e6588 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -329,6 +329,10 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2060, "NVIDIA GeForce RTX 2060", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080, "NVIDIA GeForce RTX 2080", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080TI, "NVIDIA GeForce RTX 2080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a300f11..c71c371 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2435,6 +2435,10 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, + CARD_NVIDIA_GEFORCE_RTX2060 = 0x1f08, + CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07, + CARD_NVIDIA_GEFORCE_RTX2080 = 0x1e87, + CARD_NVIDIA_GEFORCE_RTX2080TI = 0x1e07, CARD_REDHAT_VIRGL = 0x1010,

1 0

Sven Baars : windowscodecs: Fix a memory leak (Valgrind).
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: 2b0d9452521d8f5138a13f904ceef2911f9c7b38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b0d9452521d8f5138a13f90… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Jan 24 11:59:48 2019 +0100 windowscodecs: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1f132865ec21a644071a04558c116e73c3a62a19) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 7050c95..faffeae 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -620,7 +620,6 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p if (setjmp(jmpbuf)) { ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); - HeapFree(GetProcessHeap(), 0, row_pointers); This->png_ptr = NULL; hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; goto end; @@ -816,6 +815,9 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p end: LeaveCriticalSection(&This->lock); + if (row_pointers) + HeapFree(GetProcessHeap(), 0, row_pointers); + return hr; }

1 0

Gijs Vermeulen : ntdll: Validate len in NtQueryVirtualMemory.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: dcd7bf05c1bf13bdbb4ee211303219f87b05a649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd7bf05c1bf13bdbb4ee211… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Feb 18 15:22:52 2019 +0100 ntdll: Validate len in NtQueryVirtualMemory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45632 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2d52717af2a64196d9bc983ba8b75e64c05c3f8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/info.c | 3 +++ dlls/ntdll/virtual.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7690696..5f27d8b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2005,6 +2005,9 @@ static void test_queryvirtualmemory(void) /* check error code when addr is higher than working set limit */ status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + /* check error code when len is less than MEMORY_BASIC_INFORMATION size */ + status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION) - 1, &readcount); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); } static void test_affinity(void) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 030c658..da2dad1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2820,6 +2820,9 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, } } + if (len < sizeof(MEMORY_BASIC_INFORMATION)) + return STATUS_INFO_LENGTH_MISMATCH; + if (process != NtCurrentProcess()) { NTSTATUS status;

1 0

Piotr Caban : msvcrt: Fix buffer overflow in _get_tzname.
by Alexandre Julliard May 15, 2019

May 15, 2019

Module: wine Branch: stable Commit: b26f35d9ef891da33ab0486d33b151dba106f1ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=b26f35d9ef891da33ab0486d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 27 18:37:10 2019 +0100 msvcrt: Fix buffer overflow in _get_tzname. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46481 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 79188582f067b16e3aaebfad4a853d84f3a310cc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/time.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 14f4ba0..e6493b0 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -939,6 +939,11 @@ int CDECL MSVCRT__get_tzname(MSVCRT_size_t *ret, char *buf, MSVCRT_size_t bufsiz *ret = strlen(timezone)+1; if(!buf && !bufsize) return 0; + if(*ret > bufsize) + { + buf[0] = 0; + return MSVCRT_ERANGE; + } strcpy(buf, timezone); return 0;

1 0