Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 43301: Document ROS_GENERATE_RSYM environment variable.
by dgorbachev＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: dgorbachev Date: Mon Oct 5 16:13:01 2009 New Revision: 43301 URL: http://svn.reactos.org/svn/reactos?rev=43301&view=rev Log: Document ROS_GENERATE_RSYM environment variable. Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=43301&r1=4330… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Mon Oct 5 16:13:01 2009 @@ -111,6 +111,10 @@ # data added by GCC/LD as well as of RSYM symbol data. Output binary size # will go from 80 to 40MB, memory usage from 58 to 38MB and the install CD # from 18 to 13MB. The variable defaults to no. +# +# ROS_GENERATE_RSYM +# This variable controls generation of RSYM symbol data. The value can be +# either yes (to generate symbol data) or no. The variable defaults to yes. # # ROS_RBUILDFLAGS # Pass parameters to rbuild.

1 0

[dgorbachev] 43300: Modify DPRINT / DRPINT1 macros, check if DbgPrint crashed. Bug #4420.
by dgorbachev＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: dgorbachev Date: Mon Oct 5 16:12:49 2009 New Revision: 43300 URL: http://svn.reactos.org/svn/reactos?rev=43300&view=rev Log: Modify DPRINT / DRPINT1 macros, check if DbgPrint crashed. Bug #4420. Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Mon Oct 5 16:12:49 2009 @@ -51,7 +51,7 @@ PCHAR Message ); -#endif +#endif /* !defined(_RTLFUNCS_H) && !defined(_NTDDK_) */ #ifndef assert #ifndef NASSERT @@ -82,12 +82,18 @@ #if DBG /* These are always printed */ - #define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint + #define DPRINT1(fmt, ...) do { \ + if (DbgPrint("(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)) \ + DbgPrint("(%s:%d) DbgPrint() failed!\n", __FILE__, __LINE__); \ + } while (0) /* These are printed only if NDEBUG is NOT defined */ #ifndef NDEBUG - #define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint + #define DPRINT(fmt, ...) do { \ + if (DbgPrint("(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)) \ + DbgPrint("(%s:%d) DbgPrint() failed!\n", __FILE__, __LINE__); \ + } while (0) #else @@ -95,16 +101,13 @@ #endif - #define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); + #define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); - /* The ##__VA_ARGS__ syntax is not a standard and was only tested with MSVC and GCC. If other compilers support them as well, add them to this #if block. */ - #if defined(_MSC_VER) || defined(__GNUC__) - #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #endif -#else + #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) +#else /* not DBG */ /* On non-debug builds, we never show these */ #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) @@ -116,7 +119,7 @@ #define WARN_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define TRACE_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define INFO_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) -#endif +#endif /* not DBG */ #define ASSERT_IRQL_LESS_OR_EQUAL(x) ASSERT(KeGetCurrentIrql()<=(x)) #define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql()==(x))

1 0

[dgorbachev] 43299: Fix internal name of ntkrnlmp.exe. Alexander Yastrebov (menone7 ~at~ gmail com), bug #4821.
by dgorbachev＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: dgorbachev Date: Mon Oct 5 16:12:33 2009 New Revision: 43299 URL: http://svn.reactos.org/svn/reactos?rev=43299&view=rev Log: Fix internal name of ntkrnlmp.exe. Alexander Yastrebov (menone7 ~at~ gmail com), bug #4821. Modified: trunk/reactos/ntoskrnl/ntoskrnl.rc Modified: trunk/reactos/ntoskrnl/ntoskrnl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rc?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rc [iso-8859-1] Mon Oct 5 16:12:33 2009 @@ -14,8 +14,13 @@ #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_DRV_SYSTEM #define VER_FILEDESCRIPTION_STR "NT Kernel & System" +#ifndef CONFIG_SMP #define VER_INTERNALNAME_STR "ntoskrnl.exe" #define VER_ORIGINALFILENAME_STR "ntoskrnl.exe" +#else +#define VER_INTERNALNAME_STR "ntkrnlmp.exe" +#define VER_ORIGINALFILENAME_STR "ntkrnlmp.exe" +#endif #define VER_LANGNEUTRAL #include "common.ver"

1 0

