April 2022 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Don't use CDECL for user driver functions.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: wine Branch: master Commit: f6524f7a3a8048424071dcef3e367bac00a68599 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6524f7a3a8048424071dcef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:27:15 2022 +0200 win32u: Don't use CDECL for user driver functions. They are no longer used from PE code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/driver.c | 168 ++++++++++++++++++++-------------------- dlls/wineandroid.drv/android.h | 52 ++++++------- dlls/wineandroid.drv/init.c | 12 +-- dlls/wineandroid.drv/keyboard.c | 6 +- dlls/wineandroid.drv/window.c | 42 +++++----- dlls/winemac.drv/clipboard.c | 2 +- dlls/winemac.drv/display.c | 17 ++-- dlls/winemac.drv/event.c | 4 +- dlls/winemac.drv/keyboard.c | 20 ++--- dlls/winemac.drv/macdrv.h | 112 +++++++++++++-------------- dlls/winemac.drv/macdrv_main.c | 4 +- dlls/winemac.drv/mouse.c | 12 +-- dlls/winemac.drv/opengl.c | 2 +- dlls/winemac.drv/vulkan.c | 2 +- dlls/winemac.drv/window.c | 42 +++++----- dlls/winex11.drv/clipboard.c | 2 +- dlls/winex11.drv/display.c | 4 +- dlls/winex11.drv/event.c | 6 +- dlls/winex11.drv/init.c | 4 +- dlls/winex11.drv/keyboard.c | 14 ++-- dlls/winex11.drv/mouse.c | 10 +-- dlls/winex11.drv/settings.c | 6 +- dlls/winex11.drv/window.c | 54 ++++++------- dlls/winex11.drv/x11drv.h | 106 ++++++++++++------------- dlls/winex11.drv/x11drv_main.c | 4 +- include/wine/gdi_driver.h | 99 +++++++++++------------ 26 files changed, 403 insertions(+), 403 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6524f7a3a8048424071…

1 0

Jacek Caban : win32u: Move __wine_set_user_driver implementation from user32.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: wine Branch: master Commit: 1d0fbcc9d997b4d0adf5eeb8b467f54c9853d584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d0fbcc9d997b4d0adf5eeb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:26:59 2022 +0200 win32u: Move __wine_set_user_driver implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 1 - dlls/user32/clipboard.c | 2 +- dlls/user32/driver.c | 171 ------------------------------------------- dlls/user32/user32.spec | 1 - dlls/user32/user_main.c | 2 - dlls/user32/user_private.h | 7 -- dlls/win32u/driver.c | 34 +++++---- dlls/win32u/gdiobj.c | 2 +- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/sysparams.c | 3 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/wrappers.c | 6 +- include/ntuser.h | 1 + include/wine/gdi_driver.h | 1 - 15 files changed, 31 insertions(+), 205 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1d0fbcc9d997b4d0adf5…

1 0

