From: Rémi Bernon rbernon@codeweavers.com
--- dlls/win32u/driver.c | 12 ----------- dlls/wineandroid.drv/init.c | 24 --------------------- dlls/winemac.drv/display.c | 42 ------------------------------------- dlls/winemac.drv/gdi.c | 1 - dlls/winemac.drv/macdrv.h | 1 - dlls/winex11.drv/display.c | 19 ----------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 1 - include/wine/gdi_driver.h | 3 +-- 9 files changed, 1 insertion(+), 103 deletions(-)
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 628b6f92c23..02478b18a8a 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -756,11 +756,6 @@ static LONG nulldrv_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_ return DISP_CHANGE_SUCCESSFUL; }
-static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW mode ) -{ - return FALSE; /* use default implementation */ -} - static UINT nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, void *param ) { return STATUS_NOT_IMPLEMENTED; @@ -1110,11 +1105,6 @@ static LONG loaderdrv_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primar return load_driver()->pChangeDisplaySettings( displays, primary_name, hwnd, flags, lparam ); }
-static BOOL loaderdrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW mode ) -{ - return load_driver()->pGetCurrentDisplaySettings( name, is_primary, mode ); -} - static void loaderdrv_SetCursor( HWND hwnd, HCURSOR cursor ) { load_driver()->pSetCursor( hwnd, cursor ); @@ -1262,7 +1252,6 @@ static const struct user_driver_funcs lazy_load_driver = loaderdrv_UpdateClipboard, /* display modes */ loaderdrv_ChangeDisplaySettings, - loaderdrv_GetCurrentDisplaySettings, loaderdrv_UpdateDisplayDevices, /* windowing functions */ loaderdrv_CreateDesktop, @@ -1352,7 +1341,6 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(ClipboardWindowProc); SET_USER_FUNC(UpdateClipboard); SET_USER_FUNC(ChangeDisplaySettings); - SET_USER_FUNC(GetCurrentDisplaySettings); SET_USER_FUNC(UpdateDisplayDevices); SET_USER_FUNC(CreateDesktop); SET_USER_FUNC(CreateWindow); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 7f21a3b13f1..75e1d5bc8e2 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -294,29 +294,6 @@ UINT ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag }
-/*********************************************************************** - * ANDROID_GetCurrentDisplaySettings - */ -BOOL ANDROID_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode ) -{ - devmode->dmDisplayFlags = 0; - devmode->dmPosition.x = 0; - devmode->dmPosition.y = 0; - devmode->dmDisplayOrientation = 0; - devmode->dmDisplayFixedOutput = 0; - devmode->dmPelsWidth = screen_width; - devmode->dmPelsHeight = screen_height; - devmode->dmBitsPerPel = screen_bpp; - devmode->dmDisplayFrequency = 60; - devmode->dmFields = DM_POSITION | DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT | - DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; - TRACE( "current mode -- %dx%d %d bpp @%d Hz\n", - (int)devmode->dmPelsWidth, (int)devmode->dmPelsHeight, - (int)devmode->dmBitsPerPel, (int)devmode->dmDisplayFrequency ); - return TRUE; -} - - /********************************************************************** * ANDROID_wine_get_wgl_driver */ @@ -338,7 +315,6 @@ static const struct user_driver_funcs android_drv_funcs = .pVkKeyScanEx = ANDROID_VkKeyScanEx, .pSetCursor = ANDROID_SetCursor, .pChangeDisplaySettings = ANDROID_ChangeDisplaySettings, - .pGetCurrentDisplaySettings = ANDROID_GetCurrentDisplaySettings, .pUpdateDisplayDevices = ANDROID_UpdateDisplayDevices, .pCreateDesktop = ANDROID_CreateDesktop, .pCreateWindow = ANDROID_CreateWindow, diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 54745bf6005..5aad67f1809 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -911,48 +911,6 @@ static void display_get_current_mode(struct macdrv_display *display, DEVMODEW *d CFRelease(display_mode); }
-/*********************************************************************** - * GetCurrentDisplaySettings (MACDRV.@) - * - */ -BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, BOOL is_primary, LPDEVMODEW devmode) -{ - struct macdrv_display *displays = NULL; - int num_displays, display_idx; - WCHAR *end; - - TRACE("%s, %u, %p + %hu\n", debugstr_w(devname), is_primary, devmode, devmode->dmSize); - - init_original_display_mode(); - - if (macdrv_get_displays(&displays, &num_displays)) - return FALSE; - - display_idx = wcstol(devname + 11, &end, 10) - 1; - if (display_idx >= num_displays) - { - macdrv_free_displays(displays); - return FALSE; - } - - display_get_current_mode(&displays[display_idx], devmode); - macdrv_free_displays(displays); - - TRACE("current mode -- %dx%d-%dx%dx%dbpp @%d Hz", - (int)devmode->dmPosition.x, (int)devmode->dmPosition.y, - (int)devmode->dmPelsWidth, (int)devmode->dmPelsHeight, (int)devmode->dmBitsPerPel, - (int)devmode->dmDisplayFrequency); - if (devmode->dmDisplayOrientation) - TRACE(" rotated %u degrees", (unsigned int)devmode->dmDisplayOrientation * 90); - if (devmode->dmDisplayFixedOutput == DMDFO_STRETCH) - TRACE(" stretched"); - if (devmode->dmDisplayFlags & DM_INTERLACED) - TRACE(" interlaced"); - TRACE("\n"); - - return TRUE; -} - /*********************************************************************** * GetDeviceGammaRamp (MACDRV.@) */ diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 87b07e51460..f5c4c5eb7f1 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -275,7 +275,6 @@ static const struct user_driver_funcs macdrv_funcs = .pDesktopWindowProc = macdrv_DesktopWindowProc, .pDestroyCursorIcon = macdrv_DestroyCursorIcon, .pDestroyWindow = macdrv_DestroyWindow, - .pGetCurrentDisplaySettings = macdrv_GetCurrentDisplaySettings, .pUpdateDisplayDevices = macdrv_UpdateDisplayDevices, .pGetCursorPos = macdrv_GetCursorPos, .pGetKeyboardLayoutList = macdrv_GetKeyboardLayoutList, diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 74e03d95f4d..76a1ffbed60 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -129,7 +129,6 @@ static inline RECT rect_from_cgrect(CGRect cgrect) extern BOOL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags); extern void macdrv_Beep(void); extern LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid); -extern BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode); extern LRESULT macdrv_ClipboardWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp); extern UINT macdrv_UpdateDisplayDevices(const struct gdi_device_manager *device_manager, void *param); extern BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp); diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 6560f9efe85..c3a40f300db 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -146,25 +146,6 @@ void X11DRV_Settings_Init(void) X11DRV_Settings_SetHandler(&nores_handler); }
-/*********************************************************************** - * GetCurrentDisplaySettings (X11DRV.@) - * - */ -BOOL X11DRV_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode ) -{ - DEVMODEW mode; - x11drv_settings_id id; - - if (!settings_handler.get_id( name, is_primary, &id ) || !settings_handler.get_current_mode( id, &mode )) - { - ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); - return FALSE; - } - - memcpy( &devmode->dmFields, &mode.dmFields, devmode->dmSize - offsetof(DEVMODEW, dmFields) ); - return TRUE; -} - BOOL is_detached_mode(const DEVMODEW *mode) { return mode->dmFields & DM_POSITION && diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index b02ed921a7b..9f94a902620 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -443,7 +443,6 @@ static const struct user_driver_funcs x11drv_funcs = .pSystrayDockClear = X11DRV_SystrayDockClear, .pSystrayDockRemove = X11DRV_SystrayDockRemove, .pChangeDisplaySettings = X11DRV_ChangeDisplaySettings, - .pGetCurrentDisplaySettings = X11DRV_GetCurrentDisplaySettings, .pUpdateDisplayDevices = X11DRV_UpdateDisplayDevices, .pCreateDesktop = X11DRV_CreateDesktop, .pCreateWindow = X11DRV_CreateWindow, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7aecea229d3..02cba58f09f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -216,7 +216,6 @@ extern BOOL X11DRV_SystrayDockInsert( HWND owner, UINT cx, UINT cy, void *icon ) extern void X11DRV_SystrayDockClear( HWND hwnd ); extern BOOL X11DRV_SystrayDockRemove( HWND hwnd ); extern LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid ); -extern BOOL X11DRV_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode ); extern UINT X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, void *param ); extern BOOL X11DRV_CreateDesktop( const WCHAR *name, UINT width, UINT height ); extern BOOL X11DRV_CreateWindow( HWND hwnd ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 9cdf00a5625..8d628a426ae 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -219,7 +219,7 @@ struct gdi_dc_funcs };
/* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 98 +#define WINE_GDI_DRIVER_VERSION 99
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -359,7 +359,6 @@ struct user_driver_funcs void (*pUpdateClipboard)(void); /* display modes */ LONG (*pChangeDisplaySettings)(LPDEVMODEW,LPCWSTR,HWND,DWORD,LPVOID); - BOOL (*pGetCurrentDisplaySettings)(LPCWSTR,BOOL,LPDEVMODEW); UINT (*pUpdateDisplayDevices)(const struct gdi_device_manager *,void*); /* windowing functions */ BOOL (*pCreateDesktop)(const WCHAR *,UINT,UINT);