Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 39502: -remove wingdi.h from wine/winuser.h -define NOGDI for some wine dlls (this should be fixed in wine) -move wine specific window messages to internal user32 header -fix devenum includes -remove some wrong include guards in windows.h -remove the GetObjectW hack from jscript.dll
by cwittich＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: cwittich Date: Sun Feb 8 14:38:16 2009 New Revision: 39502 URL: http://svn.reactos.org/svn/reactos?rev=39502&view=rev Log: -remove wingdi.h from wine/winuser.h -define NOGDI for some wine dlls (this should be fixed in wine) -move wine specific window messages to internal user32 header -fix devenum includes -remove some wrong include guards in windows.h -remove the GetObjectW hack from jscript.dll Modified: trunk/reactos/dll/directx/devenum/devenum_private.h trunk/reactos/dll/directx/dinput/dinput.rbuild trunk/reactos/dll/directx/dplayx/dplayx.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/win32/jscript/global.c trunk/reactos/dll/win32/jscript/jscript.rbuild trunk/reactos/dll/win32/user32/include/message.h trunk/reactos/include/psdk/windows.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/dll/directx/devenum/devenum_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… ============================================================================== --- trunk/reactos/dll/directx/devenum/devenum_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/devenum/devenum_private.h [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winreg.h" #include "winerror.h" Modified: trunk/reactos/dll/directx/dinput/dinput.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput.… ============================================================================== --- trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -4,6 +4,7 @@ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dinput.spec" /> <define name="_WIN32_WINNT">0x600</define> + <define name="NOGDI" /> <include base="dinput">.</include> <include base="ReactOS">include/reactos/wine</include> <library>wine</library> Modified: trunk/reactos/dll/directx/dplayx/dplayx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.… ============================================================================== --- trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -3,6 +3,7 @@ <module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" unicode="yes">  <importlibrary definition="dplayx.spec" /> + <define name="NOGDI" /> <include base="dplayx">.</include> <include base="ReactOS">include/reactos/wine</include> <library>wine</library> Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -6,7 +6,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <define name="USE_WIN32_OPENGL" /> - + <define name="NOGDI" /> <library>uuid</library> <library>wine</library> <library>user32</library> Modified: trunk/reactos/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -43,7 +43,7 @@ static const WCHAR parseIntW[] = {'p','a','r','s','e','I','n','t',0}; static const WCHAR parseFloatW[] = {'p','a','r','s','e','F','l','o','a','t',0}; static const WCHAR unescapeW[] = {'u','n','e','s','c','a','p','e',0}; -static const WCHAR getObjectW[] = {'G','e','t','O','b','j','e','c','t',0}; +static const WCHAR GetObjectW[] = {'G','e','t','O','b','j','e','c','t',0}; static const WCHAR ScriptEngineW[] = {'S','c','r','i','p','t','E','n','g','i','n','e',0}; static const WCHAR ScriptEngineMajorVersionW[] = {'S','c','r','i','p','t','E','n','g','i','n','e','M','a','j','o','r','V','e','r','s','i','o','n',0}; @@ -298,7 +298,7 @@ {DateW, JSGlobal_Date, PROPF_CONSTR}, {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD}, {FunctionW, JSGlobal_Function, PROPF_CONSTR}, - {getObjectW, JSGlobal_GetObject, PROPF_METHOD}, + {GetObjectW, JSGlobal_GetObject, PROPF_METHOD}, {InfinityW, JSGlobal_Infinity, 0}, /* {MathW, JSGlobal_Math, 0}, */ {NaNW, JSGlobal_NaN, 0}, Modified: trunk/reactos/dll/win32/jscript/jscript.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.rbuild [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -6,6 +6,7 @@ <include base="jscript" root="intermediate">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="RPC_NO_WINDOWS_H" /> <dependency>jsglobal</dependency> <library>wine</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/user32/include/message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/m… ============================================================================== --- trunk/reactos/dll/win32/user32/include/message.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/message.h [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -12,4 +12,7 @@ BOOL FASTCALL MessageInit(VOID); VOID FASTCALL MessageCleanup(VOID); +#define WM_ALTTABACTIVE 0x0029 +#define WM_SETVISIBLE 0x0009 + #endif /* LIB_USER32_INCLUDE_MESSAGE_H */ Modified: trunk/reactos/include/psdk/windows.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev… ============================================================================== --- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -40,13 +40,9 @@ #include <stdarg.h> #include <windef.h> #include <winbase.h> -#if !(defined NOGDI || defined _WINGDI_H) #include <wingdi.h> -#endif +#include <winuser.h> #include <wincon.h> -#ifndef _WINUSER_H -#include <winuser.h> -#endif #ifndef _WINNLS_H #include <winnls.h> #endif Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -4483,6 +4483,7 @@ #define WinHelp WinHelpW #define wsprintf wsprintfW #define wvsprintf wvsprintfW + #ifndef NOGDI typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS; typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS; Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Sun Feb 8 14:38:16 2009 @@ -4,8 +4,6 @@ /* * Compatibility header */ - -#include <wingdi.h> #if !defined(_MSC_VER) #include_next "winuser.h" @@ -17,7 +15,4 @@ WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); -#define WM_ALTTABACTIVE 0x0029 -#define WM_SETVISIBLE 0x0009 - #endif /* __WINE_WINUSER_H */

