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

Jacek Caban : win32u: Move GetWindowDpiAwarenessContext from user32.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: 72316326356c6eeb724708b0d375572295781a1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=72316326356c6eeb724708b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:21:51 2022 +0100 win32u: Move GetWindowDpiAwarenessContext 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 | 25 +------------------------ dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 33 ++++++++++++++++++++++++++++++++- dlls/win32u/wrappers.c | 2 +- include/ntuser.h | 3 ++- 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a81e112ee0d..48541c19a66 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2090,30 +2090,7 @@ BOOL WINAPI IsWindowUnicode( HWND hwnd ) */ DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext( HWND hwnd ) { - WND *win; - DPI_AWARENESS_CONTEXT ret = 0; - - if (!(win = WIN_GetPtr( hwnd ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (win == WND_DESKTOP) return DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE; - if (win != WND_OTHER_PROCESS) - { - ret = ULongToHandle( win->dpi_awareness | 0x10 ); - WIN_ReleasePtr( win ); - } - else - { - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) ret = ULongToHandle( reply->awareness | 0x10 ); - } - SERVER_END_REQ; - } - return ret; + return (DPI_AWARENESS_CONTEXT)NtUserCallHwnd( hwnd, NtUserGetWindowDpiAwarenessContext ); } diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index f987f0099da..131e177a397 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -184,7 +184,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); HKL (WINAPI *pNtUserActivateKeyboardLayout)( HKL layout, UINT flags ); - DWORD (WINAPI *pNtUserCallHwnd)( HWND hwnd, DWORD code ); + ULONG_PTR (WINAPI *pNtUserCallHwnd)( HWND hwnd, DWORD code ); ULONG_PTR (WINAPI *pNtUserCallHwndParam)( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT (WINAPI *pNtUserCallNextHookEx)( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR (WINAPI *pNtUserCallNoParam)( ULONG code ); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 90e96e17842..ce03df84994 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -679,6 +679,35 @@ static BOOL is_window_unicode( HWND hwnd ) return ret; } +/* see GetWindowDpiAwarenessContext */ +static DPI_AWARENESS_CONTEXT get_window_dpi_awareness_context( HWND hwnd ) +{ + DPI_AWARENESS_CONTEXT ret = 0; + WND *win; + + if (!(win = get_win_ptr( hwnd ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (win == WND_DESKTOP) return DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE; + if (win != WND_OTHER_PROCESS) + { + ret = ULongToHandle( win->dpi_awareness | 0x10 ); + release_win_ptr( win ); + } + else + { + SERVER_START_REQ( get_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) ret = ULongToHandle( reply->awareness | 0x10 ); + } + SERVER_END_REQ; + } + return ret; +} + static LONG_PTR get_win_data( const void *ptr, UINT size ) { if (size == sizeof(WORD)) @@ -1082,12 +1111,14 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) /***************************************************************************** * NtUserCallHwnd (win32u.@) */ -DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) +ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { switch (code) { case NtUserGetParent: return HandleToUlong( get_parent( hwnd )); + case NtUserGetWindowDpiAwarenessContext: + return (ULONG_PTR)get_window_dpi_awareness_context( hwnd ); case NtUserGetWindowTextLength: return get_server_window_text( hwnd, NULL, 0 ); case NtUserIsWindow: diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 02ec62e741b..74150e11db1 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -725,7 +725,7 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); } -DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) +ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { if (!unix_funcs) return 0; return unix_funcs->pNtUserCallHwnd( hwnd, code ); diff --git a/include/ntuser.h b/include/ntuser.h index 1587e1db2f7..f45d0e8641c 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -142,6 +142,7 @@ enum enum { NtUserGetParent, + NtUserGetWindowDpiAwarenessContext, NtUserGetWindowTextLength, NtUserIsWindow, NtUserIsWindowUnicode, @@ -254,7 +255,7 @@ BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULONG unk4, ULONG thread_id, ULONG count, HWND *buffer, ULONG *size ); -DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ); +ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ); ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ); LRESULT WINAPI NtUserCallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ); ULONG_PTR WINAPI NtUserCallNoParam( ULONG code );

1 0

Jacek Caban : win32u: Introduce get_desktop_window.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: 5df07a48a6fa8bf64246839050ca0782a813d17d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df07a48a6fa8bf642468390… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:20:01 2022 +0100 win32u: Introduce get_desktop_window. 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/class.c | 8 ++++---- dlls/win32u/driver.c | 3 +-- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 14 ++++++-------- dlls/win32u/winstation.c | 9 +++++++++ 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 2652b908934..f0c372df12d 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -285,7 +285,7 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam BOOL ret; /* create the desktop window to trigger builtin class registration */ - if (!is_builtin && user_callbacks) user_callbacks->pGetDesktopWindow(); + if (!is_builtin) get_desktop_window(); if (wc->cbSize != sizeof(*wc) || wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || (!is_builtin && wc->hInstance == user32_module)) /* we can't register a class for user32 */ @@ -383,8 +383,8 @@ BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, { CLASS *class = NULL; - if (user_callbacks) /* create the desktop window to trigger builtin class registration */ - user_callbacks->pGetDesktopWindow(); + /* create the desktop window to trigger builtin class registration */ + get_desktop_window(); SERVER_START_REQ( destroy_class ) { @@ -423,7 +423,7 @@ ATOM WINAPI NtUserGetClassInfoEx( HINSTANCE instance, UNICODE_STRING *name, WNDC if (name->Buffer != (const WCHAR *)DESKTOP_CLASS_ATOM && (IS_INTRESOURCE(name->Buffer) || name->Length != sizeof(messageW) || wcsnicmp( name->Buffer, messageW, ARRAYSIZE(messageW) ))) - user_callbacks->pGetDesktopWindow(); + get_desktop_window(); if (!(class = find_class( instance, name ))) return 0; diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 8e6263db60c..90b0ca75658 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -64,8 +64,7 @@ const struct gdi_dc_funcs *get_display_driver(void) { if (user_driver == &lazy_load_driver) { - if (!user_callbacks || !user_callbacks->pGetDesktopWindow() || - user_driver == &lazy_load_driver) + if (!get_desktop_window() || user_driver == &lazy_load_driver) { static struct user_driver_funcs empty_funcs; WARN( "failed to load the display driver, falling back to null driver\n" ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d5d77897749..f987f0099da 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -298,6 +298,7 @@ extern void user_check_not_lock(void) DECLSPEC_HIDDEN; /* window.c */ struct tagWND; +extern HWND get_desktop_window(void) DECLSPEC_HIDDEN; extern HWND is_current_thread_window( HWND hwnd ) DECLSPEC_HIDDEN; extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; extern DWORD get_window_long( HWND hwnd, INT offset ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 1de2d5bc68c..7ad75642f13 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -163,8 +163,7 @@ static HWND get_hwnd_message_parent(void) { struct user_thread_info *thread_info = get_user_thread_info(); - if (!thread_info->msg_window && user_callbacks) - user_callbacks->pGetDesktopWindow(); /* trigger creation */ + if (!thread_info->msg_window) get_desktop_window(); /* trigger creation */ return thread_info->msg_window; } @@ -186,8 +185,7 @@ static HWND get_full_window_handle( HWND hwnd ) if (win == WND_DESKTOP) { - if (user_callbacks && LOWORD(hwnd) == LOWORD(user_callbacks->pGetDesktopWindow())) - return user_callbacks->pGetDesktopWindow(); + if (LOWORD(hwnd) == LOWORD(get_desktop_window())) return get_desktop_window(); else return get_hwnd_message_parent(); } @@ -619,7 +617,7 @@ static BOOL is_window_visible( HWND hwnd ) { for (i = 0; list[i+1]; i++) if (!(get_window_long( list[i], GWL_STYLE ) & WS_VISIBLE)) break; - retval = !list[i+1] && (list[i] == user_callbacks->pGetDesktopWindow()); /* top message window isn't visible */ + retval = !list[i+1] && (list[i] == get_desktop_window()); /* top message window isn't visible */ } free( list ); return retval; @@ -648,7 +646,7 @@ static BOOL is_window_drawable( HWND hwnd, BOOL icon ) for (i = 0; list[i+1]; i++) if ((get_window_long( list[i], GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) != WS_VISIBLE) break; - retval = !list[i+1] && (list[i] == user_callbacks->pGetDesktopWindow()); /* top message window isn't visible */ + retval = !list[i+1] && (list[i] == get_desktop_window()); /* top message window isn't visible */ } free( list ); return retval; @@ -689,7 +687,7 @@ static LONG_PTR get_window_long_size( HWND hwnd, INT offset, UINT size, BOOL ans if (offset == GWLP_HWNDPARENT) { HWND parent = NtUserGetAncestor( hwnd, GA_PARENT ); - if (user_callbacks && parent == user_callbacks->pGetDesktopWindow()) + if (parent == get_desktop_window()) parent = get_window_relative( hwnd, GW_OWNER ); return (ULONG_PTR)parent; } @@ -706,7 +704,7 @@ static LONG_PTR get_window_long_size( HWND hwnd, INT offset, UINT size, BOOL ans { case GWL_STYLE: retval = WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; /* message parent is not visible */ - if (user_callbacks && get_full_window_handle( hwnd ) == user_callbacks->pGetDesktopWindow()) + if (get_full_window_handle( hwnd ) == get_desktop_window()) retval |= WS_VISIBLE; return retval; case GWL_EXSTYLE: diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 02908fccd5a..49420066b15 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -388,6 +388,15 @@ BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DW return ret; } +HWND get_desktop_window(void) +{ + struct user_thread_info *thread_info = get_user_thread_info(); + + if (thread_info->top_window) return thread_info->top_window; + if (!user_callbacks) return 0; + return user_callbacks->pGetDesktopWindow(); +} + static HANDLE get_winstations_dir_handle(void) { char bufferA[64];

1 0

Jacek Caban : win32u: Move NtUserFlashWindowEx implementation from user32.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: 516249001f76d10c6eeeff4c851047a404faf8e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=516249001f76d10c6eeeff4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:19:47 2022 +0100 win32u: Move NtUserFlashWindowEx 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 | 12 +-------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 + dlls/user32/win.c | 60 +---------------------------------------- dlls/win32u/driver.c | 6 +++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 8 ++++++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 +++ dlls/win32u/window.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 +++++ include/ntuser.h | 1 + 13 files changed, 96 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=516249001f76d10c6eee…

1 0

Rémi Bernon : windows.gaming.input: Implement IIterable<T> and IIterator<T> interfaces.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: e3b1d818afb85343e8d53360e58a63d2f2616f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3b1d818afb85343e8d53360… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 9 09:48:00 2022 +0100 windows.gaming.input: Implement IIterable<T> and IIterator<T> interfaces. For the generic vector implementation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/controller.c | 11 +- dlls/windows.gaming.input/gamepad.c | 11 +- dlls/windows.gaming.input/private.h | 9 +- dlls/windows.gaming.input/vector.c | 243 +++++++++++++++++++++++++++++++-- include/windows.gaming.input.idl | 8 +- 5 files changed, 259 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3b1d818afb85343e8d5…

1 0

Rémi Bernon : windows.gaming.input: Implement CreateGameController for Gamepad runtimeclass.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: b98b9ce74f283627f1b5e12421277e012772e2bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b98b9ce74f283627f1b5e124… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 9 09:47:58 2022 +0100 windows.gaming.input: Implement CreateGameController for Gamepad runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/gamepad.c | 195 +++++++++++++++++++++++++++++++++++- 1 file changed, 193 insertions(+), 2 deletions(-) diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index 50008541281..3fdf852ac1f 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -18,11 +18,190 @@ */ #include "private.h" +#include "provider.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(input); +struct gamepad +{ + IGameControllerImpl IGameControllerImpl_iface; + IGameControllerInputSink IGameControllerInputSink_iface; + IGamepad IGamepad_iface; + IGameController *IGameController_outer; + LONG ref; + + IGameControllerProvider *provider; +}; + +static inline struct gamepad *impl_from_IGameControllerImpl( IGameControllerImpl *iface ) +{ + return CONTAINING_RECORD( iface, struct gamepad, IGameControllerImpl_iface ); +} + +static HRESULT WINAPI controller_QueryInterface( IGameControllerImpl *iface, REFIID iid, void **out ) +{ + struct gamepad *impl = impl_from_IGameControllerImpl( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IGameControllerImpl )) + { + IInspectable_AddRef( (*out = &impl->IGameControllerImpl_iface) ); + return S_OK; + } + + if (IsEqualGUID( iid, &IID_IGameControllerInputSink )) + { + IInspectable_AddRef( (*out = &impl->IGameControllerInputSink_iface) ); + return S_OK; + } + + if (IsEqualGUID( iid, &IID_IGamepad )) + { + IInspectable_AddRef( (*out = &impl->IGamepad_iface) ); + return S_OK; + } + + WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI controller_AddRef( IGameControllerImpl *iface ) +{ + struct gamepad *impl = impl_from_IGameControllerImpl( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI controller_Release( IGameControllerImpl *iface ) +{ + struct gamepad *impl = impl_from_IGameControllerImpl( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) + { + IGameControllerProvider_Release( impl->provider ); + free( impl ); + } + + return ref; +} + +static HRESULT WINAPI controller_GetIids( IGameControllerImpl *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_GetRuntimeClassName( IGameControllerImpl *iface, HSTRING *class_name ) +{ + return WindowsCreateString( RuntimeClass_Windows_Gaming_Input_Gamepad, + ARRAY_SIZE(RuntimeClass_Windows_Gaming_Input_Gamepad), + class_name ); +} + +static HRESULT WINAPI controller_GetTrustLevel( IGameControllerImpl *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI controller_Initialize( IGameControllerImpl *iface, IGameController *outer, + IGameControllerProvider *provider ) +{ + struct gamepad *impl = impl_from_IGameControllerImpl( iface ); + + TRACE( "iface %p, outer %p, provider %p.\n", iface, outer, provider ); + + impl->IGameController_outer = outer; + IGameControllerProvider_AddRef( (impl->provider = provider) ); + + return S_OK; +} + +static const struct IGameControllerImplVtbl controller_vtbl = +{ + controller_QueryInterface, + controller_AddRef, + controller_Release, + /* IInspectable methods */ + controller_GetIids, + controller_GetRuntimeClassName, + controller_GetTrustLevel, + /* IGameControllerImpl methods */ + controller_Initialize, +}; + +DEFINE_IINSPECTABLE_OUTER( input_sink, IGameControllerInputSink, struct gamepad, IGameController_outer ) + +static HRESULT WINAPI input_sink_OnInputResumed( IGameControllerInputSink *iface, UINT64 timestamp ) +{ + FIXME( "iface %p, timestamp %I64u stub!\n", iface, timestamp ); + return E_NOTIMPL; +} + +static HRESULT WINAPI input_sink_OnInputSuspended( IGameControllerInputSink *iface, UINT64 timestamp ) +{ + FIXME( "iface %p, timestamp %I64u stub!\n", iface, timestamp ); + return E_NOTIMPL; +} + +static const struct IGameControllerInputSinkVtbl input_sink_vtbl = +{ + input_sink_QueryInterface, + input_sink_AddRef, + input_sink_Release, + /* IInspectable methods */ + input_sink_GetIids, + input_sink_GetRuntimeClassName, + input_sink_GetTrustLevel, + /* IGameControllerInputSink methods */ + input_sink_OnInputResumed, + input_sink_OnInputSuspended, +}; + +DEFINE_IINSPECTABLE_OUTER( gamepad, IGamepad, struct gamepad, IGameController_outer ) + +static HRESULT WINAPI gamepad_get_Vibration( IGamepad *iface, struct GamepadVibration *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI gamepad_put_Vibration( IGamepad *iface, struct GamepadVibration value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, &value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI gamepad_GetCurrentReading( IGamepad *iface, struct GamepadReading *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL;} + +static const struct IGamepadVtbl gamepad_vtbl = +{ + gamepad_QueryInterface, + gamepad_AddRef, + gamepad_Release, + /* IInspectable methods */ + gamepad_GetIids, + gamepad_GetRuntimeClassName, + gamepad_GetTrustLevel, + /* IGamepad methods */ + gamepad_get_Vibration, + gamepad_put_Vibration, + gamepad_GetCurrentReading, +}; + struct gamepad_statics { IActivationFactory IActivationFactory_iface; @@ -232,8 +411,20 @@ DEFINE_IINSPECTABLE( controller_factory, ICustomGameControllerFactory, struct ga static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameControllerFactory *iface, IGameControllerProvider *provider, IInspectable **value ) { - FIXME( "iface %p, provider %p, value %p stub!\n", iface, provider, value ); - return E_NOTIMPL; + struct gamepad *impl; + + TRACE( "iface %p, provider %p, value %p.\n", iface, provider, value ); + + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + impl->IGameControllerImpl_iface.lpVtbl = &controller_vtbl; + impl->IGameControllerInputSink_iface.lpVtbl = &input_sink_vtbl; + impl->IGamepad_iface.lpVtbl = &gamepad_vtbl; + impl->ref = 1; + + TRACE( "created Gamepad %p\n", impl ); + + *value = (IInspectable *)&impl->IGameControllerImpl_iface; + return S_OK; } static HRESULT WINAPI controller_factory_OnGameControllerAdded( ICustomGameControllerFactory *iface, IGameController *value )

1 0

Eric Pouech : windowscodecs/tests: Use correct integral type.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: 2c0c6a9f42906f0de81dc946d013d777675854f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c0c6a9f42906f0de81dc946… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:21:48 2022 +0100 windowscodecs/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/info.c | 7 ++++--- dlls/windowscodecs/tests/metadata.c | 9 +++++---- dlls/windowscodecs/tests/palette.c | 18 +++++++++--------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 339555f23fe..31416f3d8f1 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -114,7 +114,7 @@ static void test_decoder_info(void) IWICBitmapDecoderInfo *decoder_info, *decoder_info2; IWICComponentInfo *info; HRESULT hr; - ULONG len; + UINT len; WCHAR value[256]; CLSID clsid; GUID pixelformats[32]; @@ -292,7 +292,7 @@ static void test_pixelformat_info(void) IWICPixelFormatInfo *pixelformat_info; IWICPixelFormatInfo2 *pixelformat_info2; HRESULT hr; - ULONG len, known_len; + UINT len, known_len; WCHAR value[256]; GUID guid; WICComponentType componenttype; @@ -499,7 +499,8 @@ static void test_reader_info(void) HRESULT hr; CLSID clsid; GUID container_formats[10]; - UINT count, size, tid; + UINT count, size; + DWORD tid; HANDLE thread; WICMetadataPattern *patterns; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index bec8bb08c76..8eaf22a300c 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -321,7 +321,8 @@ static void test_metadata_tEXt(void) IWICMetadataReader *reader; IWICEnumMetadataItem *enumerator; PROPVARIANT schema, id, value; - ULONG items_returned, count; + ULONG items_returned; + UINT count; GUID format; PropVariantInit(&schema); @@ -438,7 +439,7 @@ static void test_metadata_gAMA(void) HRESULT hr; IWICMetadataReader *reader; PROPVARIANT schema, id, value; - ULONG count; + UINT count; GUID format; static const WCHAR ImageGamma[] = {'I','m','a','g','e','G','a','m','m','a',0}; @@ -483,7 +484,7 @@ static void test_metadata_cHRM(void) HRESULT hr; IWICMetadataReader *reader; PROPVARIANT schema, id, value; - ULONG count; + UINT count; GUID format; int i; static const WCHAR expected_names[8][12] = { @@ -799,7 +800,7 @@ static void test_metadata_IFD(void) IWICMetadataReader *reader; IWICMetadataBlockReader *blockreader; PROPVARIANT schema, id, value; - ULONG count; + UINT count; GUID format; char *IFD_data_swapped; #ifdef WORDS_BIGENDIAN diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 583fa66c80e..d07b936ca9e 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -205,7 +205,7 @@ static void test_custom_palette(void) } } -static void generate_gray16_palette(DWORD *entries, UINT count) +static void generate_gray16_palette(WICColor *entries, UINT count) { UINT i; @@ -218,7 +218,7 @@ static void generate_gray16_palette(DWORD *entries, UINT count) } } -static void generate_gray256_palette(DWORD *entries, UINT count) +static void generate_gray256_palette(WICColor *entries, UINT count) { UINT i; @@ -231,7 +231,7 @@ static void generate_gray256_palette(DWORD *entries, UINT count) } } -static void generate_halftone8_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone8_palette(WICColor *entries, UINT count, BOOL add_transparent) { UINT i; @@ -260,7 +260,7 @@ static void generate_halftone8_palette(DWORD *entries, UINT count, BOOL add_tran entries[i] = 0; } -static void generate_halftone27_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone27_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[4] = { 0x00,0x80,0xff }; UINT i; @@ -283,7 +283,7 @@ static void generate_halftone27_palette(DWORD *entries, UINT count, BOOL add_tra entries[i] = 0; } -static void generate_halftone64_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone64_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[4] = { 0x00,0x55,0xaa,0xff }; UINT i; @@ -313,7 +313,7 @@ static void generate_halftone64_palette(DWORD *entries, UINT count, BOOL add_tra entries[i] = 0; } -static void generate_halftone125_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone125_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[5] = { 0x00, 0x40, 0x80, 0xbf, 0xff }; UINT i; @@ -336,7 +336,7 @@ static void generate_halftone125_palette(DWORD *entries, UINT count, BOOL add_tr entries[i] = 0; } -static void generate_halftone216_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone216_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; UINT i; @@ -366,7 +366,7 @@ static void generate_halftone216_palette(DWORD *entries, UINT count, BOOL add_tr entries[i] = 0; } -static void generate_halftone252_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone252_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values_rb[6] = { 0x00,0x33,0x66,0x99,0xcc,0xff }; static const BYTE halftone_values_g[7] = { 0x00,0x2b,0x55,0x80,0xaa,0xd5,0xff }; @@ -389,7 +389,7 @@ static void generate_halftone252_palette(DWORD *entries, UINT count, BOOL add_tr entries[i] = 0; } -static void generate_halftone256_palette(DWORD *entries, UINT count, BOOL add_transparent) +static void generate_halftone256_palette(WICColor *entries, UINT count, BOOL add_transparent) { static const BYTE halftone_values_b[4] = { 0x00,0x55,0xaa,0xff }; static const BYTE halftone_values_gr[8] = { 0x00,0x24,0x49,0x6d,0x92,0xb6,0xdb,0xff };

1 0

Eric Pouech : windowscodecsext/tests: Enable compilation with long types.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: b228b914fd69f92c36f27f24a0814df8c6adb9b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b228b914fd69f92c36f27f24… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 9 08:21:19 2022 +0100 windowscodecsext/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecsext/tests/Makefile.in | 1 - dlls/windowscodecsext/tests/transform.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecsext/tests/Makefile.in b/dlls/windowscodecsext/tests/Makefile.in index 22c052f8384..d99067ef296 100644 --- a/dlls/windowscodecsext/tests/Makefile.in +++ b/dlls/windowscodecsext/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windowscodecsext.dll IMPORTS = windowscodecsext ole32 diff --git a/dlls/windowscodecsext/tests/transform.c b/dlls/windowscodecsext/tests/transform.c index e76f9fe8a4f..01f0d8a289e 100644 --- a/dlls/windowscodecsext/tests/transform.c +++ b/dlls/windowscodecsext/tests/transform.c @@ -32,28 +32,28 @@ static void test_WICCreateColorTransform_Proxy(void) IWICColorTransform *transform; hr = WICCreateColorTransform_Proxy( NULL ); - ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( hr == E_INVALIDARG, "got %08lx\n", hr ); transform = NULL; hr = WICCreateColorTransform_Proxy( &transform ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (transform) IWICColorTransform_Release( transform ); hr = CoInitializeEx( NULL, COINIT_APARTMENTTHREADED ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); transform = NULL; hr = WICCreateColorTransform_Proxy( &transform ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (transform) IWICColorTransform_Release( transform ); CoUninitialize(); hr = CoInitializeEx( NULL, COINIT_MULTITHREADED ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); transform = NULL; hr = WICCreateColorTransform_Proxy( &transform ); - ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08lx\n", hr ); if (transform) IWICColorTransform_Release( transform ); CoUninitialize(); }

1 0

Rémi Bernon : windows.gaming.input: Implement CreateGameController for RawGameController runtimeclass.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: 47610b5461d59e5af364af61bbab2f27884e754d URL: https://source.winehq.org/git/wine.git/?a=commit;h=47610b5461d59e5af364af61… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 9 09:47:57 2022 +0100 windows.gaming.input: Implement CreateGameController for RawGameController runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/controller.c | 242 ++++++++++++++++++++++++++++++++- dlls/windows.gaming.input/manager.c | 36 ++++- dlls/windows.gaming.input/private.h | 34 +++-- 3 files changed, 288 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47610b5461d59e5af364…

1 0

Jacek Caban : win32u: Move GetDesktopWindow implementation from user32.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: 257206e08c30182011cd7e91822b527efa14f76c URL: https://source.winehq.org/git/wine.git/?a=commit;h=257206e08c30182011cd7e91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:20:25 2022 +0100 win32u: Move GetDesktopWindow 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/user_main.c | 3 +- dlls/user32/win.c | 82 +------------------------------- dlls/win32u/message.c | 9 ++++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/winstation.c | 110 ++++++++++++++++++++++++++++++++++++++++++- include/ntuser.h | 1 + 6 files changed, 123 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=257206e08c30182011cd…

1 0

Jacek Caban : win32u: Move IsWindowUnicode implementation from user32.
by Alexandre Julliard March 9, 2022

March 9, 2022

Module: wine Branch: master Commit: cc20ef3b3bd6ea0649419f14b0b0f59a156e0aa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc20ef3b3bd6ea0649419f14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 9 15:21:36 2022 +0100 win32u: Move IsWindowUnicode 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 | 23 +---------------------- dlls/win32u/window.c | 29 +++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4f491c16f65..a81e112ee0d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2081,28 +2081,7 @@ BOOL WINAPI IsWindowEnabled(HWND hWnd) */ BOOL WINAPI IsWindowUnicode( HWND hwnd ) { - WND * wndPtr; - BOOL retvalue = FALSE; - - if (!(wndPtr = WIN_GetPtr(hwnd))) return FALSE; - - if (wndPtr == WND_DESKTOP) return TRUE; - - if (wndPtr != WND_OTHER_PROCESS) - { - retvalue = (wndPtr->flags & WIN_ISUNICODE) != 0; - WIN_ReleasePtr( wndPtr ); - } - else - { - SERVER_START_REQ( get_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) retvalue = reply->is_unicode; - } - SERVER_END_REQ; - } - return retvalue; + return NtUserCallHwnd( hwnd, NtUserIsWindowUnicode ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index aed536c9c54..90e96e17842 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -652,6 +652,33 @@ static BOOL is_window_drawable( HWND hwnd, BOOL icon ) return retval; } +/* see IsWindowUnicode */ +static BOOL is_window_unicode( HWND hwnd ) +{ + WND *win; + BOOL ret = FALSE; + + if (!(win = get_win_ptr(hwnd))) return FALSE; + + if (win == WND_DESKTOP) return TRUE; + + if (win != WND_OTHER_PROCESS) + { + ret = (win->flags & WIN_ISUNICODE) != 0; + release_win_ptr( win ); + } + else + { + SERVER_START_REQ( get_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) ret = reply->is_unicode; + } + SERVER_END_REQ; + } + return ret; +} + static LONG_PTR get_win_data( const void *ptr, UINT size ) { if (size == sizeof(WORD)) @@ -1065,6 +1092,8 @@ DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) return get_server_window_text( hwnd, NULL, 0 ); case NtUserIsWindow: return is_window( hwnd ); + case NtUserIsWindowUnicode: + return is_window_unicode( hwnd ); case NtUserIsWindowVisible: return is_window_visible( hwnd ); /* temporary exports */ diff --git a/include/ntuser.h b/include/ntuser.h index 5463853afde..1587e1db2f7 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -144,6 +144,7 @@ enum NtUserGetParent, NtUserGetWindowTextLength, NtUserIsWindow, + NtUserIsWindowUnicode, NtUserIsWindowVisible, /* temporary exports */ NtUserCreateDesktopWindow,

1 0