wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Jacek Caban : krnl386.exe: Convert 16-bit GDI handles to full 32-bit handles.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: f05e9b1e26653c3c3a4df5f7e077ac9de76761be URL: https://source.winehq.org/git/wine.git/?a=commit;h=f05e9b1e26653c3c3a4df5f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 14:59:39 2021 +0200 krnl386.exe: Convert 16-bit GDI handles to full 32-bit handles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51570 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/wowthunk.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 5bd9d7aecd4..0e9e9b6744c 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -28,6 +28,7 @@ #include "wownt32.h" #include "excpt.h" #include "winternl.h" +#include "ntgdi.h" #include "kernel16_private.h" #include "wine/exception.h" #include "wine/debug.h" @@ -309,6 +310,24 @@ VOID WINAPI K32WOWDirectedYield16( WORD htask16 ) DirectedYield16( (HTASK16)htask16 ); } +static HANDLE gdi_handle32( WORD handle ) +{ + static GDI_SHARED_MEMORY *gdi_shared; + + if (!gdi_shared) + { + if (NtCurrentTeb()->GdiBatchCount) + { + TEB64 *teb64 = (TEB64 *)(UINT_PTR)NtCurrentTeb()->GdiBatchCount; + PEB64 *peb64 = (PEB64 *)(UINT_PTR)teb64->Peb; + gdi_shared = (GDI_SHARED_MEMORY *)(UINT_PTR)peb64->GdiSharedHandleTable; + } + else gdi_shared = (GDI_SHARED_MEMORY *)NtCurrentTeb()->Peb->GdiSharedHandleTable; + if (!gdi_shared) return ULongToHandle( handle ); + } + + return ULongToHandle( (gdi_shared->Handles[handle].Unique << 16) | handle ); +} /*********************************************************************** * K32WOWHandle32 (KERNEL32.57) @@ -321,6 +340,9 @@ HANDLE WINAPI K32WOWHandle32( WORD handle, WOW_HANDLE_TYPE type ) case WOW_TYPE_HMENU: case WOW_TYPE_HDWP: case WOW_TYPE_HDROP: + case WOW_TYPE_HACCEL: + return (HANDLE)(ULONG_PTR)handle; + case WOW_TYPE_HDC: case WOW_TYPE_HFONT: case WOW_TYPE_HRGN: @@ -328,12 +350,8 @@ HANDLE WINAPI K32WOWHandle32( WORD handle, WOW_HANDLE_TYPE type ) case WOW_TYPE_HBRUSH: case WOW_TYPE_HPALETTE: case WOW_TYPE_HPEN: - case WOW_TYPE_HACCEL: - return (HANDLE)(ULONG_PTR)handle; - case WOW_TYPE_HMETAFILE: - FIXME( "conversion of metafile handles not supported yet\n" ); - return (HANDLE)(ULONG_PTR)handle; + return gdi_handle32( handle ); case WOW_TYPE_HTASK: return ((TDB *)GlobalLock16(handle))->teb->ClientId.UniqueThread;

1 0

Jacek Caban : gdi32: Move Escape to gdidc.c.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: 84fb3b943d0a0b978e41ee972db71b43575d11d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84fb3b943d0a0b978e41ee97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 12:09:51 2021 +0200 gdi32: Move Escape to gdidc.c. 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/gdi32/driver.c | 97 ----------------------------------------------------- dlls/gdi32/gdidc.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 97 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a00fe510233..1fe288eae2f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1155,103 +1155,6 @@ DWORD WINAPI GDI_CallDeviceCapabilities16( LPCSTR lpszDevice, LPCSTR lpszPort, } -/************************************************************************ - * Escape [GDI32.@] - */ -INT WINAPI Escape( HDC hdc, INT escape, INT in_count, LPCSTR in_data, LPVOID out_data ) -{ - INT ret; - POINT *pt; - - switch (escape) - { - case ABORTDOC: - return AbortDoc( hdc ); - - case ENDDOC: - return EndDoc( hdc ); - - case GETPHYSPAGESIZE: - pt = out_data; - pt->x = GetDeviceCaps( hdc, PHYSICALWIDTH ); - pt->y = GetDeviceCaps( hdc, PHYSICALHEIGHT ); - return 1; - - case GETPRINTINGOFFSET: - pt = out_data; - pt->x = GetDeviceCaps( hdc, PHYSICALOFFSETX ); - pt->y = GetDeviceCaps( hdc, PHYSICALOFFSETY ); - return 1; - - case GETSCALINGFACTOR: - pt = out_data; - pt->x = GetDeviceCaps( hdc, SCALINGFACTORX ); - pt->y = GetDeviceCaps( hdc, SCALINGFACTORY ); - return 1; - - case NEWFRAME: - return EndPage( hdc ); - - case SETABORTPROC: - return SetAbortProc( hdc, (ABORTPROC)in_data ); - - case STARTDOC: - { - DOCINFOA doc; - char *name = NULL; - - /* in_data may not be 0 terminated so we must copy it */ - if (in_data) - { - name = HeapAlloc( GetProcessHeap(), 0, in_count+1 ); - memcpy( name, in_data, in_count ); - name[in_count] = 0; - } - /* out_data is actually a pointer to the DocInfo structure and used as - * a second input parameter */ - if (out_data) doc = *(DOCINFOA *)out_data; - else - { - doc.cbSize = sizeof(doc); - doc.lpszOutput = NULL; - doc.lpszDatatype = NULL; - doc.fwType = 0; - } - doc.lpszDocName = name; - ret = StartDocA( hdc, &doc ); - HeapFree( GetProcessHeap(), 0, name ); - if (ret > 0) ret = StartPage( hdc ); - return ret; - } - - case QUERYESCSUPPORT: - { - DWORD code; - - if (in_count < sizeof(SHORT)) return 0; - code = (in_count < sizeof(DWORD)) ? *(const USHORT *)in_data : *(const DWORD *)in_data; - switch (code) - { - case ABORTDOC: - case ENDDOC: - case GETPHYSPAGESIZE: - case GETPRINTINGOFFSET: - case GETSCALINGFACTOR: - case NEWFRAME: - case QUERYESCSUPPORT: - case SETABORTPROC: - case STARTDOC: - return TRUE; - } - break; - } - } - - /* if not handled internally, pass it to the driver */ - return ExtEscape( hdc, escape, in_count, in_data, 0, out_data ); -} - - /****************************************************************************** * NtGdiExtEscape (win32u.@) * diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0545dfef696..e6531d0d94d 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -135,6 +135,102 @@ INT WINAPI GetDeviceCaps( HDC hdc, INT cap ) return NtGdiGetDeviceCaps( hdc, cap ); } +/*********************************************************************** + * Escape (GDI32.@) + */ +INT WINAPI Escape( HDC hdc, INT escape, INT in_count, const char *in_data, void *out_data ) +{ + INT ret; + POINT *pt; + + switch (escape) + { + case ABORTDOC: + return AbortDoc( hdc ); + + case ENDDOC: + return EndDoc( hdc ); + + case GETPHYSPAGESIZE: + pt = out_data; + pt->x = GetDeviceCaps( hdc, PHYSICALWIDTH ); + pt->y = GetDeviceCaps( hdc, PHYSICALHEIGHT ); + return 1; + + case GETPRINTINGOFFSET: + pt = out_data; + pt->x = GetDeviceCaps( hdc, PHYSICALOFFSETX ); + pt->y = GetDeviceCaps( hdc, PHYSICALOFFSETY ); + return 1; + + case GETSCALINGFACTOR: + pt = out_data; + pt->x = GetDeviceCaps( hdc, SCALINGFACTORX ); + pt->y = GetDeviceCaps( hdc, SCALINGFACTORY ); + return 1; + + case NEWFRAME: + return EndPage( hdc ); + + case SETABORTPROC: + return SetAbortProc( hdc, (ABORTPROC)in_data ); + + case STARTDOC: + { + DOCINFOA doc; + char *name = NULL; + + /* in_data may not be 0 terminated so we must copy it */ + if (in_data) + { + name = HeapAlloc( GetProcessHeap(), 0, in_count+1 ); + memcpy( name, in_data, in_count ); + name[in_count] = 0; + } + /* out_data is actually a pointer to the DocInfo structure and used as + * a second input parameter */ + if (out_data) doc = *(DOCINFOA *)out_data; + else + { + doc.cbSize = sizeof(doc); + doc.lpszOutput = NULL; + doc.lpszDatatype = NULL; + doc.fwType = 0; + } + doc.lpszDocName = name; + ret = StartDocA( hdc, &doc ); + HeapFree( GetProcessHeap(), 0, name ); + if (ret > 0) ret = StartPage( hdc ); + return ret; + } + + case QUERYESCSUPPORT: + { + DWORD code; + + if (in_count < sizeof(SHORT)) return 0; + code = (in_count < sizeof(DWORD)) ? *(const USHORT *)in_data : *(const DWORD *)in_data; + switch (code) + { + case ABORTDOC: + case ENDDOC: + case GETPHYSPAGESIZE: + case GETPRINTINGOFFSET: + case GETSCALINGFACTOR: + case NEWFRAME: + case QUERYESCSUPPORT: + case SETABORTPROC: + case STARTDOC: + return TRUE; + } + break; + } + } + + /* if not handled internally, pass it to the driver */ + return ExtEscape( hdc, escape, in_count, in_data, 0, out_data ); +} + /*********************************************************************** * ExtEscape [GDI32.@] */