1 0

[gschneider] 39501: Preparation for StretchBlt pattern support: - Supply BrushObj and BrushOrigin to IntStretchBlt - Implement EngStretchBltROP to do the work, let EngStretchBlt call it (this allows ROP support for real now)
by gschneider＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: gschneider Date: Sun Feb 8 14:28:20 2009 New Revision: 39501 URL: http://svn.reactos.org/svn/reactos?rev=39501&view=rev Log: Preparation for StretchBlt pattern support: - Supply BrushObj and BrushOrigin to IntStretchBlt - Implement EngStretchBltROP to do the work, let EngStretchBlt call it (this allows ROP support for real now) Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sun Feb 8 14:28:20 2009 @@ -771,8 +771,7 @@ IN RECTL *prclDest, IN RECTL *prclSrc, IN POINTL *MaskOrigin, - IN ULONG Mode -) + IN ULONG Mode) { COLORADJUSTMENT ca; POINTL lBrushOrigin; @@ -807,6 +806,179 @@ return EngStretchBlt(psoDest, psoSource, Mask, ClipRegion, ColorTranslation, &ca, &lBrushOrigin, &rclDest, &rclSrc, &lMaskOrigin, Mode); } +/* + * @implemented + */ +BOOL +APIENTRY +EngStretchBltROP( + IN SURFOBJ *psoDest, + IN SURFOBJ *psoSource, + IN SURFOBJ *Mask, + IN CLIPOBJ *ClipRegion, + IN XLATEOBJ *ColorTranslation, + IN COLORADJUSTMENT *pca, + IN POINTL *BrushOrigin, + IN RECTL *prclDest, + IN RECTL *prclSrc, + IN POINTL *MaskOrigin, + IN ULONG Mode, + IN BRUSHOBJ *Brush, + IN DWORD ROP4) +{ + RECTL InputRect; + RECTL OutputRect; + POINTL Translate; + INTENG_ENTER_LEAVE EnterLeaveSource; + INTENG_ENTER_LEAVE EnterLeaveDest; + SURFOBJ* psoInput; + SURFOBJ* psoOutput; + PSTRETCHRECTFUNC BltRectFunc; + BOOLEAN Ret; + POINTL AdjustedBrushOrigin; + BOOL UsesSource = ROP4_USES_SOURCE(ROP4); + + if (ROP4 == R4_NOOP) + { + /* Copy destination onto itself: nop */ + return TRUE; + } + + OutputRect = *prclDest; + if (OutputRect.right < OutputRect.left) + { + OutputRect.left = prclDest->right; + OutputRect.right = prclDest->left; + } + if (OutputRect.bottom < OutputRect.top) + { + OutputRect.left = prclDest->right; + OutputRect.right = prclDest->left; + } + + InputRect = *prclSrc; + if (UsesSource) + { + if (NULL == prclSrc) + { + return FALSE; + } + + /* Make sure we don't try to copy anything outside the valid source region */ + if (InputRect.left < 0) + { + OutputRect.left -= InputRect.left; + InputRect.left = 0; + } + if (InputRect.top < 0) + { + OutputRect.top -= InputRect.top; + InputRect.top = 0; + } + + if (! IntEngEnter(&EnterLeaveSource, psoSource, &InputRect, TRUE, + &Translate, &psoInput)) + { + return FALSE; + } + + InputRect.left += Translate.x; + InputRect.right += Translate.x; + InputRect.top += Translate.y; + InputRect.bottom += Translate.y; + } + + if (NULL != ClipRegion) + { + if (OutputRect.left < ClipRegion->rclBounds.left) + { + InputRect.left += ClipRegion->rclBounds.left - OutputRect.left; + OutputRect.left = ClipRegion->rclBounds.left; + } + if (ClipRegion->rclBounds.right < OutputRect.right) + { + InputRect.right -= OutputRect.right - ClipRegion->rclBounds.right; + OutputRect.right = ClipRegion->rclBounds.right; + } + if (OutputRect.top < ClipRegion->rclBounds.top) + { + InputRect.top += ClipRegion->rclBounds.top - OutputRect.top; + OutputRect.top = ClipRegion->rclBounds.top; + } + if (ClipRegion->rclBounds.bottom < OutputRect.bottom) + { + InputRect.bottom -= OutputRect.bottom - ClipRegion->rclBounds.bottom; + OutputRect.bottom = ClipRegion->rclBounds.bottom; + } + } + + /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's + nothing to do */ + if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top) + { + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } + return TRUE; + } + + if (! IntEngEnter(&EnterLeaveDest, psoDest, &OutputRect, FALSE, &Translate, &psoOutput)) + { + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } + return FALSE; + } + + OutputRect.left += Translate.x; + OutputRect.right += Translate.x; + OutputRect.top += Translate.y; + OutputRect.bottom += Translate.y; + + if (BrushOrigin) + { + AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; + AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; + } + else + { + AdjustedBrushOrigin = Translate; + } + + if (Mask != NULL) + { + //BltRectFunc = BltMask; + DPRINT("EngStretchBlt isn't capable of handling mask yet.\n"); + IntEngLeave(&EnterLeaveDest); + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } + return FALSE; + } + else + { + BltRectFunc = CallDibStretchBlt; + } + + Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, ClipRegion, + ColorTranslation, &OutputRect, &InputRect, MaskOrigin, + &AdjustedBrushOrigin, ROP4); + + IntEngLeave(&EnterLeaveDest); + if (UsesSource) + { + IntEngLeave(&EnterLeaveSource); + } + + return Ret; +} + +/* + * @implemented + */ BOOL APIENTRY EngStretchBlt( @@ -820,159 +992,22 @@ IN RECTL *prclDest, IN RECTL *prclSrc, IN POINTL *MaskOrigin, - IN ULONG Mode -) + IN ULONG Mode) { - // www.osr.com/ddk/graphics/gdifncs_0bs7.htm - - RECTL InputRect; - RECTL OutputRect; - POINTL Translate; - INTENG_ENTER_LEAVE EnterLeaveSource; - INTENG_ENTER_LEAVE EnterLeaveDest; - SURFOBJ* psoInput; - SURFOBJ* psoOutput; - PSTRETCHRECTFUNC BltRectFunc; - BOOLEAN Ret; - POINTL AdjustedBrushOrigin; - BOOL UsesSource = ROP4_USES_SOURCE(Mode); - - if (Mode == R4_NOOP) - { - /* Copy destination onto itself: nop */ - return TRUE; - } - - OutputRect = *prclDest; - if (OutputRect.right < OutputRect.left) - { - OutputRect.left = prclDest->right; - OutputRect.right = prclDest->left; - } - if (OutputRect.bottom < OutputRect.top) - { - OutputRect.left = prclDest->right; - OutputRect.right = prclDest->left; - } - - InputRect = *prclSrc; - if (UsesSource) - { - if (NULL == prclSrc) - { - return FALSE; - } - - /* Make sure we don't try to copy anything outside the valid source region */ - if (InputRect.left < 0) - { - OutputRect.left -= InputRect.left; - InputRect.left = 0; - } - if (InputRect.top < 0) - { - OutputRect.top -= InputRect.top; - InputRect.top = 0; - } - - if (! IntEngEnter(&EnterLeaveSource, psoSource, &InputRect, TRUE, - &Translate, &psoInput)) - { - return FALSE; - } - - InputRect.left += Translate.x; - InputRect.right += Translate.x; - InputRect.top += Translate.y; - InputRect.bottom += Translate.y; - } - - if (NULL != ClipRegion) - { - if (OutputRect.left < ClipRegion->rclBounds.left) - { - InputRect.left += ClipRegion->rclBounds.left - OutputRect.left; - OutputRect.left = ClipRegion->rclBounds.left; - } - if (ClipRegion->rclBounds.right < OutputRect.right) - { - InputRect.right -= OutputRect.right - ClipRegion->rclBounds.right; - OutputRect.right = ClipRegion->rclBounds.right; - } - if (OutputRect.top < ClipRegion->rclBounds.top) - { - InputRect.top += ClipRegion->rclBounds.top - OutputRect.top; - OutputRect.top = ClipRegion->rclBounds.top; - } - if (ClipRegion->rclBounds.bottom < OutputRect.bottom) - { - InputRect.bottom -= OutputRect.bottom - ClipRegion->rclBounds.bottom; - OutputRect.bottom = ClipRegion->rclBounds.bottom; - } - } - - /* Check for degenerate case: if height or width of OutputRect is 0 pixels there's - nothing to do */ - if (OutputRect.right <= OutputRect.left || OutputRect.bottom <= OutputRect.top) - { - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return TRUE; - } - - if (! IntEngEnter(&EnterLeaveDest, psoDest, &OutputRect, FALSE, &Translate, &psoOutput)) - { - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return FALSE; - } - - OutputRect.left += Translate.x; - OutputRect.right += Translate.x; - OutputRect.top += Translate.y; - OutputRect.bottom += Translate.y; - - if (BrushOrigin) - { - AdjustedBrushOrigin.x = BrushOrigin->x + Translate.x; - AdjustedBrushOrigin.y = BrushOrigin->y + Translate.y; - } - else - { - AdjustedBrushOrigin = Translate; - } - - if (Mask != NULL) - { - //BltRectFunc = BltMask; - DPRINT("EngStretchBlt isn't capable of handling mask yet.\n"); - IntEngLeave(&EnterLeaveDest); - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - return FALSE; - } - else - { - BltRectFunc = CallDibStretchBlt; - } - - Ret = (*BltRectFunc)(psoOutput, psoInput, Mask, ClipRegion, - ColorTranslation, &OutputRect, &InputRect, MaskOrigin, - &AdjustedBrushOrigin, Mode); - - IntEngLeave(&EnterLeaveDest); - if (UsesSource) - { - IntEngLeave(&EnterLeaveSource); - } - - return Ret; + return EngStretchBltROP( + psoDest, + psoSource, + Mask, + ClipRegion, + ColorTranslation, + pca, + BrushOrigin, + prclDest, + prclSrc, + MaskOrigin, + Mode, + NULL, + SRCCOPY); } BOOL APIENTRY @@ -1104,8 +1139,8 @@ if (! ret) { // FIXME: see previous fixme - ret = EngStretchBlt(psoDest, psoSource, MaskSurf, ClipRegion, ColorTranslation, - &ca, BrushOrigin, &OutputRect, &InputRect, NULL, ROP); + ret = EngStretchBltROP(psoDest, psoSource, MaskSurf, ClipRegion, ColorTranslation, + &ca, BrushOrigin, &OutputRect, &InputRect, NULL, COLORONCOLOR, Brush, ROP); } if (UsesSource) Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sun Feb 8 14:28:20 2009 @@ -756,7 +756,9 @@ RECTL SourceRect; BOOL Status = FALSE; XLATEOBJ *XlateObj = NULL; + POINTL BrushOrigin; PGDIBRUSHOBJ BrushObj = NULL; + GDIBRUSHINST BrushInst; BOOL UsesSource = ROP3_USES_SOURCE(ROP); BOOL UsesPattern = ROP3_USES_PATTERN(ROP); @@ -835,6 +837,9 @@ IntLPtoDP(DCSrc, (LPPOINT)&SourceRect, 2); } + BrushOrigin.x = 0; + BrushOrigin.y = 0; + /* Determine surfaces to be used in the bitblt */ BitmapDest = SURFACE_LockSurface(DCDest->w.hBitmap); if (BitmapDest == NULL) @@ -920,13 +925,16 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); goto failed; } + BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin); + IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); } /* Perform the bitblt operation */ Status = IntEngStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, NULL, DCDest->CombinedClip, XlateObj, - &DestRect, &SourceRect, NULL, NULL, NULL, - ROP3_TO_ROP4(ROP)); + &DestRect, &SourceRect, NULL, + BrushObj ? &BrushInst.BrushObject : NULL, + &BrushOrigin, ROP3_TO_ROP4(ROP)); failed: if (XlateObj) Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Sun Feb 8 14:28:20 2009 @@ -938,26 +938,6 @@ UNIMPLEMENTED; return 0; } -BOOL APIENTRY -EngStretchBltROP( - IN SURFOBJ *Dest, - IN SURFOBJ *Source, - IN SURFOBJ *Mask, - IN CLIPOBJ *Clip, - IN XLATEOBJ *Xlate, - IN COLORADJUSTMENT *ColorAdjustment, - IN POINTL *BrushOrigin, - IN RECTL *DestRect, - IN RECTL *SourceRect, - IN POINTL *MaskPoint, - IN ULONG Mode, - IN BRUSHOBJ *BrushObj, - IN DWORD ROP4) -{ - UNIMPLEMENTED; - return FALSE; -} - /* * @unimplemented

