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

Jacek Caban : win32u: Mmove dummy surface implementation from user32.
by Alexandre Julliard 14 Mar '22

14 Mar '22

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 NtUserGetDCEx implementation from user32.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: ace24ec946f10459eee756f657d9d9c71d4c319e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace24ec946f10459eee756f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:43:55 2022 +0100 win32u: Move NtUserGetDCEx 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/caret.c | 4 +- dlls/user32/class.c | 20 -- dlls/user32/controls.h | 2 - dlls/user32/driver.c | 21 +- dlls/user32/listbox.c | 6 +- dlls/user32/menu.c | 6 +- dlls/user32/nonclient.c | 4 +- dlls/user32/painting.c | 551 ++---------------------------------------- dlls/user32/scroll.c | 5 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/user32/user_private.h | 2 - dlls/user32/winpos.c | 2 +- dlls/win32u/class.c | 20 +- dlls/win32u/dce.c | 557 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 8 + dlls/win32u/gdiobj.c | 2 +- dlls/win32u/ntuser_private.h | 7 +- dlls/win32u/sysparams.c | 6 + dlls/win32u/win32u.spec | 3 +- dlls/win32u/win32u_private.h | 7 +- dlls/win32u/window.c | 18 +- dlls/win32u/wrappers.c | 12 +- include/ntuser.h | 3 + 24 files changed, 661 insertions(+), 608 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ace24ec946f10459eee7…

1 0

Jacek Caban : win32u: Move NtUserReleaseDC implementation from user32.
by Alexandre Julliard 14 Mar '22

14 Mar '22

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: Move NtUserBeginPaint implementation from user32.
by Alexandre Julliard 14 Mar '22