[mkupfer] 43298: - fix the mouse swap button issue - cleanup loading mouse properties - add function to load and store DWORD for sysparams registry keys - TODO: check and fix the get and set cases for sysparams for the right registry key type
by mkupfer＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: mkupfer Date: Mon Oct 5 13:35:06 2009 New Revision: 43298 URL: http://svn.reactos.org/svn/reactos?rev=43298&view=rev Log: - fix the mouse swap button issue - cleanup loading mouse properties - add function to load and store DWORD for sysparams registry keys - TODO: check and fix the get and set cases for sysparams for the right registry key type Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Mon Oct 5 13:35:06 2009 @@ -1120,8 +1120,7 @@ mi->time = MsqCalculateMessageTime(&LargeTickCount); } - // FIXME: CurInfo->SwapButtons doesn't contain the correct value yet - SwapButtons = UserGetSystemMetrics(SM_SWAPBUTTON);//CurInfo->SwapButtons; + SwapButtons = gspv.bMouseBtnSwap; DoMove = FALSE; IntGetCursorLocation(WinSta, &MousePos); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Oct 5 13:35:06 2009 @@ -87,7 +87,19 @@ static INT -SpiLoadInt(PCWSTR pwszKey, PCWSTR pwszValue, INT iValue) +SpiLoadDWord(PCWSTR pwszKey, PCWSTR pwszValue, INT iValue) +{ + DWORD Result; + if (!RegReadUserSetting(pwszKey, pwszValue, REG_DWORD, &Result, sizeof(Result))) + { + return iValue; + } + return Result; +} + +static +INT +SpiLoadszInt(PCWSTR pwszKey, PCWSTR pwszValue, INT iValue) { WCHAR awcBuffer[12]; ULONG cbSize; @@ -102,9 +114,9 @@ static INT -SpiLoadMouse(LPWSTR pwszValue, INT iValue) -{ - return SpiLoadInt(KEY_MOUSE, pwszValue, iValue); +SpiLoadMouse(PCWSTR pwszValue, INT iValue) +{ + return SpiLoadDWord(KEY_MOUSE, pwszValue, iValue); } static @@ -113,7 +125,7 @@ { INT iRegVal; - iRegVal = SpiLoadInt(KEY_METRIC, pwszValue, METRIC2REG(iValue)); + iRegVal = SpiLoadszInt(KEY_METRIC, pwszValue, METRIC2REG(iValue)); DPRINT("Loaded metric setting '%S', iValue=%d(reg:%d), ret=%d(reg:%d)\n", pwszValue, iValue, METRIC2REG(iValue), REG2METRIC(iRegVal), iRegVal); return REG2METRIC(iRegVal); @@ -175,9 +187,14 @@ memset(&gspv, 0, sizeof(gspv)); /* Load mouse settings */ - gspv.caiMouse.FirstThreshold = SpiLoadMouse(L"MouseThreshold1", 6); - gspv.caiMouse.SecondThreshold = SpiLoadMouse(L"MouseThreshold2", 10); - gspv.caiMouse.Acceleration = SpiLoadMouse(L"MouseSpeed", 1); + gspv.caiMouse.FirstThreshold = SpiLoadMouse(VAL_MOUSE1, 6); + gspv.caiMouse.SecondThreshold = SpiLoadMouse(VAL_MOUSE2, 10); + gspv.caiMouse.Acceleration = SpiLoadMouse(VAL_MOUSE3, 1); + gspv.bMouseBtnSwap = SpiLoadMouse(VAL_SWAP, 0); + gspv.iMouseSpeed = SpiLoadMouse(VAL_MOUSE3, 1); + gspv.iDblClickTime = SpiLoadMouse(VAL_DBLCLKTIME, 500); + gspv.iDblClickWidth = SpiLoadMouse(VAL_DBLCLKWIDTH, 4); + gspv.iDblClickHeight = SpiLoadMouse(VAL_DBLCLKHEIGHT, 4); /* Load NONCLIENTMETRICS */ gspv.ncm.cbSize = sizeof(NONCLIENTMETRICSW); @@ -204,7 +221,7 @@ gspv.mm.iWidth = SpiLoadMetric(L"MinWidth", 160); gspv.mm.iHorzGap = SpiLoadMetric(L"MinHorzGap", 160); gspv.mm.iVertGap = SpiLoadMetric(L"MinVertGap", 24); - gspv.mm.iArrange = SpiLoadInt(KEY_METRIC, L"MinArrange", ARW_HIDE); + gspv.mm.iArrange = SpiLoadszInt(KEY_METRIC, L"MinArrange", ARW_HIDE); /* Load ICONMETRICS */ gspv.im.cbSize = sizeof(ICONMETRICSW); @@ -214,14 +231,7 @@ SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1); /* Load desktop settings */ - gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); - - /* Load mouse settings */ - gspv.bMouseBtnSwap = SpiLoadInt(KEY_MOUSE, VAL_SWAP, 0); - gspv.iMouseSpeed = SpiLoadInt(KEY_MOUSE, VAL_MOUSE3, 1); - gspv.iDblClickTime = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKTIME, 500); - gspv.iDblClickWidth = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKWIDTH, 4); - gspv.iDblClickHeight = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKHEIGHT, 4); + gspv.bDragFullWindows = SpiLoadszInt(KEY_DESKTOP, VAL_DRAG, 0); /* Some hardcoded values for now */ gspv.iMouseHoverTime = 80; @@ -301,6 +311,18 @@ static VOID +SpiStoreDWord(PCWSTR pwszKey, PCWSTR pwszValue, INT iValue) +{ + DWORD Value = iValue; + RegWriteUserSetting(pwszKey, + pwszValue, + REG_DWORD, + &Value, + sizeof(Value)); +} + +static +VOID SpiStoreSzInt(PCWSTR pwszKey, PCWSTR pwszValue, INT iValue) { WCHAR awcBuffer[15]; @@ -439,7 +461,20 @@ static inline UINT_PTR -SpiSetInt(PVOID pvData, INT iValue, PCWSTR pwszKey, PCWSTR pwszValue, FLONG fl) +SpiSetDWord(PVOID pvData, INT iValue, PCWSTR pwszKey, PCWSTR pwszValue, FLONG fl) +{ + REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); + *(INT*)pvData = iValue; + if (fl & SPIF_UPDATEINIFILE) + { + SpiStoreDWord(pwszKey, pwszValue, iValue); + } + return (UINT_PTR)pwszKey; +} + +static inline +UINT_PTR +SpiSetszInt(PVOID pvData, INT iValue, PCWSTR pwszKey, PCWSTR pwszValue, FLONG fl) { REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); *(INT*)pvData = iValue; @@ -588,8 +623,8 @@ GDIOBJ_SetOwnership(hbmp, NULL); /* Yes, Windows really loads the current setting from the registry. */ - ulTile = SpiLoadInt(KEY_DESKTOP, L"TileWallpaper", 0); - ulStyle = SpiLoadInt(KEY_DESKTOP, L"WallpaperStyle", 0); + ulTile = SpiLoadszInt(KEY_DESKTOP, L"TileWallpaper", 0); + ulStyle = SpiLoadszInt(KEY_DESKTOP, L"WallpaperStyle", 0); DPRINT("SpiSetWallpaper: ulTile=%ld, ulStyle=%d\n", ulTile, ulStyle); /* Check the values we found in the registry */ @@ -659,13 +694,13 @@ case SPI_SETBORDER: uiParam = max(uiParam, 1); - return SpiSetInt(&gspv.ncm.iBorderWidth, uiParam, KEY_METRIC, VAL_BORDER, fl); + return SpiSetszInt(&gspv.ncm.iBorderWidth, uiParam, KEY_METRIC, VAL_BORDER, fl); case SPI_GETKEYBOARDSPEED: return SpiGetInt(pvParam, &gspv.dwKbdSpeed, fl); case SPI_SETKEYBOARDSPEED: - return SpiSetInt(&gspv.dwKbdSpeed, uiParam, KEY_KBD, VAL_KBDSPD, fl); + return SpiSetszInt(&gspv.dwKbdSpeed, uiParam, KEY_KBD, VAL_KBDSPD, fl); case SPI_LANGDRIVER: DPRINT1("SPI_LANGDRIVER is unimplemented\n"); @@ -675,19 +710,19 @@ return SpiGetInt(pvParam, &gspv.iScrSaverTimeout, fl); case SPI_SETSCREENSAVETIMEOUT: - return SpiSetInt(&gspv.iScrSaverTimeout, uiParam, KEY_DESKTOP, VAL_SCRTO, fl); + return SpiSetszInt(&gspv.iScrSaverTimeout, uiParam, KEY_DESKTOP, VAL_SCRTO, fl); case SPI_GETSCREENSAVEACTIVE: return SpiGetInt(pvParam, &gspv.bScrSaverActive, fl); case SPI_SETSCREENSAVEACTIVE: - return SpiSetInt(&gspv.bScrSaverActive, uiParam, KEY_DESKTOP, VAL_SCRACT, fl); + return SpiSetszInt(&gspv.bScrSaverActive, uiParam, KEY_DESKTOP, VAL_SCRACT, fl); case SPI_GETGRIDGRANULARITY: return SpiGetInt(pvParam, &gspv.uiGridGranularity, fl); case SPI_SETGRIDGRANULARITY: - return SpiSetInt(&gspv.uiGridGranularity, uiParam, KEY_DESKTOP, VAL_GRID, fl); + return SpiSetszInt(&gspv.uiGridGranularity, uiParam, KEY_DESKTOP, VAL_GRID, fl); case SPI_GETDESKWALLPAPER: uiParam = min(uiParam, gspv.ustrWallpaper.Length + 1); @@ -704,7 +739,7 @@ return SpiGetInt(pvParam, &gspv.iKbdDelay, fl); case SPI_SETKEYBOARDDELAY: - return SpiSetInt(&gspv.iKbdDelay, uiParam, KEY_KBD, VAL_KBDDELAY, fl); + return SpiSetszInt(&gspv.iKbdDelay, uiParam, KEY_KBD, VAL_KBDDELAY, fl); case SPI_ICONHORIZONTALSPACING: if (pvParam) @@ -726,7 +761,7 @@ return SpiGetInt(pvParam, &gspv.im.iTitleWrap, fl); case SPI_SETICONTITLEWRAP: - return SpiSetInt(&gspv.im.iTitleWrap, uiParam, KEY_METRIC, VAL_ITWRAP, fl); + return SpiSetszInt(&gspv.im.iTitleWrap, uiParam, KEY_METRIC, VAL_ITWRAP, fl); case SPI_GETMENUDROPALIGNMENT: return SpiGetInt(pvParam, &gspv.bMenuDropAlign, fl); @@ -735,10 +770,10 @@ return SpiSetBool(&gspv.bMenuDropAlign, uiParam, KEY_MDALIGN, VAL_MDALIGN, fl); case SPI_SETDOUBLECLKWIDTH: - return SpiSetInt(&gspv.iDblClickWidth, uiParam, KEY_MOUSE, VAL_DBLCLKWIDTH, fl); + return SpiSetszInt(&gspv.iDblClickWidth, uiParam, KEY_MOUSE, VAL_DBLCLKWIDTH, fl); case SPI_SETDOUBLECLKHEIGHT: - return SpiSetInt(&gspv.iDblClickHeight, uiParam, KEY_MOUSE, VAL_DBLCLKHEIGHT, fl); + return SpiSetszInt(&gspv.iDblClickHeight, uiParam, KEY_MOUSE, VAL_DBLCLKHEIGHT, fl); case SPI_GETICONTITLELOGFONT: return SpiGet(pvParam, &gspv.im.lfFont, sizeof(LOGFONTW), fl); @@ -753,10 +788,10 @@ return (UINT_PTR)KEY_METRIC; case SPI_SETDOUBLECLICKTIME: - return SpiSetInt(&gspv.iDblClickTime, uiParam, KEY_MOUSE, VAL_DBLCLKTIME, fl); + return SpiSetszInt(&gspv.iDblClickTime, uiParam, KEY_MOUSE, VAL_DBLCLKTIME, fl); case SPI_SETMOUSEBUTTONSWAP: - return SpiSetInt(&gspv.bMouseBtnSwap, uiParam, KEY_MOUSE, VAL_SWAP, fl); + return SpiSetDWord(&gspv.bMouseBtnSwap, uiParam, KEY_MOUSE, VAL_SWAP, fl); case SPI_GETFASTTASKSWITCH: return SpiGetInt(pvParam, &gspv.bFastTaskSwitch, fl); @@ -769,7 +804,7 @@ return SpiGetInt(pvParam, &gspv.bDragFullWindows, fl); case SPI_SETDRAGFULLWINDOWS: - return SpiSetInt(&gspv.bDragFullWindows, uiParam, KEY_DESKTOP, VAL_DRAG, fl); + return SpiSetszInt(&gspv.bDragFullWindows, uiParam, KEY_DESKTOP, VAL_DRAG, fl); case SPI_GETNONCLIENTMETRICS: return SpiGet(pvParam, &gspv.ncm, sizeof(NONCLIENTMETRICSW), fl); @@ -1021,10 +1056,10 @@ return (UINT_PTR)KEY_DESKTOP; case SPI_SETDRAGWIDTH: - return SpiSetInt(&gspv.iDragWidth, uiParam, KEY_DESKTOP, VAL_DRAGWIDTH, fl); + return SpiSetszInt(&gspv.iDragWidth, uiParam, KEY_DESKTOP, VAL_DRAGWIDTH, fl); case SPI_SETDRAGHEIGHT: - return SpiSetInt(&gspv.iDragHeight, uiParam, KEY_DESKTOP, VAL_DRAGHEIGHT, fl); + return SpiSetszInt(&gspv.iDragHeight, uiParam, KEY_DESKTOP, VAL_DRAGHEIGHT, fl); case SPI_SETHANDHELD: return SpiSetBool(&gspv.bHandHeld, uiParam, KEY_DESKTOP, L"HandHeld", fl); @@ -1036,10 +1071,10 @@ return SpiGetInt(pvParam, &gspv.iPwrOffTimeout, fl); case SPI_SETLOWPOWERTIMEOUT: - return SpiSetInt(&gspv.iLowPwrTimeout, uiParam, KEY_DESKTOP, L"LowPowerTimeOut", fl); + return SpiSetszInt(&gspv.iLowPwrTimeout, uiParam, KEY_DESKTOP, L"LowPowerTimeOut", fl); case SPI_SETPOWEROFFTIMEOUT: - return SpiSetInt(&gspv.iPwrOffTimeout, uiParam, KEY_DESKTOP, L"PowerOffTimeOut", fl); + return SpiSetszInt(&gspv.iPwrOffTimeout, uiParam, KEY_DESKTOP, L"PowerOffTimeOut", fl); case SPI_GETLOWPOWERACTIVE: return SpiGetInt(pvParam, &gspv.iPwrOffTimeout, fl); @@ -1081,7 +1116,7 @@ return SpiGetInt(pvParam, &gspv.iMouseTrails, fl); case SPI_SETMOUSETRAILS: - return SpiSetInt(&gspv.iMouseTrails, uiParam, KEY_MOUSE, L"MouseTrails", fl); + return SpiSetszInt(&gspv.iMouseTrails, uiParam, KEY_MOUSE, L"MouseTrails", fl); case SPI_GETSNAPTODEFBUTTON: return SpiGetInt(pvParam, &gspv.bSnapToDefBtn, fl); @@ -1093,13 +1128,13 @@ return SpiGetInt(pvParam, &gspv.iMouseHoverWidth, fl); case SPI_SETMOUSEHOVERWIDTH: - return SpiSetInt(&gspv.iMouseHoverWidth, uiParam, KEY_MOUSE, L"MouseHoverWidth", fl); + return SpiSetszInt(&gspv.iMouseHoverWidth, uiParam, KEY_MOUSE, L"MouseHoverWidth", fl); case SPI_GETMOUSEHOVERHEIGHT: return SpiGetInt(pvParam, &gspv.iMouseHoverHeight, fl); case SPI_SETMOUSEHOVERHEIGHT: - return SpiSetInt(&gspv.iMouseHoverHeight, uiParam, KEY_MOUSE, L"MouseHoverHeight", fl); + return SpiSetszInt(&gspv.iMouseHoverHeight, uiParam, KEY_MOUSE, L"MouseHoverHeight", fl); case SPI_GETMOUSEHOVERTIME: return SpiGetInt(pvParam, &gspv.iMouseHoverTime, fl); @@ -1112,26 +1147,26 @@ * enforce the use of USER_TIMER_MAXIMUM and USER_TIMER_MINIMUM until * Windows Server 2003 SP1 and Windows XP SP2 " */ - return SpiSetInt(&gspv.iMouseHoverTime, uiParam, KEY_MOUSE, L"MouseHoverTime", fl); + return SpiSetszInt(&gspv.iMouseHoverTime, uiParam, KEY_MOUSE, L"MouseHoverTime", fl); case SPI_GETWHEELSCROLLLINES: return SpiGetInt(pvParam, &gspv.iWheelScrollLines, fl); case SPI_SETWHEELSCROLLLINES: - return SpiSetInt(&gspv.iWheelScrollLines, uiParam, KEY_DESKTOP, L"WheelScrollLines", fl); + return SpiSetszInt(&gspv.iWheelScrollLines, uiParam, KEY_DESKTOP, L"WheelScrollLines", fl); case SPI_GETMENUSHOWDELAY: return SpiGetInt(pvParam, &gspv.dwMenuShowDelay, fl); case SPI_SETMENUSHOWDELAY: - return SpiSetInt(&gspv.dwMenuShowDelay, uiParam, KEY_DESKTOP, L"MenuShowDelay", fl); + return SpiSetszInt(&gspv.dwMenuShowDelay, uiParam, KEY_DESKTOP, L"MenuShowDelay", fl); #if (_WIN32_WINNT >= 0x0600) case SPI_GETWHEELSCROLLCHARS: return SpiGetInt(pvParam, &gspv.uiWheelScrollChars, fl); case SPI_SETWHEELSCROLLCHARS: - return SpiSetInt(&gspv.uiWheelScrollChars, uiParam, KEY_DESKTOP, L"WheelScrollChars", fl); + return SpiSetszInt(&gspv.uiWheelScrollChars, uiParam, KEY_DESKTOP, L"WheelScrollChars", fl); #endif case SPI_GETSHOWIMEUI: return SpiGetInt(pvParam, &gspv.bShowImeUi, fl); @@ -1144,7 +1179,7 @@ case SPI_SETMOUSESPEED: // vgl SETMOUSE - return SpiSetInt(&gspv.iMouseSpeed, uiParam, KEY_MOUSE, L"MouseSpeed", fl); + return SpiSetszInt(&gspv.iMouseSpeed, uiParam, KEY_MOUSE, L"MouseSpeed", fl); case SPI_GETSCREENSAVERRUNNING: return SpiGetInt(pvParam, &gspv.bScrSaverRunning, fl); @@ -1318,61 +1353,61 @@ return SpiGetInt(pvParam, &gspv.dwForegroundLockTimeout, fl); case SPI_SETFOREGROUNDLOCKTIMEOUT: - return SpiSetInt(&gspv.dwForegroundLockTimeout, uiParam, KEY_MOUSE, L"", fl); + return SpiSetszInt(&gspv.dwForegroundLockTimeout, uiParam, KEY_MOUSE, L"", fl); case SPI_GETACTIVEWNDTRKTIMEOUT: return SpiGetInt(pvParam, &gspv.dwActiveTrackingTimeout, fl); case SPI_SETACTIVEWNDTRKTIMEOUT: - return SpiSetInt(&gspv.dwActiveTrackingTimeout, uiParam, KEY_MOUSE, L"", fl); + return SpiSetszInt(&gspv.dwActiveTrackingTimeout, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFOREGROUNDFLASHCOUNT: return SpiGetInt(pvParam, &gspv.dwForegroundFlashCount, fl); case SPI_SETFOREGROUNDFLASHCOUNT: - return SpiSetInt(&gspv.dwForegroundFlashCount, uiParam, KEY_MOUSE, L"", fl); + return SpiSetszInt(&gspv.dwForegroundFlashCount, uiParam, KEY_MOUSE, L"", fl); case SPI_GETCARETWIDTH: return SpiGetInt(pvParam, &gspv.dwCaretWidth, fl); case SPI_SETCARETWIDTH: - return SpiSetInt(&gspv.dwCaretWidth, uiParam, KEY_MOUSE, L"", fl); + return SpiSetszInt(&gspv.dwCaretWidth, uiParam, KEY_MOUSE, L"", fl); case SPI_GETMOUSECLICKLOCKTIME: return SpiGetInt(pvParam, &gspv.dwMouseClickLockTime, fl); case SPI_SETMOUSECLICKLOCKTIME: - return SpiSetInt(&gspv.dwMouseClickLockTime, uiParam, KEY_MOUSE, L"", fl); + return SpiSetszInt(&gspv.dwMouseClickLockTime, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFONTSMOOTHINGTYPE: return SpiGetInt(pvParam, &gspv.uiFontSmoothingType, fl); case SPI_SETFONTSMOOTHINGTYPE: - return SpiSetInt(&gspv.uiFontSmoothingType, uiParam, KEY_MOUSE, L"", fl); + return SpiSetszInt(&gspv.uiFontSmoothingType, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFONTSMOOTHINGCONTRAST: return SpiGetInt(pvParam, &gspv.uiFontSmoothingContrast, fl); case SPI_SETFONTSMOOTHINGCONTRAST: - return SpiSetInt(&gspv.uiFontSmoothingContrast, uiParam, KEY_MOUSE, L"", fl); + return SpiSetszInt(&gspv.uiFontSmoothingContrast, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFOCUSBORDERWIDTH: return SpiGetInt(pvParam, &gspv.uiFocusBorderWidth, fl); case SPI_SETFOCUSBORDERWIDTH: - return SpiSetInt(&gspv.uiFocusBorderWidth, uiParam, KEY_MOUSE, L"", fl); + return SpiSetszInt(&gspv.uiFocusBorderWidth, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFOCUSBORDERHEIGHT: return SpiGetInt(pvParam, &gspv.uiFocusBorderHeight, fl); case SPI_SETFOCUSBORDERHEIGHT: - return SpiSetInt(&gspv.uiFocusBorderHeight, uiParam, KEY_MOUSE, L"", fl); + return SpiSetszInt(&gspv.uiFocusBorderHeight, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFONTSMOOTHINGORIENTATION: return SpiGetInt(pvParam, &gspv.uiFontSmoothingOrientation, fl); case SPI_SETFONTSMOOTHINGORIENTATION: - return SpiSetInt(&gspv.uiFontSmoothingOrientation, uiParam, KEY_MOUSE, L"", fl); + return SpiSetszInt(&gspv.uiFontSmoothingOrientation, uiParam, KEY_MOUSE, L"", fl); /* The following are undocumented, but valid SPI values */ case 0x1010:

