- Wine-Commits - list.winehq.org

Jacek Caban : win32u: Use syscall interface for more clipping functions.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 28642d22398d45f49e11c6401428d51cb9243ccb URL: https://gitlab.winehq.org/wine/wine/-/commit/28642d22398d45f49e11c6401428d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 1 00:06:21 2022 +0200 win32u: Use syscall interface for more clipping functions. --- dlls/win32u/gdiobj.c | 10 ----- dlls/win32u/syscall.c | 10 +++++ dlls/win32u/win32u.spec | 20 +++++----- dlls/win32u/win32u_private.h | 10 ----- dlls/win32u/wrappers.c | 60 ----------------------------- dlls/wow64win/gdi.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 10 +++++ 7 files changed, 122 insertions(+), 90 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for more DC functions.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 5f5082afc9f3a96502239af080122c64bdff7f62 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f5082afc9f3a96502239af080122c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 23:12:29 2022 +0200 win32u: Use syscall interface for more DC functions. --- dlls/win32u/gdiobj.c | 5 ----- dlls/win32u/syscall.c | 5 +++++ dlls/win32u/win32u.spec | 10 +++++----- dlls/win32u/win32u_private.h | 6 ------ dlls/win32u/wrappers.c | 31 ------------------------------- dlls/wow64win/gdi.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 5 +++++ 7 files changed, 55 insertions(+), 47 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for D3DKMT functions.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 859eda026db1f0324803034d492905e155844f53 URL: https://gitlab.winehq.org/wine/wine/-/commit/859eda026db1f0324803034d492905… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 20:02:03 2022 +0200 win32u: Use syscall interface for D3DKMT functions. --- dlls/win32u/gdiobj.c | 10 --- dlls/win32u/syscall.c | 10 +++ dlls/win32u/win32u.spec | 20 ++--- dlls/win32u/win32u_private.h | 10 --- dlls/win32u/wrappers.c | 60 -------------- dlls/wow64win/gdi.c | 183 ++++++++++++++++++++++++++++++++++++++++++- dlls/wow64win/syscall.h | 10 +++ 7 files changed, 212 insertions(+), 91 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for DIB functions.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: e4215142f7c931757084dac1d443ab0f61d28cef URL: https://gitlab.winehq.org/wine/wine/-/commit/e4215142f7c931757084dac1d443ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 20:21:13 2022 +0200 win32u: Use syscall interface for DIB functions. --- dlls/win32u/gdiobj.c | 4 --- dlls/win32u/syscall.c | 4 +++ dlls/win32u/win32u.spec | 8 ++--- dlls/win32u/win32u_private.h | 17 --------- dlls/win32u/wrappers.c | 43 ----------------------- dlls/wow64win/gdi.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 4 +++ 7 files changed, 95 insertions(+), 68 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for more GDI object functions.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 384d34d6fbbd24d23ac14a3f8142f1db7ef01c8a URL: https://gitlab.winehq.org/wine/wine/-/commit/384d34d6fbbd24d23ac14a3f8142f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 23:31:47 2022 +0200 win32u: Use syscall interface for more GDI object functions. --- dlls/win32u/gdiobj.c | 5 ----- dlls/win32u/syscall.c | 5 +++++ dlls/win32u/win32u.spec | 10 +++++----- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 30 ------------------------------ dlls/wow64win/gdi.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 5 +++++ 7 files changed, 53 insertions(+), 45 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 431bd9360c9..c45c82bf87b 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1030,7 +1030,6 @@ BOOL WINAPI NtGdiSetColorAdjustment( HDC hdc, const COLORADJUSTMENT *ca ) static struct unix_funcs unix_funcs = { - NtGdiDeleteObjectApp, NtGdiDoPalette, NtGdiEnumFonts, NtGdiExcludeClipRect, @@ -1065,14 +1064,10 @@ static struct unix_funcs unix_funcs = NtGdiPtVisible, NtGdiRectVisible, NtGdiResizePalette, - NtGdiSelectBrush, - NtGdiSelectFont, - NtGdiSelectPen, NtGdiSetBoundsRect, NtGdiSetDeviceGammaRamp, NtGdiSetLayout, NtGdiSetSystemPaletteUse, - NtGdiUnrealizeObject, NtUserDrawCaptionTemp, NtUserDrawMenuBarTemp, NtUserEndPaint, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index db951627c0c..cbbf6f553cd 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -80,6 +80,7 @@ static void * const syscalls[] = NtGdiDdDDISetQueuedLimit, NtGdiDdDDISetVidPnSourceOwner, NtGdiDeleteClientObj, + NtGdiDeleteObjectApp, NtGdiDescribePixelFormat, NtGdiDrawStream, NtGdiEllipse, @@ -140,7 +141,10 @@ static void * const syscalls[] = NtGdiScaleViewportExtEx, NtGdiScaleWindowExtEx, NtGdiSelectBitmap, + NtGdiSelectBrush, NtGdiSelectClipPath, + NtGdiSelectFont, + NtGdiSelectPen, NtGdiSetBitmapBits, NtGdiSetBitmapDimension, NtGdiSetBrushOrg, @@ -162,6 +166,7 @@ static void * const syscalls[] = NtGdiSwapBuffers, NtGdiTransformPoints, NtGdiTransparentBlt, + NtGdiUnrealizeObject, NtGdiUpdateColors, NtGdiWidenPath, NtUserActivateKeyboardLayout, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index aa95d936c49..e4a6f281227 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -367,7 +367,7 @@ @ stdcall -syscall NtGdiDeleteClientObj(long) @ stub NtGdiDeleteColorSpace @ stub NtGdiDeleteColorTransform -@ stdcall NtGdiDeleteObjectApp(long ) +@ stdcall -syscall NtGdiDeleteObjectApp(long ) @ stdcall -syscall NtGdiDescribePixelFormat(long long long ptr) @ stub NtGdiDestroyOPMProtectedOutput @ stub NtGdiDestroyPhysicalMonitor @@ -585,10 +585,10 @@ @ stdcall -syscall NtGdiScaleViewportExtEx(long long long long long ptr) @ stdcall -syscall NtGdiScaleWindowExtEx(long long long long long ptr) @ stdcall -syscall NtGdiSelectBitmap(long long) -@ stdcall NtGdiSelectBrush(long long) +@ stdcall -syscall NtGdiSelectBrush(long long) @ stdcall -syscall NtGdiSelectClipPath(long long) -@ stdcall NtGdiSelectFont(long long) -@ stdcall NtGdiSelectPen(long long) +@ stdcall -syscall NtGdiSelectFont(long long) +@ stdcall -syscall NtGdiSelectPen(long long) @ stub NtGdiSetBitmapAttributes @ stdcall -syscall NtGdiSetBitmapBits(long long ptr) @ stdcall -syscall NtGdiSetBitmapDimension(long long long ptr) @@ -630,7 +630,7 @@ @ stub NtGdiUMPDEngFreeUserMem @ stub NtGdiUnloadPrinterDriver @ stub NtGdiUnmapMemFont -@ stdcall NtGdiUnrealizeObject(long) +@ stdcall -syscall NtGdiUnrealizeObject(long) @ stdcall -syscall NtGdiUpdateColors(long) @ stub NtGdiUpdateTransform @ stdcall -syscall NtGdiWidenPath(long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 07328cb1f95..17aed3d0c44 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -35,7 +35,6 @@ struct unix_funcs { /* win32u functions */ - BOOL (WINAPI *pNtGdiDeleteObjectApp)( HGDIOBJ obj ); LONG (WINAPI *pNtGdiDoPalette)( HGDIOBJ handle, WORD start, WORD count, void *entries, DWORD func, BOOL inbound ); BOOL (WINAPI *pNtGdiEnumFonts)( HDC hdc, ULONG type, ULONG win32_compat, ULONG face_name_len, @@ -81,14 +80,10 @@ struct unix_funcs BOOL (WINAPI *pNtGdiPtVisible)( HDC hdc, INT x, INT y ); BOOL (WINAPI *pNtGdiRectVisible)( HDC hdc, const RECT *rect ); BOOL (WINAPI *pNtGdiResizePalette)( HPALETTE palette, UINT count ); - HGDIOBJ (WINAPI *pNtGdiSelectBrush)( HDC hdc, HGDIOBJ handle ); - HGDIOBJ (WINAPI *pNtGdiSelectFont)( HDC hdc, HGDIOBJ handle ); - HGDIOBJ (WINAPI *pNtGdiSelectPen)( HDC hdc, HGDIOBJ handle ); UINT (WINAPI *pNtGdiSetBoundsRect)( HDC hdc, const RECT *rect, UINT flags ); BOOL (WINAPI *pNtGdiSetDeviceGammaRamp)( HDC hdc, void *ptr ); DWORD (WINAPI *pNtGdiSetLayout)( HDC hdc, LONG wox, DWORD layout ); UINT (WINAPI *pNtGdiSetSystemPaletteUse)( HDC hdc, UINT use ); - BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtUserDrawCaptionTemp)( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ); DWORD (WINAPI *pNtUserDrawMenuBarTemp)( HWND hwnd, HDC hdc, RECT *rect, HMENU handle, HFONT font ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 27da68d65d5..b20bd2a82b1 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -24,12 +24,6 @@ static const struct unix_funcs *unix_funcs; -BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pNtGdiDeleteObjectApp( obj ); -} - LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entries, DWORD func, BOOL inbound ) { @@ -253,24 +247,6 @@ BOOL WINAPI NtGdiResizePalette( HPALETTE palette, UINT count ) return unix_funcs->pNtGdiResizePalette( palette, count ); } -HGDIOBJ WINAPI NtGdiSelectBrush( HDC hdc, HGDIOBJ handle ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtGdiSelectBrush( hdc, handle ); -} - -HGDIOBJ WINAPI NtGdiSelectFont( HDC hdc, HGDIOBJ handle ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtGdiSelectFont( hdc, handle ); -} - -HGDIOBJ WINAPI NtGdiSelectPen( HDC hdc, HGDIOBJ handle ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtGdiSelectPen( hdc, handle ); -} - UINT WINAPI NtGdiSetBoundsRect( HDC hdc, const RECT *rect, UINT flags ) { if (!unix_funcs) return 0; @@ -295,12 +271,6 @@ UINT WINAPI NtGdiSetSystemPaletteUse( HDC hdc, UINT use ) return unix_funcs->pNtGdiSetSystemPaletteUse( hdc, use ); } -BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pNtGdiUnrealizeObject( obj ); -} - BOOL WINAPI NtUserDrawCaptionTemp( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ) { diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index a7c175591ae..e2c25032741 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -622,6 +622,13 @@ NTSTATUS WINAPI wow64_NtGdiDeleteClientObj( UINT *args ) return NtGdiDeleteClientObj( obj ); } +NTSTATUS WINAPI wow64_NtGdiDeleteObjectApp( UINT *args ) +{ + HGDIOBJ obj = get_handle( &args ); + + return NtGdiDeleteObjectApp( obj ); +} + NTSTATUS WINAPI wow64_NtGdiDescribePixelFormat( UINT *args ) { HDC hdc = get_handle( &args ); @@ -1303,6 +1310,14 @@ NTSTATUS WINAPI wow64_NtGdiSelectBitmap( UINT *args ) return HandleToUlong( NtGdiSelectBitmap( hdc, handle )); } +NTSTATUS WINAPI wow64_NtGdiSelectBrush( UINT *args ) +{ + HDC hdc = get_handle( &args ); + HGDIOBJ handle = get_handle( &args ); + + return HandleToUlong( NtGdiSelectBrush( hdc, handle )); +} + NTSTATUS WINAPI wow64_NtGdiSelectClipPath( UINT *args ) { HDC hdc = get_handle( &args ); @@ -1311,6 +1326,22 @@ NTSTATUS WINAPI wow64_NtGdiSelectClipPath( UINT *args ) return NtGdiSelectClipPath( hdc, mode ); } +NTSTATUS WINAPI wow64_NtGdiSelectFont( UINT *args ) +{ + HDC hdc = get_handle( &args ); + HGDIOBJ handle = get_handle( &args ); + + return HandleToUlong( NtGdiSelectFont( hdc, handle )); +} + +NTSTATUS WINAPI wow64_NtGdiSelectPen( UINT *args ) +{ + HDC hdc = get_handle( &args ); + HGDIOBJ handle = get_handle( &args ); + + return HandleToUlong( NtGdiSelectPen( hdc, handle )); +} + NTSTATUS WINAPI wow64_NtGdiSetBitmapBits( UINT *args ) { HBITMAP hbitmap = get_handle( &args ); @@ -1561,6 +1592,13 @@ NTSTATUS WINAPI wow64_NtGdiTransformPoints( UINT *args ) return NtGdiTransformPoints( hdc, points_in, points_out, count, mode ); } +NTSTATUS WINAPI wow64_NtGdiUnrealizeObject( UINT *args ) +{ + HGDIOBJ obj = get_handle( &args ); + + return NtGdiUnrealizeObject( obj ); +} + NTSTATUS WINAPI wow64_NtGdiUpdateColors( UINT *args ) { HDC hdc = get_handle( &args ); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 90e1d2d3e58..ee0c94047af 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -66,6 +66,7 @@ SYSCALL_ENTRY( NtGdiDdDDISetQueuedLimit ) \ SYSCALL_ENTRY( NtGdiDdDDISetVidPnSourceOwner ) \ SYSCALL_ENTRY( NtGdiDeleteClientObj ) \ + SYSCALL_ENTRY( NtGdiDeleteObjectApp ) \ SYSCALL_ENTRY( NtGdiDescribePixelFormat ) \ SYSCALL_ENTRY( NtGdiDrawStream ) \ SYSCALL_ENTRY( NtGdiEllipse ) \ @@ -126,7 +127,10 @@ SYSCALL_ENTRY( NtGdiScaleViewportExtEx ) \ SYSCALL_ENTRY( NtGdiScaleWindowExtEx ) \ SYSCALL_ENTRY( NtGdiSelectBitmap ) \ + SYSCALL_ENTRY( NtGdiSelectBrush ) \ SYSCALL_ENTRY( NtGdiSelectClipPath ) \ + SYSCALL_ENTRY( NtGdiSelectFont ) \ + SYSCALL_ENTRY( NtGdiSelectPen ) \ SYSCALL_ENTRY( NtGdiSetBitmapBits ) \ SYSCALL_ENTRY( NtGdiSetBitmapDimension ) \ SYSCALL_ENTRY( NtGdiSetBrushOrg ) \ @@ -148,6 +152,7 @@ SYSCALL_ENTRY( NtGdiSwapBuffers ) \ SYSCALL_ENTRY( NtGdiTransformPoints ) \ SYSCALL_ENTRY( NtGdiTransparentBlt ) \ + SYSCALL_ENTRY( NtGdiUnrealizeObject ) \ SYSCALL_ENTRY( NtGdiUpdateColors ) \ SYSCALL_ENTRY( NtGdiWidenPath ) \ SYSCALL_ENTRY( NtUserActivateKeyboardLayout ) \

