January 2020 - Wine-Devel - list.winehq.org

[PATCH] user.exe16: Releasing DC does not disable it.
by Jeff Smith Jan. 12, 2020

Jan. 12, 2020

ReleaseDC in user32 marks cache DCs as disabled. For user.exe (the 16-bit equivalent), this causes DCs to become inaccessible after release. On Windows, they are still accessible after release. Work around this in user.exe by re-enabling the DC immediately after calling the user32 ReleaseDC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44408 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- Tested with the program referenced in the bug report. I also wrote and ran some tests on WinXP to compare how user32.dll and user.exe handle ReleaseDC. dlls/user.exe16/window.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 10f1389f0a..bf86719325 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -23,6 +23,7 @@ #include "user_private.h" #include "wine/list.h" #include "wine/server.h" +#include "wine/gdi_driver.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); @@ -675,7 +676,9 @@ HDC16 WINAPI GetWindowDC16( HWND16 hwnd ) */ INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc ) { - return (INT16)ReleaseDC( WIN_Handle32(hwnd), HDC_32(hdc) ); + INT16 ret = (INT16)ReleaseDC( WIN_Handle32(hwnd), HDC_32(hdc) ); + SetHookFlags( HDC_32(hdc), DCHF_ENABLEDC ); + return ret; } -- 2.23.0

1 0

[PATCH v2] ntdll: Force align the stack in RtlRaiseException() on i386.
by Chip Davis Jan. 12, 2020

Jan. 12, 2020

This is an assembly function, so we have to do it manually. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Fix saving EAX. Unfortunately, I need a register because of the 'subl' instruction. dlls/ntdll/signal_i386.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e9dd0de2fc3c..099e10a3ebf2 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2548,14 +2548,22 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "leal -0x2cc(%esp),%esp\n\t" /* sizeof(CONTEXT) */ - "pushl %esp\n\t" /* context */ + "andl $-16,%esp\n\t" + "subl $16,%esp\n\t" + "movl %eax,(%esp)\n\t" + "movl %esp,%eax\n\t" + "subl $12,%esp\n\t" /* stack alignment */ + "pushl %eax\n\t" /* context */ + "movl 16(%esp),%eax\n\t" "call " __ASM_STDCALL("RtlCaptureContext",4) "\n\t" + "addl $12,%esp\n\t" "movl 4(%ebp),%eax\n\t" /* return address */ "movl 8(%ebp),%ecx\n\t" /* rec */ "movl %eax,12(%ecx)\n\t" /* rec->ExceptionAddress */ "leal 12(%ebp),%eax\n\t" "movl %eax,0xc4(%esp)\n\t" /* context->Esp */ "movl %esp,%eax\n\t" + "subl $8,%esp\n\t" /* stack alignment */ "pushl %eax\n\t" "pushl %ecx\n\t" "call " __ASM_NAME("raise_exception_full_context") "\n\t" -- 2.24.0

2 4

[PATCH] netapi32/tests: Fix the size passed to GetUserNameW() and GetComputerNameW() (Coverity).
by Zebediah Figura Jan. 12, 2020

Jan. 12, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/netapi32/tests/access.c | 4 ++-- dlls/netapi32/tests/wksta.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 0b6a5747312..f54b37b42ef 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -482,10 +482,10 @@ START_TEST(access) pDavGetHTTPFromUNCPath = (void*)GetProcAddress(hnetapi32, "DavGetHTTPFromUNCPath"); pDavGetUNCFromHTTPPath = (void*)GetProcAddress(hnetapi32, "DavGetUNCFromHTTPPath"); - size = sizeof(user_name); + size = ARRAY_SIZE(user_name); ret = GetUserNameW(user_name, &size); ok(ret, "Failed to get user name, error %u.\n", GetLastError()); - size = sizeof(computer_name); + size = ARRAY_SIZE(computer_name); ret = GetComputerNameW(computer_name, &size); ok(ret, "Failed to get computer name, error %u.\n", GetLastError()); diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 684905c4dcb..f53fcbbcce1 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -175,10 +175,10 @@ START_TEST(wksta) pNetpGetComputerName = (void *)GetProcAddress(GetModuleHandleA("netapi32.dll"), "NetpGetComputerName"); - size = sizeof(user_name); + size = ARRAY_SIZE(user_name); ret = GetUserNameW(user_name, &size); ok(ret, "Failed to get user name, error %u.\n", GetLastError()); - size = sizeof(computer_name); + size = ARRAY_SIZE(computer_name); ret = GetComputerNameW(computer_name, &size); ok(ret, "Failed to get computer name, error %u.\n", GetLastError()); -- 2.24.1

