December 2022 - Wine-Commits

Huw Davies : winemac: Fix printf format warnings in window.c.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: abec83e50979d7c5ed0f2b99a52a361d3db96dc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/abec83e50979d7c5ed0f2b99a52a36… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 16:18:53 2022 +0000 winemac: Fix printf format warnings in window.c. --- dlls/winemac.drv/window.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 37696f02d25..896efb6a68e 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); static pthread_mutex_t win_data_mutex; static CFMutableDictionaryRef win_datas; -static DWORD activate_on_focus_time; +static unsigned int activate_on_focus_time; /*********************************************************************** @@ -129,10 +129,10 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, * * Helper for macdrv_window_to_mac_rect and macdrv_mac_to_window_rect. */ -static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT *rect, +static void get_mac_rect_offset(struct macdrv_win_data *data, unsigned int style, RECT *rect, const RECT *window_rect, const RECT *client_rect) { - DWORD ex_style, style_mask = 0, ex_style_mask = 0; + unsigned int ex_style, style_mask = 0, ex_style_mask = 0; rect->top = rect->bottom = rect->left = rect->right = 0; @@ -1309,7 +1309,7 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) { MSG msg; RECT origRect, movedRect, desktopRect; - LONG hittest = (LONG)(wparam & 0x0f); + int hittest = (int)(wparam & 0x0f); POINT capturePoint; LONG style = NtUserGetWindowLongW(hwnd, GWL_STYLE); BOOL moved = FALSE; @@ -1325,7 +1325,7 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) capturePoint.y = (short)HIWORD(dwPoint); NtUserClipCursor(NULL); - TRACE("hwnd %p hittest %d, pos %d,%d\n", hwnd, hittest, capturePoint.x, capturePoint.y); + TRACE("hwnd %p hittest %d, pos %d,%d\n", hwnd, hittest, (int)capturePoint.x, (int)capturePoint.y); origRect.left = origRect.right = origRect.top = origRect.bottom = 0; if (AdjustWindowRectEx(&origRect, style, FALSE, NtUserGetWindowLongW(hwnd, GWL_EXSTYLE))) @@ -1486,9 +1486,9 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) /*********************************************************************** * perform_window_command */ -static void perform_window_command(HWND hwnd, DWORD style_any, DWORD style_none, WORD command, WORD hittest) +static void perform_window_command(HWND hwnd, unsigned int style_any, unsigned int style_none, WORD command, WORD hittest) { - DWORD style; + unsigned int style; TRACE("win %p style_any 0x%08x style_none 0x%08x command 0x%04x hittest 0x%04x\n", hwnd, style_any, style_none, command, hittest); @@ -1668,7 +1668,7 @@ void macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, DWOR { struct macdrv_win_data *data = get_win_data(hwnd); - TRACE("hwnd %p key %#08x alpha %#02x flags %x\n", hwnd, key, alpha, flags); + TRACE("hwnd %p key %#08x alpha %#02x flags %x\n", hwnd, (unsigned int)key, alpha, (unsigned int)flags); if (data) { @@ -1757,7 +1757,7 @@ void macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) { struct macdrv_win_data *data; - TRACE("hwnd %p offset %d styleOld 0x%08x styleNew 0x%08x\n", hwnd, offset, style->styleOld, style->styleNew); + TRACE("hwnd %p offset %d styleOld 0x%08x styleNew 0x%08x\n", hwnd, offset, (unsigned int)style->styleOld, (unsigned int)style->styleNew); if (hwnd == NtUserGetDesktopWindow()) return; if (!(data = get_win_data(hwnd))) return; @@ -1865,7 +1865,7 @@ LRESULT macdrv_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam) !NtUserGetWindowLongPtrW(hwnd, GWLP_ID) && (NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_SYSMENU)) { - TRACE("ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam); + TRACE("ignoring SC_KEYMENU wp %lx lp %lx\n", (unsigned long)wparam, lparam); ret = 0; } @@ -2022,7 +2022,7 @@ LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) return 0; } - FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp); + FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, (unsigned long)wp, lp); return 0; } @@ -2104,7 +2104,7 @@ void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, { struct macdrv_thread_data *thread_data; struct macdrv_win_data *data; - DWORD new_style = NtUserGetWindowLongW(hwnd, GWL_STYLE); + unsigned int new_style = NtUserGetWindowLongW(hwnd, GWL_STYLE); RECT old_window_rect, old_whole_rect, old_client_rect; if (!(data = get_win_data(hwnd))) return; @@ -2298,16 +2298,16 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) if (data->window_rect.left == rect.left && data->window_rect.top == rect.top) flags |= SWP_NOMOVE; else - TRACE("%p moving from (%d,%d) to (%d,%d)\n", hwnd, data->window_rect.left, - data->window_rect.top, rect.left, rect.top); + TRACE("%p moving from (%d,%d) to (%d,%d)\n", hwnd, (int)data->window_rect.left, + (int)data->window_rect.top, (int)rect.left, (int)rect.top); if ((data->window_rect.right - data->window_rect.left == width && data->window_rect.bottom - data->window_rect.top == height) || (IsRectEmpty(&data->window_rect) && width == 1 && height == 1)) flags |= SWP_NOSIZE; else - TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, - data->window_rect.bottom - data->window_rect.top, width, height); + TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, (int)(data->window_rect.right - data->window_rect.left), + (int)(data->window_rect.bottom - data->window_rect.top), width, height); being_dragged = data->drag_event != NULL; release_win_data(data); @@ -2333,7 +2333,7 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) */ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) { - LONG style = NtUserGetWindowLongW(hwnd, GWL_STYLE); + unsigned int style = NtUserGetWindowLongW(hwnd, GWL_STYLE); if (!hwnd) return; @@ -2455,7 +2455,7 @@ void macdrv_window_did_minimize(HWND hwnd) void macdrv_window_did_unminimize(HWND hwnd) { struct macdrv_win_data *data; - DWORD style; + unsigned int style; TRACE("win %p\n", hwnd);

1 0

Huw Davies : winemac: Fix remaining printf format warnings.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 027bd21b0c2b7d1f4560cccc4a00213a4167be8d URL: https://gitlab.winehq.org/wine/wine/-/commit/027bd21b0c2b7d1f4560cccc4a0021… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 16:22:56 2022 +0000 winemac: Fix remaining printf format warnings. --- dlls/winemac.drv/macdrv_main.c | 10 +++++----- dlls/winemac.drv/opengl.c | 4 ++-- dlls/winemac.drv/unixlib.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 39bd66f3211..eeed9a4bcbe 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -132,12 +132,12 @@ HKEY open_hkcu_key(const char *name) sid = ((TOKEN_USER *)sid_data)->User.Sid; len = sprintf(buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, - MAKELONG(MAKEWORD(sid->IdentifierAuthority.Value[5], - sid->IdentifierAuthority.Value[4]), - MAKEWORD(sid->IdentifierAuthority.Value[3], - sid->IdentifierAuthority.Value[2]))); + (unsigned int)MAKELONG(MAKEWORD(sid->IdentifierAuthority.Value[5], + sid->IdentifierAuthority.Value[4]), + MAKEWORD(sid->IdentifierAuthority.Value[3], + sid->IdentifierAuthority.Value[2]))); for (i = 0; i < sid->SubAuthorityCount; i++) - len += sprintf(buffer + len, "-%u", sid->SubAuthority[i]); + len += sprintf(buffer + len, "-%u", (unsigned int)sid->SubAuthority[i]); ascii_to_unicode(bufferW, buffer, len); hkcu = reg_open_key(NULL, bufferW, len * sizeof(WCHAR)); diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e1da34892ba..ff78b183360 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -76,7 +76,7 @@ struct wgl_context BOOL sharing; LONG update_swap_interval; LONG view_moved; - DWORD last_flush_time; + unsigned int last_flush_time; UINT major; }; @@ -2222,7 +2222,7 @@ static void macdrv_glFlush(void) if (skip_single_buffer_flushes) { const pixel_format *pf = &pixel_formats[context->format - 1]; - DWORD now = NtGetTickCount(); + unsigned int now = NtGetTickCount(); TRACE("double buffer %d last flush time %d now %d\n", (int)pf->double_buffer, context->last_flush_time, now); diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 614e3ddb11a..07f0da4a6f3 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -87,7 +87,7 @@ struct init_params /* macdrv_notify_icon params */ struct notify_icon_params { - DWORD msg; + unsigned int msg; struct _NOTIFYICONDATAW *data; };

1 0

Huw Davies : winemac: Fix printf format warnings in mouse.c.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 262b3bb507cdd97ba5ed41d8c8f736835691db2a URL: https://gitlab.winehq.org/wine/wine/-/commit/262b3bb507cdd97ba5ed41d8c8f736… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 16:20:44 2022 +0000 winemac: Fix printf format warnings in mouse.c. --- dlls/winemac.drv/mouse.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 6dd90978a93..cb194095d55 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -274,7 +274,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, CFArrayRef frames; TRACE("hdc %p icon->hbmMask %p icon->xHotspot %d icon->yHotspot %d width %d height %d\n", - hdc, icon->hbmMask, icon->xHotspot, icon->yHotspot, width, height); + hdc, icon->hbmMask, (int)icon->xHotspot, (int)icon->yHotspot, width, height); info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = width; @@ -484,7 +484,7 @@ static CFDictionaryRef create_cursor_frame(HDC hdc, const ICONINFOEXW *iinfo, HA TRACE("hdc %p iinfo->xHotspot %d iinfo->yHotspot %d icon %p hbmColor %p color_bits %p color_size %d" " hbmMask %p mask_bits %p mask_size %d width %d height %d istep %d\n", - hdc, iinfo->xHotspot, iinfo->yHotspot, icon, hbmColor, color_bits, color_size, + hdc, (int)iinfo->xHotspot, (int)iinfo->yHotspot, icon, hbmColor, color_bits, color_size, hbmMask, mask_bits, mask_size, width, height, istep); frame = CFDictionaryCreateMutable(NULL, 0, &kCFCopyStringDictionaryKeyCallBacks, @@ -631,7 +631,7 @@ cleanup: frames = NULL; } else - TRACE("returning cursor with %d frames\n", nFrames); + TRACE("returning cursor with %d frames\n", (int)nFrames); /* Cleanup all of the resources used to obtain the frame data */ if (hbmColor) NtGdiDeleteObjectApp(hbmColor); if (hbmMask) NtGdiDeleteObjectApp(hbmMask); @@ -691,7 +691,7 @@ BOOL macdrv_GetCursorPos(LPPOINT pos) ret = macdrv_get_cursor_position(&pt); if (ret) { - TRACE("pointer at (%g,%g) server pos %d,%d\n", pt.x, pt.y, pos->x, pos->y); + TRACE("pointer at (%g,%g) server pos %d,%d\n", pt.x, pt.y, (int)pos->x, (int)pos->y); pos->x = floor(pt.x); pos->y = floor(pt.y); } @@ -957,6 +957,6 @@ void macdrv_release_capture(HWND hwnd, const macdrv_event *event) { NtUserReleaseCapture(); if (!NtUserPostMessage(capture, WM_CANCELMODE, 0, 0)) - WARN("failed to post WM_CANCELMODE; error 0x%08x\n", RtlGetLastWin32Error()); + WARN("failed to post WM_CANCELMODE; error 0x%08x\n", (unsigned int)RtlGetLastWin32Error()); } }

1 0

Huw Davies : winemac: Fix printf format warnings in keyboard.c.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 0553cbe7c98ec95f239d135596e9cae6b7d007c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/0553cbe7c98ec95f239d135596e9ca… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 13:38:22 2022 +0000 winemac: Fix printf format warnings in keyboard.c. --- dlls/winemac.drv/keyboard.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 1592bcad1a2..76c038caf02 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -898,7 +898,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) from the default map, if it's still available. */ for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { - DWORD vkey = default_map[keyc].vkey; + unsigned int vkey = default_map[keyc].vkey; if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */ if (thread_data->keyc2vkey[keyc]) continue; /* already assigned */ @@ -988,7 +988,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /*********************************************************************** * macdrv_send_keyboard_input */ -static void macdrv_send_keyboard_input(HWND hwnd, WORD vkey, WORD scan, DWORD flags, DWORD time) +static void macdrv_send_keyboard_input(HWND hwnd, WORD vkey, WORD scan, unsigned int flags, unsigned int time) { INPUT input; @@ -1307,7 +1307,7 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) UInt32 deadKeyState = 0; UniCharCount len; OSStatus status; - DWORD vkey; + unsigned int vkey; int i; uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); @@ -1368,12 +1368,12 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) len = wcslen(buffer); } - TRACE("lparam 0x%08x -> %s\n", lparam, debugstr_w(buffer)); + TRACE("lparam 0x%08x -> %s\n", (unsigned int)lparam, debugstr_w(buffer)); return len; } } - WARN("found no name for lparam 0x%08x\n", lparam); + WARN("found no name for lparam 0x%08x\n", (unsigned int)lparam); return 0; }

1 0

Alex Henrie : include: Add _recalloc.
by Alexandre Julliard Dec. 13, 2022

Dec. 13, 2022

Module: wine Branch: master Commit: 3ffc42044032f7c8198c33ee1b17a7f79eb7af51 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ffc42044032f7c8198c33ee1b17a7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 19:27:38 2022 -0700 include: Add _recalloc. --- include/msvcrt/corecrt_malloc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/corecrt_malloc.h b/include/msvcrt/corecrt_malloc.h index 1478a6a6c89..4c0d35f7e08 100644 --- a/include/msvcrt/corecrt_malloc.h +++ b/include/msvcrt/corecrt_malloc.h @@ -30,6 +30,7 @@ _ACRTIMP void* __cdecl calloc(size_t,size_t); _ACRTIMP void __cdecl free(void*); _ACRTIMP void* __cdecl malloc(size_t); _ACRTIMP void* __cdecl realloc(void*,size_t); +_ACRTIMP void* __cdecl _recalloc(void*,size_t,size_t); _ACRTIMP void* __cdecl _expand(void*,size_t); _ACRTIMP size_t __cdecl _msize(void*);

1 0

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

Dec. 13, 2022

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 event.c.
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

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 Dec. 12, 2022

Dec. 12, 2022

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 Dec. 12, 2022

Dec. 12, 2022

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

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

Dec. 12, 2022

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 clipboard.c.
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

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 Dec. 12, 2022

Dec. 12, 2022

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

Eric Pouech : d3dx9/tests: Avoid a GCC warning (-Wsizeof-array-div).
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

Module: wine Branch: master Commit: c86894147850e835211035d5bda2fa28d09c8340 URL: https://gitlab.winehq.org/wine/wine/-/commit/c86894147850e835211035d5bda2fa… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 12 17:02:34 2022 +0100 d3dx9/tests: Avoid a GCC warning (-Wsizeof-array-div). Follow GCC recommendations for getting rid of it. MingW/GCC (11.3, 12.x) complains with: /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c: In function 'test_effect_parameter_value': /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1838:71: warning: expression does not compute the number of elements in this array; element type is 'DWORD' {aka 'long unsigned int'}, not 'D3DXMATRIX' {aka 'struct _D3DMATRIX'} [-Wsizeof-array-div] 1838 | const D3DXMATRIX *matrix_pointer_array[sizeof(input_value)/sizeof(D3DXMATRIX)]; | ^ /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1838:71: note: add parentheses around the second 'sizeof' to silence this warning /home/eric/work/wine/dlls/d3dx9_36/tests/effect.c:1835:19: note: array 'input_value' declared here 1835 | DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; | ^~~~~~~~~~~ Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3dx9_36/tests/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 18a44ca6a60..b5231d10795 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1835,7 +1835,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; UINT l, n, m, element; - const D3DXMATRIX *matrix_pointer_array[sizeof(input_value)/sizeof(D3DXMATRIX)]; + const D3DXMATRIX *matrix_pointer_array[sizeof(input_value)/(sizeof(D3DXMATRIX))]; parameter = effect->lpVtbl->GetParameterByName(effect, NULL, res_full_name); ok(parameter != NULL, "%u - %s: GetParameterByName failed\n", i, res_full_name);

1 0

Fabian Maurer : user32/tests: Ignore undocumented Win11 message.
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

Module: wine Branch: master Commit: 275d548f553db4b88a50752e92553afc105597cb URL: https://gitlab.winehq.org/wine/wine/-/commit/275d548f553db4b88a50752e92553a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 12 16:08:24 2022 +0100 user32/tests: Ignore undocumented Win11 message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54000 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/win.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 097aab64eaf..1252e046ad3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -160,6 +160,7 @@ static BOOL ignore_message( UINT message, HWND hwnd ) /* these are always ignored */ return (message >= 0xc000 || + message == 0x0060 || /* Internal undocumented message introduced by Win11 */ message == WM_GETICON || message == WM_GETOBJECT || message == WM_TIMER ||

1 0

Alexandre Julliard : winegcc: Add -ldl when linking .so files.
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

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

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

Dec. 12, 2022

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

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

Dec. 12, 2022

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

Torge Matthies : ntdll: Make sure xmm6-xmm15 are always restored in unix call dispatcher.
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

Module: wine Branch: master Commit: 1480d0f376e54057ce678574df72e340bb9454c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1480d0f376e54057ce678574df72e3… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Sun Dec 11 10:46:29 2022 +0100 ntdll: Make sure xmm6-xmm15 are always restored in unix call dispatcher. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index fa8660ca914..18de58fd713 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2913,14 +2913,6 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "movq %r8,%rdi\n\t" /* args */ "callq *(%r10,%rdx,8)\n\t" "movq %rsp,%rcx\n" - "testl $0xffff,0x94(%rcx)\n\t" /* frame->restore_flags */ - "jnz .L__wine_syscall_dispatcher_return\n\t" -#ifdef __linux__ - "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ - "jz 1f\n\t" - "movw 0x7e(%rcx),%fs\n" - "1:\n\t" -#endif "movdqa 0x1c0(%rcx),%xmm6\n\t" "movdqa 0x1d0(%rcx),%xmm7\n\t" "movdqa 0x1e0(%rcx),%xmm8\n\t" @@ -2931,6 +2923,14 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, "movdqa 0x230(%rcx),%xmm13\n\t" "movdqa 0x240(%rcx),%xmm14\n\t" "movdqa 0x250(%rcx),%xmm15\n\t" + "testl $0xffff,0x94(%rcx)\n\t" /* frame->restore_flags */ + "jnz .L__wine_syscall_dispatcher_return\n\t" +#ifdef __linux__ + "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ + "jz 1f\n\t" + "movw 0x7e(%rcx),%fs\n" + "1:\n\t" +#endif "movq 0x60(%rcx),%r14\n\t" __ASM_CFI(".cfi_same_value r14\n\t") "movq 0x28(%rcx),%rdi\n\t"

1 0

Rémi Bernon : winevulkan: Return void for some critical functions.
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

Module: wine Branch: master Commit: 0dda60eab2dc1ed8b08c0fea20800657a6502383 URL: https://gitlab.winehq.org/wine/wine/-/commit/0dda60eab2dc1ed8b08c0fea208006… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 5 12:19:48 2022 +0100 winevulkan: Return void for some critical functions. Allowing the compiler to generate tail calls for the unix thunks. --- dlls/winevulkan/make_vulkan | 20 +- dlls/winevulkan/vulkan_thunks.c | 2240 ++++++++++++++++----------------------- 2 files changed, 911 insertions(+), 1349 deletions(-)

1 0

Robert Wilhelm : vbscript: Fix spelling in a FIXME message.
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

Module: wine Branch: master Commit: 83708f7cc307496dd56c6d292a287c83b9a366b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/83708f7cc307496dd56c6d292a287c… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Dec 12 10:31:50 2022 +0100 vbscript: Fix spelling in a FIXME message. --- dlls/vbscript/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 816252eb2ec..382504a3d5a 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -1123,7 +1123,7 @@ static class_decl_t *add_class_function(parser_ctx_t *ctx, class_decl_t *class_d static class_decl_t *add_dim_prop(parser_ctx_t *ctx, class_decl_t *class_decl, dim_decl_t *dim_decl, unsigned storage_flags) { if(storage_flags & STORAGE_IS_DEFAULT) { - FIXME("variant prop van't be default value\n"); + FIXME("variant prop can't be default value\n"); ctx->hres = E_FAIL; return NULL; }

1 0

Rémi Bernon : winevulkan: Skip asserts for some critical functions.
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

Module: wine Branch: master Commit: b55a469c55192df0409f94abd30ee46746328aef URL: https://gitlab.winehq.org/wine/wine/-/commit/b55a469c55192df0409f94abd30ee4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 5 12:19:48 2022 +0100 winevulkan: Skip asserts for some critical functions. --- dlls/winevulkan/loader_thunks.c | 896 ++++++++++------------------------------ dlls/winevulkan/make_vulkan | 24 +- 2 files changed, 245 insertions(+), 675 deletions(-)

1 0

Rémi Bernon : winevulkan: Skip traces for some critical functions.
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

Module: wine Branch: master Commit: 1fe2ab814d3dfdd953911ec26df1f1b7163b6a00 URL: https://gitlab.winehq.org/wine/wine/-/commit/1fe2ab814d3dfdd953911ec26df1f1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 5 12:19:48 2022 +0100 winevulkan: Skip traces for some critical functions. --- dlls/winevulkan/make_vulkan | 4 +- dlls/winevulkan/vulkan_thunks.c | 896 ---------------------------------------- 2 files changed, 3 insertions(+), 897 deletions(-)

1 0

Ziqing Hui : mf/tests: Test info headers returned by GetOutputType for WMV decoder.
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

Module: wine Branch: master Commit: d23eeecc28b9abc04cc0b699fa3f687500923d20 URL: https://gitlab.winehq.org/wine/wine/-/commit/d23eeecc28b9abc04cc0b699fa3f68… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Dec 5 11:45:12 2022 +0800 mf/tests: Test info headers returned by GetOutputType for WMV decoder. --- dlls/mf/tests/transform.c | 114 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 101 insertions(+), 13 deletions(-)

1 0

Ziqing Hui : mf/tests: Test GetOutputType for WMV decoder.
by Alexandre Julliard Dec. 12, 2022

Dec. 12, 2022

Module: wine Branch: master Commit: 8638140a1d320bc2522eb99dba82e553cfa28304 URL: https://gitlab.winehq.org/wine/wine/-/commit/8638140a1d320bc2522eb99dba82e5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Nov 29 10:06:33 2022 +0800 mf/tests: Test GetOutputType for WMV decoder. --- dlls/mf/tests/transform.c | 180 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 141 insertions(+), 39 deletions(-)

1 0

Alexandre Julliard : Wine release 8.0-rc1
by Alexandre Julliard Dec. 9, 2022

Dec. 9, 2022

Module: website Branch: master Commit: 2723a70dea70b2fe40289f11b4230bd16f871dbc URL: https://gitlab.winehq.org/winehq/winehq/-/commit/2723a70dea70b2fe40289f11b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 9 22:18:45 2022 +0100 Wine release 8.0-rc1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022120901.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/en/2022120901.xml b/news/en/2022120901.xml new file mode 100644 index 00000000..8291eb94 --- /dev/null +++ b/news/en/2022120901.xml @@ -0,0 +1,19 @@ +<news> +<date>December 9, 2022</date> +<title>Wine 8.0-rc1 Released</title> +<body> + The Wine development release 8.0-rc1 is now available. + This is the first release candidate for the upcoming Wine 8.0. It marks the beginning of the yearly code freeze period. Please give this release a good testing and report any issue that you find, to help us make the final 8.0 as good as possible. + <a href="{$root}/announce/8.0-rc1">What's new</a> in this release: +<ul> + <li>Bundled vkd3d upgraded to version 1.6.</li> + <li>Vulkan and OpenGL thunking optimizations.</li> + <li>More support for print processors.</li> + <li>Improved joystick control panel.</li> + <li>Long types printf format conversion finished.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.0/wine-8.0-rc1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0