1 0

[cwittich] 39500: don't include windows.h
by cwittich＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: cwittich Date: Sun Feb 8 14:23:28 2009 New Revision: 39500 URL: http://svn.reactos.org/svn/reactos?rev=39500&view=rev Log: don't include windows.h Modified: trunk/reactos/dll/win32/glu32/include/gluos.h Modified: trunk/reactos/dll/win32/glu32/include/gluos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/include/gl… ============================================================================== --- trunk/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/include/gluos.h [iso-8859-1] Sun Feb 8 14:23:28 2009 @@ -44,7 +44,8 @@ #define STRICT 1 #endif -#include <windows.h> +#include <windef.h> +#include <winbase.h> /* Non documented stuff in MS Headers */ /* NurbsCallback */

1 0

[dchapyshev] 39499: - Fix typos
by dchapyshev＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: dchapyshev Date: Sun Feb 8 13:28:41 2009 New Revision: 39499 URL: http://svn.reactos.org/svn/reactos?rev=39499&view=rev Log: - Fix typos Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Sun Feb 8 13:28:41 2009 @@ -219,7 +219,7 @@ GROUPBOX "Âûäåëåíèå ïàìÿòè (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Ôèçè÷åñêàÿ ïàìÿòü (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT GROUPBOX "Ïàìÿòü ÿäðà (K)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "Äèñêðèïòîðîâ",IDS_TOTALS_HANDLE_COUNT,12,131,57,8 + LTEXT "Äåñêðèïòîðîâ",IDS_TOTALS_HANDLE_COUNT,12,131,57,8 LTEXT "Ïîòîêîâ",IDS_TOTALS_THREAD_COUNT,12,140,30,8 LTEXT "Ïðîöåññîâ",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | @@ -398,7 +398,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,107,61,90,10 CONTROL "&Áàçîâûé ïðèîðèòåò",IDC_BASEPRIORITY,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,72,90,10 - CONTROL "Ñ÷åò÷èê &äèñêðèïòîðîâ",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + CONTROL "Ñ÷åò÷èê &äåñêðèïòîðîâ",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,83,90,10 CONTROL "Ñ&÷åò÷èê ïîòîêîâ",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,94,69,10 @@ -627,7 +627,7 @@ IDS_TAB_PAGEDPOOL "Ïóë ñòðàíèö" IDS_TAB_NPPOOL "NP ïóë" IDS_TAB_BASEPRI "Áàçîâûé ïðèîðèòåò" - IDS_TAB_HANDLES "Äèñêðèïòîðû" + IDS_TAB_HANDLES "Äåñêðèïòîðû" IDS_TAB_THREADS "Ïîòîêè" IDS_TAB_USERPBJECTS "Îáúåêòû USER" IDS_TAB_GDIOBJECTS "GDI îáúåêòû"