1 0

Jacek Caban : win32u: Use syscall interface for more bitmap functions.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 4aecddf06a31e25f21ed565643ecb58aded79e2f URL: https://gitlab.winehq.org/wine/wine/-/commit/4aecddf06a31e25f21ed565643ecb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 15:59:15 2022 +0200 win32u: Use syscall interface for more bitmap functions. --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 2 -- dlls/win32u/wrappers.c | 12 ------------ dlls/wow64win/gdi.c | 17 +++++++++++++++++ dlls/wow64win/syscall.h | 2 ++ 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 1df4c83ed55..93c20f5cac0 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1030,7 +1030,6 @@ BOOL WINAPI NtGdiSetColorAdjustment( HDC hdc, const COLORADJUSTMENT *ca ) static struct unix_funcs unix_funcs = { - NtGdiCreateCompatibleBitmap, NtGdiCreateCompatibleDC, NtGdiCreateDIBitmapInternal, NtGdiCreateMetafileDC, @@ -1082,7 +1081,6 @@ static struct unix_funcs unix_funcs = NtGdiResetDC, NtGdiResizePalette, NtGdiRestoreDC, - NtGdiSelectBitmap, NtGdiSelectBrush, NtGdiSelectFont, NtGdiSelectPen, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 40229632d16..56298cd7697 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -50,6 +50,7 @@ static void * const syscalls[] = NtGdiComputeXformCoefficients, NtGdiCreateBitmap, NtGdiCreateClientObj, + NtGdiCreateCompatibleBitmap, NtGdiCreateDIBBrush, NtGdiCreateDIBSection, NtGdiCreateEllipticRgn, @@ -122,6 +123,7 @@ static void * const syscalls[] = NtGdiSaveDC, NtGdiScaleViewportExtEx, NtGdiScaleWindowExtEx, + NtGdiSelectBitmap, NtGdiSelectClipPath, NtGdiSetBitmapBits, NtGdiSetBitmapDimension, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index cdd39aebf8a..53066822bd6 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -145,7 +145,7 @@ @ stdcall -syscall NtGdiCreateClientObj(long) @ stub NtGdiCreateColorSpace @ stub NtGdiCreateColorTransform -@ stdcall NtGdiCreateCompatibleBitmap(long long long) +@ stdcall -syscall NtGdiCreateCompatibleBitmap(long long long) @ stdcall NtGdiCreateCompatibleDC(long) @ stdcall -syscall NtGdiCreateDIBBrush(ptr long long long long ptr) @ stdcall -syscall NtGdiCreateDIBSection(long long long ptr long long long long ptr) @@ -584,7 +584,7 @@ @ stub NtGdiScaleValues @ stdcall -syscall NtGdiScaleViewportExtEx(long long long long long ptr) @ stdcall -syscall NtGdiScaleWindowExtEx(long long long long long ptr) -@ stdcall NtGdiSelectBitmap(long long) +@ stdcall -syscall NtGdiSelectBitmap(long long) @ stdcall NtGdiSelectBrush(long long) @ stdcall -syscall NtGdiSelectClipPath(long long) @ stdcall NtGdiSelectFont(long long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index ebfe18fcbc2..926bacb7db5 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -35,7 +35,6 @@ struct unix_funcs { /* win32u functions */ - HBITMAP (WINAPI *pNtGdiCreateCompatibleBitmap)( HDC hdc, INT width, INT height ); HDC (WINAPI *pNtGdiCreateCompatibleDC)( HDC hdc ); HBITMAP (WINAPI *pNtGdiCreateDIBitmapInternal)( HDC hdc, INT width, INT height, DWORD init, const void *bits, const BITMAPINFO *data, @@ -104,7 +103,6 @@ struct unix_funcs DRIVER_INFO_2W *driver_info, void *dev ); BOOL (WINAPI *pNtGdiResizePalette)( HPALETTE palette, UINT count ); BOOL (WINAPI *pNtGdiRestoreDC)( HDC hdc, INT level ); - HGDIOBJ (WINAPI *pNtGdiSelectBitmap)( HDC hdc, HGDIOBJ handle ); HGDIOBJ (WINAPI *pNtGdiSelectBrush)( HDC hdc, HGDIOBJ handle ); HGDIOBJ (WINAPI *pNtGdiSelectFont)( HDC hdc, HGDIOBJ handle ); HGDIOBJ (WINAPI *pNtGdiSelectPen)( HDC hdc, HGDIOBJ handle ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 4cd756fd575..4f51dbd2206 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -24,12 +24,6 @@ static const struct unix_funcs *unix_funcs; -HBITMAP WINAPI NtGdiCreateCompatibleBitmap( HDC hdc, INT width, INT height ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtGdiCreateCompatibleBitmap( hdc, width, height ); -} - HDC WINAPI NtGdiCreateCompatibleDC( HDC hdc ) { if (!unix_funcs) return 0; @@ -303,12 +297,6 @@ BOOL WINAPI NtGdiRestoreDC( HDC hdc, INT level ) return unix_funcs->pNtGdiRestoreDC( hdc, level ); } -HGDIOBJ WINAPI NtGdiSelectBitmap( HDC hdc, HGDIOBJ handle ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtGdiSelectBitmap( hdc, handle ); -} - HGDIOBJ WINAPI NtGdiSelectBrush( HDC hdc, HGDIOBJ handle ) { if (!unix_funcs) return 0; diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index d6006adf8d1..0edb41fc444 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -207,6 +207,15 @@ NTSTATUS WINAPI wow64_NtGdiCreateClientObj( UINT *args ) return HandleToUlong( NtGdiCreateClientObj( type )); } +NTSTATUS WINAPI wow64_NtGdiCreateCompatibleBitmap( UINT *args ) +{ + HDC hdc = get_handle( &args ); + INT width = get_ulong( &args ); + INT height = get_ulong( &args ); + + return HandleToUlong( NtGdiCreateCompatibleBitmap( hdc, width, height )); +} + NTSTATUS WINAPI wow64_NtGdiCreateDIBBrush( UINT *args ) { const void *data = get_ptr( &args ); @@ -1037,6 +1046,14 @@ NTSTATUS WINAPI wow64_NtGdiScaleWindowExtEx( UINT *args ) return NtGdiScaleWindowExtEx( hdc, x_num, x_denom, y_num, y_denom, size ); } +NTSTATUS WINAPI wow64_NtGdiSelectBitmap( UINT *args ) +{ + HDC hdc = get_handle( &args ); + HGDIOBJ handle = get_handle( &args ); + + return HandleToUlong( NtGdiSelectBitmap( hdc, handle )); +} + NTSTATUS WINAPI wow64_NtGdiSelectClipPath( UINT *args ) { HDC hdc = get_handle( &args ); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 1f925757eb6..dfbe2129556 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -36,6 +36,7 @@ SYSCALL_ENTRY( NtGdiComputeXformCoefficients ) \ SYSCALL_ENTRY( NtGdiCreateBitmap ) \ SYSCALL_ENTRY( NtGdiCreateClientObj ) \ + SYSCALL_ENTRY( NtGdiCreateCompatibleBitmap ) \ SYSCALL_ENTRY( NtGdiCreateDIBBrush ) \ SYSCALL_ENTRY( NtGdiCreateDIBSection ) \ SYSCALL_ENTRY( NtGdiCreateEllipticRgn ) \ @@ -108,6 +109,7 @@ SYSCALL_ENTRY( NtGdiSaveDC ) \ SYSCALL_ENTRY( NtGdiScaleViewportExtEx ) \ SYSCALL_ENTRY( NtGdiScaleWindowExtEx ) \ + SYSCALL_ENTRY( NtGdiSelectBitmap ) \ SYSCALL_ENTRY( NtGdiSelectClipPath ) \ SYSCALL_ENTRY( NtGdiSetBitmapBits ) \ SYSCALL_ENTRY( NtGdiSetBitmapDimension ) \