1 0

[cgutman] 43297: - Remove the STATUS_PENDING case in UnlockAndMaybeComplete so we can catch pending IRPs which didn't get queued in the PendingIrpList
by cgutman＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: cgutman Date: Mon Oct 5 04:31:16 2009 New Revision: 43297 URL: http://svn.reactos.org/svn/reactos?rev=43297&view=rev Log: - Remove the STATUS_PENDING case in UnlockAndMaybeComplete so we can catch pending IRPs which didn't get queued in the PendingIrpList Modified: trunk/reactos/drivers/network/afd/afd/lock.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Oct 5 04:31:16 2009 @@ -290,22 +290,12 @@ NTSTATUS NTAPI UnlockAndMaybeComplete ( PAFD_FCB FCB, NTSTATUS Status, PIRP Irp, UINT Information ) { - Irp->IoStatus.Status = Status; Irp->IoStatus.Information = Information; - - if( Status == STATUS_PENDING ) { - /* We should firstly mark this IRP as pending, because - otherwise it may be completed by StreamSocketConnectComplete() - before we return from SocketStateUnlock(). */ - IoMarkIrpPending( Irp ); - SocketStateUnlock( FCB ); - } else { - if ( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); - (void)IoSetCancelRoutine(Irp, NULL); - SocketStateUnlock( FCB ); - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - } + if ( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + (void)IoSetCancelRoutine(Irp, NULL); + SocketStateUnlock( FCB ); + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); return Status; } @@ -325,5 +315,6 @@ &Irp->Tail.Overlay.ListEntry ); IoMarkIrpPending(Irp); (void)IoSetCancelRoutine(Irp, AfdCancelHandler); - return UnlockAndMaybeComplete( FCB, STATUS_PENDING, Irp, 0 ); -} + SocketStateUnlock( FCB ); + return STATUS_PENDING; +}