1 0

[dchapyshev] 39498: - FIXME -> TRACE for unimplemented functions
by dchapyshev＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: dchapyshev Date: Sun Feb 8 13:14:48 2009 New Revision: 39498 URL: http://svn.reactos.org/svn/reactos?rev=39498&view=rev Log: - FIXME -> TRACE for unimplemented functions Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/dll/win32/shell32/stubs.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Sun Feb 8 13:14:48 2009 @@ -181,10 +181,10 @@ 181 stdcall -noname RegisterShellHook(long long) 182 varargs ShellMessageBoxA(long long str str long) 183 varargs ShellMessageBoxW(long long wstr wstr long) -184 stdcall -noname ArrangeWindows(long long long long long) # Fixme +184 stdcall -noname ArrangeWindows(long long long long long) 185 stdcall -noname SHHandleDiskFull(ptr long) # Fixme 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) -187 stdcall -noname ILGetPseudoNameW(ptr ptr wstr long) # Fixme +187 stdcall -noname ILGetPseudoNameW(ptr ptr wstr long) 188 stdcall -noname ShellDDEInit(long) 189 stdcall ILCreateFromPathA(str) 190 stdcall ILCreateFromPathW(wstr) Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Sun Feb 8 13:14:48 2009 @@ -521,7 +521,8 @@ WORD cKids, CONST HWND * lpKids) { - FIXME("(%p 0x%08x %p 0x%04x %p):stub.\n", + /* Unimplemented in WinXP SP3 */ + TRACE("(%p 0x%08x %p 0x%04x %p):stub.\n", hwndParent, dwReserved, lpRect, cKids, lpKids); return 0; } Modified: trunk/reactos/dll/win32/shell32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] Sun Feb 8 13:14:48 2009 @@ -1098,7 +1098,9 @@ WINAPI ILGetPseudoNameW(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2, LPWSTR szStr, INT iUnknown) { - FIXME("ILGetPseudoNameW() stub\n"); + /* Unimplemented in WinXP SP3 */ + TRACE("ILGetPseudoNameW() stub\n"); + *szStr = 0; return FALSE; }