1 0

Zebediah Figura : xactengine: Use the xaudio2 channel.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 47ee70a84e4cb50d33e2ab754aabab5032090434 URL: https://gitlab.winehq.org/wine/wine/-/commit/47ee70a84e4cb50d33e2ab754aabab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 19 13:30:31 2023 -0500 xactengine: Use the xaudio2 channel. Unify this with the rest of xaudio. --- dlls/xactengine3_7/xact_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index f2737e0a9bd..b0f8ec13ac4 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -36,7 +36,7 @@ #include "wine/debug.h" #include "wine/rbtree.h" -WINE_DEFAULT_DEBUG_CHANNEL(xact3); +WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #if XACT3_VER < 0x0300 #define IID_IXACT3Engine IID_IXACTEngine

1 0

Anton Baskanov : dsound: Use the value from SetFrequency when 3D processing is disabled.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: ef2d8d8e5db96a14a4848a30c440b82d9a3c2766 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef2d8d8e5db96a14a4848a30c440b8… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Apr 25 17:55:58 2023 +0700 dsound: Use the value from SetFrequency when 3D processing is disabled. --- dlls/dsound/sound3d.c | 2 ++ dlls/dsound/tests/ds3d.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 0008e34755d..7ad37a30f8d 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -196,6 +196,8 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) /* this one is here only to eliminate annoying warning message */ dsb->volpan.lVolume = dsb->ds3db_lVolume; DSOUND_RecalcVolPan (&dsb->volpan); + dsb->freq = dsb->ds3db_freq; + DSOUND_RecalcFormat(dsb); return; } diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 781d23e876f..a8da83df6e1 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1454,7 +1454,6 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_HEADRELATIVE, 0, -90, 1, -90, 22050, 29400); - /* Wine TODO: The frequency is not updated. */ check_doppler(dsound, listener, play, DS3DMODE_DISABLE, 0, 0, 1, -90, 22050, 22050); IDirectSound3DListener_Release(listener);

1 0

Anton Baskanov : dsound/tests: Test distance and Doppler factor.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 23eca82ac333f1f5a9feb6edb2c022a3e7e59f98 URL: https://gitlab.winehq.org/wine/wine/-/commit/23eca82ac333f1f5a9feb6edb2c022… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 14:58:07 2023 +0700 dsound/tests: Test distance and Doppler factor. --- dlls/dsound/tests/ds3d.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index a8da83df6e1..14f83d9c0a0 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1456,6 +1456,44 @@ static void test_doppler(GUID *guid, BOOL play) check_doppler(dsound, listener, play, DS3DMODE_DISABLE, 0, 0, 1, -90, 22050, 22050); + hr = IDirectSound3DListener_SetDistanceFactor(listener, 10, DS3D_DEFERRED); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, -9, 22050, 29400); + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, 9, 22050, 17640); + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 9, 0.1f, 0, 22050, 29400); + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -9, 0.1f, 0, 22050, 17640); + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, -24, 22050, 44100); + /* Wine TODO: The distance factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, 24, 22050, 14700); + + hr = IDirectSound3DListener_SetDistanceFactor(listener, DS3D_DEFAULTDISTANCEFACTOR, DS3D_DEFERRED); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirectSound3DListener_SetDopplerFactor(listener, 2, DS3D_DEFERRED); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -45, 22050, 29400); + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 45, 22050, 17640); + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 45, 1, 0, 22050, 29400); + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -45, 1, 0, 22050, 17640); + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -120, 22050, 44100); + /* Wine TODO: The Doppler factor has no effect. */ + check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 120, 22050, 14700); + + hr = IDirectSound3DListener_SetDopplerFactor(listener, DS3D_DEFAULTDOPPLERFACTOR, DS3D_DEFERRED); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + IDirectSound3DListener_Release(listener); ref = IDirectSoundBuffer_Release(primary); ok(!ref, "Got outstanding refcount %ld.\n", ref);

1 0

Anton Baskanov : dsound: Take distance and Doppler factor into account.
by Alexandre Julliard May 26, 2023

May 26, 2023

Module: wine Branch: master Commit: 69d088ca5b0e85337d6f0c1c8655721a8fef0575 URL: https://gitlab.winehq.org/wine/wine/-/commit/69d088ca5b0e85337d6f0c1c865572… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 24 15:07:32 2023 +0700 dsound: Take distance and Doppler factor into account. --- dlls/dsound/sound3d.c | 5 +++-- dlls/dsound/tests/ds3d.c | 12 ------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 7ad37a30f8d..3fa9ff6801f 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -168,7 +168,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) float a, ingain; /* doppler shift related stuff */ D3DVECTOR vRelativeVel; - D3DVALUE flFreq, flRelativeVel, flLimitedVel; + D3DVALUE flFreq, flRelativeVel, flLimitedVel, flVelocityFactor; TRACE("(%p)\n",dsb); @@ -308,7 +308,8 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) NOTE: if buffer moves TOWARDS the listener, its velocity component is NEGATIVE if buffer moves AWAY from listener, its velocity component is POSITIVE */ flRelativeVel = ProjectVector(&vRelativeVel, &vDistance); - flLimitedVel = max(-DEFAULT_VELOCITY/2, min(DEFAULT_VELOCITY/2, flRelativeVel)); + flVelocityFactor = dsb->device->ds3dl.flDistanceFactor * dsb->device->ds3dl.flDopplerFactor; + flLimitedVel = max(-DEFAULT_VELOCITY/2, min(DEFAULT_VELOCITY/2, flRelativeVel * flVelocityFactor)); /* formula taken from Gianicoli D.: Physics, 4th edition: */ flFreq = dsb->ds3db_freq * (DEFAULT_VELOCITY/(DEFAULT_VELOCITY + flLimitedVel)); TRACE("doppler: Relative velocity (component) = %f => Doppler shift: %ld Hz -> %f Hz\n", diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 14f83d9c0a0..9c65f674b3b 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1459,17 +1459,11 @@ static void test_doppler(GUID *guid, BOOL play) hr = IDirectSound3DListener_SetDistanceFactor(listener, 10, DS3D_DEFERRED); ok(hr == S_OK, "Got hr %#lx.\n", hr); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, -9, 22050, 29400); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, 9, 22050, 17640); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 9, 0.1f, 0, 22050, 29400); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -9, 0.1f, 0, 22050, 17640); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, -24, 22050, 44100); - /* Wine TODO: The distance factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 0.1f, 24, 22050, 14700); hr = IDirectSound3DListener_SetDistanceFactor(listener, DS3D_DEFAULTDISTANCEFACTOR, DS3D_DEFERRED); @@ -1478,17 +1472,11 @@ static void test_doppler(GUID *guid, BOOL play) hr = IDirectSound3DListener_SetDopplerFactor(listener, 2, DS3D_DEFERRED); ok(hr == S_OK, "Got hr %#lx.\n", hr); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -45, 22050, 29400); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 45, 22050, 17640); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 45, 1, 0, 22050, 29400); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, -45, 1, 0, 22050, 17640); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, -120, 22050, 44100); - /* Wine TODO: The Doppler factor has no effect. */ check_doppler(dsound, listener, play, DS3DMODE_NORMAL, 0, 0, 1, 120, 22050, 14700); hr = IDirectSound3DListener_SetDopplerFactor(listener, DS3D_DEFAULTDOPPLERFACTOR, DS3D_DEFERRED);

1 0