1 0

[PATCH] dinput: Support default DIPROP_BUFFERSIZE buffer size
by Alistair Leslie-Hughes Jan. 12, 2020

Jan. 12, 2020

When a program calls SetProperty with DIPROP_BUFFERSIZE, dinput records this value for GetProperty but only uses it when the device can support that number of buffers otherwise it ignores this value.. In the case of game "Far Cry 5", it passes through (DWORD)-1 which cause HeapAlloc to fail ((DWORD)-1 * sizeof(DIDEVICEOBJECTDATA)). Since there is no real way of working out the max value, I've capped it at 100 as the default value is 20. MSDN reference. https://docs.microsoft.com/en-us/previous-versions/windows/desktop/ee417908… Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45732 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 14 ++++++++++---- dlls/dinput/device_private.h | 3 ++- dlls/dinput/joystick_linux.c | 4 ++++ dlls/dinput/joystick_linuxinput.c | 4 ++++ dlls/dinput/joystick_osx.c | 4 ++++ dlls/dinput/keyboard.c | 3 +++ dlls/dinput/mouse.c | 3 +++ dlls/dinput/tests/device.c | 14 ++++++++++++++ 8 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 28329d03b5..1604075f84 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1307,7 +1307,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, if (pdiph->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; - pd->dwData = This->queue_len; + pd->dwData = This->buffersize; TRACE("buffersize = %d\n", pd->dwData); break; } @@ -1396,12 +1396,18 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( TRACE("buffersize = %d\n", pd->dwData); EnterCriticalSection(&This->crit); + + This->buffersize = pd->dwData; + + This->queue_len = This->buffersize > 100 ? 100 : This->buffersize; + if (This->buffersize > 100) + WARN("Trying to set large buffer size %d\n", pd->dwData); + HeapFree(GetProcessHeap(), 0, This->data_queue); - This->data_queue = !pd->dwData ? NULL : HeapAlloc(GetProcessHeap(), 0, - pd->dwData * sizeof(DIDEVICEOBJECTDATA)); + This->data_queue = !This->queue_len ? NULL : HeapAlloc(GetProcessHeap(), 0, + This->queue_len * sizeof(DIDEVICEOBJECTDATA)); This->queue_head = This->queue_tail = This->overflow = 0; - This->queue_len = pd->dwData; LeaveCriticalSection(&This->crit); break; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 27e9c26286..23d9e2eebc 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -71,10 +71,11 @@ struct IDirectInputDeviceImpl DI_EVENT_PROC event_proc; /* function to receive mouse & keyboard events */ LPDIDEVICEOBJECTDATA data_queue; /* buffer for 'GetDeviceData'. */ - int queue_len; /* size of the queue - set in 'SetProperty' */ + int queue_len; /* valid size of the queue */ int queue_head; /* position to write new event into queue */ int queue_tail; /* next event to read from queue */ BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ + DWORD buffersize; /* size of the queue - set in 'SetProperty' */ DataFormat data_format; /* user data format and wine to user format converter */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index afdf659b4a..1e7bf72936 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -501,6 +501,10 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, newDevice->generic.base.ref = 1; newDevice->generic.base.dinput = dinput; newDevice->generic.base.guid = *rguid; + newDevice->generic.base.buffersize = 20; + newDevice->generic.base.queue_len = 20; + newDevice->generic.base.data_queue = HeapAlloc(GetProcessHeap(), 0, + newDevice->generic.base.queue_len * sizeof(DIDEVICEOBJECTDATA)); InitializeCriticalSection(&newDevice->generic.base.crit); newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->generic.base.crit"); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index b5418d805c..98283a1eed 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -471,6 +471,10 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig newDevice->generic.base.ref = 1; newDevice->generic.base.guid = *rguid; newDevice->generic.base.dinput = dinput; + newDevice->generic.base.buffersize = 20; + newDevice->generic.base.queue_len = 20; + newDevice->generic.base.data_queue = HeapAlloc(GetProcessHeap(), 0, + newDevice->generic.base.queue_len * sizeof(DIDEVICEOBJECTDATA)); newDevice->generic.joy_polldev = joy_polldev; newDevice->joyfd = -1; newDevice->joydev = &joydevs[index]; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 990f5d1f07..c48cad1f5a 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1168,6 +1168,10 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, newDevice->generic.base.ref = 1; newDevice->generic.base.dinput = dinput; newDevice->generic.base.guid = *rguid; + newDevice->generic.base.buffersize = 20; + newDevice->generic.base.queue_len = 20; + newDevice->generic.base.data_queue = HeapAlloc(GetProcessHeap(), 0, + newDevice->generic.base.queue_len * sizeof(DIDEVICEOBJECTDATA)); InitializeCriticalSection(&newDevice->generic.base.crit); newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->generic.base.crit"); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 47f28cac52..15a6be4dee 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -268,6 +268,9 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); newDevice->subtype = get_keyboard_subtype(); + newDevice->base.buffersize = 20; + newDevice->base.queue_len = 20; + newDevice->base.data_queue = HeapAlloc(GetProcessHeap(), 0, newDevice->base.queue_len * sizeof(DIDEVICEOBJECTDATA)); /* Create copy of default data format */ if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIKeyboard.dwSize))) goto failed; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 08ace2f4e9..59c8c9dad8 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -214,6 +214,9 @@ static SysMouseImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); newDevice->base.dinput = dinput; newDevice->base.event_proc = dinput_mouse_hook; + newDevice->base.buffersize = 20; + newDevice->base.queue_len = 20; + newDevice->base.data_queue = HeapAlloc(GetProcessHeap(), 0, newDevice->base.queue_len * sizeof(DIDEVICEOBJECTDATA)); get_app_key(&hkey, &appkey); if (!get_config_key(hkey, appkey, "MouseWarpOverride", buffer, sizeof(buffer))) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index a2a5a65686..4dd16c70d2 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -106,8 +106,22 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); dp.diph.dwHow = DIPH_DEVICE; dp.diph.dwObj = 0; + dp.dwData = -1; + + hr = IDirectInputDevice_GetProperty(device, DIPROP_BUFFERSIZE, &dp.diph); + ok(hr == DI_OK, "Failed: %08x\n", hr); + ok(dp.dwData == 20, "got %d\n", dp.dwData); + + dp.dwData = -1; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + dp.dwData = 0; + hr = IDirectInputDevice_GetProperty(device, DIPROP_BUFFERSIZE, &dp.diph); + ok(hr == DI_OK, "Failed: %08x\n", hr); + ok(dp.dwData == -1, "got %d\n", dp.dwData); + dp.dwData = 0; hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); cnt = 5; -- 2.24.1