1 0

[cgutman] 43296: - Cancel pending user IRPs when we get a IRP_MJ_CLEANUP request - Previously there was some confusion between IRPs in PendingIrpList and InFlightRequest, InFlightRequest IRPs go from AFD to a TDI transport driver (tcpip) which are sent on behalf of AFD and are cancelled upon socket destruction (IRP_MJ_CLOSE) vs. IRPs in the PendingIrpList which go from user-mode to AFD which are sent of behalf of the user and should be cancelled when handling IRP_MJ_CLEANUP
by cgutman＠svn.reactos.org 05 Oct '09

05 Oct '09

Author: cgutman Date: Mon Oct 5 03:44:17 2009 New Revision: 43296 URL: http://svn.reactos.org/svn/reactos?rev=43296&view=rev Log: - Cancel pending user IRPs when we get a IRP_MJ_CLEANUP request - Previously there was some confusion between IRPs in PendingIrpList and InFlightRequest, InFlightRequest IRPs go from AFD to a TDI transport driver (tcpip) which are sent on behalf of AFD and are cancelled upon socket destruction (IRP_MJ_CLOSE) vs. IRPs in the PendingIrpList which go from user-mode to AFD which are sent of behalf of the user and should be cancelled when handling IRP_MJ_CLEANUP Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Oct 5 03:44:17 2009 @@ -172,6 +172,38 @@ } static NTSTATUS NTAPI +AfdCleanupSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp) +{ + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = FileObject->FsContext; + PLIST_ENTRY CurrentEntry, NextEntry; + UINT Function; + PIRP CurrentIrp; + + if( !SocketAcquireStateLock( FCB ) ) return LostSocket(Irp); + + for (Function = 0; Function < MAX_FUNCTIONS; Function++) + { + CurrentEntry = FCB->PendingIrpList[Function].Flink; + while (CurrentEntry != &FCB->PendingIrpList[Function]) + { + NextEntry = CurrentEntry->Flink; + CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); + + /* The cancel routine will remove the IRP from the list */ + IoCancelIrp(CurrentIrp); + + CurrentEntry = NextEntry; + } + } + + KillSelectsForFCB( FCB->DeviceExt, FileObject, FALSE ); + + return UnlockAndMaybeComplete(FCB, STATUS_SUCCESS, Irp, 0); +} + +static NTSTATUS NTAPI AfdCloseSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp) { @@ -346,6 +378,9 @@ case IRP_MJ_CLOSE: /* Ditto the borrowing */ return AfdCloseSocket(DeviceObject, Irp, IrpSp); + + case IRP_MJ_CLEANUP: + return AfdCleanupSocket(DeviceObject, Irp, IrpSp); /* write data */ case IRP_MJ_WRITE: @@ -626,6 +661,7 @@ /* register driver routines */ DriverObject->MajorFunction[IRP_MJ_CLOSE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_CREATE] = AfdDispatch; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_READ] = AfdDispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = AfdDispatch;