1 0

[cwittich] 39497: E_PROP_ID_UNSUPPORTED is already defined in vfwmsgs.h
by cwittich＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: cwittich Date: Sun Feb 8 12:52:59 2009 New Revision: 39497 URL: http://svn.reactos.org/svn/reactos?rev=39497&view=rev Log: E_PROP_ID_UNSUPPORTED is already defined in vfwmsgs.h Modified: trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Sun Feb 8 12:52:59 2009 @@ -18,14 +18,6 @@ WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); #define WM_ALTTABACTIVE 0x0029 - -#ifndef E_PROP_ID_UNSUPPORTED -#define E_PROP_ID_UNSUPPORTED ((HRESULT)0x80070490) -#endif -#ifndef E_PROP_SET_UNSUPPORTED -#define E_PROP_SET_UNSUPPORTED ((HRESULT)0x80070492) -#endif - #define WM_SETVISIBLE 0x0009 #endif /* __WINE_WINUSER_H */

1 0

[dchapyshev] 39496: - Implement PathIsURL
by dchapyshev＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: dchapyshev Date: Sun Feb 8 12:49:18 2009 New Revision: 39496 URL: http://svn.reactos.org/svn/reactos?rev=39496&view=rev Log: - Implement PathIsURL Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/stubs.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Sun Feb 8 12:49:18 2009 @@ -249,7 +249,7 @@ 249 stdcall -noname PathParseIconLocation(wstr) PathParseIconLocationW 250 stdcall -noname PathRemoveExtension(wstr) PathRemoveExtensionW 251 stdcall -noname PathRemoveArgs(wstr) PathRemoveArgsW -252 stdcall -noname PathIsURL(wstr) shell32.PathIsURL # Fixme +252 stdcall -noname PathIsURL(wstr) shlwapi.PathIsURLW 253 stub -noname SHIsCurrentProcessConsoleSession 254 stub -noname DisconnectWindowsDialog 255 stdcall Options_RunDLLA(ptr ptr str long) Modified: trunk/reactos/dll/win32/shell32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.c [iso-8859-1] Sun Feb 8 12:49:18 2009 @@ -1406,14 +1406,3 @@ FIXME("SHGetUserSessionId() stub\n"); return NULL; } - -/* - * Unimplemented - */ -BOOL -WINAPI -PathIsURL(LPCWSTR pszPath) -{ - FIXME("PathIsURL() stub\n"); - return FALSE; -}

