August 2021 - Wine-devel - list.winehq.org

[PATCH v2 4/9] gdi32: Reimplement CreateBrushIndirect on top of other brush constructors.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/brush.c | 96 +++----------------------------------- dlls/gdi32/gdiobj.c | 14 +++--- dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/objects.c | 26 +++++++++++ dlls/gdi32/tests/brush.c | 11 +++++ 5 files changed, 51 insertions(+), 97 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 5febac710dc..75737d1083b 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -167,26 +167,7 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * } -/*********************************************************************** - * CreateBrushIndirect (GDI32.@) - * - * Create a logical brush with a given style, color or pattern. - * - * PARAMS - * brush [I] Pointer to a LOGBRUSH structure describing the desired brush. - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot be - * created. - * - * NOTES - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. - * - Windows 95 and earlier cannot create brushes from bitmaps or DIBs larger - * than 8x8 pixels. If a larger bitmap is given, only a portion of the bitmap - * is used. - */ -HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) +HBRUSH create_brush( const LOGBRUSH *brush ) { BRUSHOBJ * ptr; HBRUSH hbrush; @@ -212,19 +193,6 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) * CreateHatchBrush (GDI32.@) * * Create a logical brush with a hatched pattern. - * - * PARAMS - * style [I] Direction of lines for the hatch pattern (HS_* values from "wingdi.h") - * color [I] Colour of the hatched pattern - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) { @@ -236,7 +204,7 @@ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) logbrush.lbColor = color; logbrush.lbHatch = style; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -244,18 +212,6 @@ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) * CreatePatternBrush (GDI32.@) * * Create a logical brush with a pattern from a bitmap. - * - * PARAMS - * hbitmap [I] Bitmap containing pattern for the brush - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) { @@ -263,7 +219,7 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) TRACE("%p\n", hbitmap ); logbrush.lbHatch = (ULONG_PTR)hbitmap; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -271,21 +227,6 @@ HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) * CreateDIBPatternBrush (GDI32.@) * * Create a logical brush with a pattern from a DIB. - * - * PARAMS - * hbitmap [I] Global object containing BITMAPINFO structure for the pattern - * coloruse [I] Specifies color format, if provided - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. - * - This function is for compatibility only. CreateDIBPatternBrushPt() should - * be used instead. */ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) { @@ -298,7 +239,7 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) logbrush.lbHatch = (ULONG_PTR)hbitmap; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -306,19 +247,6 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) * CreateDIBPatternBrushPt (GDI32.@) * * Create a logical brush with a pattern from a DIB. - * - * PARAMS - * data [I] Pointer to a BITMAPINFO structure and image data for the pattern - * coloruse [I] Specifies color format, if provided - * - * RETURNS - * A handle to the created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) { @@ -335,7 +263,7 @@ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) logbrush.lbColor = coloruse; logbrush.lbHatch = (ULONG_PTR)data; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } @@ -343,18 +271,6 @@ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) * CreateSolidBrush (GDI32.@) * * Create a logical brush consisting of a single colour. - * - * PARAMS - * color [I] Colour to make the solid brush - * - * RETURNS - * A handle to the newly created brush, or a NULL handle if the brush cannot - * be created. - * - * NOTES - * - This function uses CreateBrushIndirect() to create the brush. - * - The brush returned should be freed by the caller using DeleteObject() - * when it is no longer required. */ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) { @@ -366,7 +282,7 @@ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) logbrush.lbColor = color; logbrush.lbHatch = 0; - return CreateBrushIndirect( &logbrush ); + return create_brush( &logbrush ); } diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index da428d149ce..07277a12e8c 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -641,12 +641,12 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) font_init(); /* create stock objects */ - stock_objects[WHITE_BRUSH] = CreateBrushIndirect( &WhiteBrush ); - stock_objects[LTGRAY_BRUSH] = CreateBrushIndirect( &LtGrayBrush ); - stock_objects[GRAY_BRUSH] = CreateBrushIndirect( &GrayBrush ); - stock_objects[DKGRAY_BRUSH] = CreateBrushIndirect( &DkGrayBrush ); - stock_objects[BLACK_BRUSH] = CreateBrushIndirect( &BlackBrush ); - stock_objects[NULL_BRUSH] = CreateBrushIndirect( &NullBrush ); + stock_objects[WHITE_BRUSH] = create_brush( &WhiteBrush ); + stock_objects[LTGRAY_BRUSH] = create_brush( &LtGrayBrush ); + stock_objects[GRAY_BRUSH] = create_brush( &GrayBrush ); + stock_objects[DKGRAY_BRUSH] = create_brush( &DkGrayBrush ); + stock_objects[BLACK_BRUSH] = create_brush( &BlackBrush ); + stock_objects[NULL_BRUSH] = create_brush( &NullBrush ); stock_objects[WHITE_PEN] = CreatePenIndirect( &WhitePen ); stock_objects[BLACK_PEN] = CreatePenIndirect( &BlackPen ); @@ -672,7 +672,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) scaled_stock_objects[SYSTEM_FIXED_FONT] = create_scaled_font( &deffonts->SystemFixedFont ); scaled_stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); - stock_objects[DC_BRUSH] = CreateBrushIndirect( &DCBrush ); + stock_objects[DC_BRUSH] = create_brush( &DCBrush ); stock_objects[DC_PEN] = CreatePenIndirect( &DCPen ); /* clear the NOSYSTEM bit on all stock objects*/ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 91230666fad..ffa28f39c73 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -168,6 +168,7 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src extern void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; /* brush.c */ +extern HBRUSH create_brush( const LOGBRUSH *brush ); extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4225437aa4a..48474515151 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -398,6 +398,32 @@ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) return NtGdiCreatePen( style, width, color, NULL ); } +/*********************************************************************** + * CreateBrushIndirect (GDI32.@) + */ +HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH *brush ) +{ + switch (brush->lbStyle) + { + case BS_NULL: + return GetStockObject( NULL_BRUSH ); + case BS_SOLID: + return CreateSolidBrush( brush->lbColor ); + case BS_HATCHED: + return CreateHatchBrush( brush->lbHatch, brush->lbColor ); + case BS_PATTERN: + case BS_PATTERN8X8: + return CreatePatternBrush( (HBITMAP)brush->lbHatch ); + case BS_DIBPATTERN: + return CreateDIBPatternBrush( (HGLOBAL)brush->lbHatch, brush->lbColor ); + case BS_DIBPATTERNPT: + return CreateDIBPatternBrushPt( (void *)brush->lbHatch, brush->lbColor ); + default: + WARN( "invalid brush style %u\n", brush->lbStyle ); + return 0; + } +} + /*********************************************************************** * CreateBitmapIndirect (GDI32.@) */ diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index 1a2201bd511..f04ee22ab6d 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -361,6 +361,16 @@ static void test_brush_org( void ) ReleaseDC( 0, hdc ); } +static void test_null_brush(void) +{ + LOGBRUSH lb; + HBRUSH brush; + + lb.lbStyle = BS_NULL; + brush = CreateBrushIndirect(&lb); + ok(brush == GetStockObject(NULL_BRUSH), "brush is not NULL_BRUSH\n"); +} + START_TEST(brush) { test_solidbrush(); @@ -368,4 +378,5 @@ START_TEST(brush) test_pattern_brush(); test_palette_brush(); test_brush_org(); + test_null_brush(); } -- 2.23.0

1 0

[PATCH v2 3/9] gdi32: Move D3DKMTOpenAdapterFromGdiDisplayName to objects.c.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/driver.c | 91 ----------------------------------------- dlls/gdi32/objects.c | 97 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 92 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 3073f745f92..f370d088585 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -32,11 +32,6 @@ #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" -#include "winternl.h" -#include "initguid.h" -#include "devguid.h" -#include "setupapi.h" -#include "ddk/d3dkmthk.h" #include "ntgdi_private.h" #include "wine/list.h" @@ -45,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(driver); -DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); - struct graphics_driver { struct list entry; @@ -163,20 +156,6 @@ BOOL is_display_device( LPCWSTR name ) return TRUE; } -static HANDLE get_display_device_init_mutex( void ) -{ - HANDLE mutex = CreateMutexW( NULL, FALSE, L"display_device_init" ); - - WaitForSingleObject( mutex, INFINITE ); - return mutex; -} - -static void release_display_device_init_mutex( HANDLE mutex ) -{ - ReleaseMutex( mutex ); - CloseHandle( mutex ); -} - #ifdef __i386__ static const WCHAR printer_env[] = L"w32x86"; #elif defined __x86_64__ @@ -1249,76 +1228,6 @@ NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) return status; } -/****************************************************************************** - * D3DKMTOpenAdapterFromGdiDisplayName [GDI32.@] - */ -NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) -{ - WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; - HDEVINFO devinfo = INVALID_HANDLE_VALUE; - NTSTATUS status = STATUS_UNSUCCESSFUL; - D3DKMT_OPENADAPTERFROMLUID luid_desc; - SP_DEVINFO_DATA device_data; - DWORD size, state_flags; - DEVPROPTYPE type; - HANDLE mutex; - int index; - - TRACE("(%p)\n", desc); - - if (!desc) - return STATUS_UNSUCCESSFUL; - - TRACE("DeviceName: %s\n", wine_dbgstr_w( desc->DeviceName )); - if (wcsnicmp( desc->DeviceName, L"\\\\.\\DISPLAY", lstrlenW(L"\\\\.\\DISPLAY") )) - return STATUS_UNSUCCESSFUL; - - index = wcstol( desc->DeviceName + lstrlenW(L"\\\\.\\DISPLAY"), &end, 10 ) - 1; - if (*end) - return STATUS_UNSUCCESSFUL; - - /* Get adapter LUID from SetupAPI */ - mutex = get_display_device_init_mutex(); - - size = sizeof( bufferW ); - swprintf( key_nameW, MAX_PATH, L"\\Device\\Video%d", index ); - if (RegGetValueW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) - goto done; - - /* Strip \Registry\Machine\ prefix and retrieve Wine specific data set by the display driver */ - lstrcpyW( key_nameW, bufferW + 18 ); - size = sizeof( state_flags ); - if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"StateFlags", RRF_RT_REG_DWORD, NULL, - &state_flags, &size )) - goto done; - - if (!(state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - goto done; - - size = sizeof( bufferW ); - if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"GPUID", RRF_RT_REG_SZ, NULL, bufferW, &size )) - goto done; - - devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); - device_data.cbSize = sizeof( device_data ); - SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, - (BYTE *)&luid_desc.AdapterLuid, sizeof( luid_desc.AdapterLuid ), - NULL, 0)) - goto done; - - if ((status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) goto done; - - desc->hAdapter = luid_desc.hAdapter; - desc->AdapterLuid = luid_desc.AdapterLuid; - desc->VidPnSourceId = index; - -done: - SetupDiDestroyDeviceInfoList( devinfo ); - release_display_device_init_mutex( mutex ); - return status; -} - /****************************************************************************** * NtGdiDdDDIOpenAdapterFromLuid (win32u.@) */ diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 3acafbc9331..4225437aa4a 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -19,9 +19,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdlib.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "gdi_private.h" +#include "winuser.h" +#include "winreg.h" #include "winnls.h" -#include "winternl.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "wine/rbtree.h" #include "wine/debug.h" @@ -29,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + struct hdc_list { HDC hdc; @@ -619,3 +629,88 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT start, UINT count, const RGBQUAD *co { return NtGdiDoPalette( hdc, start, count, (void *)colors, NtGdiSetDIBColorTable, FALSE ); } + +static HANDLE get_display_device_init_mutex( void ) +{ + HANDLE mutex = CreateMutexW( NULL, FALSE, L"display_device_init" ); + + WaitForSingleObject( mutex, INFINITE ); + return mutex; +} + +static void release_display_device_init_mutex( HANDLE mutex ) +{ + ReleaseMutex( mutex ); + CloseHandle( mutex ); +} + +/*********************************************************************** + * D3DKMTOpenAdapterFromGdiDisplayName (GDI32.@) + */ +NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) +{ + WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + NTSTATUS status = STATUS_UNSUCCESSFUL; + D3DKMT_OPENADAPTERFROMLUID luid_desc; + SP_DEVINFO_DATA device_data; + DWORD size, state_flags; + DEVPROPTYPE type; + HANDLE mutex; + int index; + + TRACE("(%p)\n", desc); + + if (!desc) + return STATUS_UNSUCCESSFUL; + + TRACE("DeviceName: %s\n", wine_dbgstr_w( desc->DeviceName )); + if (wcsnicmp( desc->DeviceName, L"\\\\.\\DISPLAY", lstrlenW(L"\\\\.\\DISPLAY") )) + return STATUS_UNSUCCESSFUL; + + index = wcstol( desc->DeviceName + lstrlenW(L"\\\\.\\DISPLAY"), &end, 10 ) - 1; + if (*end) + return STATUS_UNSUCCESSFUL; + + /* Get adapter LUID from SetupAPI */ + mutex = get_display_device_init_mutex(); + + size = sizeof( bufferW ); + swprintf( key_nameW, MAX_PATH, L"\\Device\\Video%d", index ); + if (RegGetValueW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", key_nameW, + RRF_RT_REG_SZ, NULL, bufferW, &size )) + goto done; + + /* Strip \Registry\Machine\ prefix and retrieve Wine specific data set by the display driver */ + lstrcpyW( key_nameW, bufferW + 18 ); + size = sizeof( state_flags ); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"StateFlags", RRF_RT_REG_DWORD, NULL, + &state_flags, &size )) + goto done; + + if (!(state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + goto done; + + size = sizeof( bufferW ); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, L"GPUID", RRF_RT_REG_SZ, NULL, bufferW, &size )) + goto done; + + devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); + device_data.cbSize = sizeof( device_data ); + SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid_desc.AdapterLuid, sizeof( luid_desc.AdapterLuid ), + NULL, 0)) + goto done; + + if ((status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) goto done; + + desc->hAdapter = luid_desc.hAdapter; + desc->AdapterLuid = luid_desc.AdapterLuid; + desc->VidPnSourceId = index; + +done: + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + return status; +} -- 2.23.0

1 0

[PATCH v2 2/9] gdi32: Implement NtGdiDdDDIOpenAdapterFromLuid.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> And use it for D3DKMTOpenAdapterFromGdiDisplayName. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/driver.c | 41 +++++++++++++++++++++++------------------ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 6 ++++++ include/ntgdi.h | 1 + 4 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index fba1f1cffea..3073f745f92 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1257,13 +1257,11 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; HDEVINFO devinfo = INVALID_HANDLE_VALUE; NTSTATUS status = STATUS_UNSUCCESSFUL; - static D3DKMT_HANDLE handle_start = 0; - struct d3dkmt_adapter *adapter; + D3DKMT_OPENADAPTERFROMLUID luid_desc; SP_DEVINFO_DATA device_data; DWORD size, state_flags; DEVPROPTYPE type; HANDLE mutex; - LUID luid; int index; TRACE("(%p)\n", desc); @@ -1279,10 +1277,6 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI if (*end) return STATUS_UNSUCCESSFUL; - adapter = heap_alloc( sizeof( *adapter ) ); - if (!adapter) - return STATUS_NO_MEMORY; - /* Get adapter LUID from SetupAPI */ mutex = get_display_device_init_mutex(); @@ -1309,28 +1303,39 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI device_data.cbSize = sizeof( device_data ); SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, - (BYTE *)&luid, sizeof( luid ), NULL, 0)) + (BYTE *)&luid_desc.AdapterLuid, sizeof( luid_desc.AdapterLuid ), + NULL, 0)) goto done; - EnterCriticalSection( &driver_section ); - /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ - adapter->handle = ++handle_start; - list_add_tail( &d3dkmt_adapters, &adapter->entry ); - LeaveCriticalSection( &driver_section ); + if ((status = NtGdiDdDDIOpenAdapterFromLuid( &luid_desc ))) goto done; - desc->hAdapter = handle_start; - desc->AdapterLuid = luid; + desc->hAdapter = luid_desc.hAdapter; + desc->AdapterLuid = luid_desc.AdapterLuid; desc->VidPnSourceId = index; - status = STATUS_SUCCESS; done: SetupDiDestroyDeviceInfoList( devinfo ); release_display_device_init_mutex( mutex ); - if (status != STATUS_SUCCESS) - heap_free( adapter ); return status; } +/****************************************************************************** + * NtGdiDdDDIOpenAdapterFromLuid (win32u.@) + */ +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ) +{ + static D3DKMT_HANDLE handle_start = 0; + struct d3dkmt_adapter *adapter; + + if (!(adapter = heap_alloc( sizeof( *adapter ) ))) return STATUS_NO_MEMORY; + + EnterCriticalSection( &driver_section ); + desc->hAdapter = adapter->handle = ++handle_start; + list_add_tail( &d3dkmt_adapters, &adapter->entry ); + LeaveCriticalSection( &driver_section ); + return STATUS_SUCCESS; +} + /****************************************************************************** * NtGdiDdDDICreateDevice (win32u.@) */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 48ce04e3819..5bddcd26de6 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -89,6 +89,7 @@ @ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc +@ stdcall D3DKMTOpenAdapterFromLuid(ptr) NtGdiDdDDIOpenAdapterFromLuid @ stdcall D3DKMTQueryStatistics(ptr) NtGdiDdDDIQueryStatistics @ stdcall D3DKMTSetQueuedLimit(ptr) NtGdiDdDDISetQueuedLimit @ stdcall D3DKMTSetVidPnSourceOwner(ptr) NtGdiDdDDISetVidPnSourceOwner diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index dc53ea343c0..2ca3c4d7448 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -122,6 +122,12 @@ typedef struct _D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId; } D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME; +typedef struct _D3DKMT_OPENADAPTERFROMLUID +{ + LUID AdapterLuid; + D3DKMT_HANDLE hAdapter; +} D3DKMT_OPENADAPTERFROMLUID; + typedef struct _D3DKMT_SETVIDPNSOURCEOWNER { D3DKMT_HANDLE hDevice; diff --git a/include/ntgdi.h b/include/ntgdi.h index 7f3ecec8c64..ba4d2ff3556 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -333,6 +333,7 @@ NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ); NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ); NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ); NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ); +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *desc ); NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ); NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ); NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ); -- 2.23.0

1 0

[PATCH v2 1/9] gdi32: Use ntgdi names for D3DKMT functions.
by Huw Davies 25 Aug '21

25 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/dib.c | 8 ++++---- dlls/gdi32/driver.c | 38 +++++++++++++++++++------------------- dlls/gdi32/gdi32.spec | 22 +++++++++++----------- include/ntgdi.h | 12 ++++++++++++ 4 files changed, 46 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index de1942894de..5a8d29ae5bf 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1579,9 +1579,9 @@ error: /*********************************************************************** - * D3DKMTCreateDCFromMemory (GDI32.@) + * NtGdiDdDDICreateDCFromMemory (win32u.@) */ -NTSTATUS WINAPI D3DKMTCreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) +NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ) { const struct d3dddi_format_info { @@ -1693,9 +1693,9 @@ error: /*********************************************************************** - * D3DKMTDestroyDCFromMemory (GDI32.@) + * NtGdiDdDDIDestroyDCFromMemory (win32u.@) */ -NTSTATUS WINAPI D3DKMTDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ) +NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ) { if (!desc) return STATUS_INVALID_PARAMETER; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 1df4660211e..fba1f1cffea 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1203,27 +1203,27 @@ ULONG WINAPI DdQueryDisplaySettingsUniqueness(VOID) } /****************************************************************************** - * D3DKMTOpenAdapterFromHdc [GDI32.@] + * NtGdiDdDDIOpenAdapterFromHdc (win32u.@) */ -NTSTATUS WINAPI D3DKMTOpenAdapterFromHdc( void *pData ) +NTSTATUS WINAPI NtGdiDdDDIOpenAdapterFromHdc( void *pData ) { FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } /****************************************************************************** - * D3DKMTEscape [GDI32.@] + * NtGdiDdDDIEscape (win32u.@) */ -NTSTATUS WINAPI D3DKMTEscape( const void *pData ) +NTSTATUS WINAPI NtGdiDdDDIEscape( const void *pData ) { FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } /****************************************************************************** - * D3DKMTCloseAdapter [GDI32.@] + * NtGdiDdDDICloseAdapter (win32u.@) */ -NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { NTSTATUS status = STATUS_INVALID_PARAMETER; struct d3dkmt_adapter *adapter; @@ -1332,9 +1332,9 @@ done: } /****************************************************************************** - * D3DKMTCreateDevice [GDI32.@] + * NtGdiDdDDICreateDevice (win32u.@) */ -NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) +NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ) { static D3DKMT_HANDLE handle_start = 0; struct d3dkmt_adapter *adapter; @@ -1377,9 +1377,9 @@ NTSTATUS WINAPI D3DKMTCreateDevice( D3DKMT_CREATEDEVICE *desc ) } /****************************************************************************** - * D3DKMTDestroyDevice [GDI32.@] + * NtGdiDdDDIDestroyDevice (win32u.@) */ -NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) +NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) { NTSTATUS status = STATUS_INVALID_PARAMETER; D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; @@ -1397,7 +1397,7 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) { memset( &set_owner_desc, 0, sizeof(set_owner_desc) ); set_owner_desc.hDevice = desc->hDevice; - D3DKMTSetVidPnSourceOwner( &set_owner_desc ); + NtGdiDdDDISetVidPnSourceOwner( &set_owner_desc ); list_remove( &device->entry ); heap_free( device ); status = STATUS_SUCCESS; @@ -1410,27 +1410,27 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) } /****************************************************************************** - * D3DKMTQueryStatistics [GDI32.@] + * NtGdiDdDDIQueryStatistics (win32u.@) */ -NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats) +NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ) { FIXME("(%p): stub\n", stats); return STATUS_SUCCESS; } /****************************************************************************** - * D3DKMTSetQueuedLimit [GDI32.@] + * NtGdiDdDDISetQueuedLimit (win32u.@) */ -NTSTATUS WINAPI D3DKMTSetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) +NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ) { FIXME( "(%p): stub\n", desc ); return STATUS_NOT_IMPLEMENTED; } /****************************************************************************** - * D3DKMTSetVidPnSourceOwner [GDI32.@] + * NtGdiDdDDISetVidPnSourceOwner (win32u.@) */ -NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) +NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ) { TRACE("(%p)\n", desc); @@ -1448,9 +1448,9 @@ NTSTATUS WINAPI D3DKMTSetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *des } /****************************************************************************** - * D3DKMTCheckVidPnExclusiveOwnership [GDI32.@] + * NtGdiDdDDICheckVidPnExclusiveOwnership (win32u.@) */ -NTSTATUS WINAPI D3DKMTCheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) +NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ) { TRACE("(%p)\n", desc); diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6aef8c2dbf6..48ce04e3819 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,18 +80,18 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) -@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) -@ stdcall D3DKMTCloseAdapter(ptr) -@ stdcall D3DKMTCreateDCFromMemory(ptr) -@ stdcall D3DKMTCreateDevice(ptr) -@ stdcall D3DKMTDestroyDCFromMemory(ptr) -@ stdcall D3DKMTDestroyDevice(ptr) -@ stdcall D3DKMTEscape(ptr) +@ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr) NtGdiDdDDICheckVidPnExclusiveOwnership +@ stdcall D3DKMTCloseAdapter(ptr) NtGdiDdDDICloseAdapter +@ stdcall D3DKMTCreateDCFromMemory(ptr) NtGdiDdDDICreateDCFromMemory +@ stdcall D3DKMTCreateDevice(ptr) NtGdiDdDDICreateDevice +@ stdcall D3DKMTDestroyDCFromMemory(ptr) NtGdiDdDDIDestroyDCFromMemory +@ stdcall D3DKMTDestroyDevice(ptr) NtGdiDdDDIDestroyDevice +@ stdcall D3DKMTEscape(ptr) NtGdiDdDDIEscape @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) -@ stdcall D3DKMTOpenAdapterFromHdc(ptr) -@ stdcall D3DKMTQueryStatistics(ptr) -@ stdcall D3DKMTSetQueuedLimit(ptr) -@ stdcall D3DKMTSetVidPnSourceOwner(ptr) +@ stdcall D3DKMTOpenAdapterFromHdc(ptr) NtGdiDdDDIOpenAdapterFromHdc +@ stdcall D3DKMTQueryStatistics(ptr) NtGdiDdDDIQueryStatistics +@ stdcall D3DKMTSetQueuedLimit(ptr) NtGdiDdDDISetQueuedLimit +@ stdcall D3DKMTSetVidPnSourceOwner(ptr) NtGdiDdDDISetVidPnSourceOwner @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) @ stdcall DeleteDC(long) diff --git a/include/ntgdi.h b/include/ntgdi.h index e1bb6fb901d..7f3ecec8c64 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -20,7 +20,9 @@ #define _NTGDI_ #include <wingdi.h> +#include <winternl.h> #include <winspool.h> +#include <ddk/d3dkmthk.h> typedef struct _GDI_HANDLE_ENTRY { @@ -325,4 +327,14 @@ BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ); BOOL WINAPI NtGdiUpdateColors( HDC hdc ); BOOL WINAPI NtGdiWidenPath( HDC hdc ); +NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc ); +NTSTATUS WINAPI NtGdiDdDDICloseAdapter( const D3DKMT_CLOSEADAPTER *desc ); +NTSTATUS WINAPI NtGdiDdDDICreateDCFromMemory( D3DKMT_CREATEDCFROMMEMORY *desc ); +NTSTATUS WINAPI NtGdiDdDDICreateDevice( D3DKMT_CREATEDEVICE *desc ); +NTSTATUS WINAPI NtGdiDdDDIDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ); +NTSTATUS WINAPI NtGdiDdDDIDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ); +NTSTATUS WINAPI NtGdiDdDDIQueryStatistics( D3DKMT_QUERYSTATISTICS *stats ); +NTSTATUS WINAPI NtGdiDdDDISetQueuedLimit( D3DKMT_SETQUEUEDLIMIT *desc ); +NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER *desc ); + #endif /* _NTGDI_ */ -- 2.23.0

1 0

[PATCH] conhost: Use font face length as number of characters.
by Jacek Caban 25 Aug '21

25 Aug '21

From: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/conhost.c | 13 +++++++++---- programs/conhost/window.c | 24 +++++++++++++----------- 2 files changed, 22 insertions(+), 15 deletions(-)

1 0

[PATCH 9/9] gdi32: Use NtGdiCreateDIBBrush for CreateDIBPatternBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 20 -------------------- dlls/gdi32/objects.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 20 deletions(-)

1 0

[PATCH 7/9] gdi32: Use NtGdiCreatePatternBrushInternal for CreatePatternBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 9 +++++---- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-)

1 0

[PATCH 6/9] gdi32: Use NtGdiCreateHatchBrush for CreateHatchBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 6 +++--- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH 5/9] gdi32: Use NtGdiCreateSolidBrush for CreateSolidBrush.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 4 ++-- dlls/gdi32/objects.c | 8 ++++++++ include/ntgdi.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH 4/9] gdi32: Reimplement CreateBrushIndirect on top of other brush constructors.
by Jacek Caban 25 Aug '21

25 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/brush.c | 96 +++----------------------------------- dlls/gdi32/gdiobj.c | 14 +++--- dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/objects.c | 26 +++++++++++ dlls/gdi32/tests/brush.c | 11 +++++ 5 files changed, 51 insertions(+), 97 deletions(-)

1 0