1 0

[dgorbachev] 43295: Add "#pragma code_page(...)" again to fix compilation.
by dgorbachev＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: dgorbachev Date: Mon Oct 5 00:40:01 2009 New Revision: 43295 URL: http://svn.reactos.org/svn/reactos?rev=43295&view=rev Log: Add "#pragma code_page(...)" again to fix compilation. Modified: trunk/reactos/dll/win32/kernel32/lang/de-DE.rc trunk/reactos/dll/win32/kernel32/lang/en-US.rc trunk/reactos/dll/win32/kernel32/lang/es-ES.rc trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/kernel32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/de-DE.rc [iso-8859-1] Mon Oct 5 00:40:01 2009 @@ -1,3 +1,5 @@ +#pragma code_page(1252) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/kernel32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/en-US.rc [iso-8859-1] Mon Oct 5 00:40:01 2009 @@ -1,3 +1,5 @@ +#pragma code_page(1252) + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/kernel32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/es… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/es-ES.rc [iso-8859-1] Mon Oct 5 00:40:01 2009 @@ -1,3 +1,5 @@ +#pragma code_page(1252) + LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc [iso-8859-1] Mon Oct 5 00:40:01 2009 @@ -1,3 +1,5 @@ +#pragma code_page(1251) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE

1 0