Jacek Caban : win32u: Partially move WM_SYSCOMMAND implementation from user32.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: wine Branch: master Commit: 12a6f8d49b3defe6d25643db8a7d8fe838e042f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a6f8d49b3defe6d25643db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:26:39 2022 +0200 win32u: Partially move WM_SYSCOMMAND implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 8 +------- dlls/user32/nonclient.c | 7 +------ dlls/win32u/defwnd.c | 16 ++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 +- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index e913897bbbe..934078a32b5 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -69,11 +69,6 @@ static void CDECL nulldrv_UpdateClipboard(void) { } -static LRESULT CDECL nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) -{ - return -1; -} - /********************************************************************** * Lazy loading user driver @@ -130,7 +125,7 @@ static struct user_driver_funcs lazy_load_driver = NULL, NULL, NULL, - nulldrv_SysCommand, + NULL, NULL, NULL, NULL, @@ -162,7 +157,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v do { if (!driver->p##name) driver->p##name = nulldrv_##name; } while(0) SET_USER_FUNC(UpdateClipboard); - SET_USER_FUNC(SysCommand); #undef SET_USER_FUNC prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver ); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index a2a49fda27b..25eee85c5a6 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1540,12 +1540,7 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) { TRACE("hwnd %p WM_SYSCOMMAND %lx %lx\n", hwnd, wParam, lParam ); - if (!IsWindowEnabled( hwnd )) return 0; - - if (HOOK_CallHooks( WH_CBT, HCBT_SYSCOMMAND, wParam, lParam, TRUE )) - return 0; - - if (!USER_Driver->pSysCommand( hwnd, wParam, lParam )) + if (!NtUserMessageCall( hwnd, WM_SYSCOMMAND, wParam, lParam, 0, FNID_DEFWINDOWPROC, FALSE )) return 0; switch (wParam & 0xfff0) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 68ac46c7e8f..22d2b08951d 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -121,6 +121,18 @@ static HICON set_window_icon( HWND hwnd, WPARAM type, HICON icon ) return ret; } +static LRESULT handle_sys_command( HWND hwnd, WPARAM wparam, LPARAM lparam ) +{ + if (!is_window_enabled( hwnd )) return 0; + + if (call_hooks( WH_CBT, HCBT_SYSCOMMAND, wparam, lparam, TRUE )) + return 0; + + if (!user_driver->pSysCommand( hwnd, wparam, lparam )) + return 0; + + return 1; +} LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { @@ -156,6 +168,10 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, case WM_SETICON: result = (LRESULT)set_window_icon( hwnd, wparam, (HICON)lparam ); break; + + case WM_SYSCOMMAND: + result = handle_sys_command( hwnd, wparam, lparam ); + break; } return result; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d60cc9cda48..1b1a9e8ee83 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -410,6 +410,7 @@ extern HWND is_current_process_window( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND is_current_thread_window( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL is_iconic( HWND hwnd ) DECLSPEC_HIDDEN; +extern BOOL is_window_enabled( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL is_window_unicode( HWND hwnd ) DECLSPEC_HIDDEN; extern DWORD get_window_long( HWND hwnd, INT offset ) DECLSPEC_HIDDEN; extern BOOL get_window_rect( HWND hwnd, RECT *rect, UINT dpi ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 10c6ff4bf89..c5022b814cd 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -808,7 +808,7 @@ BOOL is_window_unicode( HWND hwnd ) } /* see IsWindowEnabled */ -static BOOL is_window_enabled( HWND hwnd ) +BOOL is_window_enabled( HWND hwnd ) { LONG ret;

1 0

Jacek Caban : win32u: Move IsWindowEnabled implementation from user32.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: wine Branch: master Commit: c31954dfa7b026bc13960d3c8184ee94e1b4b05c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c31954dfa7b026bc13960d3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:26:25 2022 +0200 win32u: Move IsWindowEnabled implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 9 ++------- dlls/win32u/window.c | 13 +++++++++++++ include/ntuser.h | 1 + 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0a3f65e5aa4..881825b5510 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -915,14 +915,9 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) /*********************************************************************** * IsWindowEnabled (USER32.@) */ -BOOL WINAPI IsWindowEnabled(HWND hWnd) +BOOL WINAPI IsWindowEnabled( HWND hwnd ) { - LONG ret; - - SetLastError(NO_ERROR); - ret = GetWindowLongW( hWnd, GWL_STYLE ); - if (!ret && GetLastError() != NO_ERROR) return FALSE; - return !(ret & WS_DISABLED); + return NtUserCallHwnd( hwnd, NtUserIsWindowEnabled ); } /*********************************************************************** diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 0b826644131..10c6ff4bf89 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -807,6 +807,17 @@ BOOL is_window_unicode( HWND hwnd ) return ret; } +/* see IsWindowEnabled */ +static BOOL is_window_enabled( HWND hwnd ) +{ + LONG ret; + + SetLastError( NO_ERROR ); + ret = get_window_long( hwnd, GWL_STYLE ); + if (!ret && GetLastError() != NO_ERROR) return FALSE; + return !(ret & WS_DISABLED); +} + /* see GetWindowDpiAwarenessContext */ DPI_AWARENESS_CONTEXT get_window_dpi_awareness_context( HWND hwnd ) { @@ -4979,6 +4990,8 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) return get_server_window_text( hwnd, NULL, 0 ); case NtUserIsWindow: return is_window( hwnd ); + case NtUserIsWindowEnabled: + return is_window_enabled( hwnd ); case NtUserIsWindowUnicode: return is_window_unicode( hwnd ); case NtUserIsWindowVisible: diff --git a/include/ntuser.h b/include/ntuser.h index 46da835e24b..38cc8f96057 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -198,6 +198,7 @@ enum NtUserGetWindowDpiAwarenessContext, NtUserGetWindowTextLength, NtUserIsWindow, + NtUserIsWindowEnabled, NtUserIsWindowUnicode, NtUserIsWindowVisible, };

