December 2022 - Wine-commits

Zebediah Figura : win32u: Downgrade the NtOpenFile ERR to a WARN in add_device().
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: a5811228b4a600a8f833f8523d57f9f19b16d6ac URL: https://gitlab.winehq.org/wine/wine/-/commit/a5811228b4a600a8f833f8523d57f9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 18:12:28 2022 -0600 win32u: Downgrade the NtOpenFile ERR to a WARN in add_device(). This may fail for multiple legitimate reasons. Most commonly, the device may not actually be present on the machine (it will appear in the registry regardless). Less commonly, the device may have been removed between the call to NtEnumerateKey and here. We can get around the former by checking the Linked subkey value, but there is not much point; failing to open the file gives us just as much information. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53300 --- dlls/win32u/rawinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 2f48e4f8c43..ab1252ccea6 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -249,7 +249,7 @@ static struct device *add_device( HKEY key, DWORD type ) if ((status = NtOpenFile( &file, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT ))) { - ERR( "Failed to open device file %s, status %#x.\n", debugstr_w(path), status ); + WARN( "Failed to open device file %s, status %#x.\n", debugstr_w(path), status ); return NULL; }

1 0

Huw Davies : winemac: Fix printf format warnings in clipboard.c.
by Alexandre Julliard 12 Dec '22

12 Dec '22

Module: wine Branch: master Commit: dfd4f37fee3cf769e23b5a761c1c6035e87c53c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfd4f37fee3cf769e23b5a761c1c60… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 13:24:45 2022 +0000 winemac: Fix printf format warnings in clipboard.c. --- dlls/winemac.drv/clipboard.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 4e6f4ac44ca..91e954d0ab5 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -192,12 +192,12 @@ static const struct /* The prefix prepended to a Win32 clipboard format name to make a Mac pasteboard type. */ static const CFStringRef registered_name_type_prefix = CFSTR("org.winehq.registered."); -static DWORD clipboard_thread_id; +static unsigned int clipboard_thread_id; static HWND clipboard_hwnd; static BOOL is_clipboard_owner; static macdrv_window clipboard_cocoa_window; -static ULONG last_clipboard_update; -static DWORD last_get_seqno; +static unsigned int last_clipboard_update; +static unsigned int last_get_seqno; static WINE_CLIPFORMAT **current_mac_formats; static unsigned int nb_current_mac_formats; @@ -285,7 +285,8 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) if (!NtUserGetClipboardFormatName(format->format_id, buffer, ARRAY_SIZE(buffer))) { - WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), RtlGetLastWin32Error()); + WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), + (unsigned int)RtlGetLastWin32Error()); free(format); return NULL; } @@ -1142,7 +1143,7 @@ NTSTATUS macdrv_dnd_get_data(void *arg) CFIndex i; CFStringRef type, best_type; WINE_CLIPFORMAT* best_format = NULL; - NTSTATUS status = STATUS_SUCCESS; + unsigned int status = STATUS_SUCCESS; TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(params->format)); @@ -1563,7 +1564,7 @@ static void update_clipboard(void) static BOOL updating; TRACE("is_clipboard_owner %d last_clipboard_update %u now %u\n", - is_clipboard_owner, last_clipboard_update, NtGetTickCount()); + is_clipboard_owner, last_clipboard_update, (unsigned int)NtGetTickCount()); if (updating) return; updating = TRUE; @@ -1599,7 +1600,7 @@ static BOOL init_clipboard(HWND hwnd) register_builtin_formats(); grab_win32_clipboard(); - TRACE("clipboard thread %04x running\n", GetCurrentThreadId()); + TRACE("clipboard thread %04x running\n", clipboard_thread_id); return TRUE; }

1 0

Huw Davies : winemac: Fix printf format warnings in display.c.
by Alexandre Julliard 12 Dec '22

12 Dec '22