1 0

[cwittich] 39495: get rid of some junk
by cwittich＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: cwittich Date: Sun Feb 8 12:47:23 2009 New Revision: 39495 URL: http://svn.reactos.org/svn/reactos?rev=39495&view=rev Log: get rid of some junk Modified: trunk/reactos/include/reactos/wine/winuser.h Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Sun Feb 8 12:47:23 2009 @@ -11,9 +11,7 @@ #include_next "winuser.h" #endif -#define WS_EX_TRAYWINDOW 0x80000000L #define DCX_USESTYLE 0x00010000 -#define WS_EX_MANAGED 0x40000000L /* Window managed by the window system */ #define LB_CARETOFF 0x01a4 WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); @@ -28,17 +26,6 @@ #define E_PROP_SET_UNSUPPORTED ((HRESULT)0x80070492) #endif -/* MapVirtualKey translation types */ -#if 0 -#define MAPVK_VK_TO_VSC 0 -#define MAPVK_VSC_TO_VK 1 -#define MAPVK_VK_TO_CHAR 2 -#define MAPVK_VSC_TO_VK_EX 3 -#define MAPVK_VK_TO_VSC_EX 4 -#endif #define WM_SETVISIBLE 0x0009 -#define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom)))) -#define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom)))) - #endif /* __WINE_WINUSER_H */

