ChangeSet ID: 21029 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/02 04:54:42 Modified files: include : winuser.h dlls/x11drv : settings.c Log message: Lionel Ulmer <lionel.ulmer(a)free.fr> Add 'ENUM_...._SETTINGS' flag and make use of it in the X11DRV code. Patch: http://cvs.winehq.org/patch.py?id=21029 Old revision New revision Changes Path 1.228 1.229 +4 -0 wine/include/winuser.h 1.3 1.4 +2 -2 wine/dlls/x11drv/settings.c Index: wine/include/winuser.h diff -u -p wine/include/winuser.h:1.228 wine/include/winuser.h:1.229 --- wine/include/winuser.h:1.228 2 Nov 2005 10:54:42 -0000 +++ wine/include/winuser.h 2 Nov 2005 10:54:42 -0000 @@ -1304,6 +1304,10 @@ BOOL WINAPI SetSysColors(INT,cons #define IDTRYAGAIN 10 #define IDCONTINUE 11 +/* Used for EnumDisplaySettingsEx */ +#define ENUM_CURRENT_SETTINGS ((DWORD) -1) +#define ENUM_REGISTRY_SETTINGS ((DWORD) -2) + /****** Window classes ******/ typedef struct tagCREATESTRUCTA Index: wine/dlls/x11drv/settings.c diff -u -p wine/dlls/x11drv/settings.c:1.3 wine/dlls/x11drv/settings.c:1.4 --- wine/dlls/x11drv/settings.c:1.3 2 Nov 2005 10:54:42 -0000 +++ wine/dlls/x11drv/settings.c 2 Nov 2005 10:54:42 -0000 @@ -170,12 +170,12 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWS devmode->dmDisplayFlags = 0; devmode->dmDisplayFrequency = 0; devmode->dmSize = sizeof(DEVMODEW); - if (n == (DWORD)-1) + if (n == ENUM_CURRENT_SETTINGS) { TRACE("mode %ld (current) -- getting current mode (%s)\n", n, handler_name); n = pGetCurrentMode(); } - if (n == (DWORD)-2) + if (n == ENUM_REGISTRY_SETTINGS) { TRACE("mode %ld (registry) -- getting default mode (%s)\n", n, handler_name); n = dd_mode_default;