Module: wine Branch: master Commit: b46c60f4fad9dbee4d32848048251d11fb8981cd URL: https://gitlab.winehq.org/wine/wine/-/commit/b46c60f4fad9dbee4d32848048251d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 13:27:24 2022 +0000 winemac: Fix printf format warnings in display.c. --- dlls/winemac.drv/display.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index f24ada839ab..12e12d297d9 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -737,7 +737,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN struct display_mode_descriptor *desc; CGDisplayModeRef best_display_mode; - TRACE("%p %s %p 0x%08x %p\n", displays, debugstr_w(primary_name), hwnd, flags, lpvoid); + TRACE("%p %s %p 0x%08x %p\n", displays, debugstr_w(primary_name), hwnd, (unsigned int)flags, lpvoid); init_original_display_mode(); @@ -769,18 +769,18 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN } if (mode->dmBitsPerPel != bpp) - TRACE("using default %d bpp instead of caller's request %d bpp\n", bpp, mode->dmBitsPerPel); + TRACE("using default %d bpp instead of caller's request %d bpp\n", bpp, (int)mode->dmBitsPerPel); - TRACE("looking for %dx%dx%dbpp @%d Hz", mode->dmPelsWidth, mode->dmPelsHeight, - bpp, mode->dmDisplayFrequency); + TRACE("looking for %dx%dx%dbpp @%d Hz", (int)mode->dmPelsWidth, (int)mode->dmPelsHeight, + bpp, (int)mode->dmDisplayFrequency); TRACE(" %sstretched", mode->dmDisplayFixedOutput == DMDFO_STRETCH ? "" : "un"); TRACE(" %sinterlaced", mode->dmDisplayFlags & DM_INTERLACED ? "" : "non-"); TRACE("\n"); if (!(best_display_mode = find_best_display_mode(mode, display_modes, bpp, desc))) { - ERR("No matching mode found %ux%ux%d @%u!\n", mode->dmPelsWidth, mode->dmPelsHeight, - bpp, mode->dmDisplayFrequency); + ERR("No matching mode found %ux%ux%d @%u!\n", (unsigned int)mode->dmPelsWidth, (unsigned int)mode->dmPelsHeight, + bpp, (unsigned int)mode->dmDisplayFrequency); ret = DISP_CHANGE_BADMODE; } else if (!macdrv_set_display_mode(&macdrv_displays[0], best_display_mode)) @@ -913,11 +913,11 @@ BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, BOOL is_primary, LPDEVMOD macdrv_free_displays(displays); TRACE("current mode -- %dx%d-%dx%dx%dbpp @%d Hz", - devmode->dmPosition.x, devmode->dmPosition.y, - devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel, - devmode->dmDisplayFrequency); + (int)devmode->dmPosition.x, (int)devmode->dmPosition.y, + (int)devmode->dmPelsWidth, (int)devmode->dmPelsHeight, (int)devmode->dmBitsPerPel, + (int)devmode->dmDisplayFrequency); if (devmode->dmDisplayOrientation) - TRACE(" rotated %u degrees", devmode->dmDisplayOrientation * 90); + TRACE(" rotated %u degrees", (unsigned int)devmode->dmDisplayOrientation * 90); if (devmode->dmDisplayFixedOutput == DMDFO_STRETCH) TRACE(" stretched"); if (devmode->dmDisplayFlags & DM_INTERLACED) @@ -1073,7 +1073,7 @@ static void init_registry_display_settings(void) DISPLAY_DEVICEW dd = {sizeof(dd)}; UNICODE_STRING str; DWORD i = 0; - LONG ret; + int ret; while (!NtUserEnumDisplayDevices(NULL, i++, &dd, 0)) { @@ -1090,8 +1090,8 @@ static void init_registry_display_settings(void) } TRACE("Device %s current display mode %ux%u %ubits %uHz at %d,%d.\n", - wine_dbgstr_w(dd.DeviceName), dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel, - dm.dmDisplayFrequency, dm.dmPosition.x, dm.dmPosition.y); + wine_dbgstr_w(dd.DeviceName), (unsigned int)dm.dmPelsWidth, (unsigned int)dm.dmPelsHeight, + (unsigned int)dm.dmBitsPerPel, (unsigned int)dm.dmDisplayFrequency, (int)dm.dmPosition.x, (int)dm.dmPosition.y); ret = NtUserChangeDisplaySettings(&str, &dm, NULL, CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); @@ -1196,8 +1196,8 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage /* Initialize modes */ for (mode = modes; mode < modes + mode_count; mode++) { - TRACE("mode: %dx%dx%dbpp @%d Hz, %sstretched %sinterlaced\n", mode->dmPelsWidth, mode->dmPelsHeight, - mode->dmBitsPerPel, mode->dmDisplayFrequency, + TRACE("mode: %dx%dx%dbpp @%d Hz, %sstretched %sinterlaced\n", (int)mode->dmPelsWidth, (int)mode->dmPelsHeight, + (int)mode->dmBitsPerPel, (int)mode->dmDisplayFrequency, mode->dmDisplayFixedOutput == DMDFO_STRETCH ? "" : "un", mode->dmDisplayFlags & DM_INTERLACED ? "" : "non-"); device_manager->add_mode( mode, param );