2 1

Wine staging 5.0 rc5 release
by Alistair Leslie-Hughes Jan. 11, 2020

Jan. 11, 2020

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.0 rc5 (870 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * combase: Add GetRestrictedErrorInfo and RoOriginateLanguageException stubs. Added: * [45732] dinput: Far Cry 5 Cannot Steer Land Vehicles * [48408] dsound: Use an SRW lock for buffer_list_lock. Updated: * dxva2-Video_Decoder * activeds-ADsOpenObject * ntdll-ForceBottomUpAlloc * user32-rawinput-nolegacy Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] ntdll: Force align the stack in RtlRaiseException() on i386.
by Chip Davis Jan. 11, 2020

Jan. 11, 2020

This is an assembly function, so we have to do it manually. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/ntdll/signal_i386.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e9dd0de2fc3c..159819a92ba2 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2548,14 +2548,20 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "leal -0x2cc(%esp),%esp\n\t" /* sizeof(CONTEXT) */ - "pushl %esp\n\t" /* context */ + "andl $-16,%esp\n\t" + "subl $16,%esp\n\t" + "movl %esp,%eax\n\t" + "subl $12,%esp\n\t" /* stack alignment */ + "pushl %eax\n\t" /* context */ "call " __ASM_STDCALL("RtlCaptureContext",4) "\n\t" + "addl $12,%esp\n\t" "movl 4(%ebp),%eax\n\t" /* return address */ "movl 8(%ebp),%ecx\n\t" /* rec */ "movl %eax,12(%ecx)\n\t" /* rec->ExceptionAddress */ "leal 12(%ebp),%eax\n\t" "movl %eax,0xc4(%esp)\n\t" /* context->Esp */ "movl %esp,%eax\n\t" + "subl $8,%esp\n\t" /* stack alignment */ "pushl %eax\n\t" "pushl %ecx\n\t" "call " __ASM_NAME("raise_exception_full_context") "\n\t" -- 2.24.0

2 1

[PATCH] dbghelp: Look for .eh_fram if no .eh_frame is found.
by Chip Davis Jan. 11, 2020

Jan. 11, 2020

lld produces these, because '.eh_frame' misses the eight-character limit by one character, but '.eh_fram' does not. This allows it to avoid producing a string table for this common section. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/dbghelp/dwarf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 26e2f42ba0d0..980e1d21781a 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3516,7 +3516,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, BOOL ret = TRUE; struct module_format* dwarf2_modfmt; - dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect); + if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect)) + /* lld produces .eh_fram to avoid generating a long name */ + dwarf2_init_section(&eh_frame, fmap, ".eh_fram", NULL, &eh_frame_sect); dwarf2_init_section(&section[section_debug], fmap, ".debug_info", ".zdebug_info", &debug_sect); dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", ".zdebug_abbrev", &debug_abbrev_sect); dwarf2_init_section(&section[section_string], fmap, ".debug_str", ".zdebug_str", &debug_str_sect); -- 2.24.0

1 0

[PATCH 1/2] setupapi: Add support for IDF_CHECKFIRST flag in SetupPromptForDiskW.
by Gijs Vermeulen Jan. 11, 2020

Jan. 11, 2020

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20465 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/setupapi/dialog.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c index fdabf887b0..cdc739490b 100644 --- a/dlls/setupapi/dialog.c +++ b/dlls/setupapi/dialog.c @@ -241,6 +241,34 @@ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR Disk SetLastError(ERROR_INVALID_PARAMETER); return DPROMPT_CANCEL; } + + if (PathToSource && (DiskPromptStyle & IDF_CHECKFIRST)) + { + WCHAR filepath[MAX_PATH]; + + if (lstrlenW(PathToSource) + 1 + lstrlenW(FileSought) < sizeof(filepath)) + { + _snwprintf(filepath, MAX_PATH, L"%s\\%s", PathToSource, FileSought); + + if (GetFileAttributesW(filepath) != INVALID_FILE_ATTRIBUTES) + { + if (PathRequiredSize) + *PathRequiredSize = lstrlenW(PathToSource) + 1; + + if (!PathBuffer) + return DPROMPT_SUCCESS; + + if (PathBufferSize >= lstrlenW(PathToSource) + 1) + { + lstrcpyW(PathBuffer, PathToSource); + return DPROMPT_SUCCESS; + } + else + return DPROMPT_BUFFERTOOSMALL; + } + } + } + params.DialogTitle = DialogTitle; params.DiskName = DiskName; params.PathToSource = PathToSource; -- 2.24.1

1 1

Compiling d2d1 shaders
by Giovanni Mascellani Jan. 11, 2020

Jan. 11, 2020

Hi, d2d1.dll code contains HLSL shaders both in source code (guarded by #if 0) and in bytecode. What is the correct way to recompile the bytecode when the changing the source code? Is there some automated tooling, or is everything done by manual copy and paste? In particular, I believe it is NOT ok to use Microsoft's implementation of D3DCompile & co., or is it? Thanks, Giovanni. -- Giovanni Mascellani <g.mascellani(a)gmail.com> Postdoc researcher - Université Libre de Bruxelles

1 0

[PATCH] netapi32: fixed buffer size to GetUserNameW and GetComputerNameW
by Marcus Meissner Jan. 11, 2020

Jan. 11, 2020

Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/netapi32/tests/access.c | 4 ++-- dlls/netapi32/tests/wksta.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 3cf6cb35dd..0f0ac5417f 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -494,10 +494,10 @@ START_TEST(access) pDavGetHTTPFromUNCPath = (void*)GetProcAddress(hnetapi32, "DavGetHTTPFromUNCPath"); pDavGetUNCFromHTTPPath = (void*)GetProcAddress(hnetapi32, "DavGetUNCFromHTTPPath"); - size = sizeof(user_name); + size = ARRAY_SIZE(user_name); ret = GetUserNameW(user_name, &size); ok(ret, "Failed to get user name, error %u.\n", GetLastError()); - size = sizeof(computer_name); + size = ARRAY_SIZE(computer_name); ret = GetComputerNameW(computer_name, &size); ok(ret, "Failed to get computer name, error %u.\n", GetLastError()); diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 684905c4dc..f53fcbbcce 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -175,10 +175,10 @@ START_TEST(wksta) pNetpGetComputerName = (void *)GetProcAddress(GetModuleHandleA("netapi32.dll"), "NetpGetComputerName"); - size = sizeof(user_name); + size = ARRAY_SIZE(user_name); ret = GetUserNameW(user_name, &size); ok(ret, "Failed to get user name, error %u.\n", GetLastError()); - size = sizeof(computer_name); + size = ARRAY_SIZE(computer_name); ret = GetComputerNameW(computer_name, &size); ok(ret, "Failed to get computer name, error %u.\n", GetLastError()); -- 2.24.1

1 0