[dreimer] 43294: Update German NLS Files in Kernel32
by dreimer＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: dreimer Date: Mon Oct 5 00:32:07 2009 New Revision: 43294 URL: http://svn.reactos.org/svn/reactos?rev=43294&view=rev Log: Update German NLS Files in Kernel32 Modified: trunk/reactos/dll/win32/kernel32/nls/dea.nls trunk/reactos/dll/win32/kernel32/nls/dec.nls trunk/reactos/dll/win32/kernel32/nls/del.nls trunk/reactos/dll/win32/kernel32/nls/des.nls trunk/reactos/dll/win32/kernel32/nls/deu.nls Modified: trunk/reactos/dll/win32/kernel32/nls/dea.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/dea… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/dea.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/dea.nls [iso-8859-1] Mon Oct 5 00:32:07 2009 @@ -141,14 +141,14 @@ LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Türkisch" LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebräisch" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" LGRPID_INDIC+LGRPID_RES_BASE "Indisch" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" Modified: trunk/reactos/dll/win32/kernel32/nls/dec.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/dec… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/dec.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/dec.nls [iso-8859-1] Mon Oct 5 00:32:07 2009 @@ -141,14 +141,14 @@ LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Türkisch" LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebräisch" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" LGRPID_INDIC+LGRPID_RES_BASE "Indisch" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" Modified: trunk/reactos/dll/win32/kernel32/nls/del.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/del… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/del.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/del.nls [iso-8859-1] Mon Oct 5 00:32:07 2009 @@ -141,14 +141,14 @@ LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Türkisch" LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebräisch" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" LGRPID_INDIC+LGRPID_RES_BASE "Indisch" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" Modified: trunk/reactos/dll/win32/kernel32/nls/des.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/des… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/des.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/des.nls [iso-8859-1] Mon Oct 5 00:32:07 2009 @@ -141,14 +141,14 @@ LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Türkisch" LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)" LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chinesisch (Vereinfacht)" LGRPID_THAI+LGRPID_RES_BASE "Thai" LGRPID_HEBREW+LGRPID_RES_BASE "Hebräisch" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisch" LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisch" LGRPID_INDIC+LGRPID_RES_BASE "Indisch" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisch" Modified: trunk/reactos/dll/win32/kernel32/nls/deu.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/deu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/deu.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/deu.nls [iso-8859-1] Mon Oct 5 00:32:07 2009 @@ -141,7 +141,7 @@ LGRPID_BALTIC+LGRPID_RES_BASE "Baltisch" LGRPID_GREEK+LGRPID_RES_BASE "Griechisch" LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisch" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkisch" + LGRPID_TURKISH+LGRPID_RES_BASE "Türkisch" LGRPID_JAPANESE+LGRPID_RES_BASE "Japanisch" LGRPID_KOREAN+LGRPID_RES_BASE "Koreanisch" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chinesisch (Traditionell)"