1 0

Huw Davies : winemac: Use a designated initializer to silence a compiler warning.
by Alexandre Julliard 12 Dec '22

12 Dec '22

Module: wine Branch: master Commit: b7f3acf0eeee1b5af44a6d1fb4b0b1c1cab60b58 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7f3acf0eeee1b5af44a6d1fb4b0b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 9 09:51:26 2022 +0000 winemac: Use a designated initializer to silence a compiler warning. --- dlls/winemac.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 6ca46f55dff..11dcc1123a6 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -290,7 +290,7 @@ BOOL query_ime_char_rect(macdrv_query* query) void *himc = query->ime_char_rect.data; CFRange *range = &query->ime_char_rect.range; CGRect *rect = &query->ime_char_rect.rect; - struct ime_query_char_rect_result result = {0}; + struct ime_query_char_rect_result result = { .location = 0 }; struct ime_query_char_rect_params params; BOOL ret;

1 0

Huw Davies : winemac: Fix printf format warnings in event.c.
by Alexandre Julliard 12 Dec '22

12 Dec '22

Module: wine Branch: master Commit: 5e7b4bbe5760ab247c8170dc73e2ffca2d5423f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e7b4bbe5760ab247c8170dc73e2ff… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 13:29:38 2022 +0000 winemac: Fix printf format warnings in event.c. --- dlls/winemac.drv/event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 11dcc1123a6..e4f76e2b0e1 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -519,8 +519,8 @@ NTSTATUS macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handles, struct macdrv_thread_data *data = macdrv_thread_data(); macdrv_event_mask event_mask = get_event_mask(mask); - TRACE("count %d, handles %p, timeout %p, mask %x, flags %x\n", count, - handles, timeout, mask, flags); + TRACE("count %d, handles %p, timeout %p, mask %x, flags %x\n", (unsigned int)count, + handles, timeout, (unsigned int)mask, (unsigned int)flags); if (!data) {

1 0

Huw Davies : winemac: Fix LONG vs int mismatch.
by Alexandre Julliard 12 Dec '22

12 Dec '22

Module: wine Branch: master Commit: 650b9b0179b278d9fbf317765bdc67c8c98a77ca URL: https://gitlab.winehq.org/wine/wine/-/commit/650b9b0179b278d9fbf317765bdc67… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 13:34:11 2022 +0000 winemac: Fix LONG vs int mismatch. --- dlls/winemac.drv/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index b43ea0b5dc7..1592bcad1a2 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -594,7 +594,7 @@ static void update_layout_list(void) struct layout *layout; int i; - if (!InterlockedExchange(&macdrv_layout_list_needs_update, FALSE)) return; + if (!InterlockedExchange((LONG *)&macdrv_layout_list_needs_update, FALSE)) return; sources = macdrv_create_input_source_list();

1 0

Jacek Caban : win32u: Call init_window_call_params after WH_CALLWNDPROC hook in call_window_proc.
by Alexandre Julliard 12 Dec '22

12 Dec '22

Module: wine Branch: master Commit: 5075c31ed00b09f9bc0cbea9d940557e170eb17f URL: https://gitlab.winehq.org/wine/wine/-/commit/5075c31ed00b09f9bc0cbea9d94055… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 16:31:25 2022 +0100 win32u: Call init_window_call_params after WH_CALLWNDPROC hook in call_window_proc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53908 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52779 --- dlls/user32/tests/msg.c | 33 +++++++++++++++++++++++++++++++++ dlls/win32u/message.c | 22 ++++++++++------------ 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e36eb7125e6..50bfc9855dd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19417,6 +19417,38 @@ static void test_create_name(void) UnregisterClassW( L"TestCreateNameClassW", NULL ); } +static LRESULT WINAPI changed_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + if (msg == WM_USER) return 3; + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +static LRESULT WINAPI call_window_proc_hook( INT code, WPARAM wparam, LPARAM lparam ) +{ + CWPSTRUCT *cwp = (CWPSTRUCT *)lparam; + + ok( cwp->message == WM_USER, "message = %u\n", cwp->message ); + SetWindowLongPtrW( cwp->hwnd, GWLP_WNDPROC, (LONG_PTR)changed_window_proc ); + return CallNextHookEx( NULL, code, wparam, lparam ); +} + +static void test_hook_changing_window_proc(void) +{ + HWND hwnd; + HHOOK hook; + LRESULT res; + + hwnd = CreateWindowExW( 0, L"static", NULL, WS_POPUP, 0,0,0,0,GetDesktopWindow(),0,0, NULL ); + hook = SetWindowsHookExW( WH_CALLWNDPROC, call_window_proc_hook, NULL, GetCurrentThreadId() ); + ok( hook != NULL, "SetWindowsHookExW failed: %lu\n", GetLastError() ); + + res = SendMessageW( hwnd, WM_USER, 1, 2 ); + ok( res == 3, "SendMessageW(WM_USER) returned %Iu\n", res ); + + UnhookWindowsHookEx( hook ); + DestroyWindow( hwnd ); +} + START_TEST(msg) { char **test_argv; @@ -19534,6 +19566,7 @@ START_TEST(msg) test_TrackPopupMenuEmpty(); test_DoubleSetCapture(); test_create_name(); + test_hook_changing_window_proc(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */ diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index ff417169ad1..d1eeacba39e 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1346,6 +1346,14 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar if (!needs_unpack) size = 0; if (!is_current_thread_window( hwnd )) return 0; + + /* first the WH_CALLWNDPROC hook */ + cwp.lParam = lparam; + cwp.wParam = wparam; + cwp.message = msg; + cwp.hwnd = hwnd = get_full_window_handle( hwnd ); + call_hooks( WH_CALLWNDPROC, HC_ACTION, same_thread, (LPARAM)&cwp, sizeof(cwp) ); + if (size && !(params = malloc( sizeof(*params) + size ))) return 0; if (!init_window_call_params( params, hwnd, msg, wparam, lparam, &result, !unicode, mapping )) { @@ -1359,25 +1367,15 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar params->ansi = FALSE; if (size) memcpy( params + 1, buffer, size ); } - - /* first the WH_CALLWNDPROC hook */ - cwp.lParam = lparam; - cwp.wParam = wparam; - cwp.message = msg; - cwp.hwnd = params->hwnd; - call_hooks( WH_CALLWNDPROC, HC_ACTION, same_thread, (LPARAM)&cwp, sizeof(cwp) ); - dispatch_win_proc_params( params, sizeof(*params) + size ); + if (params != &p) free( params ); /* and finally the WH_CALLWNDPROCRET hook */ cwpret.lResult = result; cwpret.lParam = lparam; cwpret.wParam = wparam; cwpret.message = msg; - cwpret.hwnd = params->hwnd; - - if (params != &p) free( params ); - + cwpret.hwnd = hwnd; call_hooks( WH_CALLWNDPROCRET, HC_ACTION, same_thread, (LPARAM)&cwpret, sizeof(cwpret) ); return result; }

1 0

Piotr Caban : winspool/tests: Fix test failures on Windows 11.
by Alexandre Julliard 12 Dec '22

12 Dec '22

Module: wine Branch: master Commit: c3c48d18afc6cb3c0d55de7f9b645b0cf4291ee7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3c48d18afc6cb3c0d55de7f9b645b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Dec 10 20:45:39 2022 +0100 winspool/tests: Fix test failures on Windows 11. --- dlls/winspool.drv/tests/info.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 58ab581ed25..92b042e354a 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -929,13 +929,15 @@ static void test_EnumForms(LPSTR pName) SetLastError(0xdeadbeef); res = EnumFormsA(hprinter, level, buffer, cbBuf, NULL, &pcReturned); - ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER) , + ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER || + GetLastError() == ERROR_INVALID_PARAMETER), "(%ld) returned %ld with %ld (expected '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); SetLastError(0xdeadbeef); res = EnumFormsA(hprinter, level, buffer, cbBuf, &pcbNeeded, NULL); - ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER) , + ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER || + GetLastError() == ERROR_INVALID_PARAMETER), "(%ld) returned %ld with %ld (expected '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1043,7 +1045,8 @@ static void test_EnumMonitors(void) pcbNeeded = MAGIC_DEAD; pcReturned = MAGIC_DEAD; res = EnumMonitorsA(NULL, level, buffer, cbBuf, NULL, &pcReturned); - ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER || + GetLastError() == ERROR_INVALID_PARAMETER, "(%ld) returned %ld with %ld (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1051,7 +1054,8 @@ static void test_EnumMonitors(void) pcReturned = MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = EnumMonitorsA(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); - ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER || + GetLastError() == ERROR_INVALID_PARAMETER, "(%ld) returned %ld with %ld (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1137,7 +1141,8 @@ static void test_EnumPorts(void) SetLastError(0xdeadbeef); res = EnumPortsA(NULL, level, buffer, cbBuf, NULL, &pcReturned); /* NT: RPC_X_NULL_REF_POINTER (1780), 9x: success */ - ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER) ) || + ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER || + GetLastError() == ERROR_INVALID_PARAMETER)) || ( res && (GetLastError() == ERROR_SUCCESS) ), "(%ld) returned %ld with %ld (expected '0' with " "RPC_X_NULL_REF_POINTER or '!=0' with NO_ERROR)\n", @@ -1147,7 +1152,8 @@ static void test_EnumPorts(void) SetLastError(0xdeadbeef); res = EnumPortsA(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); /* NT: RPC_X_NULL_REF_POINTER (1780), 9x: success */ - ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER) ) || + ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER || + GetLastError() == ERROR_INVALID_PARAMETER)) || ( res && (GetLastError() == ERROR_SUCCESS) ), "(%ld) returned %ld with %ld (expected '0' with " "RPC_X_NULL_REF_POINTER or '!=0' with NO_ERROR)\n", @@ -1261,7 +1267,8 @@ static void test_EnumPrinterDrivers(void) pcbNeeded = 0xdeadbeef; pcReturned = 0xdeadbeef; res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, NULL, &pcReturned); - ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER || + GetLastError() == ERROR_INVALID_PARAMETER, "(%lu) got %lu with %lu (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1269,7 +1276,8 @@ static void test_EnumPrinterDrivers(void) pcReturned = 0xdeadbeef; SetLastError(0xdeadbeef); res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, &pcbNeeded, NULL); - ok( res || GetLastError() == RPC_X_NULL_REF_POINTER, + ok( res || GetLastError() == RPC_X_NULL_REF_POINTER || + GetLastError() == ERROR_INVALID_PARAMETER, "(%lu) got %lu with %lu (expected '!=0' or '0' with " "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); @@ -1410,7 +1418,8 @@ static void test_EnumPrintProcessors(void) pcReturned = 0xdeadbeef; res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf, NULL, &pcReturned); /* the NULL is ignored on win9x */ - ok( broken(res) || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)), + ok( broken(res) || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER || + GetLastError() == ERROR_INVALID_PARAMETER)), "got %lu with %lu (expected '0' with RPC_X_NULL_REF_POINTER)\n", res, GetLastError()); @@ -1419,7 +1428,8 @@ static void test_EnumPrintProcessors(void) SetLastError(0xdeadbeef); res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf, &pcbNeeded, NULL); /* the NULL is ignored on win9x */ - ok( broken(res) || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)), + ok( broken(res) || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER || + GetLastError() == ERROR_INVALID_PARAMETER)), "got %lu with %lu (expected '0' with RPC_X_NULL_REF_POINTER)\n", res, GetLastError());

1 0

Alexandre Julliard : winecrt0: Include windef.h to get definitions needed on FreeBSD.
by Alexandre Julliard 12 Dec '22

12 Dec '22

Module: wine Branch: master Commit: f69c11117ee56cb664bd0ade1392c5553ff2af30 URL: https://gitlab.winehq.org/wine/wine/-/commit/f69c11117ee56cb664bd0ade1392c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 12:30:44 2022 +0100 winecrt0: Include windef.h to get definitions needed on FreeBSD. Reported by Gerald Pfeifer. --- dlls/winecrt0/dll_soinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecrt0/dll_soinit.c b/dlls/winecrt0/dll_soinit.c index e0ed9a1be1e..f76c2993304 100644 --- a/dlls/winecrt0/dll_soinit.c +++ b/dlls/winecrt0/dll_soinit.c @@ -38,7 +38,7 @@ #ifdef HAVE_LINK_H # include <link.h> #endif -#include "basetsd.h" +#include "windef.h" #ifdef __FreeBSD__

1 0

Alexandre Julliard : winegcc: Add -ldl when linking .so files.
by Alexandre Julliard 12 Dec '22

12 Dec '22

Module: wine Branch: master Commit: 19f59ce83923a6338f479ef1d6516d3a3e8d97c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/19f59ce83923a6338f479ef1d6516d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 17:08:45 2022 +0100 winegcc: Add -ldl when linking .so files. This is needed for dladdr1/dlinfo to run the constructors. --- tools/winegcc/winegcc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a850cce765f..142ab81de12 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1372,6 +1372,7 @@ static void build(struct options* opts) if (!opts->nostdlib && !is_pe) { + strarray_add(&link_args, "-ldl"); strarray_add(&link_args, "-lm"); strarray_add(&link_args, "-lc"); }

1 0