1 0

Jacek Caban : win32u: Move default window text setting to from user32.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: wine Branch: master Commit: 27cfcaa277764127a28368f8315f7c26cb326f7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=27cfcaa277764127a28368f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:24:55 2022 +0200 win32u: Move default window text setting to from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 112 +++---------------------------------------- dlls/user32/driver.c | 7 +-- dlls/user32/user_main.c | 1 - dlls/win32u/Makefile.in | 1 + dlls/win32u/defwnd.c | 110 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/message.c | 2 + dlls/win32u/tests/win32u.c | 34 +++++++++++++ dlls/win32u/win32u_private.h | 4 ++ dlls/win32u/window.c | 2 + include/ntuser.h | 1 + 10 files changed, 162 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27cfcaa277764127a283…

1 0

Alex Henrie : mciwave: Fix bad free in MCI_SendCommandAsync (Coverity).
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: wine Branch: master Commit: c814fbe1df962d45134a7e00fe923d6707b03445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c814fbe1df962d45134a7e00… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 3 21:57:45 2022 -0600 mciwave: Fix bad free in MCI_SendCommandAsync (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 3ca884ed6e0..b2582a56123 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -124,7 +124,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, async_cmd cmd, DWORD_PTR dwParam1 WARN("Couldn't allocate thread for async command handling, sending synchronously\n"); if (handles[1]) CloseHandle(handles[1]); sca->evt = NULL; - return MCI_SCAStarter(&sca); + return MCI_SCAStarter(sca); } SetThreadPriority(handles[0], THREAD_PRIORITY_TIME_CRITICAL);

1 0

Daniel Lehman : ntdll/tests: Test return values from CloseHandle.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: wine Branch: master Commit: 18f46e5a57b6c7655dd0c75e89083cf76e67cf9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f46e5a57b6c7655dd0c75e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Apr 3 00:13:35 2022 -0700 ntdll/tests: Test return values from CloseHandle. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 98d185f5f07..8af8d6b70da 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8606,7 +8606,9 @@ static inline BOOL is_magic_handle(HANDLE handle) static void test_closehandle(DWORD numexc, HANDLE handle) { + NTSTATUS status, expect; PVOID vectored_handler; + BOOL ret, expectret; if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler || !pRtlRaiseException) { @@ -8618,18 +8620,28 @@ static void test_closehandle(DWORD numexc, HANDLE handle) ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); invalid_handle_exceptions = 0; - CloseHandle(handle); - todo_wine_if(is_magic_handle(handle)) + expectret = is_magic_handle(handle) || broken(numexc && sizeof(handle) == 4); /* < Win10 */ + ret = CloseHandle(handle); + ok(expectret || (GetLastError() == ERROR_INVALID_HANDLE), + "CloseHandle had wrong GetLastError(), got %lu for %p\n", GetLastError(), handle); + todo_wine_if(is_magic_handle(handle)) { + ok(ret == expectret || broken(HandleToLong(handle) < 0) /* < Win10 */, + "CloseHandle expected %d, got %d for %p\n", expectret, ret, handle); ok(invalid_handle_exceptions == numexc || broken(!numexc && is_magic_handle(handle)), /* < Win10 */ "CloseHandle generated %ld exceptions, expected %ld for %p\n", invalid_handle_exceptions, numexc, handle); + } invalid_handle_exceptions = 0; - pNtClose(handle); - todo_wine_if(is_magic_handle(handle)) + expect = expectret ? STATUS_SUCCESS : STATUS_INVALID_HANDLE; + status = pNtClose(handle); + todo_wine_if(is_magic_handle(handle)) { + ok(status == expect || broken(HandleToLong(handle) < 0), /* < Win10 */ + "NtClose returned unexpected status %#lx, expected %#lx for %p\n", status, expect, handle); ok(invalid_handle_exceptions == numexc || broken(!numexc && is_magic_handle(handle)), /* < Win10 */ "CloseHandle generated %ld exceptions, expected %ld for %p\n", invalid_handle_exceptions, numexc, handle); + } pRtlRemoveVectoredExceptionHandler(vectored_handler); }

1 0

Jacek Caban : win32u: Move WM_SETICON implementation from user32.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: wine Branch: master Commit: d32d3b4f315ea20e3df655c79790323439521476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d32d3b4f315ea20e3df655c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:25:11 2022 +0200 win32u: Move WM_SETICON implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 48 +++--------------------------------------------- dlls/user32/driver.c | 7 +------ dlls/win32u/defwnd.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 51 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 0cd00de5410..b477e47f6eb 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -517,53 +517,11 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_SETICON: { - HICON ret; - WND *wndPtr = WIN_GetPtr( hwnd ); - - switch(wParam) - { - case ICON_SMALL: - ret = wndPtr->hIconSmall; - if (ret && !lParam && wndPtr->hIcon) - { - wndPtr->hIconSmall2 = CopyImage( wndPtr->hIcon, IMAGE_ICON, - GetSystemMetrics( SM_CXSMICON ), - GetSystemMetrics( SM_CYSMICON ), 0 ); - } - else if (lParam && wndPtr->hIconSmall2) - { - DestroyIcon( wndPtr->hIconSmall2 ); - wndPtr->hIconSmall2 = NULL; - } - wndPtr->hIconSmall = (HICON)lParam; - break; - case ICON_BIG: - ret = wndPtr->hIcon; - if (wndPtr->hIconSmall2) - { - DestroyIcon( wndPtr->hIconSmall2 ); - wndPtr->hIconSmall2 = NULL; - } - if (lParam && !wndPtr->hIconSmall) - { - wndPtr->hIconSmall2 = CopyImage( (HICON)lParam, IMAGE_ICON, - GetSystemMetrics( SM_CXSMICON ), - GetSystemMetrics( SM_CYSMICON ), 0 ); - } - wndPtr->hIcon = (HICON)lParam; - break; - default: - ret = 0; - break; - } - WIN_ReleasePtr( wndPtr ); - - USER_Driver->pSetWindowIcon( hwnd, wParam, (HICON)lParam ); - + LRESULT res = NtUserMessageCall( hwnd, msg, wParam, lParam, + 0, FNID_DEFWINDOWPROC, FALSE ); if( (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CAPTION) == WS_CAPTION ) NC_HandleNCPaint( hwnd , (HRGN)1 ); /* Repaint caption */ - - return (LRESULT)ret; + return res; } case WM_GETICON: diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 8d356139c11..e913897bbbe 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -69,10 +69,6 @@ static void CDECL nulldrv_UpdateClipboard(void) { } -static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) -{ -} - static LRESULT CDECL nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) { return -1; @@ -130,7 +126,7 @@ static struct user_driver_funcs lazy_load_driver = NULL, NULL, NULL, - nulldrv_SetWindowIcon, + NULL, NULL, NULL, NULL, @@ -166,7 +162,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v do { if (!driver->p##name) driver->p##name = nulldrv_##name; } while(0) SET_USER_FUNC(UpdateClipboard); - SET_USER_FUNC(SetWindowIcon); SET_USER_FUNC(SysCommand); #undef SET_USER_FUNC diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 314f8ea1d13..68ac46c7e8f 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -74,6 +74,54 @@ static BOOL set_window_text( HWND hwnd, const void *text, BOOL ansi ) return TRUE; } +static HICON set_window_icon( HWND hwnd, WPARAM type, HICON icon ) +{ + HICON ret = 0; + WND *win; + + if (!(win = get_win_ptr( hwnd ))) return 0; + + switch (type) + { + case ICON_SMALL: + ret = win->hIconSmall; + if (ret && !icon && win->hIcon && user_callbacks) + { + win->hIconSmall2 = user_callbacks->pCopyImage( win->hIcon, IMAGE_ICON, + get_system_metrics( SM_CXSMICON ), + get_system_metrics( SM_CYSMICON ), 0 ); + } + else if (icon && win->hIconSmall2) + { + NtUserDestroyCursor( win->hIconSmall2, 0 ); + win->hIconSmall2 = NULL; + } + win->hIconSmall = icon; + break; + + case ICON_BIG: + ret = win->hIcon; + if (win->hIconSmall2) + { + NtUserDestroyCursor( win->hIconSmall2, 0 ); + win->hIconSmall2 = NULL; + } + if (icon && !win->hIconSmall && user_callbacks) + { + win->hIconSmall2 = user_callbacks->pCopyImage( icon, IMAGE_ICON, + get_system_metrics( SM_CXSMICON ), + get_system_metrics( SM_CYSMICON ), 0 ); + } + win->hIcon = icon; + break; + } + release_win_ptr( win ); + + user_driver->pSetWindowIcon( hwnd, type, icon ); + return ret; +} + + LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { LRESULT result = 0; @@ -104,6 +152,10 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, case WM_SETTEXT: result = set_window_text( hwnd, (void *)lparam, ansi ); break; + + case WM_SETICON: + result = (LRESULT)set_window_icon( hwnd, wparam, (HICON)lparam ); + break; } return result;

1 0

Nikolay Sivov : d3drm: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: wine Branch: master Commit: c699803ff09a705f6506f88e6f8ed221b4d04965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c699803ff09a705f6506f88e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 14:59:43 2022 +0300 d3drm: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/Makefile.in | 1 - dlls/d3drm/d3drm.c | 56 ++++++++-------- dlls/d3drm/device.c | 50 +++++++-------- dlls/d3drm/face.c | 36 +++++------ dlls/d3drm/frame.c | 82 ++++++++++++------------ dlls/d3drm/light.c | 8 +-- dlls/d3drm/material.c | 6 +- dlls/d3drm/meshbuilder.c | 162 +++++++++++++++++++++++------------------------ dlls/d3drm/texture.c | 52 +++++++-------- dlls/d3drm/viewport.c | 30 ++++----- 10 files changed, 241 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c699803ff09a705f6506…

1 0

Jacek Caban : win32u: Improve string duplication helpers.
by Alexandre Julliard April 7, 2022

April 7, 2022

Module: wine Branch: master Commit: b7f108ed9c91c91adf0f3ce0d5806b1c3e7625e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f108ed9c91c91adf0f3ce0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:24:25 2022 +0200 win32u: Improve string duplication helpers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/font.c | 37 ++++++++++++++++++++++--------------- dlls/win32u/freetype.c | 22 ++-------------------- dlls/win32u/win32u_private.h | 28 +++++++++++++++++++++++----- 3 files changed, 47 insertions(+), 40 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 87ef75f04af..2bf68141d6d 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -277,15 +277,6 @@ static inline INT INTERNAL_YWSTODS(DC *dc, INT height) return pt[1].y - pt[0].y; } -static inline WCHAR *strdupW( const WCHAR *p ) -{ - WCHAR *ret; - DWORD len = (lstrlenW(p) + 1) * sizeof(WCHAR); - ret = malloc( len ); - memcpy(ret, p, len); - return ret; -} - static INT FONT_GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ); static BOOL FONT_DeleteObject( HGDIOBJ handle ); @@ -1201,8 +1192,8 @@ static struct gdi_font_face *create_face( struct gdi_font_family *family, const struct gdi_font_face *face = calloc( 1, sizeof(*face) ); face->refcount = 1; - face->style_name = strdupW( style ); - face->full_name = strdupW( fullname ); + face->style_name = wcsdup( style ); + face->full_name = wcsdup( fullname ); face->face_index = index; face->fs = fs; face->ntmFlags = ntmflags; @@ -1210,7 +1201,7 @@ static struct gdi_font_face *create_face( struct gdi_font_family *family, const face->flags = flags; face->data_ptr = data_ptr; face->data_size = data_size; - if (file) face->file = strdupW( file ); + if (file) face->file = wcsdup( file ); if (size) face->size = *size; else face->scalable = TRUE; if (insert_face_in_family_list( face, family )) return face; @@ -2075,9 +2066,9 @@ static struct gdi_font *create_gdi_font( const struct gdi_font_face *face, const font->ntmFlags = face->ntmFlags; font->aa_flags = HIWORD( face->flags ); if (!family_name) family_name = face->family->family_name; - font->otm.otmpFamilyName = (char *)strdupW( family_name ); - font->otm.otmpStyleName = (char *)strdupW( face->style_name ); - font->otm.otmpFaceName = (char *)strdupW( face->full_name ); + font->otm.otmpFamilyName = (char *)wcsdup( family_name ); + font->otm.otmpStyleName = (char *)wcsdup( face->style_name ); + font->otm.otmpFaceName = (char *)wcsdup( face->full_name ); return font; } @@ -3311,6 +3302,22 @@ DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *sr if (!info && !(info = get_cptable( get_acp() ))) return 0; + if (!dst) + { + /* only compute length */ + if (info->DBCSOffsets) + { + for (ret = 0; srclen--; src++, ret++) + { + if (!info->DBCSOffsets[(unsigned char)*src]) continue; + if (!srclen--) break; + src++; + } + } + else ret = srclen; + return ret * sizeof(WCHAR); + } + dstlen /= sizeof(WCHAR); if (info->DBCSOffsets) { diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index b6063a14570..0703d32740e 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -584,24 +584,6 @@ static BOOL is_subpixel_rendering_enabled( void ) } -static LPWSTR strdupW(LPCWSTR p) -{ - LPWSTR ret; - DWORD len = (lstrlenW(p) + 1) * sizeof(WCHAR); - ret = malloc( len ); - memcpy(ret, p, len); - return ret; -} - -static WCHAR *towstr(const char *str) -{ - DWORD len = strlen(str) + 1; - WCHAR *wstr = malloc( len * sizeof(WCHAR) ); - win32u_mbtowc( NULL, wstr, len * sizeof(WCHAR), str, len ); - return wstr; -} - - static const LANGID mac_langid_table[] = { MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ENGLISH */ @@ -1168,7 +1150,7 @@ static WCHAR *decode_opentype_name( struct opentype_name *name ) if (len == ARRAY_SIZE(buffer)) WARN("Truncated font name %s -> %s\n", debugstr_an(name->bytes, name->length), debugstr_w(buffer)); else buffer[len] = 0; - return strdupW( buffer ); + return wcsdup( buffer ); } struct unix_face @@ -3687,7 +3669,7 @@ static BOOL freetype_set_outline_text_metrics( struct gdi_font *font ) { static const WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; FIXME("failed to read full_nameW for font %s!\n", wine_dbgstr_w((WCHAR *)font->otm.otmpFamilyName)); - font->otm.otmpFullName = (char *)strdupW(fake_nameW); + font->otm.otmpFullName = (char *)wcsdup( fake_nameW ); } needed = sizeof(font->otm) + (lstrlenW( (WCHAR *)font->otm.otmpFamilyName ) + 1 + lstrlenW( (WCHAR *)font->otm.otmpStyleName ) + 1 + diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 874cc92f4d4..3af6a9409d6 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -571,7 +571,30 @@ static inline ULONG win32u_wcstoul( const WCHAR *s, WCHAR **end, int base ) return negative ? -ret : ret; } +DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, + DWORD srclen ) DECLSPEC_HIDDEN; +DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, + DWORD srclen ) DECLSPEC_HIDDEN; + +static inline WCHAR *win32u_wcsdup( const WCHAR *str ) +{ + DWORD size = (lstrlenW( str ) + 1) * sizeof(WCHAR); + WCHAR *ret = malloc( size ); + if (ret) memcpy( ret, str, size ); + return ret; +} + +static inline WCHAR *towstr( const char *str ) +{ + DWORD len = strlen( str ) + 1; + DWORD size = win32u_mbtowc( NULL, NULL, 0, str, len ); + WCHAR *ret = malloc( size ); + if (ret) win32u_mbtowc( NULL, ret, size, str, len ); + return ret; +} + #define towupper(c) win32u_towupper(c) +#define wcsdup(s) win32u_wcsdup(s) #define wcstol(s,e,b) win32u_wcstol(s,e,b) #define wcstoul(s,e,b) win32u_wcstoul(s,e,b) @@ -587,11 +610,6 @@ static inline UINT asciiz_to_unicode( WCHAR *dst, const char *src ) return (p - dst) * sizeof(WCHAR); } -DWORD win32u_mbtowc( CPTABLEINFO *info, WCHAR *dst, DWORD dstlen, const char *src, - DWORD srclen ) DECLSPEC_HIDDEN; -DWORD win32u_wctomb( CPTABLEINFO *info, char *dst, DWORD dstlen, const WCHAR *src, - DWORD srclen ) DECLSPEC_HIDDEN; - static inline BOOL is_win9x(void) { return NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32s;

1 0