Author: fireball
Date: Mon Oct 15 14:14:28 2012
New Revision: 57564
URL: http://svn.reactos.org/svn/reactos?rev=57564&view=rev
Log:
- Get rid of version redefines. It turned out the 6.0+ stuff could be easily
isolated.
Modified:
branches/arwinss/arwinss/client/user32/CMakeLists.txt
branches/arwinss/arwinss/client/user32/sysparams.c
Modified: branches/arwinss/arwinss/client/user32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/CMakeLists.txt?rev=57564&r1=57563&r2=57564&view=diff
==============================================================================
--- branches/arwinss/arwinss/client/user32/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/arwinss/arwinss/client/user32/CMakeLists.txt [iso-8859-1] Mon Oct
15 14:14:28 2012
@@ -1,15 +1,5 @@
add_definitions(-D__WINESRC__
-D_WINE)
-
-remove_definitions(-DWINVER=0x502
- -D_WIN32_WINNT=0x502
- -D_WIN32_WINDOWS=0x502
- -D_SETUPAPI_VER=0x502)
-
-add_definitions(-DWINVER=0x0600
- -D_WIN32_WINNT=0x0600
- -D_WIN32_WINDOWS=0x600
- -D_SETUPAPI_VER=0x600)
spec2def(user32.dll user32.spec ADD_IMPORTLIB)
Modified: branches/arwinss/arwinss/client/user32/sysparams.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/sysparams.c?rev=57564&r1=57563&r2=57564&view=diff
==============================================================================
--- branches/arwinss/arwinss/client/user32/sysparams.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/client/user32/sysparams.c [iso-8859-1] Mon Oct 15
14:14:28 2012
@@ -316,7 +316,9 @@
static UINT mouse_hover_width = 4;
static UINT mouse_hover_height = 4;
static UINT mouse_hover_time = 400;
+#if (_WIN32_WINNT >= 0x0600)
static UINT mouse_scroll_chars = 3;
+#endif
static UINT mouse_scroll_lines = 3;
static UINT menu_show_delay = 400;
static UINT menu_drop_alignment = 0;
@@ -2141,7 +2143,7 @@
SPI_SETMENUSHOWDELAY_VALNAME,
&menu_show_delay, uiParam, fWinIni );
break;
-
+#if (_WIN32_WINNT >= 0x0600)
case SPI_GETWHEELSCROLLCHARS: /* 108 _WIN32_WINNT
>= 0x400 || _WIN32_WINDOW > 0x400 */
ret = get_uint_param( SPI_SETMOUSESCROLLCHARS_IDX,
SPI_SETMOUSESCROLLCHARS_REGKEY,
@@ -2155,7 +2157,7 @@
SPI_SETMOUSESCROLLCHARS_VALNAME,
&mouse_scroll_chars, uiParam, fWinIni );
break;
-
+#endif
WINE_SPI_FIXME(SPI_GETSHOWIMEUI); /* 110 _WIN32_WINNT >=
0x400 || _WIN32_WINDOW > 0x400 */
WINE_SPI_FIXME(SPI_SETSHOWIMEUI); /* 111 _WIN32_WINNT >=
0x400 || _WIN32_WINDOW > 0x400 */
@@ -2331,6 +2333,7 @@
ret = set_user_pref_param( 3, 0x80, PtrToUlong(pvParam), fWinIni );
break;
+#if (_WIN32_WINNT >= 0x0600)
/* _WIN32_WINNT >= 0x600 */
WINE_SPI_FIXME(SPI_GETDISABLEOVERLAPPEDCONTENT);
WINE_SPI_FIXME(SPI_SETDISABLEOVERLAPPEDCONTENT);
@@ -2340,7 +2343,7 @@
WINE_SPI_FIXME(SPI_SETCLEARTYPE);
WINE_SPI_FIXME(SPI_GETSPEECHRECOGNITION);
WINE_SPI_FIXME(SPI_SETSPEECHRECOGNITION);
-
+#endif
case SPI_GETFOREGROUNDLOCKTIMEOUT: /* 0x2000 _WIN32_WINNT >=
0x500 || _WIN32_WINDOW > 0x400 */
ret = get_uint_param( SPI_SETFOREGROUNDLOCKTIMEOUT_IDX,
SPI_SETFOREGROUNDLOCKTIMEOUT_REGKEY,