14 Mar '22

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 NtUserEndPaint implementation from user32.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: wine Branch: master Commit: 31a044efa5aca292f3443f7a23f54af6b407426a URL: https://source.winehq.org/git/wine.git/?a=commit;h=31a044efa5aca292f3443f7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 11:44:41 2022 +0100 win32u: Move NtUserEndPaint 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 | 4 ++-- dlls/user32/defwnd.c | 2 +- dlls/user32/edit.c | 2 +- dlls/user32/listbox.c | 2 +- dlls/user32/menu.c | 2 +- dlls/user32/painting.c | 13 ------------- dlls/user32/scroll.c | 2 +- dlls/user32/static.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 + dlls/win32u/dce.c | 12 ++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 18 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 37b5fe317e1..f4b570126f7 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -253,7 +253,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, (btnPaintFunc[btn_type])( hWnd, hdc, ODA_DRAWENTIRE ); SetBkMode(hdc, nOldMode); /* reset painting mode */ } - if ( !wParam ) EndPaint( hWnd, &ps ); + if (!wParam) NtUserEndPaint( hWnd, &ps ); break; } diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 21de55ad479..7fc75e8038a 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -832,8 +832,8 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) SelectObject( hDC, hPrevBrush ); } - if( !hParamDC ) - EndPaint(lphc->self, &ps); + if (!hParamDC) + NtUserEndPaint( lphc->self, &ps ); return 0; } diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 9804c3b5418..c4de8928462 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -381,7 +381,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa wine_dbgstr_rect(&ps.rcPaint)); DrawIcon( hdc, x, y, hIcon ); } - EndPaint( hwnd, &ps ); + NtUserEndPaint( hwnd, &ps ); } return 0; } diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index e56fd85926d..9bbfa2727b2 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3776,7 +3776,7 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc) SelectObject(dc, old_font); if (!hdc) - EndPaint(es->hwndSelf, &ps); + NtUserEndPaint( es->hwndSelf, &ps ); } diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 29ed35be331..fedd32711fd 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -3092,7 +3092,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam PAINTSTRUCT ps; HDC hdc = ( wParam ) ? ((HDC)wParam) : NtUserBeginPaint( descr->self, &ps ); ret = LISTBOX_Paint( descr, hdc ); - if( !wParam ) EndPaint( descr->self, &ps ); + if (!wParam) NtUserEndPaint( descr->self, &ps ); } return ret; case WM_SIZE: diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 430d7ca8402..c0d03d30d0f 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3584,7 +3584,7 @@ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM NtUserBeginPaint( hwnd, &ps ); MENU_DrawPopupMenu( hwnd, ps.hdc, (HMENU)GetWindowLongPtrW( hwnd, 0 ) ); - EndPaint( hwnd, &ps ); + NtUserEndPaint( hwnd, &ps ); return 0; } diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 3cc1f802abd..218f57f1670 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -550,19 +550,6 @@ static HWND fix_caret(HWND hWnd, const RECT *scroll_rect, INT dx, INT dy, } -/*********************************************************************** - * EndPaint (USER32.@) - */ -BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) -{ - ShowCaret( hwnd ); - flush_window_surfaces( FALSE ); - if (!lps) return FALSE; - release_dc( hwnd, lps->hdc, TRUE ); - return TRUE; -} - - /*********************************************************************** * GetDC (USER32.@) * diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 090d0bc1c7e..f1b5da5165f 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1523,7 +1523,7 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA PAINTSTRUCT ps; HDC hdc = wParam ? (HDC)wParam : NtUserBeginPaint( hwnd, &ps ); SCROLL_DrawScrollBar( hwnd, hdc, SB_CTL, g_tracking_info.hit_test, &g_tracking_info, TRUE, TRUE ); - if (!wParam) EndPaint(hwnd, &ps); + if (!wParam) NtUserEndPaint( hwnd, &ps ); } break; diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 88ccb83c687..013e5c20312 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -385,7 +385,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam (staticPaintFunc[style])( hwnd, hdc, hbrush, full_style ); SelectClipRgn( hdc, hrgn ); if (hrgn) DeleteObject( hrgn ); - if (!wParam) EndPaint(hwnd, &ps); + if (!wParam) NtUserEndPaint( hwnd, &ps ); } break; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 00decbbfade..8b339f7bfac 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -211,7 +211,7 @@ @ stdcall EndDeferWindowPos(long) @ stdcall EndDialog(long long) @ stdcall EndMenu() -@ stdcall EndPaint(long ptr) +@ stdcall EndPaint(long ptr) NtUserEndPaint @ stub EndTask # @ stub EnterReaderModeHelper @ stdcall EnumChildWindows(long ptr long) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index d1d7a7ef1b2..1b4e8833a89 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -151,6 +151,7 @@ static const struct user_callbacks user_funcs = SendMessageW, SendNotifyMessageW, SetWindowPos, + ShowCaret, WaitForInputIdle, notify_ime, register_builtin_classes, diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 5055e909351..218f502f848 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -926,3 +926,15 @@ HDC WINAPI NtUserBeginPaint( HWND hwnd, PAINTSTRUCT *ps ) ps->hdc = hdc; return hdc; } + +/*********************************************************************** + * NtUserEndPaint (win32u.@) + */ +BOOL WINAPI NtUserEndPaint( HWND hwnd, const PAINTSTRUCT *ps ) +{ + if (user_callbacks) user_callbacks->pShowCaret( hwnd ); + flush_window_surfaces( FALSE ); + if (!ps) return FALSE; + release_dc( hwnd, ps->hdc, TRUE ); + return TRUE; +} diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index a186c05a7cf..68cde8936a3 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1162,6 +1162,7 @@ static struct unix_funcs unix_funcs = NtUserCountClipboardFormats, NtUserDestroyCursor, NtUserDrawIconEx, + NtUserEndPaint, NtUserEnumDisplayDevices, NtUserEnumDisplayMonitors, NtUserEnumDisplaySettings, diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index b870d0d0bcd..0e73be6fcd0 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -38,6 +38,7 @@ struct user_callbacks LRESULT (WINAPI *pSendMessageW)( HWND, UINT, WPARAM, LPARAM ); BOOL (WINAPI *pSendNotifyMessageW)( HWND, UINT, WPARAM, LPARAM ); BOOL (WINAPI *pSetWindowPos)( HWND, HWND, INT, INT, INT, INT, UINT ); + BOOL (WINAPI *pShowCaret)( HWND hwnd ); DWORD (WINAPI *pWaitForInputIdle)( HANDLE, DWORD ); void (CDECL *notify_ime)( HWND hwnd, UINT param ); void (CDECL *register_builtin_classes)(void); diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 1c1cb19ae94..ad24113adff 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -874,7 +874,7 @@ @ stub NtUserEnableWindowResizeOptimization @ stub NtUserEndDeferWindowPosEx @ stub NtUserEndMenu -@ stub NtUserEndPaint +@ stdcall NtUserEndPaint(long ptr) @ stdcall NtUserEnumDisplayDevices(ptr long ptr long) @ stdcall NtUserEnumDisplayMonitors(long ptr ptr long) @ stdcall NtUserEnumDisplaySettings(ptr long ptr long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 6350813037c..b67a90c26c7 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -198,6 +198,7 @@ struct unix_funcs BOOL (WINAPI *pNtUserDestroyCursor)( HCURSOR cursor, ULONG arg ); BOOL (WINAPI *pNtUserDrawIconEx)( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ); + BOOL (WINAPI *pNtUserEndPaint)( HWND hwnd, const PAINTSTRUCT *ps ); NTSTATUS (WINAPI *pNtUserEnumDisplayDevices)( UNICODE_STRING *device, DWORD index, DISPLAY_DEVICEW *info, DWORD flags ); BOOL (WINAPI *pNtUserEnumDisplayMonitors)( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index a69e81e8e10..40100c7cde2 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -149,6 +149,12 @@ INT WINAPI NtGdiEndPage( HDC hdc ) return unix_funcs->pNtGdiEndPage( hdc ); } +BOOL WINAPI NtUserEndPaint( HWND hwnd, const PAINTSTRUCT *ps ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserEndPaint( hwnd, ps ); +} + BOOL WINAPI NtGdiEnumFonts( HDC hdc, ULONG type, ULONG win32_compat, ULONG face_name_len, const WCHAR *face_name, ULONG charset, ULONG *count, void *buf ) { diff --git a/include/ntuser.h b/include/ntuser.h index 455d81a10fb..e27ef262403 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -297,6 +297,7 @@ BOOL WINAPI NtUserDestroyAcceleratorTable( HACCEL handle ); BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg ); BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ); +BOOL WINAPI NtUserEndPaint( HWND hwnd, const PAINTSTRUCT *ps ); NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, DISPLAY_DEVICEW *info, DWORD flags ); BOOL WINAPI NtUserEnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp );

1 0

Jacek Caban : win32u: Move NtUserRedrawWindow implementation from user32.
by Alexandre Julliard 14 Mar '22

14 Mar '22

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 NtUserGetUpdateRgn implementation from user32.
by Alexandre Julliard 14 Mar '22

14 Mar '22

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

Rémi Bernon : winegstreamer: Implement WMA decoder Process(Input|Output) error checks.
by Alexandre Julliard 14 Mar '22

14 Mar '22

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

Rémi Bernon : dinput/tests: Test IIterator_IInspectable_MoveNext returned values.
by Alexandre Julliard 14 Mar '22

14 Mar '22

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 : windows.gaming.input: Fix IIterator_IInspectable_MoveNext returne value.
by Alexandre Julliard 14 Mar '22

14 Mar '22

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