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

Jacek Caban : user32: Fix nameA pointer in alloc_menu_nameW.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: fa77147b5b105cb22196b6ca6977c1de9ec77d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa77147b5b105cb22196b6ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:43:07 2022 +0100 user32: Fix nameA pointer in alloc_menu_nameW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52651 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/class.c | 1 + dlls/user32/tests/class.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 3b6b70b8004..5d1c44a441d 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -174,6 +174,7 @@ static BOOL alloc_menu_nameW( struct client_menu_name *ret, const WCHAR *menu_na DWORD lenA = WideCharToMultiByte( CP_ACP, 0, menu_name, lenW, NULL, 0, NULL, NULL ); ret->nameW = HeapAlloc( GetProcessHeap(), 0, lenA + lenW * sizeof(WCHAR) ); if (!ret->nameW) return FALSE; + ret->nameA = (char *)(ret->nameW + lenW); memcpy( ret->nameW, menu_name, lenW * sizeof(WCHAR) ); WideCharToMultiByte( CP_ACP, 0, menu_name, lenW, ret->nameA, lenA, NULL, NULL ); } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 590e342585d..64fc3c014e3 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1545,6 +1545,53 @@ static void test_uxtheme(void) UnregisterClassA(class_name, GetModuleHandleA(NULL)); } +static void test_class_name(void) +{ + WCHAR class_name[] = L"ClassNameTest"; + HINSTANCE hinst = GetModuleHandleW(0); + WNDCLASSEXW wcex; + const WCHAR *nameW; + const char *nameA; + UINT_PTR res; + HWND hwnd; + + memset(&wcex, 0, sizeof wcex); + wcex.cbSize = sizeof wcex; + wcex.lpfnWndProc = ClassTest_WndProc; + wcex.hIcon = LoadIconW(0, (LPCWSTR)IDI_APPLICATION); + wcex.hInstance = hinst; + wcex.lpszClassName = class_name; + wcex.lpszMenuName = L"menu name"; + ok(RegisterClassExW(&wcex), "RegisterClassExW returned 0\n"); + hwnd = CreateWindowExW(0, class_name, NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, hinst, 0); + ok(hwnd != NULL, "Window was not created\n"); + + nameA = (const char *)GetClassLongPtrA(hwnd, GCLP_MENUNAME); + ok(!strcmp(nameA, "menu name"), "unexpected class name %s\n", debugstr_a(nameA)); + nameW = (const WCHAR *)GetClassLongPtrW(hwnd, GCLP_MENUNAME); + ok(!wcscmp(nameW, L"menu name"), "unexpected class name %s\n", debugstr_w(nameW)); + + res = SetClassLongPtrA(hwnd, GCLP_MENUNAME, (LONG_PTR)"nameA"); + todo_wine + ok(res, "SetClassLongPtrA returned 0\n"); + nameA = (const char *)GetClassLongPtrA(hwnd, GCLP_MENUNAME); + ok(!strcmp(nameA, "nameA"), "unexpected class name %s\n", debugstr_a(nameA)); + nameW = (const WCHAR *)GetClassLongPtrW(hwnd, GCLP_MENUNAME); + ok(!wcscmp(nameW, L"nameA"), "unexpected class name %s\n", debugstr_w(nameW)); + + res = SetClassLongPtrW(hwnd, GCLP_MENUNAME, (LONG_PTR)L"nameW"); + todo_wine + ok(res, "SetClassLongPtrW returned 0\n"); + nameA = (const char *)GetClassLongPtrA(hwnd, GCLP_MENUNAME); + ok(!strcmp(nameA, "nameW"), "unexpected class name %s\n", debugstr_a(nameA)); + nameW = (const WCHAR *)GetClassLongPtrW(hwnd, GCLP_MENUNAME); + ok(!wcscmp(nameW, L"nameW"), "unexpected class name %s\n", debugstr_w(nameW)); + + DestroyWindow(hwnd); + UnregisterClassW(class_name, hinst); +} + START_TEST(class) { char **argv; @@ -1578,6 +1625,7 @@ START_TEST(class) test_icons(); test_comctl32_classes(); test_actctx_classes(); + test_class_name(); /* this test unregisters the Button class so it should be executed at the end */ test_instances();

1 0

Jacek Caban : win32u: Move NtUserWindowFromDC implementation from user32.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: e411d919580b7bc72c6a86b03d8a4dbbbc567f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e411d919580b7bc72c6a86b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:43:32 2022 +0100 win32u: Move NtUserWindowFromDC 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/painting.c | 27 --------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/win32u/Makefile.in | 1 + dlls/win32u/dce.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 13 ++++++++++++- dlls/win32u/palette.c | 9 +++------ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 7 +++++++ include/ntuser.h | 1 + 12 files changed, 71 insertions(+), 38 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 96a06fe98c7..2f8ab9b81f8 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -35,17 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -struct dce -{ - struct list entry; /* entry in global DCE list */ - HDC hdc; - HWND hwnd; - HRGN clip_rgn; - DWORD flags; - LONG count; /* usage count; 0 or 1 for cache DCEs, always 1 for window DCEs, - always >= 1 for class DCEs */ -}; - static struct list dce_list = LIST_INIT(dce_list); #define DCE_CACHE_SIZE 64 @@ -1164,22 +1153,6 @@ INT WINAPI ReleaseDC( HWND hwnd, HDC hdc ) } -/********************************************************************** - * WindowFromDC (USER32.@) - */ -HWND WINAPI WindowFromDC( HDC hdc ) -{ - struct dce *dce; - HWND hwnd = 0; - - USER_Lock(); - dce = (struct dce *)GetDCHook( hdc, NULL ); - if (dce) hwnd = dce->hwnd; - USER_Unlock(); - return hwnd; -} - - /*********************************************************************** * LockWindowUpdate (USER32.@) * diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4c4e795c34a..aac2e39fa6d 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -818,7 +818,7 @@ @ stdcall WinHelpA(long str long long) @ stdcall WinHelpW(long wstr long long) # @ stub WinOldAppHackoMatic -@ stdcall WindowFromDC(long) +@ stdcall WindowFromDC(long) NtUserWindowFromDC @ stdcall WindowFromPoint(int64) @ stdcall WindowFromPhysicalPoint(int64) # @ stub YieldTask diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 2ef7b3f01d0..ba7462ee241 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -151,7 +151,6 @@ static const struct user_callbacks user_funcs = SendNotifyMessageW, SetWindowPos, WaitForInputIdle, - WindowFromDC, free_dce, notify_ime, register_builtin_classes, diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index ceb8f83eb97..2dea3682064 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -17,6 +17,7 @@ C_SRCS = \ clipping.c \ cursoricon.c \ dc.c \ + dce.c \ dib.c \ dibdrv/bitblt.c \ dibdrv/dc.c \ diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c new file mode 100644 index 00000000000..a811f7eae7f --- /dev/null +++ b/dlls/win32u/dce.c @@ -0,0 +1,42 @@ +/* + * Window painting functions + * + * Copyright 1993, 1994, 1995, 2001, 2004, 2005, 2008 Alexandre Julliard + * Copyright 1996, 1997, 1999 Alex Korobka + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "ntgdi_private.h" +#include "ntuser_private.h" + +/********************************************************************** + * NtUserWindowFromDC (win32u.@) + */ +HWND WINAPI NtUserWindowFromDC( HDC hdc ) +{ + struct dce *dce; + HWND hwnd = 0; + + user_lock(); + dce = (struct dce *)GetDCHook( hdc, NULL ); + if (dce) hwnd = dce->hwnd; + user_unlock(); + return hwnd; +} diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 6c10a3e77e1..160e3ab5f14 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -38,7 +38,6 @@ struct user_callbacks BOOL (WINAPI *pSendNotifyMessageW)( HWND, UINT, WPARAM, LPARAM ); BOOL (WINAPI *pSetWindowPos)( HWND, HWND, INT, INT, INT, INT, UINT ); DWORD (WINAPI *pWaitForInputIdle)( HANDLE, DWORD ); - HWND (WINAPI *pWindowFromDC)( HDC ); void (WINAPI *free_dce)( struct dce *dce, HWND hwnd ); void (CDECL *notify_ime)( HWND hwnd, UINT param ); void (CDECL *register_builtin_classes)(void); @@ -196,6 +195,18 @@ typedef struct tagWINDOWPROC #define MAX_ATOM_LEN 255 +/* FIXME: make it private to dce.c */ +struct dce +{ + struct list entry; /* entry in global DCE list */ + HDC hdc; + HWND hwnd; + HRGN clip_rgn; + DWORD flags; + LONG count; /* usage count; 0 or 1 for cache DCEs, always 1 for window DCEs, + always >= 1 for class DCEs */ +}; + /* Built-in class names (see _Undocumented_Windows_ p.418) */ #define POPUPMENU_CLASS_ATOM MAKEINTATOM(32768) /* PopupMenu */ #define DESKTOP_CLASS_ATOM MAKEINTATOM(32769) /* Desktop */ diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index 367bfea21b4..18885c7fba8 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -516,7 +516,7 @@ HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) if (!bkg && hpal != get_stock_object( DEFAULT_PALETTE )) { - HWND hwnd = user_callbacks->pWindowFromDC( hdc ); + HWND hwnd = NtUserWindowFromDC( hdc ); if (hwnd) { /* set primary palette if it's related to current active */ @@ -582,7 +582,7 @@ UINT realize_palette( HDC hdc ) if (realized && is_primary) { /* send palette change notification */ - HWND hwnd = user_callbacks->pWindowFromDC( hdc ); + HWND hwnd = NtUserWindowFromDC( hdc ); if (hwnd) user_callbacks->pSendMessageTimeoutW( HWND_BROADCAST, WM_PALETTECHANGED, HandleToUlong(hwnd), 0, SMTO_ABORTIFHUNG, 2000, NULL ); @@ -591,9 +591,6 @@ UINT realize_palette( HDC hdc ) } -typedef HWND (WINAPI *WindowFromDC_funcptr)( HDC ); -typedef BOOL (WINAPI *RedrawWindow_funcptr)( HWND, const RECT *, HRGN, UINT ); - /********************************************************************** * NtGdiUpdateColors (win32u.@) * @@ -607,7 +604,7 @@ BOOL WINAPI NtGdiUpdateColors( HDC hDC ) if (!size) return FALSE; if (!user_callbacks) return TRUE; - hwnd = user_callbacks->pWindowFromDC( hDC ); + hwnd = NtUserWindowFromDC( hDC ); /* Docs say that we have to remap current drawable pixel by pixel * but it would take forever given the speed of XGet/PutPixel. diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 41f9cfead49..abe32b8d70c 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -158,6 +158,7 @@ static void * const syscalls[] = NtUserSetWindowsHookEx, NtUserUnhookWinEvent, NtUserUnhookWindowsHookEx, + NtUserWindowFromDC, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 671d26f6805..7238e729e79 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1309,7 +1309,7 @@ @ stub NtUserWaitForMsgAndEvent @ stub NtUserWaitForRedirectionStartComplete @ stub NtUserWaitMessage -@ stub NtUserWindowFromDC +@ stdcall -syscall NtUserWindowFromDC(long) @ stub NtUserWindowFromPhysicalPoint @ stdcall NtUserWindowFromPoint(long long) @ stub NtUserYieldTask diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 82262cd83ab..b6cdf5edfb2 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -142,6 +142,7 @@ SYSCALL_ENTRY( NtUserSetWinEventHook ) \ SYSCALL_ENTRY( NtUserSetWindowsHookEx ) \ SYSCALL_ENTRY( NtUserUnhookWinEvent ) \ - SYSCALL_ENTRY( NtUserUnhookWindowsHookEx ) + SYSCALL_ENTRY( NtUserUnhookWindowsHookEx ) \ + SYSCALL_ENTRY( NtUserWindowFromDC ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 4ee05838b47..b8c4a86a352 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -206,6 +206,13 @@ NTSTATUS WINAPI wow64_NtUserGetWindowRgnEx( UINT *args ) return NtUserGetWindowRgnEx( hwnd, hrgn, unk ); } +NTSTATUS WINAPI wow64_NtUserWindowFromDC( UINT *args ) +{ + HDC hdc = get_handle( &args ); + + return HandleToUlong( NtUserWindowFromDC( hdc )); +} + NTSTATUS WINAPI wow64_NtUserBuildHwndList( UINT *args ) { HDESK desktop = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 28a025059f6..fb8db926888 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -407,6 +407,7 @@ BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *p const BLENDFUNCTION *blend, DWORD flags, const RECT *dirty ); WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ); DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ); +HWND WINAPI NtUserWindowFromDC( HDC hdc ); HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ); #endif /* _NTUSER_ */

1 0

Rémi Bernon : windows.gaming.input: Fix IIterator_IInspectable_MoveNext returne value.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: ace5d0adb8243bb34b003404e3ac9782361f0c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace5d0adb8243bb34b003404… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 10:28:14 2022 +0100 windows.gaming.input: Fix IIterator_IInspectable_MoveNext returne value. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 1 - dlls/windows.gaming.input/vector.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 8a27f16932f..3580964e187 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -1095,7 +1095,6 @@ static void test_windows_gaming_input(void) ok( ret == TRUE, "got HasCurrent %u\n", ret ); hr = IIterator_RawGameController_MoveNext( iterator, &ret ); ok( hr == S_OK, "First returned %#lx\n", hr ); - todo_wine ok( ret == FALSE, "got MoveNext %u\n", ret ); hr = IIterator_RawGameController_get_HasCurrent( iterator, &ret ); ok( hr == S_OK, "First returned %#lx\n", hr ); diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index 10dac5a5547..ae83d16a384 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -126,8 +126,8 @@ static HRESULT WINAPI iterator_MoveNext( IIterator_IInspectable *iface, BOOL *va FIXME("\n"); - if ((*value = impl->index < impl->size)) impl->index++; - return S_OK; + if (impl->index < impl->size) impl->index++; + return IIterator_IInspectable_get_HasCurrent( iface, value ); } static HRESULT WINAPI iterator_GetMany( IIterator_IInspectable *iface, UINT32 items_size,

1 0

Rémi Bernon : dinput/tests: Test IIterator_IInspectable_MoveNext returned values.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 87ada5544ec8c9d2bc0febd6f1e0119b9b2ae506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ada5544ec8c9d2bc0febd6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 10:28:13 2022 +0100 dinput/tests: Test IIterator_IInspectable_MoveNext returned values. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index a2072ca16de..8a27f16932f 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -961,6 +961,8 @@ static void test_windows_gaming_input(void) EventRegistrationToken controller_removed_token; IVectorView_RawGameController *controller_view; EventRegistrationToken controller_added_token; + IIterable_RawGameController *iterable; + IIterator_RawGameController *iterator; IRawGameControllerStatics *statics; HANDLE hwnd, thread, stop_event; IInspectable *tmp_inspectable; @@ -968,7 +970,8 @@ static void test_windows_gaming_input(void) HSTRING str; UINT32 size; HRESULT hr; - DWORD ret; + DWORD res; + BOOL ret; MSG msg; if (!load_combase_functions()) return; @@ -1080,6 +1083,28 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_Size returned %#lx\n", hr ); ok( size == 1, "got size %u\n", size ); + hr = IVectorView_RawGameController_QueryInterface( controller_view, &IID_IIterable_RawGameController, + (void **)&iterable ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + hr = IIterable_RawGameController_First( iterable, &iterator ); + ok( hr == S_OK, "First returned %#lx\n", hr ); + IIterable_RawGameController_Release( iterable ); + + hr = IIterator_RawGameController_get_HasCurrent( iterator, &ret ); + ok( hr == S_OK, "First returned %#lx\n", hr ); + ok( ret == TRUE, "got HasCurrent %u\n", ret ); + hr = IIterator_RawGameController_MoveNext( iterator, &ret ); + ok( hr == S_OK, "First returned %#lx\n", hr ); + todo_wine + ok( ret == FALSE, "got MoveNext %u\n", ret ); + hr = IIterator_RawGameController_get_HasCurrent( iterator, &ret ); + ok( hr == S_OK, "First returned %#lx\n", hr ); + ok( ret == FALSE, "got MoveNext %u\n", ret ); + hr = IIterator_RawGameController_MoveNext( iterator, &ret ); + ok( hr == S_OK, "First returned %#lx\n", hr ); + ok( ret == FALSE, "got MoveNext %u\n", ret ); + IIterator_RawGameController_Release( iterator ); + IVectorView_RawGameController_Release( controller_view ); hr = IRawGameControllerStatics_get_RawGameControllers( statics, &controller_view ); ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); @@ -1112,9 +1137,9 @@ static void test_windows_gaming_input(void) thread = CreateThread( NULL, 0, dinput_test_device_thread, stop_event, 0, NULL ); ok( !!thread, "CreateThread failed, error %lu\n", GetLastError() ); wait_for_events( 1, &controller_added.event, INFINITE ); - ret = wait_for_events( 1, &custom_factory.added_event, 500 ); + res = wait_for_events( 1, &custom_factory.added_event, 500 ); todo_wine - ok( !ret, "wait_for_events returned %#lx\n", ret ); + ok( !res, "wait_for_events returned %#lx\n", res ); hr = IRawGameControllerStatics_get_RawGameControllers( statics, &controller_view ); ok( hr == S_OK, "get_RawGameControllers returned %#lx\n", hr ); hr = IVectorView_RawGameController_GetAt( controller_view, 0, &raw_controller ); @@ -1159,9 +1184,9 @@ next: IGameController_Release( game_controller ); IRawGameController_Release( raw_controller ); SetEvent( stop_event ); - ret = wait_for_events( 1, &custom_factory.removed_event, 500 ); + res = wait_for_events( 1, &custom_factory.removed_event, 500 ); todo_wine - ok( !ret, "wait_for_events returned %#lx\n", ret ); + ok( !res, "wait_for_events returned %#lx\n", res ); wait_for_events( 1, &controller_removed.event, INFINITE ); hr = IRawGameControllerStatics_remove_RawGameControllerAdded( statics, controller_added_token );

1 0

Rémi Bernon : winegstreamer: Implement WMA decoder Process(Input|Output) error checks.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 6834fc5c9dd11026261aaa723d9df29d373ebdf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6834fc5c9dd11026261aaa72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 14 14:43:21 2022 +0100 winegstreamer: Implement WMA decoder Process(Input|Output) error checks. Checking that WMA decoder ignores any incorrectly sized input sample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 23 ++++++++++++++--------- dlls/winegstreamer/wma_decoder.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 880fbc9fc3f..de72ad5a6e7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6035,6 +6035,7 @@ static void test_wma_decoder(void) MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; MFT_OUTPUT_STREAM_INFO output_info; + MFT_OUTPUT_DATA_BUFFER outputs[2]; MFT_INPUT_STREAM_INFO input_info; MFT_OUTPUT_DATA_BUFFER output; const BYTE *wma_encoded_data; @@ -6212,7 +6213,7 @@ static void test_wma_decoder(void) ok(hr == S_OK, "ProcessInput returned %#lx\n", hr); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %lu\n", ret); - sample = create_sample(wma_encoded_data + wma_block_size, wma_block_size - wma_block_size / 2); + sample = create_sample(wma_encoded_data, wma_block_size + 1); hr = IMFTransform_ProcessInput(transform, 0, sample, 0); todo_wine ok(hr == S_OK, "ProcessInput returned %#lx\n", hr); @@ -6235,16 +6236,13 @@ static void test_wma_decoder(void) status = 0xdeadbeef; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %lu\n", output.dwStreamID); ok(!output.pSample, "got pSample %p\n", output.pSample); - todo_wine ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, "got dwStatus %#lx\n", output.dwStatus); ok(!output.pEvents, "got pEvents %p\n", output.pEvents); - todo_wine ok(status == 0, "got status %#lx\n", status); sample = create_sample(wma_encoded_data, wma_block_size); @@ -6257,16 +6255,25 @@ static void test_wma_decoder(void) status = 0xdeadbeef; memset(&output, 0, sizeof(output)); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); ok(!output.pSample, "got pSample %p\n", output.pSample); - todo_wine ok(output.dwStatus == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE)) /* Win7 */, "got dwStatus %#lx\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#lx\n", status); + status = 0xdeadbeef; + memset(&output, 0, sizeof(output)); + output_info.cbSize = sizeof(wma_decoded_data); + sample = create_sample(NULL, output_info.cbSize); + outputs[0].pSample = sample; + sample = create_sample(NULL, output_info.cbSize); + outputs[1].pSample = sample; + hr = IMFTransform_ProcessOutput(transform, 0, 2, outputs, &status); + ok(hr == E_INVALIDARG, "ProcessOutput returned %#lx\n", hr); + IMFSample_Release(outputs[0].pSample); + IMFSample_Release(outputs[1].pSample); + i = 1; status = 0xdeadbeef; output_info.cbSize = sizeof(wma_decoded_data); @@ -6337,7 +6344,6 @@ static void test_wma_decoder(void) ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); ok(output.pSample == sample, "got pSample %p\n", output.pSample); ok(output.dwStatus == 0, "got dwStatus %#lx\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#lx\n", status); ret = IMFSample_Release(sample); ok(ret == 0, "Release returned %lu\n", ret); @@ -6353,7 +6359,6 @@ static void test_wma_decoder(void) ok(output.dwStatus == 0 || broken(output.dwStatus == (MFT_OUTPUT_DATA_BUFFER_INCOMPLETE|7)) /* Win7 */, "got dwStatus %#lx\n", output.dwStatus); - todo_wine ok(status == 0, "got status %#lx\n", status); check_sample(sample, NULL, 0, NULL); ret = IMFSample_Release(sample); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 6c198706944..a35da1cdc70 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -520,14 +520,47 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MFT_INPUT_STREAM_INFO info; + HRESULT hr; + FIXME("iface %p, id %lu, sample %p, flags %#lx stub!\n", iface, id, sample, flags); + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) + return hr; + return E_NOTIMPL; } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *samples, DWORD *status) { + struct wma_decoder *decoder = impl_from_IMFTransform(iface); + MFT_OUTPUT_STREAM_INFO info; + HRESULT hr; + FIXME("iface %p, flags %#lx, count %lu, samples %p, status %p stub!\n", iface, flags, count, samples, status); + + if (count > 1) + return E_INVALIDARG; + + if (!decoder->wg_transform) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(iface, 0, &info))) + return hr; + + *status = 0; + samples[0].dwStatus = 0; + if (!samples[0].pSample) + { + samples[0].dwStatus = MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE; + return MF_E_TRANSFORM_NEED_MORE_INPUT; + } + return E_NOTIMPL; }

1 0

Jacek Caban : win32u: Move NtUserRedrawWindow implementation from user32.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 45e0afbca43c1dcffd4c7c7fbfc5109478d800c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45e0afbca43c1dcffd4c7c7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:45:30 2022 +0100 win32u: Move NtUserRedrawWindow 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/combo.c | 8 +- dlls/user32/defwnd.c | 4 +- dlls/user32/desktop.c | 2 +- dlls/user32/menu.c | 2 +- dlls/user32/painting.c | 170 ++---------------------------------- dlls/user32/static.c | 3 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/user32/winpos.c | 2 +- dlls/win32u/dce.c | 200 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntuser_private.h | 1 - dlls/win32u/palette.c | 3 +- dlls/win32u/sysparams.c | 3 +- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 +- dlls/win32u/wrappers.c | 6 ++ include/ntuser.h | 1 + 19 files changed, 234 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=45e0afbca43c1dcffd4c…

1 0

Jacek Caban : win32u: Move NtUserReleaseDC implementation from user32.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: b1708179b923cd89a993031ebe05bc2cb7bdff39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1708179b923cd89a993031e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:45:12 2022 +0100 win32u: Move NtUserReleaseDC 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/button.c | 4 ++-- dlls/user32/caret.c | 4 ++-- dlls/user32/clipboard.c | 6 +++--- dlls/user32/combo.c | 6 +++--- dlls/user32/dialog.c | 4 ++-- dlls/user32/edit.c | 10 +++++----- dlls/user32/icontitle.c | 2 +- dlls/user32/listbox.c | 6 +++--- dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 8 ++++---- dlls/user32/msgbox.c | 2 +- dlls/user32/nonclient.c | 8 ++++---- dlls/user32/painting.c | 21 +++------------------ dlls/user32/scroll.c | 4 ++-- dlls/user32/static.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 2 +- dlls/win32u/dce.c | 35 +++++++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 23 files changed, 84 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1708179b923cd89a993…

1 0

Jacek Caban : win32u: Mmove dummy surface implementation from user32.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 4bb7e5af52a582568aec9196d151c24b83311ab1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bb7e5af52a582568aec9196… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:45:01 2022 +0100 win32u: Mmove dummy surface 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/painting.c | 4 +- dlls/user32/win.c | 68 -------------------------- dlls/user32/win.h | 1 - dlls/user32/winpos.c | 7 +-- dlls/win32u/dce.c | 110 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 9 ++-- dlls/win32u/window.c | 43 +---------------- include/ntuser.h | 1 + 8 files changed, 126 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4bb7e5af52a582568aec…

1 0

Jacek Caban : win32u: Move NtUserBeginPaint implementation from user32.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: 0b0403baa889c729cf40cd302b00adcd7b8d4aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b0403baa889c729cf40cd30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:44:10 2022 +0100 win32u: Move NtUserBeginPaint 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/button.c | 2 +- dlls/user32/combo.c | 6 +- dlls/user32/defwnd.c | 2 +- dlls/user32/edit.c | 2 +- dlls/user32/listbox.c | 2 +- dlls/user32/menu.c | 2 +- dlls/user32/painting.c | 31 -------- dlls/user32/scroll.c | 4 +- dlls/user32/static.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 + dlls/user32/user_private.h | 2 +- dlls/win32u/dce.c | 184 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntuser_private.h | 2 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++ include/ntuser.h | 1 + 19 files changed, 210 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b0403baa889c729cf40…

1 0

Jacek Caban : win32u: Move NtUserGetUpdateRgn implementation from user32.
by Alexandre Julliard March 14, 2022

March 14, 2022

Module: wine Branch: master Commit: d942281a0029ef42a075d64cf5d94b9502168261 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d942281a0029ef42a075d64c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:45:43 2022 +0100 win32u: Move NtUserGetUpdateRgn 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/message.c | 4 +- dlls/user32/painting.c | 34 +--------- dlls/user32/user32.spec | 2 +- dlls/user32/win.h | 1 - dlls/user32/winpos.c | 37 ----------- dlls/win32u/dce.c | 33 +++++++++- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/window.c | 150 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 ++ include/ntuser.h | 1 + 12 files changed, 197 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d942281a0029ef42a075…

1 0