1 0

[dchapyshev] 39494: .def -> .spec (based on amd64 branch with my fixes)
by dchapyshev＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: dchapyshev Date: Sun Feb 8 12:45:17 2009 New Revision: 39494 URL: http://svn.reactos.org/svn/reactos?rev=39494&view=rev Log: .def -> .spec (based on amd64 branch with my fixes) Added: trunk/reactos/dll/win32/dnsapi/dnsapi.spec (with props) trunk/reactos/dll/win32/gdi32/gdi32.spec (with props) trunk/reactos/dll/win32/lsasrv/lsasrv.spec (with props) trunk/reactos/dll/win32/opengl32/opengl32.spec (with props) trunk/reactos/dll/win32/psapi/psapi.spec (with props) trunk/reactos/dll/win32/smdll/smdll.spec (with props) Removed: trunk/reactos/dll/win32/dnsapi/dnsapi.def trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/lsasrv/lsasrv.def trunk/reactos/dll/win32/opengl32/opengl32.def trunk/reactos/dll/win32/psapi/psapi.def trunk/reactos/dll/win32/smdll/smdll.def Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/dll/win32/opengl32/opengl32.rbuild trunk/reactos/dll/win32/psapi/psapi.rbuild trunk/reactos/dll/win32/smdll/smdll.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/dnsapi/dnsapi.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.de… Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.rb… Added: trunk/reactos/dll/win32/dnsapi/dnsapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.sp… Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/st… Removed: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… Added: trunk/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.spec… Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… Removed: trunk/reactos/dll/win32/lsasrv/lsasrv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.de… Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… Added: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… Removed: trunk/reactos/dll/win32/opengl32/opengl32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… Modified: trunk/reactos/dll/win32/opengl32/opengl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… Added: trunk/reactos/dll/win32/opengl32/opengl32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… Removed: trunk/reactos/dll/win32/psapi/psapi.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.def?… Modified: trunk/reactos/dll/win32/psapi/psapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.rbui… Added: trunk/reactos/dll/win32/psapi/psapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.spec… Removed: trunk/reactos/dll/win32/smdll/smdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/smdll.def?… Modified: trunk/reactos/dll/win32/smdll/smdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/smdll.rbui… Added: trunk/reactos/dll/win32/smdll/smdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/smdll.spec…

1 0

