Module: wine Branch: master Commit: 0ba17961a90bee198945d2eb68c0cc2e698cd03e URL: https://gitlab.winehq.org/wine/wine/-/commit/0ba17961a90bee198945d2eb68c0cc2...
Author: Piotr Caban piotr@codeweavers.com Date: Mon May 8 14:15:49 2023 +0200
gdi32: Add device name to wine_get_gdi_driver call.
---
dlls/gdi32/dc.c | 2 +- dlls/win32u/dc.c | 4 ++-- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/wineps.drv.spec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c747d3a478e..a0308ffa118 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -42,7 +42,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 };
-typedef const void * (CDECL *driver_entry_point)( unsigned int version ); +typedef const void * (CDECL *driver_entry_point)( unsigned int version, const WCHAR *device );
struct graphics_driver { diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 8379cd353ef..bcfbed29426 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -719,8 +719,8 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD funcs = get_display_driver(); else if (hspool) { - const struct gdi_dc_funcs * (CDECL *wine_get_gdi_driver)( unsigned int ) = hspool; - funcs = wine_get_gdi_driver( WINE_GDI_DRIVER_VERSION ); + const struct gdi_dc_funcs * (CDECL *wine_get_gdi_driver)( unsigned int, const WCHAR * ) = hspool; + funcs = wine_get_gdi_driver( WINE_GDI_DRIVER_VERSION, device ? device->Buffer : NULL ); } if (!funcs) { diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 97f68d19a91..c5bb855ea93 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -687,7 +687,7 @@ static struct gdi_dc_funcs psdrv_funcs = /****************************************************************************** * PSDRV_get_gdi_driver */ -const struct gdi_dc_funcs * CDECL PSDRV_get_gdi_driver( unsigned int version ) +const struct gdi_dc_funcs * CDECL PSDRV_get_gdi_driver( unsigned int version, const WCHAR *name ) { if (version != WINE_GDI_DRIVER_VERSION) { diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 45b7d114e7e..aca8ed2d10f 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -1,4 +1,4 @@ -@ cdecl wine_get_gdi_driver(long) PSDRV_get_gdi_driver +@ cdecl wine_get_gdi_driver(long str) PSDRV_get_gdi_driver @ stdcall -private DllRegisterServer()
# Printer driver config exports