1 0

Jacek Caban : gdi32: Use NtGdiExtEscape for ExtEscape.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: 73d483d7e6611bb2ea88341f81a3668db29ad289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73d483d7e6611bb2ea88341f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 12:09:34 2021 +0200 gdi32: Use NtGdiExtEscape for ExtEscape. 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/gdi32/driver.c | 21 ++++----------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 11 +++++++++++ dlls/gdi32/mfdrv/init.c | 22 +++++++++++----------- include/ntgdi.h | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 3cb9c2d1e65..a00fe510233 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1253,25 +1253,12 @@ INT WINAPI Escape( HDC hdc, INT escape, INT in_count, LPCSTR in_data, LPVOID out /****************************************************************************** - * ExtEscape [GDI32.@] + * NtGdiExtEscape (win32u.@) * * Access capabilities of a particular device that are not available through GDI. - * - * PARAMS - * hdc [I] Handle to device context - * nEscape [I] Escape function - * cbInput [I] Number of bytes in input structure - * lpszInData [I] Pointer to input structure - * cbOutput [I] Number of bytes in output structure - * lpszOutData [O] Pointer to output structure - * - * RETURNS - * Success: >0 - * Not implemented: 0 - * Failure: <0 */ -INT WINAPI ExtEscape( HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData, - INT cbOutput, LPSTR lpszOutData ) +INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, int driver_id, INT escape, INT input_size, + const char *input, INT output_size, char *output ) { PHYSDEV physdev; INT ret; @@ -1280,7 +1267,7 @@ INT WINAPI ExtEscape( HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData, if (!dc) return 0; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pExtEscape ); - ret = physdev->funcs->pExtEscape( physdev, nEscape, cbInput, lpszInData, cbOutput, lpszOutData ); + ret = physdev->funcs->pExtEscape( physdev, escape, input_size, input, output_size, output ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 038766e5688..6d23e7e0ecc 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -55,6 +55,8 @@ extern BOOL METADC_Chord( HDC hdc, INT left, INT top, INT right, INT bottom, INT extern BOOL METADC_Ellipse( HDC hdc, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL METADC_ExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; +extern BOOL METADC_ExtEscape( HDC hdc, INT escape, INT input_size, const void *input, + INT output_size, void *output ) DECLSPEC_HIDDEN; extern BOOL METADC_ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT fill_type ) DECLSPEC_HIDDEN; extern BOOL METADC_ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index c512982c35d..0545dfef696 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -135,6 +135,17 @@ INT WINAPI GetDeviceCaps( HDC hdc, INT cap ) return NtGdiGetDeviceCaps( hdc, cap ); } +/*********************************************************************** + * ExtEscape [GDI32.@] + */ +INT WINAPI ExtEscape( HDC hdc, INT escape, INT input_size, const char *input, + INT output_size, char *output ) +{ + if (is_meta_dc( hdc )) + return METADC_ExtEscape( hdc, escape, input_size, input, output_size, output ); + return NtGdiExtEscape( hdc, NULL, 0, escape, input_size, input, output_size, output ); +} + /*********************************************************************** * GetTextAlign (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 40fdc5d7a01..7b9880cd789 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -35,25 +35,25 @@ static BOOL CDECL MFDRV_DeleteDC( PHYSDEV dev ); /********************************************************************** - * MFDRV_ExtEscape + * METADC_ExtEscape */ -static INT CDECL MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, - INT cbOutput, LPVOID out_data ) +BOOL METADC_ExtEscape( HDC hdc, INT escape, INT input_size, const void *input, + INT output_size, void *output ) { METARECORD *mr; DWORD len; - INT ret; + BOOL ret; - if (cbOutput) return 0; /* escapes that require output cannot work in metafiles */ + if (output_size) return FALSE; /* escapes that require output cannot work in metafiles */ - len = sizeof(*mr) + sizeof(WORD) + ((cbInput + 1) & ~1); + len = sizeof(*mr) + sizeof(WORD) + ((input_size + 1) & ~1); mr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); mr->rdSize = len / 2; mr->rdFunction = META_ESCAPE; - mr->rdParm[0] = nEscape; - mr->rdParm[1] = cbInput; - memcpy(&(mr->rdParm[2]), in_data, cbInput); - ret = MFDRV_WriteRecord( dev, mr, len); + mr->rdParm[0] = escape; + mr->rdParm[1] = input_size; + memcpy( &mr->rdParm[2], input, input_size ); + ret = metadc_record( hdc, mr, len ); HeapFree(GetProcessHeap(), 0, mr); return ret; } @@ -123,7 +123,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pEnumFonts */ NULL, /* pEnumICMProfiles */ NULL, /* pExtDeviceMode */ - MFDRV_ExtEscape, /* pExtEscape */ + NULL, /* pExtEscape */ NULL, /* pExtFloodFill */ NULL, /* pExtTextOut */ MFDRV_FillPath, /* pFillPath */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 618ac89a042..a48464f67a8 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -190,8 +190,8 @@ HRGN WINAPI NtGdiExtCreateRegion( const XFORM *xform, DWORD count, const RGN INT WINAPI NtGdiExtGetObjectW( HGDIOBJ handle, INT count, void *buffer ); INT WINAPI NtGdiExtSelectClipRgn( HDC hdc, HRGN region, INT mode ); BOOL WINAPI NtGdiFillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ); -INT WINAPI NtGdiExtEscape( HDC hdc, INT escape, INT input_size, const char *input, - INT output_size, char *output ); +INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, INT driver_id, INT escape, INT input_size, + const char *input, INT output_size, char *output ); BOOL WINAPI NtGdiExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT type ); BOOL WINAPI NtGdiFrameRgn( HDC hdc, HRGN hrgn, HBRUSH brush, INT width, INT height );

