wine-commits May 2023

wine-commits@winehq.org

1 participants
775 discussions

Alexandre Julliard : ntdll: Also update the entry point address when loading an ARM64X binary.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: 30040cc9d7d87338fe00150fec85adf4e01e65d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/30040cc9d7d87338fe00150fec85ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 26 16:52:23 2023 +0200 ntdll: Also update the entry point address when loading an ARM64X binary. --- dlls/ntdll/unix/virtual.c | 5 ++++- include/wine/server_protocol.h | 5 +++-- server/mapping.c | 3 ++- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6835f9cd645..92ee61e6353 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2677,7 +2677,9 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena (!machine && main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64)) { update_arm64x_mapping( ptr, nt, sections ); - image_info->machine = nt->FileHeader.Machine; /* reload changed machine from NT header */ + /* reload changed data from NT header */ + image_info->machine = nt->FileHeader.Machine; + image_info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; } #endif if (machine && machine != nt->FileHeader.Machine) return STATUS_NOT_SUPPORTED; @@ -2810,6 +2812,7 @@ static NTSTATUS virtual_map_image( HANDLE mapping, void **addr_ptr, SIZE_T *size req->mapping = wine_server_obj_handle( mapping ); req->base = wine_server_client_ptr( view->base ); req->size = size; + req->entry = image_info->entry_point; req->machine = image_info->machine; status = wine_server_call( req ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 45a50106408..87626aaf051 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1998,8 +1998,9 @@ struct map_image_view_request obj_handle_t mapping; client_ptr_t base; mem_size_t size; + unsigned int entry; unsigned short machine; - char __pad_34[6]; + char __pad_38[2]; }; struct map_image_view_reply { @@ -6414,7 +6415,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 769 +#define SERVER_PROTOCOL_VERSION 770 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index bcb05ec8f8f..e730486ac77 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1270,7 +1270,8 @@ DECL_HANDLER(map_image_view) view->committed = NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; view->image = mapping->image; - view->image.machine = req->machine; + view->image.machine = req->machine; + view->image.entry_point = req->entry; add_process_view( current, view ); if (view->base != mapping->image.base) set_error( STATUS_IMAGE_NOT_AT_BASE ); diff --git a/server/protocol.def b/server/protocol.def index 95ddb1d5011..1c492ea5cc2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1612,6 +1612,7 @@ enum server_fd_type obj_handle_t mapping; /* file mapping handle */ client_ptr_t base; /* view base address (page-aligned) */ mem_size_t size; /* view size */ + unsigned int entry; /* entry point in mapped view */ unsigned short machine; /* machine in the mapped view */ @END diff --git a/server/request.h b/server/request.h index bb1863b2b85..c7288255aa3 100644 --- a/server/request.h +++ b/server/request.h @@ -1126,7 +1126,8 @@ C_ASSERT( sizeof(struct map_view_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, mapping) == 12 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, base) == 16 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, size) == 24 ); -C_ASSERT( FIELD_OFFSET(struct map_image_view_request, machine) == 32 ); +C_ASSERT( FIELD_OFFSET(struct map_image_view_request, entry) == 32 ); +C_ASSERT( FIELD_OFFSET(struct map_image_view_request, machine) == 36 ); C_ASSERT( sizeof(struct map_image_view_request) == 40 ); C_ASSERT( sizeof(struct map_builtin_view_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct unmap_view_request, base) == 16 ); diff --git a/server/trace.c b/server/trace.c index 93c98b85590..007c0b578f5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2185,6 +2185,7 @@ static void dump_map_image_view_request( const struct map_image_view_request *re fprintf( stderr, " mapping=%04x", req->mapping ); dump_uint64( ", base=", &req->base ); dump_uint64( ", size=", &req->size ); + fprintf( stderr, ", entry=%08x", req->entry ); fprintf( stderr, ", machine=%04x", req->machine ); }

1 0

Jacek Caban : win32u: Use syscall interface for all ntgdi functions.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: c73684e533824217a0e37d66af2a4dfcee5c1c02 URL: https://gitlab.winehq.org/wine/wine/-/commit/c73684e533824217a0e37d66af2a4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 1 01:07:48 2022 +0200 win32u: Use syscall interface for all ntgdi functions. --- dlls/win32u/gdiobj.c | 11 ---- dlls/win32u/syscall.c | 11 ++++ dlls/win32u/win32u.spec | 22 ++++---- dlls/win32u/win32u_private.h | 13 ----- dlls/win32u/wrappers.c | 69 ------------------------- dlls/wow64win/gdi.c | 119 +++++++++++++++++++++++++++++++++++++++---- dlls/wow64win/syscall.h | 11 ++++ 7 files changed, 143 insertions(+), 113 deletions(-)

1 0

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

26 May '23

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 font functions.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: 1ac5a2e01aca0ac55478a9963f12b4888fcf6143 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ac5a2e01aca0ac55478a9963f12b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 1 00:05:05 2022 +0200 win32u: Use syscall interface for more font functions. --- dlls/win32u/gdiobj.c | 7 ----- dlls/win32u/syscall.c | 7 +++++ dlls/win32u/win32u.spec | 14 ++++----- dlls/win32u/win32u_private.h | 10 ------- dlls/win32u/wrappers.c | 45 ----------------------------- dlls/wow64win/gdi.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 7 +++++ 7 files changed, 89 insertions(+), 69 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for more font functions.
by Alexandre Julliard 26 May '23

26 May '23

Module: wine Branch: master Commit: 9b5c916e4e8b90da795be93d8203743d76d22edb URL: https://gitlab.winehq.org/wine/wine/-/commit/9b5c916e4e8b90da795be93d820374… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 23:53:14 2022 +0200 win32u: Use syscall interface for more font functions. --- dlls/win32u/gdiobj.c | 10 --- dlls/win32u/syscall.c | 10 +++ dlls/win32u/win32u.spec | 20 ++--- dlls/win32u/win32u_private.h | 16 ---- dlls/win32u/wrappers.c | 67 --------------- dlls/wow64win/gdi.c | 194 +++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 10 +++ 7 files changed, 224 insertions(+), 103 deletions(-)

1 0

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

26 May '23

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 DC functions.
by Alexandre Julliard 26 May '23

26 May '23

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 DIB functions.
by Alexandre Julliard 26 May '23

26 May '23

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 D3DKMT functions.
by Alexandre Julliard 26 May '23

26 May '23

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 more bitmap functions.
by Alexandre Julliard 26 May '23

26 May '23

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

← Newer
1
...
10
11
12
13
14
15
16
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2023