[dgorbachev] 39493: Kenichi Aramaki (karamaki-at-gmail-dot-com): - Fix Japanese keyboard layout (bug #4145). - Fix buffer overflow in CMD.EXE when dealing with double-byte code page (bug #4146).
by dgorbachev＠svn.reactos.org 08 Feb '09

08 Feb '09

Author: dgorbachev Date: Sun Feb 8 11:41:21 2009 New Revision: 39493 URL: http://svn.reactos.org/svn/reactos?rev=39493&view=rev Log: Kenichi Aramaki (karamaki-at-gmail-dot-com): - Fix Japanese keyboard layout (bug #4145). - Fix buffer overflow in CMD.EXE when dealing with double-byte code page (bug #4146). Modified: trunk/reactos/base/shell/cmd/console.c trunk/reactos/dll/keyboard/kbdja/kbdja.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Feb 8 11:41:21 2009 @@ -157,18 +157,18 @@ VOID ConPuts(LPTSTR szText, DWORD nStdHandle) { DWORD dwWritten; - HANDLE hStdHandle; + HANDLE hStdHandle; PCHAR pBuf; INT len; len = _tcslen(szText); #ifdef _UNICODE - pBuf = cmd_alloc(len + 1); - len = WideCharToMultiByte( OutputCodePage, 0, szText, len + 1, pBuf, len + 1, NULL, NULL) - 1; + pBuf = cmd_alloc(len * 2 + 1); + len = WideCharToMultiByte(OutputCodePage, 0, szText, len + 1, pBuf, len * 2 + 1, NULL, NULL) - 1; #else pBuf = szText; #endif - hStdHandle = GetStdHandle(nStdHandle); + hStdHandle = GetStdHandle(nStdHandle); WriteFile (hStdHandle, pBuf, @@ -213,10 +213,10 @@ TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD dwWritten; - len = _vstprintf (szOut, szFormat, arg_ptr); -#ifdef _UNICODE - pBuf = cmd_alloc(len + 1); - len = WideCharToMultiByte( OutputCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; + len = _vstprintf(szOut, szFormat, arg_ptr); +#ifdef _UNICODE + pBuf = cmd_alloc(len * 2 + 1); + len = WideCharToMultiByte(OutputCodePage, 0, szOut, len + 1, pBuf, len * 2 + 1, NULL, NULL) - 1; #else pBuf = szOut; #endif @@ -226,7 +226,6 @@ len, &dwWritten, NULL); - #ifdef _UNICODE cmd_free(pBuf); Modified: trunk/reactos/dll/keyboard/kbdja/kbdja.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdja/kbdja.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdja/kbdja.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdja/kbdja.c [iso-8859-1] Sun Feb 8 11:41:21 2009 @@ -63,7 +63,7 @@ /* Third letters row */ 'Z', 'X', 'C', 'V', 'B', 'N', 'M', VK_OEM_COMMA, - VK_OEM_PERIOD,VK_OEM_2,/*VK_OEM_5,*/ VK_RSHIFT, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT, /* - 37 - */ /* Bottom Row */ VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, @@ -100,13 +100,13 @@ /* Not sure who uses these codes */ VK_EMPTY, VK_EMPTY, VK_EMPTY, /* - 72 - */ - VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_EMPTY, VK_OEM_102, VK_EMPTY, VK_EMPTY, /* - 76 - */ /* One more f-key */ VK_F24, /* - 77 - */ VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, - VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ + VK_EMPTY, VK_EMPTY, VK_OEM_5, VK_EMPTY, /* PA1 */ VK_EMPTY, /* - 80 - */ 0 @@ -181,11 +181,12 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ /* Legacy (telnet-style) ascii escapes */ - { VK_OEM_4, 0, {'[', '{', 0x1b /* ESC */} }, - { VK_OEM_6, 0, {']', '}', 0x1d /* GS */} }, - { VK_OEM_5, 0, {'\\','|', 0x1c /* FS */} }, - { VK_RETURN,0, {'\r', '\r', '\n'} }, - { 0,0 } + { VK_OEM_4, NOCAPS, {'[' , '{' , 0x1b /* ESC */} }, + { VK_OEM_6, NOCAPS, {']' , '}' , 0x1d /* GS */} }, + { VK_OEM_5, NOCAPS, {'\\', '|' , 0x1c /* FS */} }, /* Yen */ + { VK_OEM_102, NOCAPS, {'\\', '_' , 0x1c /* FS */} }, /* 'ro' */ + { VK_RETURN, NOCAPS, {'\r', '\r', '\n' } }, + { 0, 0 } }; ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { @@ -239,7 +240,7 @@ { VK_NUMPAD9, 0, {'9'} }, { VK_DECIMAL, 0, {'.'} }, { VK_BACK, 0, {'\010'} }, - { 0,0 } + { 0, 0 } }; #define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } @@ -249,7 +250,7 @@ vk_master(2,key_to_chars_2mod), vk_master(3,key_to_chars_3mod), vk_master(4,key_to_chars_4mod), - { 0,0,0 } + { 0, 0, 0 } }; ROSDATA VSC_LPWSTR key_names[] = {

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