1 0

Jacek Caban : gdi32: Use NtGdiStretchDIBitsInternal for StretchDIBits.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: 225004e1eb001f9bcde182d0c9f45f7210621205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=225004e1eb001f9bcde182d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 12:09:16 2021 +0200 gdi32: Use NtGdiStretchDIBitsInternal for StretchDIBits. 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/gdi32/dib.c | 10 +++++----- dlls/gdi32/enhmfdrv/bitblt.c | 44 +++++++++++++++++++++++++----------------- dlls/gdi32/gdi_private.h | 9 ++++++++- dlls/gdi32/gdidc.c | 23 ++++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 38 ++++++++++++++++++------------------ dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 3 --- include/ntgdi.h | 5 +++++ 8 files changed, 87 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=225004e1eb001f9bcde1…

1 0

Jacek Caban : gdi32: Use NtGdiSetDIBitsToDeviceInternal for SetDIBitsToDevice.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: aa230489d237e6a592bc33210c935bfee3f28e0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa230489d237e6a592bc3321… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 12:09:03 2021 +0200 gdi32: Use NtGdiSetDIBitsToDeviceInternal for SetDIBitsToDevice. 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/gdi32/dib.c | 11 ++++++----- dlls/gdi32/enhmfdrv/bitblt.c | 37 +++++++++++++++++++++++-------------- dlls/gdi32/gdi_private.h | 8 ++++++++ dlls/gdi32/gdidc.c | 22 ++++++++++++++++++++++ dlls/gdi32/mfdrv/bitblt.c | 22 +++++++++++----------- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 4 ---- include/ntgdi.h | 5 +++++ 8 files changed, 76 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa230489d237e6a592bc…

1 0

Jacek Caban : gdi32: Remove no longer used driver entry points.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: eeecc2a39a1a4fd46e3d6ac539e28b835fe5c415 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeecc2a39a1a4fd46e3d6ac5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 12:08:35 2021 +0200 gdi32: Remove no longer used driver entry points. 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/gdi32/dibdrv/dc.c | 4 ---- dlls/gdi32/driver.c | 2 -- dlls/gdi32/enhmfdrv/init.c | 2 -- dlls/gdi32/font.c | 2 -- dlls/gdi32/mapping.c | 10 ---------- dlls/gdi32/mfdrv/init.c | 2 -- dlls/gdi32/ntgdi_private.h | 2 -- dlls/gdi32/path.c | 2 -- dlls/wineandroid.drv/init.c | 2 -- dlls/winemac.drv/gdi.c | 2 -- dlls/wineps.drv/init.c | 2 -- dlls/winex11.drv/init.c | 2 -- dlls/winex11.drv/xrender.c | 2 -- include/wine/gdi_driver.h | 4 +--- 14 files changed, 1 insertion(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eeecc2a39a1a4fd46e3d…

1 0

Jacek Caban : gdi32: Use NtGdiModifyWorldTransform for SetWorldTransform implementation.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: ce94982927ca0650462d00417fe930ab105d3988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce94982927ca0650462d0041… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 12:08:23 2021 +0200 gdi32: Use NtGdiModifyWorldTransform for SetWorldTransform implementation. 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/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 -- dlls/gdi32/enhmfdrv/init.c | 3 +-- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/mapping.c | 30 ------------------------------ 6 files changed, 16 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 744ef47a97f..cab79d07aaf 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -300,22 +300,14 @@ BOOL EMFDC_SetLayout( DC_ATTR *dc_attr, DWORD layout ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform) +BOOL EMFDC_SetWorldTransform( DC_ATTR *dc_attr, const XFORM *xform ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetWorldTransform ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRSETWORLDTRANSFORM emr; - BOOL ret; emr.emr.iType = EMR_SETWORLDTRANSFORM; emr.emr.nSize = sizeof(emr); emr.xform = *xform; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pSetWorldTransform( next, xform ); - physDev->modifying_transform--; - return ret; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_ModifyWorldTransform( DC_ATTR *dc_attr, const XFORM *xform, DWORD mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index d2db67cd03e..4ee00df6c9a 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -41,7 +41,6 @@ typedef struct HBRUSH dc_brush; HPEN dc_pen; INT restoring; /* RestoreDC counter */ - INT modifying_transform;/* Counter for functions that can change world transform */ BOOL path; INT dev_caps[COLORMGMTCAPS + 1]; } EMFDRV_PDEVICE; @@ -107,7 +106,6 @@ extern INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDes BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, BITMAPINFO *info, UINT wUsage, DWORD dwRop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index e6b501aaf77..267e4c4fe61 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -126,7 +126,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pSetDeviceGammaRamp */ EMFDRV_SetPixel, /* pSetPixel */ EMFDRV_SetTextColor, /* pSetTextColor */ - EMFDRV_SetWorldTransform, /* pSetWorldTransform */ + NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ NULL, /* pStretchBlt */ @@ -338,7 +338,6 @@ HDC WINAPI CreateEnhMetaFileW( physDev->dc_brush = 0; physDev->dc_pen = 0; physDev->restoring = 0; - physDev->modifying_transform = 0; physDev->path = FALSE; if (hdc) /* if no ref, use current display */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f3fb35c3834..2bfe23a42a5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -186,6 +186,7 @@ extern BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HI extern BOOL EMFDC_SetViewportOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetWindowExtEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetWindowOrgEx( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetWorldTransform( DC_ATTR *dc_attr, const XFORM *xform ) DECLSPEC_HIDDEN; extern BOOL EMFDC_StretchBlt( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, DWORD rop ); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index e4f26742c9f..44ad3e798bf 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -613,6 +613,18 @@ BOOL WINAPI ModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) return NtGdiModifyWorldTransform( hdc, xform, mode ); } +/*********************************************************************** + * SetWorldTransform (GDI32.@) + */ +BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetWorldTransform( dc_attr, xform )) return FALSE; + return NtGdiModifyWorldTransform( hdc, xform, MWT_SET ); +} + /*********************************************************************** * SetStretchBltMode (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 381c29dd26f..d5beef70b1c 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -148,10 +148,6 @@ BOOL CDECL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD BOOL CDECL nulldrv_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) { - DC *dc = get_nulldrv_dc( dev ); - - dc->xformWorld2Wnd = *xform; - DC_UpdateXforms( dc ); return TRUE; } @@ -379,32 +375,6 @@ BOOL WINAPI NtGdiModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) } -/*********************************************************************** - * SetWorldTransform (GDI32.@) - */ -BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform ) -{ - BOOL ret = FALSE; - DC *dc; - - if (!xform) return FALSE; - /* The transform must conform to (eM11 * eM22 != eM12 * eM21) requirement */ - if (xform->eM11 * xform->eM22 == xform->eM12 * xform->eM21) return FALSE; - - TRACE("eM11 %f eM12 %f eM21 %f eM22 %f eDx %f eDy %f\n", - xform->eM11, xform->eM12, xform->eM21, xform->eM22, xform->eDx, xform->eDy); - - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetWorldTransform ); - if (dc->attr->graphics_mode == GM_ADVANCED) - ret = physdev->funcs->pSetWorldTransform( physdev, xform ); - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * NtGdiSetVirtualResolution (win32u.@) *

1 0

Jacek Caban : gdi32: Support MWT_SET in NtGdiModifyWorldTransform.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: eb5c039f42249395290df76551469f084ba13232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5c039f42249395290df765… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 12:08:00 2021 +0200 gdi32: Support MWT_SET in NtGdiModifyWorldTransform. It's not defined in public headers, but it's documented in EMF spec. 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/gdi32/mapping.c | 5 +++++ dlls/gdi32/tests/mapping.c | 22 ++++++++++++++++++++++ include/ntgdi.h | 2 ++ 3 files changed, 29 insertions(+) diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index d30d98b8592..381c29dd26f 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -366,6 +366,11 @@ BOOL WINAPI NtGdiModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) case MWT_RIGHTMULTIPLY: ret = CombineTransform( &dc->xformWorld2Wnd, &dc->xformWorld2Wnd, xform ); break; + case MWT_SET: + ret = dc->attr->graphics_mode == GM_ADVANCED && + xform->eM11 * xform->eM22 != xform->eM12 * xform->eM21; + if (ret) dc->xformWorld2Wnd = *xform; + break; } if (ret) DC_UpdateXforms( dc ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index fece9da94dc..90c9d5a6617 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -385,6 +385,7 @@ static void test_dc_layout(void) static void test_modify_world_transform(void) { HDC hdc = GetDC(0); + XFORM xform, xform2; int ret; ret = SetGraphicsMode(hdc, GM_ADVANCED); @@ -399,6 +400,27 @@ static void test_modify_world_transform(void) ret = ModifyWorldTransform(hdc, NULL, MWT_RIGHTMULTIPLY); ok(!ret, "ret = %d\n", ret); + xform.eM11 = 2; + xform.eM12 = 0; + xform.eM21 = 0; + xform.eM22 = 1; + xform.eDx = xform.eDy = 0; + ret = ModifyWorldTransform(hdc, &xform, 4); + ok(ret, "ModifyWorldTransform failed\n"); + + memset(&xform2, 0xcc, sizeof(xform2)); + ret = GetWorldTransform(hdc, &xform2); + ok(ret, "GetWorldTransform failed\n"); + ok(!memcmp(&xform, &xform2, sizeof(xform)), "unexpected xform\n"); + + xform.eM11 = 1; + xform.eM12 = 1; + xform.eM21 = 1; + xform.eM22 = 1; + xform.eDx = xform.eDy = 0; + ret = ModifyWorldTransform(hdc, &xform, 4); + ok(!ret, "ModifyWorldTransform succeeded\n"); + ReleaseDC(0, hdc); } diff --git a/include/ntgdi.h b/include/ntgdi.h index 9aeaea5d3cb..9132d606c43 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -105,6 +105,8 @@ enum NtGdiSetMapMode = 8, }; +#define MWT_SET 4 + /* structs not compatible with native Windows */ #ifdef __WINESRC__

1 0

Jacek Caban : gdi32: Use NtGdiModifyWorldTransform for ModifyWorldTransform.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: 36bfd7cd71e1612770a5f7fc6d76ae3e73afe16f URL: https://source.winehq.org/git/wine.git/?a=commit;h=36bfd7cd71e1612770a5f7fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 13 12:07:48 2021 +0200 gdi32: Use NtGdiModifyWorldTransform for ModifyWorldTransform. 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/gdi32/enhmfdrv/dc.c | 12 ++------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 12 +++++++++ dlls/gdi32/mapping.c | 48 ++++++++++++++++-------------------- include/ntgdi.h | 1 + 7 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 4e7602f1f38..744ef47a97f 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -318,12 +318,9 @@ BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform) return ret; } -BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode) +BOOL EMFDC_ModifyWorldTransform( DC_ATTR *dc_attr, const XFORM *xform, DWORD mode ) { - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pModifyWorldTransform ); - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); EMRMODIFYWORLDTRANSFORM emr; - BOOL ret; emr.emr.iType = EMR_MODIFYWORLDTRANSFORM; emr.emr.nSize = sizeof(emr); @@ -341,12 +338,7 @@ BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD m emr.xform = *xform; } emr.iMode = mode; - - if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; - physDev->modifying_transform++; - ret = next->funcs->pModifyWorldTransform( next, xform, mode ); - physDev->modifying_transform--; - return ret; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_SetMapperFlags( DC_ATTR *dc_attr, DWORD flags ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index ae7fa9bdd9a..d2db67cd03e 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -81,7 +81,6 @@ extern BOOL CDECL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, U void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index e9b0e5a9873..e6b501aaf77 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -94,7 +94,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_GradientFill, /* pGradientFill */ EMFDRV_InvertRgn, /* pInvertRgn */ EMFDRV_LineTo, /* pLineTo */ - EMFDRV_ModifyWorldTransform, /* pModifyWorldTransform */ + NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ NULL, /* pPaintRgn */ EMFDRV_PatBlt, /* pPatBlt */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 305dec43c7f..f3fb35c3834 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -143,6 +143,8 @@ extern BOOL EMFDC_IntersectClipRect( DC_ATTR *dc_attr, INT left, INT top, INT ri INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_InvertRgn( DC_ATTR *dc_attr, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_ModifyWorldTransform( DC_ATTR *dc_attr, const XFORM *xform, + DWORD mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_OffsetClipRgn( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_PaintRgn( DC_ATTR *dc_attr, HRGN hrgn ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index b8faf9fb58c..e4f26742c9f 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -601,6 +601,18 @@ BOOL WINAPI GetWorldTransform( HDC hdc, XFORM *xform ) return NtGdiGetTransform( hdc, 0x203, xform ); } +/**************************************************************************** + * ModifyWorldTransform (GDI32.@) + */ +BOOL WINAPI ModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_ModifyWorldTransform( dc_attr, xform, mode )) return FALSE; + return NtGdiModifyWorldTransform( hdc, xform, mode ); +} + /*********************************************************************** * SetStretchBltMode (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index f21b965bc4b..d30d98b8592 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -143,28 +143,6 @@ BOOL set_map_mode( DC *dc, int mode ) BOOL CDECL nulldrv_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD mode ) { - DC *dc = get_nulldrv_dc( dev ); - - switch (mode) - { - case MWT_IDENTITY: - dc->xformWorld2Wnd.eM11 = 1.0f; - dc->xformWorld2Wnd.eM12 = 0.0f; - dc->xformWorld2Wnd.eM21 = 0.0f; - dc->xformWorld2Wnd.eM22 = 1.0f; - dc->xformWorld2Wnd.eDx = 0.0f; - dc->xformWorld2Wnd.eDy = 0.0f; - break; - case MWT_LEFTMULTIPLY: - CombineTransform( &dc->xformWorld2Wnd, xform, &dc->xformWorld2Wnd ); - break; - case MWT_RIGHTMULTIPLY: - CombineTransform( &dc->xformWorld2Wnd, &dc->xformWorld2Wnd, xform ); - break; - default: - return FALSE; - } - DC_UpdateXforms( dc ); return TRUE; } @@ -361,9 +339,9 @@ BOOL WINAPI NtGdiScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, /**************************************************************************** - * ModifyWorldTransform (GDI32.@) + * NtGdiModifyWorldTransform (win32u.@) */ -BOOL WINAPI ModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) +BOOL WINAPI NtGdiModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) { BOOL ret = FALSE; DC *dc; @@ -371,9 +349,25 @@ BOOL WINAPI ModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) if (!xform && mode != MWT_IDENTITY) return FALSE; if ((dc = get_dc_ptr( hdc ))) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pModifyWorldTransform ); - if (dc->attr->graphics_mode == GM_ADVANCED) - ret = physdev->funcs->pModifyWorldTransform( physdev, xform, mode ); + switch (mode) + { + case MWT_IDENTITY: + dc->xformWorld2Wnd.eM11 = 1.0f; + dc->xformWorld2Wnd.eM12 = 0.0f; + dc->xformWorld2Wnd.eM21 = 0.0f; + dc->xformWorld2Wnd.eM22 = 1.0f; + dc->xformWorld2Wnd.eDx = 0.0f; + dc->xformWorld2Wnd.eDy = 0.0f; + ret = TRUE; + break; + case MWT_LEFTMULTIPLY: + ret = CombineTransform( &dc->xformWorld2Wnd, xform, &dc->xformWorld2Wnd ); + break; + case MWT_RIGHTMULTIPLY: + ret = CombineTransform( &dc->xformWorld2Wnd, &dc->xformWorld2Wnd, xform ); + break; + } + if (ret) DC_UpdateXforms( dc ); release_dc_ptr( dc ); } return ret; diff --git a/include/ntgdi.h b/include/ntgdi.h index 5d67798052a..9aeaea5d3cb 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -229,6 +229,7 @@ BOOL WINAPI NtGdiFontIsLinked( HDC hdc ); INT WINAPI NtGdiIntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ); BOOL WINAPI NtGdiInvertRgn( HDC hdc, HRGN hrgn ); BOOL WINAPI NtGdiLineTo( HDC hdc, INT x, INT y ); +BOOL WINAPI NtGdiModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ); BOOL WINAPI NtGdiMoveTo( HDC hdc, INT x, INT y, POINT *pt ); INT WINAPI NtGdiOffsetClipRgn( HDC hdc, INT x, INT y ); INT WINAPI NtGdiOffsetRgn( HRGN hrgn, INT x, INT y );

1 0

Rémi Bernon : winebus.sys: Move SDL mapping loading to a separate helper.
by Alexandre Julliard 13 Aug '21

13 Aug '21

Module: wine Branch: master Commit: a67ac02dc3f695e5f3c8e6a1cfead876404e4d7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a67ac02dc3f695e5f3c8e6a1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 13 09:46:18 2021 +0200 winebus.sys: Move SDL mapping loading to a separate helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 103 +++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index d866fb0d8bb..8c9886c7d3c 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -862,6 +862,57 @@ static void process_device_event(SDL_Event *event) set_mapped_report_from_event(event); } +static void sdl_load_mappings(void) +{ + HKEY key; + static const WCHAR szPath[] = {'m','a','p',0}; + const char *mapping; + + if ((mapping = getenv("SDL_GAMECONTROLLERCONFIG"))) + { + TRACE("Setting environment mapping %s\n", debugstr_a(mapping)); + if (pSDL_GameControllerAddMapping(mapping) < 0) + WARN("Failed to add environment mapping %s\n", pSDL_GetError()); + } + else if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_QUERY_VALUE, &key)) + { + DWORD index = 0; + CHAR *buffer = NULL; + DWORD buffer_len = 0; + LSTATUS rc; + + do + { + CHAR name[255]; + DWORD name_len; + DWORD type; + DWORD data_len = buffer_len; + + name_len = sizeof(name); + rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); + if (rc == ERROR_MORE_DATA || buffer == NULL) + { + if (buffer) buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, data_len); + else buffer = HeapAlloc(GetProcessHeap(), 0, data_len); + buffer_len = data_len; + + name_len = sizeof(name); + rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); + } + + if (rc == STATUS_SUCCESS) + { + TRACE("Setting registry mapping %s\n", debugstr_a(buffer)); + if (pSDL_GameControllerAddMapping(buffer) < 0) + WARN("Failed to add registry mapping %s\n", pSDL_GetError()); + index++; + } + } while (rc == STATUS_SUCCESS); + HeapFree(GetProcessHeap(), 0, buffer); + NtClose(key); + } +} + static DWORD CALLBACK deviceloop_thread(void *args) { HANDLE init_done = args; @@ -877,57 +928,7 @@ static DWORD CALLBACK deviceloop_thread(void *args) pSDL_GameControllerEventState(SDL_ENABLE); /* Process mappings */ - if (pSDL_GameControllerAddMapping != NULL) - { - HKEY key; - static const WCHAR szPath[] = {'m','a','p',0}; - const char *mapping; - - if ((mapping = getenv("SDL_GAMECONTROLLERCONFIG"))) - { - TRACE("Setting environment mapping %s\n", debugstr_a(mapping)); - if (pSDL_GameControllerAddMapping(mapping) < 0) - WARN("Failed to add environment mapping %s\n", pSDL_GetError()); - } - else if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_QUERY_VALUE, &key)) - { - DWORD index = 0; - CHAR *buffer = NULL; - DWORD buffer_len = 0; - LSTATUS rc; - - do { - CHAR name[255]; - DWORD name_len; - DWORD type; - DWORD data_len = buffer_len; - - name_len = sizeof(name); - rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); - if (rc == ERROR_MORE_DATA || buffer == NULL) - { - if (buffer) - buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, data_len); - else - buffer = HeapAlloc(GetProcessHeap(), 0, data_len); - buffer_len = data_len; - - name_len = sizeof(name); - rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); - } - - if (rc == STATUS_SUCCESS) - { - TRACE("Setting registry mapping %s\n", debugstr_a(buffer)); - if (pSDL_GameControllerAddMapping(buffer) < 0) - WARN("Failed to add registry mapping %s\n", pSDL_GetError()); - index ++; - } - } while (rc == STATUS_SUCCESS); - HeapFree(GetProcessHeap(), 0, buffer); - NtClose(key); - } - } + if (pSDL_GameControllerAddMapping != NULL) sdl_load_mappings(); SetEvent(init_done);

1 0

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 August 2021