1 0

[dgorbachev] 43293: Add Spanish translation of Kernel32, fix translation of ServMan. Javier Remacha, bug #4872.
by dgorbachev＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: dgorbachev Date: Mon Oct 5 00:03:21 2009 New Revision: 43293 URL: http://svn.reactos.org/svn/reactos?rev=43293&view=rev Log: Add Spanish translation of Kernel32, fix translation of ServMan. Javier Remacha, bug #4872. Added: trunk/reactos/dll/win32/kernel32/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc trunk/reactos/dll/win32/kernel32/kernel32.rc trunk/reactos/dll/win32/kernel32/lang/de-DE.rc trunk/reactos/dll/win32/kernel32/lang/en-US.rc trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -148,15 +148,15 @@ END IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148 -CAPTION "Stop Other Services" +CAPTION "Detener otros servicios" FONT 8, "MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL - LTEXT "Do you want to stop these services?",IDC_STATIC, 15, 110, 150, 10 - DEFPUSHBUTTON "Yes", IDOK, 60, 129, 54, 14 + LTEXT "¿Desea detener estos servicios?",IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Si", IDOK, 60, 129, 54, 14 PUSHBUTTON "No", IDCANCEL, 120, 129, 54, 14 END Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -10,4 +10,5 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/dll/win32/kernel32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/de-DE.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -1,5 +1,3 @@ -#pragma code_page(1252) - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/kernel32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/en-US.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -1,5 +1,3 @@ -#pragma code_page(1252) - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE Added: trunk/reactos/dll/win32/kernel32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/es… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/es-ES.rc (added) +++ trunk/reactos/dll/win32/kernel32/lang/es-ES.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -1,0 +1,161 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + /* Names of code pages */ + 1250 "1250 (ANSI - Europa Central)" + 1251 "1251 (ANSI - Cirílico)" + 1252 "1252 (ANSI - Latín I)" + 1253 "1253 (ANSI - Griego)" + 1254 "1254 (ANSI - Turco)" + 1255 "1255 (ANSI - Hebreo)" + 1256 "1256 (ANSI - Árabe)" + 1257 "1257 (ANSI - Báltico)" + 1258 "1258 (ANSI/OEM - VietNam)" + 874 "874 (ANSI/OEM - Tailandés)" + 932 "932 (ANSI/OEM - Japonés Shift-JIS)" + 936 "936 (ANSI/OEM - Chino simplificado GBK)" + 949 "949 (ANSI/OEM - Coreano)" + 950 "950 (ANSI/OEM - Chino tradicional Big5)" + + 437 "437 (OEM - Estados Unidos)" + 737 "737 (OEM - Griego 437G)" + 775 "775 (OEM - Báltico)" + 850 "850 (OEM - Latín I multilíngüe)" + 852 "852 (OEM - Latín II)" + 855 "855 (OEM - Cirílico)" + 857 "857 (OEM - Turco)" + 858 "858 (OEM - Latín I multilíngüe + Euro)" + 860 "860 (OEM - Portugués)" + 861 "861 (OEM - Islandés)" + 862 "862 (OEM - Hebreo)" + 863 "863 (OEM - Francés canadiense)" + 864 "864 (OEM - Árabe)" + 865 "865 (OEM - Nórdico)" + 866 "866 (OEM - Ruso)" + 869 "869 (OEM - Griego moderno)" + + 10000 "10000 (MAC - Romano)" + 10001 "10001 (MAC - Japonés)" + 10002 "10002 (MAC - Chino tradicional Big5)" + 10003 "10003 (MAC - Coreano)" + 10004 "10004 (MAC - Árabe)" + 10005 "10005 (MAC - Hebreo)" + 10006 "10006 (MAC - Griego I)" + 10007 "10007 (MAC - Cyirílico)" + 10008 "10008 (MAC - Chino simplificado GB 2312)" + 10010 "10010 (MAC - Rumania)" + 10017 "10017 (MAC - Ucrania)" + 10021 "10021 (MAC - Tailandés)" + 10029 "10029 (MAC - Latín II)" + 10079 "10079 (MAC - Islandés)" + 10081 "10081 (MAC - Turco)" + 10082 "10082 (MAC - Croacia)" + + 65000 "65000 (UTF-7)" + 65001 "65001 (UTF-8)" + + 3700 "37 (IBM EBCDIC - E.E.U.U y Canadá)" /* FIXME */ + 1026 "1026 (IBM EBCDIC - Turquía (Latin-5))" + 1047 "1047 (IBM EBCDIC - Latin-1 y sistema abierto)" + 1140 "1140 (IBM EBCDIC - E.E.U.U/Canadá (37 + Euro))" + 1141 "1141 (IBM EBCDIC - Alemania (20273 + Euro))" + 1142 "1142 (IBM EBCDIC - Dinamarca y Noruega (20277 + Euro))" + 1143 "1143 (IBM EBCDIC - Finlandia y Suecia(20278 + Euro))" + 1144 "1144 (IBM EBCDIC - Italia (20280 + Euro))" + 1145 "1145 (IBM EBCDIC - Latinoamérica y España (20284 + Euro))" + 1146 "1146 (IBM EBCDIC - Reino Unido (20285 + Euro))" + 1147 "1147 (IBM EBCDIC - Francia (20297 + Euro))" + 1148 "1148 (IBM EBCDIC - Internacional (500 + Euro))" + 1149 "1149 (IBM EBCDIC - Islandia (20871 + Euro))" + 20273 "20273 (IBM EBCDIC - Alemania)" + 20277 "20277 (IBM EBCDIC - Dinamarca/Noruega)" + 20278 "20278 (IBM EBCDIC - Finlandia/Suecia)" + 20280 "20280 (IBM EBCDIC - Italia)" + 20284 "20284 (IBM EBCDIC - Latinoamérica/España)" + 20285 "20285 (IBM EBCDIC - Reino Unido)" + 20290 "20290 (IBM EBCDIC - Katakana japonés extendido)" + 20297 "20297 (IBM EBCDIC - Francia)" + 20420 "20420 (IBM EBCDIC - Árabe)" + 20423 "20423 (IBM EBCDIC - Griego)" + 20424 "20424 (IBM EBCDIC - Hebreo)" + 20833 "20833 (IBM EBCDIC - Coreano extendido)" + 20838 "20838 (IBM EBCDIC - Tailandés)" + 20871 "20871 (IBM EBCDIC - Islandés)" + 20880 "20880 (IBM EBCDIC - Cirílico (Ruso))" + 20905 "20905 (IBM EBCDIC - Turco)" + 20924 "20924 (IBM EBCDIC - Latín-1 y sistema abierto (1047 + Euro))" + 21025 "21025 (IBM EBCDIC - Cirílico (Serbio, Búlgaro))" + 500 "500 (IBM EBCDIC - Internacional)" + 870 "870 (IBM EBCDIC - Multilíngüe/ROECE (Latín-2))" + 875 "875 (IBM EBCDIC - Griego moderno)" + + 20269 "20269 (ISO 6937 Acento sin espacio)" + 28591 "28591 (ISO 8859-1 Latín I)" + 28592 "28592 (ISO 8859-2 Europa Central)" + 28593 "28593 (ISO 8859-3 Latín 3)" + 28594 "28594 (ISO 8859-4 Báltico)" + 28595 "28595 (ISO 8859-5 Cirílico)" + 28596 "28596 (ISO 8859-6 Árabe)" + 28597 "28597 (ISO 8859-7 Griego)" + 28598 "28598 (ISO 8859-8 Hebreo: orden visual)" + 28599 "28599 (ISO 8859-9 Latín 5)" + 28605 "28605 (ISO 8859-15 Latín 9)" + 38598 "38598 (ISO 8859-8 Hebreo: orden lógico)" + + 20105 "20105 (IA5 IRV Alfabeto international No.5)" + 20106 "20106 (IA5 Alemán)" + 20107 "20107 (IA5 Sueco)" + 20108 "20108 (IA5 Noruego)" + + 1361 "1361 (Coreano - Johab)" + 20000 "20000 (CNS - Taiwán)" + 20001 "20001 (TCA - Taiwán)" + 20002 "20002 (Eten - Taiwán)" + 20003 "20003 (IBM5550 - Taiwán)" + 20004 "20004 (TeleText - Taiwán)" + 20005 "20005 (Wang - Taiwán)" + 20127 "20127 (E.E.U.U.-ASCII)" + 20261 "20261 (T.61)" + 20866 "20866 (Ruso - KOI8)" + 21027 "21027 (Alfabeto extendido minúsculas)" + 21866 "21866 (Ucraniano - KOI8-U)" + 708 "708 (Árabe - ASMO)" + 720 "720 (Árabe - Transparente ASMO)" + 20932 "20932 (JIS X 0208-1990 & 0212-1990)" + 20936 "20936 (Chino simplificado GB2312)" + 20949 "20949 (Korean Wansung)" + + 57002 "57002 (ISCII Devanagari)" + 57003 "57003 (ISCII Bengali)" + 57004 "57004 (ISCII Tamil)" + 57005 "57005 (ISCII Telugu)" + 57006 "57006 (ISCII Assamese)" + 57007 "57007 (ISCII Oriya)" + 57008 "57008 (ISCII Kannada)" + 57009 "57009 (ISCII Malayalam)" + 57010 "57010 (ISCII Gujarati)" + 57011 "57011 (ISCII Gurmukhi)" + + 50930 "50930 (IBM EBCDIC - Japonés (Katakana) extendido y Japonés)" + 50931 "50931 (IBM EBCDIC - E.E.U.U/Canadá y Japonés)" + 50933 "50933 (IBM EBCDIC - Coreano extendido y Coreano)" + 50935 "50935 (IBM EBCDIC - Chino simplificado)" + 50937 "50937 (IBM EBCDIC - E.E.U.U/Canadá y Chino tradicional)" + 50939 "50939 (IBM EBCDIC - Japonés (Latín) extendido y Japonés)" + + 50220 "50220 (ISO-2022 Japonés sin Katakana de ancho medio)" + 50221 "50221 (ISO-2022 Japonés con Katakana de ancho medio)" + 50222 "50222 (ISO-2022 Japonés JIS X 0201-1989)" + 50225 "50225 (ISO-2022 Coreano)" + 50227 "50227 (ISO-2022 Chino simplificado)" + 50229 "50229 (ISO-2022 Chino tradicional)" + + 51932 "51932 (EUC-Japonés)" + 51936 "51936 (EUC-Chino simplificado)" + 51949 "51949 (EUC-Coreano)" + 51950 "51950 (EUC-Chino tradicional)" + + 52936 "52936 (HZ-GB2312 Chino simplificado)" + 54936 "54936 (GB18030 Chino simplificado)" +END Propchange: trunk/reactos/dll/win32/kernel32/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc [iso-8859-1] Mon Oct 5 00:03:21 2009 @@ -1,5 +1,3 @@ -#pragma code_page(1251) - LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE

1 0

[mkupfer] 43292: temporarily workaround for swap mouse buttons feature
by mkupfer＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: mkupfer Date: Sun Oct 4 22:45:51 2009 New Revision: 43292 URL: http://svn.reactos.org/svn/reactos?rev=43292&view=rev Log: temporarily workaround for swap mouse buttons feature Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Oct 4 22:45:51 2009 @@ -1120,7 +1120,8 @@ mi->time = MsqCalculateMessageTime(&LargeTickCount); } - SwapButtons = CurInfo->SwapButtons; + // FIXME: CurInfo->SwapButtons doesn't contain the correct value yet + SwapButtons = UserGetSystemMetrics(SM_SWAPBUTTON);//CurInfo->SwapButtons; DoMove = FALSE; IntGetCursorLocation(WinSta, &MousePos);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs