Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

by mf＠svn.reactos.com

sync with Wine's repository Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cs.rc _____ Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-06-20 18:21:07 UTC (rev 16157) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-06-20 18:48:32 UTC (rev 16158) @@ -24,8 +24,8 @@ /* Menu */ - + IDM_WINEFILE MENU FIXED IMPURE { POPUP "&Arkiv" { _____ Modified: trunk/reactos/subsys/system/winefile/cs.rc --- trunk/reactos/subsys/system/winefile/cs.rc 2005-06-20 18:21:07 UTC (rev 16157) +++ trunk/reactos/subsys/system/winefile/cs.rc 2005-06-20 18:48:32 UTC (rev 16158) @@ -6,7 +6,6 @@ * Copyright 2002 Steven Edwards * Copyright 2002 Alexandre Julliard * Copyright 2004 David Kredba - * Copyright 2005 Denzil <d3nzil(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

19 years, 3 months

[ion] 16157: Compile user32 with NDK, clean up its headers, and separate it from the intenral win32k stuff

by ion＠svn.reactos.com

Compile user32 with NDK, clean up its headers, and separate it from the intenral win32k stuff Modified: trunk/reactos/include/win32k/brush.h Added: trunk/reactos/include/win32k/caret.h Modified: trunk/reactos/include/win32k/cursoricon.h Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/include/win32k/paint.h Modified: trunk/reactos/lib/user32/include/draw.h Modified: trunk/reactos/lib/user32/include/user32.h Added: trunk/reactos/lib/user32/include/user32p.h Modified: trunk/reactos/lib/user32/misc/dllmain.c Modified: trunk/reactos/lib/user32/windows/dialog.c Modified: trunk/reactos/subsys/win32k/include/caret.h Modified: trunk/reactos/subsys/win32k/w32k.h _____ Modified: trunk/reactos/include/win32k/brush.h --- trunk/reactos/include/win32k/brush.h 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/include/win32k/brush.h 2005-06-20 18:21:07 UTC (rev 16157) @@ -74,13 +74,6 @@ #define BRUSHOBJ_UnlockBrush(pBrush) GDIOBJ_UnlockObjByPtr(pBrush) BOOL INTERNAL_CALL BRUSH_Cleanup(PVOID ObjectBody); -#ifdef __USE_W32API -typedef struct _PATRECT { - RECT r; - HBRUSH hBrush; -} PATRECT, * PPATRECT; -#endif - HBRUSH STDCALL NtGdiCreateBrushIndirect( CONST LOGBRUSH *LogBrush); @@ -110,32 +103,6 @@ VOID); BOOL STDCALL -NtGdiPatBlt( - HDC hDC, - INT XLeft, - INT YLeft, - INT Width, - INT Height, - DWORD ROP); - -BOOL STDCALL -NtGdiPolyPatBlt( - HDC hDC, - DWORD dwRop, - PPATRECT pRects, - INT cRects, - ULONG Reserved); - -BOOL STDCALL -NtGdiPatBlt( - HDC hDC, - INT XLeft, - INT YLeft, - INT Width, - INT Height, - DWORD ROP); - -BOOL STDCALL NtGdiSetBrushOrgEx( HDC hDC, INT XOrg, _____ Added: trunk/reactos/include/win32k/caret.h --- trunk/reactos/include/win32k/caret.h 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/include/win32k/caret.h 2005-06-20 18:21:07 UTC (rev 16157) @@ -0,0 +1,23 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: include/win32k/caret.h + * PURPOSE: GDI32/Win32k Caret interface + * PROGRAMMER: + * + */ + +#ifndef WIN32K_CARET_H_INCLUDED +#define WIN32K_CARET_H_INCLUDED + +typedef struct _THRDCARETINFO +{ + HWND hWnd; + HBITMAP Bitmap; + POINT Pos; + SIZE Size; + BYTE Visible; + BYTE Showing; +} THRDCARETINFO, *PTHRDCARETINFO; + +#endif /* WIN32K_FONT_H_INCLUDED */ _____ Modified: trunk/reactos/include/win32k/cursoricon.h --- trunk/reactos/include/win32k/cursoricon.h 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/include/win32k/cursoricon.h 2005-06-20 18:21:07 UTC (rev 16157) @@ -2,9 +2,6 @@ #ifndef __WIN32K_CURSORICON_H #define __WIN32K_CURSORICON_H -#include <win32k/dc.h> -#include <win32k/gdiobj.h> - #include <pshpack1.h> /* Structures for reading icon/cursor files and resources */ _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/include/win32k/ntuser.h 2005-06-20 18:21:07 UTC (rev 16157) @@ -1,7 +1,9 @@ #ifndef __WIN32K_NTUSER_H #define __WIN32K_NTUSER_H +#ifndef _NTNDK_ #include <ddk/ntapi.h> +#endif #define WM_SYSTIMER 280 _____ Modified: trunk/reactos/include/win32k/paint.h --- trunk/reactos/include/win32k/paint.h 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/include/win32k/paint.h 2005-06-20 18:21:07 UTC (rev 16157) @@ -1,6 +1,37 @@ #ifndef __WIN32K_PAINT_H #define __WIN32K_PAINT_H +typedef struct _PATRECT { + RECT r; + HBRUSH hBrush; +} PATRECT, * PPATRECT; + +BOOL STDCALL +NtGdiPatBlt( + HDC hDC, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + DWORD ROP); + +BOOL STDCALL +NtGdiPolyPatBlt( + HDC hDC, + DWORD dwRop, + PPATRECT pRects, + INT cRects, + ULONG Reserved); + +BOOL STDCALL +NtGdiPatBlt( + HDC hDC, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + DWORD ROP); + BOOL STDCALL NtGdiGdiFlush (VOID); DWORD STDCALL NtGdiGdiGetBatchLimit (VOID); DWORD STDCALL NtGdiGdiSetBatchLimit (DWORD Limit); _____ Modified: trunk/reactos/lib/user32/include/draw.h --- trunk/reactos/lib/user32/include/draw.h 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/lib/user32/include/draw.h 2005-06-20 18:21:07 UTC (rev 16157) @@ -1 +1,2 @@ HPEN STDCALL GetSysColorPen (int nIndex); +void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo); _____ Modified: trunk/reactos/lib/user32/include/user32.h --- trunk/reactos/lib/user32/include/user32.h 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/lib/user32/include/user32.h 2005-06-20 18:21:07 UTC (rev 16157) @@ -1,156 +1,34 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS user32.dll - * FILE: include/user32.h - * PURPOSE: Global user32 definitions + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/user32/include/user32.h + * PURPOSE: Win32 User Library + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ +/* INCLUDES ******************************************************************/ + #ifndef USER32_H #define USER32_H -#include <ctype.h> -#include <stdio.h> -#include <limits.h> +/* SDK/NDK Headers */ #include <windows.h> #include <windowsx.h> #define NTOS_MODE_USER -#include <ntos.h> -#include <win32k/win32k.h> +#include <ndk/ntndk.h> + +/* External Win32K Headers */ +#include <win32k/ntuser.h> +#include <win32k/caret.h> #include <win32k/callback.h> -#include "accel.h" -#include "cursor.h" -#ifndef __WINE__ -#include "debug.h" -#endif -#include "draw.h" -#include "menu.h" -#include "message.h" -#include "regcontrol.h" -#include "resource.h" -#include "scroll.h" -#include "strpool.h" -#include "window.h" -#include "winpos.h" -#include "winsta.h" +#include <win32k/cursoricon.h> +#include <win32k/menu.h> +#include <win32k/paint.h> -extern HINSTANCE User32Instance; +/* Internal User32 Headers */ +#include "user32p.h" -typedef struct _USER32_THREAD_DATA -{ - MSG LastMessage; - HKL KeyboardLayoutHandle; -} USER32_THREAD_DATA, *PUSER32_THREAD_DATA; +/* FIXME: FILIP */ +HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); -PUSER32_THREAD_DATA User32GetThreadData(); - -/* a copy of this structure is in subsys/win32k/include/caret.h */ -typedef struct _THRDCARETINFO -{ - HWND hWnd; - HBITMAP Bitmap; - POINT Pos; - SIZE Size; - BYTE Visible; - BYTE Showing; -} THRDCARETINFO, *PTHRDCARETINFO; - -void InitStockObjects(void); -VOID CreateFrameBrushes(VOID); -VOID DeleteFrameBrushes(VOID); -void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo); - -#define NtUserMsqSetWakeMask(dwWaitMask) \ - (HANDLE)NtUserCallOneParam(dwWaitMask, ONEPARAM_ROUTINE_MSQSETWAKEMASK) - -#define NtUserMsqClearWakeMask() \ - NtUserCallNoParam(NOPARAM_ROUTINE_MSQCLEARWAKEMASK) - -LONG WINAPI RegCloseKey(HKEY); -LONG WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,PHKEY); -LONG WINAPI RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); - -#ifdef __USE_W32API -NTSTATUS STDCALL ZwCallbackReturn(PVOID Result, - ULONG ResultLength, - NTSTATUS Status); -#endif - -#define NtUserAnyPopup() \ - (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ANYPOPUP) - -#define NtUserValidateRgn(hWnd, hRgn) \ - (BOOL)NtUserCallTwoParam((DWORD)hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN) - -#define NtUserSetWindowContextHelpId(hWnd, dwContextHelpId) \ - (BOOL)NtUserCallTwoParam((DWORD)hwnd, dwContextHelpId, TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID) - -#define NtUserSetCaretPos(X, Y) \ - (BOOL)NtUserCallTwoParam((DWORD)X, (DWORD)Y, TWOPARAM_ROUTINE_SETCARETPOS) - -#define NtUserSetGUIThreadHandle(field, hwnd) \ - (BOOL)NtUserCallTwoParam((DWORD)field, (DWORD)hwnd, TWOPARAM_ROUTINE_SETGUITHRDHANDLE) - -#define NtUserSetMenuItemRect(menu, mir) \ - (BOOL)NtUserCallTwoParam((DWORD)menu, (DWORD)mir, TWOPARAM_ROUTINE_SETMENUITEMRECT) - -#define NtUserSetMenuBarHeight(menu, height) \ - (BOOL)NtUserCallTwoParam((DWORD)menu, (DWORD)height, TWOPARAM_ROUTINE_SETMENUBARHEIGHT) - -#define NtUserGetWindowInfo(hwnd, pwi) \ - (BOOL)NtUserCallTwoParam((DWORD)hwnd, (DWORD)pwi, TWOPARAM_ROUTINE_GETWINDOWINFO) - -#define NtUserRegisterLogonProcess(hproc, x) \ - (BOOL)NtUserCallTwoParam((DWORD)hproc, (DWORD)x, TWOPARAM_ROUTINE_REGISTERLOGONPROC) - -#define NtUserGetSysColorBrushes(HBrushes, count) \ - (BOOL)NtUserCallTwoParam((DWORD)(HBrushes), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES) - -#define NtUserGetSysColorPens(HPens, count) \ - (BOOL)NtUserCallTwoParam((DWORD)(HPens), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORPENS) - -#define NtUserGetSysColors(ColorRefs, count) \ - (BOOL)NtUserCallTwoParam((DWORD)(ColorRefs), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORS) - -#define NtUserSetSysColors(ColorRefs, count) \ - (BOOL)NtUserCallTwoParam((DWORD)(ColorRefs), (DWORD)(count), TWOPARAM_ROUTINE_SETSYSCOLORS) - -#define NtUserSetCaretBlinkTime(uMSeconds) \ - (BOOL)NtUserCallOneParam((DWORD)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME) - -#define NtUserEnumClipboardFormats(format) \ - (UINT)NtUserCallOneParam(format, ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS) - -#define NtUserWindowFromDC(hDC) \ - (HWND)NtUserCallOneParam((DWORD)hDC, ONEPARAM_ROUTINE_WINDOWFROMDC) - -#define NtUserSwitchCaretShowing(CaretInfo) \ - (BOOL)NtUserCallOneParam((DWORD)CaretInfo, ONEPARAM_ROUTINE_SWITCHCARETSHOWING) - -#define NtUserSwapMouseButton(fSwap) \ - (BOOL)NtUserCallOneParam((DWORD)fSwap, ONEPARAM_ROUTINE_SWAPMOUSEBUTTON) - -#define NtUserGetMenu(hWnd) \ - (HMENU)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_GETMENU) - -#define NtUserSetMessageExtraInfo(lParam) \ - (LPARAM)NtUserCallOneParam((DWORD)lParam, ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO) - -#define NtUserIsWindowUnicode(hWnd) \ - (BOOL)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_ISWINDOWUNICODE) - -#define NtUserGetWindowContextHelpId(hwnd) \ - NtUserCallOneParam((DWORD)hwnd, ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID) - -#define NtUserGetWindowInstance(hwnd) \ - (HINSTANCE)NtUserCallOneParam((DWORD)hwnd, ONEPARAM_ROUTINE_GETWINDOWINSTANCE) - -#define NtUserGetCursorPos(lpPoint) \ - (BOOL)NtUserCallOneParam((DWORD)lpPoint, ONEPARAM_ROUTINE_GETCURSORPOSITION) - -#define NtUserIsWindowInDestroy(hWnd) \ - (BOOL)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_ISWINDOWINDESTROY) - -#define NtUserEnableProcessWindowGhosting(bEnable) \ - NtUserCallOneParam((DWORD)bEnable, ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING) - #endif /* USER32_H */ _____ Added: trunk/reactos/lib/user32/include/user32p.h --- trunk/reactos/lib/user32/include/user32p.h 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/lib/user32/include/user32p.h 2005-06-20 18:21:07 UTC (rev 16157) @@ -0,0 +1,128 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS System Libraries + * FILE: lib/user32/include/user32p.h + * PURPOSE: Win32 User Library Private Headers + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#ifndef USER32_PRIVATE_H +#define USER32_PRIVATE_H + +/* Private User32 Headers */ +#include "accel.h" +#include "cursor.h" +#ifndef __WINE__ +#include "debug.h" +#endif +#include "draw.h" +#include "menu.h" +#include "message.h" +#include "regcontrol.h" +#include "resource.h" +#include "scroll.h" +#include "strpool.h" +#include "window.h" +#include "winpos.h" +#include "winsta.h" + +/* One/Two Param Functions */ +#define NtUserMsqSetWakeMask(dwWaitMask) \ + (HANDLE)NtUserCallOneParam(dwWaitMask, ONEPARAM_ROUTINE_MSQSETWAKEMASK) + +#define NtUserMsqClearWakeMask() \ + NtUserCallNoParam(NOPARAM_ROUTINE_MSQCLEARWAKEMASK) + +#define NtUserAnyPopup() \ + (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ANYPOPUP) + +#define NtUserValidateRgn(hWnd, hRgn) \ + (BOOL)NtUserCallTwoParam((DWORD)hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN) + +#define NtUserSetWindowContextHelpId(hWnd, dwContextHelpId) \ + (BOOL)NtUserCallTwoParam((DWORD)hwnd, dwContextHelpId, TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID) + +#define NtUserSetCaretPos(X, Y) \ + (BOOL)NtUserCallTwoParam((DWORD)X, (DWORD)Y, TWOPARAM_ROUTINE_SETCARETPOS) + +#define NtUserSetGUIThreadHandle(field, hwnd) \ + (BOOL)NtUserCallTwoParam((DWORD)field, (DWORD)hwnd, TWOPARAM_ROUTINE_SETGUITHRDHANDLE) + +#define NtUserSetMenuItemRect(menu, mir) \ + (BOOL)NtUserCallTwoParam((DWORD)menu, (DWORD)mir, TWOPARAM_ROUTINE_SETMENUITEMRECT) + +#define NtUserSetMenuBarHeight(menu, height) \ + (BOOL)NtUserCallTwoParam((DWORD)menu, (DWORD)height, TWOPARAM_ROUTINE_SETMENUBARHEIGHT) + +#define NtUserGetWindowInfo(hwnd, pwi) \ + (BOOL)NtUserCallTwoParam((DWORD)hwnd, (DWORD)pwi, TWOPARAM_ROUTINE_GETWINDOWINFO) + +#define NtUserRegisterLogonProcess(hproc, x) \ + (BOOL)NtUserCallTwoParam((DWORD)hproc, (DWORD)x, TWOPARAM_ROUTINE_REGISTERLOGONPROC) + +#define NtUserGetSysColorBrushes(HBrushes, count) \ + (BOOL)NtUserCallTwoParam((DWORD)(HBrushes), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES) + +#define NtUserGetSysColorPens(HPens, count) \ + (BOOL)NtUserCallTwoParam((DWORD)(HPens), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORPENS) + +#define NtUserGetSysColors(ColorRefs, count) \ + (BOOL)NtUserCallTwoParam((DWORD)(ColorRefs), (DWORD)(count), TWOPARAM_ROUTINE_GETSYSCOLORS) + +#define NtUserSetSysColors(ColorRefs, count) \ + (BOOL)NtUserCallTwoParam((DWORD)(ColorRefs), (DWORD)(count), TWOPARAM_ROUTINE_SETSYSCOLORS) + +#define NtUserSetCaretBlinkTime(uMSeconds) \ + (BOOL)NtUserCallOneParam((DWORD)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME) + +#define NtUserEnumClipboardFormats(format) \ + (UINT)NtUserCallOneParam(format, ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS) + +#define NtUserWindowFromDC(hDC) \ + (HWND)NtUserCallOneParam((DWORD)hDC, ONEPARAM_ROUTINE_WINDOWFROMDC) + +#define NtUserSwitchCaretShowing(CaretInfo) \ + (BOOL)NtUserCallOneParam((DWORD)CaretInfo, ONEPARAM_ROUTINE_SWITCHCARETSHOWING) + +#define NtUserSwapMouseButton(fSwap) \ + (BOOL)NtUserCallOneParam((DWORD)fSwap, ONEPARAM_ROUTINE_SWAPMOUSEBUTTON) + +#define NtUserGetMenu(hWnd) \ + (HMENU)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_GETMENU) + +#define NtUserSetMessageExtraInfo(lParam) \ + (LPARAM)NtUserCallOneParam((DWORD)lParam, ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO) + +#define NtUserIsWindowUnicode(hWnd) \ + (BOOL)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_ISWINDOWUNICODE) + +#define NtUserGetWindowContextHelpId(hwnd) \ + NtUserCallOneParam((DWORD)hwnd, ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID) + +#define NtUserGetWindowInstance(hwnd) \ + (HINSTANCE)NtUserCallOneParam((DWORD)hwnd, ONEPARAM_ROUTINE_GETWINDOWINSTANCE) + +#define NtUserGetCursorPos(lpPoint) \ + (BOOL)NtUserCallOneParam((DWORD)lpPoint, ONEPARAM_ROUTINE_GETCURSORPOSITION) + +#define NtUserIsWindowInDestroy(hWnd) \ + (BOOL)NtUserCallOneParam((DWORD)hWnd, ONEPARAM_ROUTINE_ISWINDOWINDESTROY) + +#define NtUserEnableProcessWindowGhosting(bEnable) \ + NtUserCallOneParam((DWORD)bEnable, ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING) + +/* Internal Thread Data */ +extern HINSTANCE User32Instance; + +typedef struct _USER32_THREAD_DATA +{ + MSG LastMessage; + HKL KeyboardLayoutHandle; +} USER32_THREAD_DATA, *PUSER32_THREAD_DATA; + +PUSER32_THREAD_DATA User32GetThreadData(); + +#endif +/* EOF */ _____ Modified: trunk/reactos/lib/user32/misc/dllmain.c --- trunk/reactos/lib/user32/misc/dllmain.c 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/lib/user32/misc/dllmain.c 2005-06-20 18:21:07 UTC (rev 16157) @@ -2,6 +2,8 @@ /* FIXME: Belongs to some header. */ WINBOOL STDCALL GdiDllInitialize(HANDLE, DWORD, LPVOID); +void InitStockObjects(void); +VOID DeleteFrameBrushes(VOID); #ifdef DBG @@ -13,7 +15,6 @@ extern CRITICAL_SECTION gcsMPH; static ULONG User32TlsIndex; HINSTANCE User32Instance; - HWINSTA ProcessWindowStation; PUSER32_THREAD_DATA _____ Modified: trunk/reactos/lib/user32/windows/dialog.c --- trunk/reactos/lib/user32/windows/dialog.c 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/lib/user32/windows/dialog.c 2005-06-20 18:21:07 UTC (rev 16157) @@ -1891,7 +1891,7 @@ if (!endptr || (endptr == str)) /* Conversion was unsuccessful */ return 0; /* FIXME: errno? */ - if (((result == LONG_MIN) || (result == LONG_MAX))/* && (errno == ERANGE) */) + if (((result == 0) || (result == 0xFFFFFFFF))/* && (errno == ERANGE) */) return 0; } else @@ -1900,7 +1900,7 @@ if (!endptr || (endptr == str)) /* Conversion was unsuccessful */ return 0; /* FIXME: errno? */ - if ((result == LONG_MAX)/* && (errno == ERANGE) */) return 0; + if ((result == 0xFFFFFFFF)/* && (errno == ERANGE) */) return 0; } if (lpTranslated) *lpTranslated = TRUE; return (UINT)result; _____ Modified: trunk/reactos/subsys/win32k/include/caret.h --- trunk/reactos/subsys/win32k/include/caret.h 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/subsys/win32k/include/caret.h 2005-06-20 18:21:07 UTC (rev 16157) @@ -6,17 +6,6 @@ #define IDCARETTIMER (0xffff) -/* a copy of this structure is in lib/user32/include/user32.h */ -typedef struct _THRDCARETINFO -{ - HWND hWnd; - HBITMAP Bitmap; - POINT Pos; - SIZE Size; - BYTE Visible; - BYTE Showing; -} THRDCARETINFO, *PTHRDCARETINFO; - BOOL FASTCALL IntDestroyCaret(PW32THREAD Win32Thread); _____ Modified: trunk/reactos/subsys/win32k/w32k.h --- trunk/reactos/subsys/win32k/w32k.h 2005-06-20 16:53:47 UTC (rev 16156) +++ trunk/reactos/subsys/win32k/w32k.h 2005-06-20 18:21:07 UTC (rev 16157) @@ -17,6 +17,7 @@ #include <win32k/win32k.h> #include <win32k/callback.h> +#include <win32k/caret.h> #include <csrss/csrss.h> #include <internal/ntoskrnl.h>

19 years, 3 months

[mf] 16156: Sync with Wine repo

by mf＠svn.reactos.com

Sync with Wine repo Modified: trunk/reactos/subsys/system/winefile/license.c _____ Modified: trunk/reactos/subsys/system/winefile/license.c --- trunk/reactos/subsys/system/winefile/license.c 2005-06-20 16:52:02 UTC (rev 16155) +++ trunk/reactos/subsys/system/winefile/license.c 2005-06-20 16:53:47 UTC (rev 16156) @@ -1,5 +1,5 @@ /* - * Copyright 2000, 2003, 2004, 2005 Martin Fuchs + * Copyright 2000 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

19 years, 3 months

[mf] 16155: Stefan Huehner <stefan@huehner.org>:

by mf＠svn.reactos.com

Stefan Huehner <stefan(a)huehner.org>: Remove some -Wstrict-prototypes warnings. Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-06-20 16:32:42 UTC (rev 16154) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-06-20 16:52:02 UTC (rev 16155) @@ -204,7 +204,7 @@ static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND hwnd); static void set_curdir(ChildWnd* child, Entry* entry, int idx, HWND hwnd); static void refresh_child(ChildWnd* child); -static void refresh_drives(); +static void refresh_drives(void); static void get_path(Entry* dir, PTSTR path); static void format_date(const FILETIME* ft, TCHAR* buffer, int visible_cols); @@ -279,7 +279,7 @@ /* allocate and initialise a directory entry */ -static Entry* alloc_entry() +static Entry* alloc_entry(void) { Entry* entry = (Entry*) malloc(sizeof(Entry)); @@ -4053,7 +4053,7 @@ static IContextMenu3* s_pctxmenu3 = NULL; #endif -static void CtxMenu_reset() +static void CtxMenu_reset(void) { s_pctxmenu2 = NULL;

19 years, 3 months

[mbosma] 16154: g++ seams to have a problem with this dummy union names.

by mbosma＠svn.reactos.com

g++ seams to have a problem with this dummy union names. Modified: trunk/reactos/include/ddraw.h _____ Modified: trunk/reactos/include/ddraw.h --- trunk/reactos/include/ddraw.h 2005-06-20 14:30:44 UTC (rev 16153) +++ trunk/reactos/include/ddraw.h 2005-06-20 16:32:42 UTC (rev 16154) @@ -760,33 +760,33 @@ DWORD dwAlphaBitDepth; /* C: how many bits for alpha channels*/ DWORD dwLuminanceBitCount; DWORD dwBumpBitCount; - } DUMMYUNIONNAME1; + }; union { DWORD dwRBitMask; /* 10: mask for red bit*/ DWORD dwYBitMask; /* 10: mask for Y bits*/ DWORD dwStencilBitDepth; DWORD dwLuminanceBitMask; DWORD dwBumpDuBitMask; - } DUMMYUNIONNAME2; + }; union { DWORD dwGBitMask; /* 14: mask for green bits*/ DWORD dwUBitMask; /* 14: mask for U bits*/ DWORD dwZBitMask; DWORD dwBumpDvBitMask; - } DUMMYUNIONNAME3; + }; union { DWORD dwBBitMask; /* 18: mask for blue bits*/ DWORD dwVBitMask; /* 18: mask for V bits*/ DWORD dwStencilBitMask; DWORD dwBumpLuminanceBitMask; - } DUMMYUNIONNAME4; + }; union { - DWORD dwRGBAlphaBitMask; /* 1C: mask for alpha channel */ - DWORD dwYUVAlphaBitMask; /* 1C: mask for alpha channel */ + DWORD dwRGBAlphaBitMask; /* 1C: mask for alpha channel */ + DWORD dwYUVAlphaBitMask; /* 1C: mask for alpha channel */ DWORD dwLuminanceAlphaBitMask; DWORD dwRGBZBitMask; /* 1C: mask for Z channel */ DWORD dwYUVZBitMask; /* 1C: mask for Z channel */ - } DUMMYUNIONNAME5; + }; /* 20: next structure */ } DDPIXELFORMAT,*LPDDPIXELFORMAT;

19 years, 3 months

Re: [ros-diffs] [navaraf] 16149: Forgot this file in r16147.

by Filip Navara

19 years, 3 months

[navaraf] 16153: Remove Jamfiles.

by navaraf＠svn.reactos.com

Remove Jamfiles. Deleted: trunk/reactos/lib/advapi32/Jamfile Deleted: trunk/reactos/lib/kernel32/Jamfile Deleted: trunk/reactos/lib/ntdll/Jamfile _____ Deleted: trunk/reactos/lib/advapi32/Jamfile --- trunk/reactos/lib/advapi32/Jamfile 2005-06-20 14:23:13 UTC (rev 16152) +++ trunk/reactos/lib/advapi32/Jamfile 2005-06-20 14:30:44 UTC (rev 16153) @@ -1,34 +0,0 @@ -SubDir ROS_TOP Lib Advapi32 ; - -# This stuff should actually be moved to Jamrules -# in order to more easily support other compilers -CCFLAGS += -Wall -fno-builtin ; - -# NOTE - I'm no Jam expert, yet. This stuff should be -# abstracted into the Jamrules file. -LINKFLAGS += -nostartfiles -nostdlib ; -LINKFLAGS += -Wl,--image-base,0x77DB0000 ; - -MISC_SRCS = dllmain shutdown sysfunc ; - -REG_SRCS = reg ; - -SEC_SRCS = ac lsa misc sec sid ; - -SERVICE_SRCS = scm sctrl undoc ; - -TOKEN_SRCS = privilege token ; - -ADVAPI32_SRCS = - misc/$(MISC_SRCS).c - reg/$(REG_SRCS).c - sec/$(SEC_SRCS).c - service/$(SERVICE_SRCS).c - token/$(TOKEN_SRCS).c - ; - -SharedLibrary advapi32 : $(ADVAPI32_SRCS) ; -LINKLIBS = - $(ROS_TOP)/dk/w32/lib/ntdll.a - $(ROS_TOP)/dk/w32/lib/kernel32.a - ; _____ Deleted: trunk/reactos/lib/kernel32/Jamfile --- trunk/reactos/lib/kernel32/Jamfile 2005-06-20 14:23:13 UTC (rev 16152) +++ trunk/reactos/lib/kernel32/Jamfile 2005-06-20 14:30:44 UTC (rev 16153) @@ -1,66 +0,0 @@ -SubDir ROS_TOP lib kernel32 ; - -# This stuff should actually be moved to Jamrules -# in order to more easily support other compilers -CCFLAGS += -Wall -fno-builtin ; - -# NOTE - I'm no Jam expert, yet. This stuff should be -# abstracted into the Jamrules file. -LINKFLAGS = -nostartfiles -nostdlib -shared ; -LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ; - - -SYNCH_SRCS = - critical event intrlck mutex - sem timer wait - ; - -MISC_SRCS = - error atom handle env - dllmain comm errormsg - console time toolhelp - stubs lang ldr res - sysinfo profile - mbchars muldiv getname - perfcnt - ; - -FILE_SRCS = - file curdir lfile dir - iocompl volume deviceio dosdev - create find copy pipe - move lock rw delete - npipe tape mailslot backup - cnotify - ; - -MEM_SRCS = - global heap isbad local - procmem section virtual - ; - -THREAD_SRCS = fiber thread tls ; - -PROCESS_SRCS = proc cmdline create session ; - -STRING_SRCS = lstring ; - -EXCEPT_SRCS = except ; - -KERNEL32_SRCS = - misc/$(MISC_SRCS).c - file/$(FILE_SRCS).c - thread/$(THREAD_SRCS).c - process/$(PROCESS_SRCS).c - string/$(STRING_SRCS).c - mem/$(MEM_SRCS).c - synch/$(SYNCH_SRCS).c - except/$(EXCEPT_SRCS).c - ; - - -SharedLibrary kernel32 : $(KERNEL32_SRCS) ; -LINKLIBS = - $(ROS_TOP)/dk/w32/lib/ntdll.a - $(ROS_TOP)/dk/w32/lib/rosrtl.a - ; _____ Deleted: trunk/reactos/lib/ntdll/Jamfile --- trunk/reactos/lib/ntdll/Jamfile 2005-06-20 14:23:13 UTC (rev 16152) +++ trunk/reactos/lib/ntdll/Jamfile 2005-06-20 14:30:44 UTC (rev 16153) @@ -1,88 +0,0 @@ -SubDir ROS_TOP Lib Ntdll ; - -HDRS += $(ROS_TOP)/Include ; -#Echo HDRS is $(HDRS) ; - -#Echo AS is $(AS) ; - -# for some reason DEFINES isn't coming in :( -#DEFINES += __NTDLL__ ; -CCFLAGS += -D__NTDLL__ ; # less portable :( - -# This stuff should actually be moved to Jamrules -# in order to more easily support other compilers -#CCFLAGS += -Wall -Werror -fno-builtin ; -CCFLAGS += -Wall -fno-builtin ; - -# NOTE - I'm no Jam expert, yet. This stuff should be -# abstracted into the Jamrules file. -LINKFLAGS += -Wl,--image-base,0x77f60000 ; -LINKFLAGS += -Wl,--file-alignment,0x1000 - -Wl,--section-alignment,0x1000 - -nostartfiles - ; - -# This needs to be abstracted to Jamrules, too -LINKFLAGS += -Wl,--entry,_LdrInitializeThunk@16 ; - -# we need to override action As here, because we're -# compiling except.s with gcc instead of as... -actions As -{ - $(CC) -c -x assembler-with-cpp $(ASFLAGS) -c $(>) -o $(<) -} - - -CSR_SRCS = lpc capture probe thread ; - -DBG_SRCS = brkpoint debug print ; #winedbg - -RTL_I386_SRCS = exception.c except.s ; - -RTL_SRCS = critical error heap largeint - math mem nls process sd - thread unicode env path ppb - bitmap time acl sid image - access apc callback luid misc - registry exception intrlck resource - handle atom message timezone - propvar security dos8dot3 compress - ; - -STDIO_SRCS = sprintf swprintf ; - -STDLIB_SRCS = abs atoi atoi64 atol - itoa itow labs splitp - strtol strtoul wcstol - wcstoul wtoi wtoi64 wtol - mbstowcs wcstombs qsort - ; - -STRING_SRCS = ctype memccpy memchr - memcmp memcpy memicmp - memmove memset strcat - strchr strcmp strcspn - strcpy stricmp strlen - strlwr strncat strncmp - strncpy strnicmp strnlen - strpbrk strrchr strspn - strstr strupr wstring - ; - -NTDLL_SRCS = - napi.c - ldr/startup.c - rtl/i386/$(RTL_I386_SRCS) - dbg/$(DBG_SRCS).c - rtl/$(RTL_SRCS).c - stdio/$(STDIO_SRCS).c - stdlib/$(STDLIB_SRCS).c - string/$(STRING_SRCS).c - stubs/stubs.c - ldr/res.c - ldr/utils.c - csr/$(CSR_SRCS).c - ; - - -SharedLibrary ntdll : $(NTDLL_SRCS) ;

19 years, 3 months

[navaraf] 16152: Fix warnings.

by navaraf＠svn.reactos.com

Fix warnings. Modified: trunk/reactos/lib/kbdda/kbdda.c Modified: trunk/reactos/lib/kbddv/kbddv.c Modified: trunk/reactos/lib/kbdes/kbdes.c Modified: trunk/reactos/lib/kbdfr/kbdfr.c Modified: trunk/reactos/lib/kbdgr/kbdgr.c _____ Modified: trunk/reactos/lib/kbdda/kbdda.c --- trunk/reactos/lib/kbdda/kbdda.c 2005-06-20 14:08:06 UTC (rev 16151) +++ trunk/reactos/lib/kbdda/kbdda.c 2005-06-20 14:23:13 UTC (rev 16152) @@ -8,9 +8,13 @@ #ifdef _M_IA64 #define ROSDATA static __declspec(allocate(".data")) #else +#ifdef _MSC_VER #pragma data_seg(".data") #define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) #endif +#endif #define VK_EMPTY 0xff /* The non-existent VK */ #define KSHIFT 0x001 /* Shift modifier */ @@ -25,47 +29,6 @@ #define SHFT_INVALID 0x0F -/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */ -#ifndef VK_OEM_1 -#define VK_OEM_1 0xba -#endif -#ifndef VK_OEM_PLUS -#define VK_OEM_PLUS 0xbb -#endif -#ifndef VK_OEM_COMMA -#define VK_OEM_COMMA 0xbc -#endif -#ifndef VK_OEM_MINUS -#define VK_OEM_MINUS 0xbd -#endif -#ifndef VK_OEM_PERIOD -#define VK_OEM_PERIOD 0xbe -#endif -#ifndef VK_OEM_2 -#define VK_OEM_2 0xbf -#endif -#ifndef VK_OEM_3 -#define VK_OEM_3 0xc0 -#endif -#ifndef VK_OEM_4 -#define VK_OEM_4 0xdb -#endif -#ifndef VK_OEM_5 -#define VK_OEM_5 0xdc -#endif -#ifndef VK_OEM_6 -#define VK_OEM_6 0xdd -#endif -#ifndef VK_OEM_7 -#define VK_OEM_7 0xde -#endif -#ifndef VK_OEM_8 -#define VK_OEM_8 0xdf -#endif -#ifndef VK_OEM_102 -#define VK_OEM_102 0xe1 -#endif - ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ /* - 00 - */ @@ -194,13 +157,7 @@ { 0, 0 } }; -typedef struct _mymod { - PVOID mod_keys; - WORD maxmod; - BYTE mod_max[7]; -} INTERNAL_KBD_MODIFIERS; - -ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = { +ROSDATA MODIFIERS modifier_bits = { modifier_keys, 6, { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ @@ -212,67 +169,67 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* Normal vs Shifted */ /* The numbers */ - { VK_OEM_5, NOCAPS, 0xbd, 0xa7 }, - { '1', NOCAPS, '1', '!' }, + { VK_OEM_5, NOCAPS, {0xbd, 0xa7} }, + { '1', NOCAPS, {'1', '!'} }, /* Ctrl-2 generates NUL */ - { VK_OEM_PLUS, NOCAPS, '+', '?' }, + { VK_OEM_PLUS, NOCAPS, {'+', '?'} }, /* First letter row */ - { 'Q', CAPS, 'q', 'Q' }, - { 'W', CAPS, 'w', 'W' }, - { 'R', CAPS, 'r', 'R' }, - { 'T', CAPS, 't', 'T' }, - { 'Y', CAPS, 'y', 'Y' }, - { 'U', CAPS, 'u', 'U' }, - { 'I', CAPS, 'i', 'I' }, - { 'O', CAPS, 'o', 'O' }, - { 'P', CAPS, 'p', 'P' }, - { VK_OEM_6, CAPS, 0xe5, 0xc5, }, /* ? */ + { 'Q', CAPS, {'q', 'Q'} }, + { 'W', CAPS, {'w', 'W'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'U', CAPS, {'u', 'U'} }, + { 'I', CAPS, {'i', 'I'} }, + { 'O', CAPS, {'o', 'O'} }, + { 'P', CAPS, {'p', 'P'} }, + { VK_OEM_6, CAPS, {0xe5, 0xc5} }, /* ? */ /* Second letter row */ - { 'A', CAPS, 'a', 'A' }, - { 'S', CAPS, 's', 'S' }, - { 'D', CAPS, 'd', 'D' }, - { 'F', CAPS, 'f', 'F' }, - { 'G', CAPS, 'g', 'G' }, - { 'H', CAPS, 'h', 'H' }, - { 'J', CAPS, 'j', 'J' }, - { 'K', CAPS, 'k', 'K' }, - { 'L', CAPS, 'l', 'L' }, + { 'A', CAPS, {'a', 'A'} }, + { 'S', CAPS, {'s', 'S'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'L', CAPS, {'l', 'L'} }, /* Third letter row */ - { 'Z', CAPS, 'z', 'Z' }, - { 'X', CAPS, 'x', 'X' }, - { 'C', CAPS, 'c', 'C' }, - { 'V', CAPS, 'v', 'V' }, - { 'B', CAPS, 'b', 'B' }, - { 'N', CAPS, 'n', 'N' }, + { 'Z', CAPS, {'z', 'Z'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'C', CAPS, {'c', 'C'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'N', CAPS, {'n', 'N'} }, /* Specials */ - { VK_OEM_7, CAPS, 0xf8, 0xd8 }, /* Ï */ - { VK_OEM_3, CAPS, 0xe6, 0xc6 }, /* ã */ + { VK_OEM_7, CAPS, {0xf8, 0xd8} }, /* Ï */ + { VK_OEM_3, CAPS, {0xe6, 0xc6} }, /* ã */ - { VK_OEM_COMMA, CAPS, ',', ';' }, - { VK_OEM_PERIOD, CAPS, '.', ':' }, - { VK_OEM_2, NOCAPS, '\'', '*' }, + { VK_OEM_COMMA, CAPS, {',', ';'} }, + { VK_OEM_PERIOD, CAPS, {'.', ':'} }, + { VK_OEM_2, NOCAPS, {'\'', '*'} }, - { VK_DECIMAL, NOCAPS, ',', ',' }, - { VK_TAB, NOCAPS, '\t', '\t' }, - { VK_ADD, NOCAPS, '+', '+' }, - { VK_DIVIDE, NOCAPS, '/', '/' }, - { VK_MULTIPLY, NOCAPS, '*', '*' }, - { VK_SUBTRACT, NOCAPS, '-', '-' }, + { VK_DECIMAL, NOCAPS, {',', ','} }, + { VK_TAB, NOCAPS, {'\t', '\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ /* Legacy (telnet-style) ascii escapes */ - { VK_OEM_MINUS, NOCAPS, '-', '_', 0x1f /* US */ }, - { VK_RETURN, NOCAPS, '\r', '\r', '\n' }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x1f /* US */} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, - { VK_BACK, NOCAPS, '\b', '\b', 0x7f }, - { VK_ESCAPE, NOCAPS, 0x1b, 0x1b, 0x1b }, - { VK_SPACE, NOCAPS, ' ', ' ', ' ' }, - { VK_CANCEL, NOCAPS, 0x03, 0x03, 0x03 }, + { VK_BACK, NOCAPS, {'\b', '\b', 0x7f} }, + { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} }, + { VK_SPACE, NOCAPS, {' ', ' ', ' '} }, + { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} }, { 0,0 } }; @@ -280,44 +237,44 @@ ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, Ctrl-Alt */ /* Legacy Ascii generators */ - { '2', NOCAPS, '2', '\"', WCH_NONE, '@' }, - { '3', NOCAPS, '3', '#', WCH_NONE, 0x00a3 }, - { '4', NOCAPS, '4', 0xa4, WCH_NONE, '$' }, - { '5', NOCAPS, '5', '%', WCH_NONE, 0x20ac }, - { '7', NOCAPS, '7', '/', WCH_NONE, '{' }, - { '8', NOCAPS, '8', '(', WCH_NONE, '[' }, - { '9', NOCAPS, '9', ')', WCH_NONE, ']' }, - { '0', NOCAPS, '0', '=', WCH_NONE, '}' }, - { VK_OEM_4, NOCAPS, WCH_DEAD, WCH_DEAD, WCH_DEAD, '|' }, - { VK_EMPTY , NOCAPS, 0xb4, '`', '|', WCH_NONE }, + { '2', NOCAPS, {'2', '\"', WCH_NONE, '@'} }, + { '3', NOCAPS, {'3', '#', WCH_NONE, 0x00a3} }, + { '4', NOCAPS, {'4', 0xa4, WCH_NONE, '$'} }, + { '5', NOCAPS, {'5', '%', WCH_NONE, 0x20ac} }, + { '7', NOCAPS, {'7', '/', WCH_NONE, '{'} }, + { '8', NOCAPS, {'8', '(', WCH_NONE, '['} }, + { '9', NOCAPS, {'9', ')', WCH_NONE, ']'} }, + { '0', NOCAPS, {'0', '=', WCH_NONE, '}'} }, + { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_DEAD, '|'} }, + { VK_EMPTY , NOCAPS, {0xb4, '`', '|', WCH_NONE} }, - { 'E', CAPS, 'e', 'E', WCH_NONE, 0x20ac }, - { VK_OEM_1, NOCAPS, WCH_DEAD, WCH_DEAD, WCH_NONE, WCH_DEAD }, - { VK_EMPTY , NOCAPS, 0xa8, '^', WCH_NONE, '~' }, + { 'E', CAPS, {'e', 'E', WCH_NONE, 0x20ac} }, + { VK_OEM_1, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, WCH_DEAD} }, + { VK_EMPTY , NOCAPS, {0xa8, '^', WCH_NONE, '~'} }, - { 'M', CAPS, 'm', 'M', WCH_NONE, 0x00b5 }, - { VK_OEM_102, NOCAPS, '<', '>', 0x001c, '\\' }, + { 'M', CAPS, {'m', 'M', WCH_NONE, 0x00b5} }, + { VK_OEM_102, NOCAPS, {'<', '>', 0x001c, '\\'} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { /* Normal, Shifted, Ctrl, Ctrl-Alt, C-S-x */ - { '6', NOCAPS, '6', '&', WCH_NONE, WCH_NONE, 0x1e /* RS */ }, + { '6', NOCAPS, {'6', '&', WCH_NONE, WCH_NONE, 0x1e /* RS */} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_DECIMAL, 0, '.' }, - { VK_NUMPAD0, 0, '0' }, - { VK_NUMPAD1, 0, '1' }, - { VK_NUMPAD2, 0, '2' }, - { VK_NUMPAD3, 0, '3' }, - { VK_NUMPAD4, 0, '4' }, - { VK_NUMPAD5, 0, '5' }, - { VK_NUMPAD6, 0, '6' }, - { VK_NUMPAD7, 0, '7' }, - { VK_NUMPAD8, 0, '8' }, - { VK_NUMPAD9, 0, '9' }, + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {'.'} }, { 0,0 } }; @@ -496,7 +453,7 @@ /* Finally, the master table */ ROSDATA KBDTABLES keyboard_layout_table = { /* modifier assignments */ - (PMODIFIERS)&modifier_bits, + &modifier_bits, /* character from vk tables */ vk_to_wchar_master_table, _____ Modified: trunk/reactos/lib/kbddv/kbddv.c --- trunk/reactos/lib/kbddv/kbddv.c 2005-06-20 14:08:06 UTC (rev 16151) +++ trunk/reactos/lib/kbddv/kbddv.c 2005-06-20 14:23:13 UTC (rev 16152) @@ -13,9 +13,13 @@ #ifdef _M_IA64 #define ROSDATA static __declspec(allocate(".data")) #else +#ifdef _MSC_VER #pragma data_seg(".data") #define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) #endif +#endif #define VK_EMPTY 0xff /* The non-existent VK */ #define KSHIFT 0x001 /* Shift modifier */ @@ -28,47 +32,6 @@ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ -/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */ -#ifndef VK_OEM_1 /* ;/: */ -#define VK_OEM_1 0xba -#endif -#ifndef VK_OEM_PLUS -#define VK_OEM_PLUS 0xbb -#endif -#ifndef VK_OEM_COMMA -#define VK_OEM_COMMA 0xbc -#endif -#ifndef VK_OEM_MINUS -#define VK_OEM_MINUS 0xbd -#endif -#ifndef VK_OEM_PERIOD -#define VK_OEM_PERIOD 0xbe -#endif -#ifndef VK_OEM_2 /* //? */ -#define VK_OEM_2 0xbf -#endif -#ifndef VK_OEM_3 /* `/~ */ -#define VK_OEM_3 0xc0 -#endif -#ifndef VK_OEM_4 /* [/{ */ -#define VK_OEM_4 0xdb -#endif -#ifndef VK_OEM_5 /* \/| */ -#define VK_OEM_5 0xdc -#endif -#ifndef VK_OEM_6 /* ]/} */ -#define VK_OEM_6 0xdd -#endif -#ifndef VK_OEM_7 /* '/" */ -#define VK_OEM_7 0xde -#endif -#ifndef VK_OEM_8 -#define VK_OEM_8 0xdf -#endif -#ifndef VK_OEM_102 -#define VK_OEM_102 0xe1 -#endif - ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ /* - 00 - */ @@ -158,13 +121,7 @@ { 0, 0 } }; -typedef struct _mymod { - PVOID mod_keys; - WORD maxmod; - BYTE mod_max[4]; -} INTERNAL_KBD_MODIFIERS; - -ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = { +ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, { 0, 1, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT */ @@ -176,98 +133,98 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* Normal vs Shifted */ /* The numbers */ - { '1', NOCAPS, '1', '!' }, + { '1', NOCAPS, {'1', '!'} }, /* Ctrl-2 generates NUL */ - { '3', NOCAPS, '3', '#' }, - { '4', NOCAPS, '4', '$' }, - { '5', NOCAPS, '5', '%' }, + { '3', NOCAPS, {'3', '#'} }, + { '4', NOCAPS, {'4', '$'} }, + { '5', NOCAPS, {'5', '%'} }, /* Ctrl-6 generates RS */ - { '7', NOCAPS, '7', '&' }, - { '8', NOCAPS, '8', '*' }, - { '9', NOCAPS, '9', '(' }, - { '0', NOCAPS, '0', ')' }, + { '7', NOCAPS, {'7', '&'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, /* First letter row */ - { 'P', CAPS, 'p', 'P' }, - { 'Y', CAPS, 'y', 'Y' }, - { 'F', CAPS, 'f', 'F' }, - { 'G', CAPS, 'g', 'G' }, - { 'C', CAPS, 'c', 'C' }, - { 'R', CAPS, 'r', 'R' }, - { 'L', CAPS, 'l', 'L' }, + { 'P', CAPS, {'p', 'P'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'C', CAPS, {'c', 'C'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'L', CAPS, {'l', 'L'} }, /* Second letter row */ - { 'A', CAPS, 'a', 'A' }, - { 'O', CAPS, 'o', 'O' }, - { 'E', CAPS, 'e', 'E' }, - { 'U', CAPS, 'u', 'U' }, - { 'I', CAPS, 'i', 'I' }, - { 'D', CAPS, 'd', 'D' }, - { 'H', CAPS, 'h', 'H' }, - { 'T', CAPS, 't', 'T' }, - { 'N', CAPS, 'n', 'N' }, - { 'S', CAPS, 's', 'S' }, + { 'A', CAPS, {'a', 'A'} }, + { 'O', CAPS, {'o', 'O'} }, + { 'E', CAPS, {'e', 'E'} }, + { 'U', CAPS, {'u', 'U'} }, + { 'I', CAPS, {'i', 'I'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'N', CAPS, {'n', 'N'} }, + { 'S', CAPS, {'s', 'S'} }, /* Third letter row */ - { 'Q', CAPS, 'q', 'Q' }, - { 'J', CAPS, 'j', 'J' }, - { 'K', CAPS, 'k', 'K' }, - { 'X', CAPS, 'x', 'X' }, - { 'B', CAPS, 'b', 'B' }, - { 'M', CAPS, 'm', 'M' }, - { 'W', CAPS, 'w', 'W' }, - { 'V', CAPS, 'v', 'V' }, - { 'Z', CAPS, 'z', 'Z' }, + { 'Q', CAPS, {'q', 'Q'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'M', CAPS, {'m', 'M'} }, + { 'W', CAPS, {'w', 'W'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'Z', CAPS, {'z', 'Z'} }, /* Specials */ /* Ctrl-_ generates US */ - { VK_OEM_7 ,NOCAPS, '\'','\"'}, - { VK_OEM_COMMA ,NOCAPS, ',', '<' }, - { VK_OEM_PERIOD ,NOCAPS, '.', '>' }, - { VK_OEM_2 ,NOCAPS, '/', '?' }, - { VK_OEM_PLUS ,NOCAPS, '=', '+' }, - { VK_OEM_1 ,NOCAPS, ';', ':' }, - { VK_OEM_3 ,NOCAPS, '`', '~' }, + { VK_OEM_7 ,NOCAPS, {'\'','\"'} }, + { VK_OEM_COMMA ,NOCAPS, {',', '<'} }, + { VK_OEM_PERIOD ,NOCAPS, {'.', '>'} }, + { VK_OEM_2 ,NOCAPS, {'/', '?'} }, + { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, + { VK_OEM_1 ,NOCAPS, {';', ':'} }, + { VK_OEM_3 ,NOCAPS, {'`', '~'} }, /* Keys that do not have shift states */ - { VK_TAB ,NOCAPS, '\t','\t'}, - { VK_ADD ,NOCAPS, '+', '+' }, - { VK_SUBTRACT,NOCAPS, '-', '-' }, - { VK_MULTIPLY,NOCAPS, '*', '*' }, - { VK_DIVIDE ,NOCAPS, '/', '/' }, - { VK_ESCAPE ,NOCAPS, '\x1b','\x1b' }, - { VK_SPACE ,NOCAPS, ' ', ' ' }, + { VK_TAB ,NOCAPS, {'\t','\t'} }, + { VK_ADD ,NOCAPS, {'+', '+'} }, + { VK_SUBTRACT,NOCAPS, {'-', '-'} }, + { VK_MULTIPLY,NOCAPS, {'*', '*'} }, + { VK_DIVIDE ,NOCAPS, {'/', '/'} }, + { VK_ESCAPE ,NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE ,NOCAPS, {' ', ' '} }, { 0, 0 } }; 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' }, + { 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 } }; ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, C-S-x */ /* Legacy Ascii generators */ - { '2', NOCAPS, '2', '@', WCH_NONE, 0 }, - { '6', NOCAPS, '6', '^', WCH_NONE, 0x1e /* RS */ }, - { VK_OEM_MINUS, NOCAPS, '-', '_', WCH_NONE, 0x1f /* US */ }, + { '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, + { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, 0x1f /* US */} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_NUMPAD0, 0, '0' }, - { VK_NUMPAD1, 0, '1' }, - { VK_NUMPAD2, 0, '2' }, - { VK_NUMPAD3, 0, '3' }, - { VK_NUMPAD4, 0, '4' }, - { VK_NUMPAD5, 0, '5' }, - { VK_NUMPAD6, 0, '6' }, - { VK_NUMPAD7, 0, '7' }, - { VK_NUMPAD8, 0, '8' }, - { VK_NUMPAD9, 0, '9' }, - { VK_DECIMAL, 0, '.' }, - { VK_BACK, 0, '\010' }, + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {'.'} }, + { VK_BACK, 0, {'\010'} }, { 0,0 } }; @@ -366,7 +323,7 @@ /* Finally, the master table */ ROSDATA KBDTABLES keyboard_layout_table = { /* modifier assignments */ - (PMODIFIERS)&modifier_bits, + &modifier_bits, /* character from vk tables */ vk_to_wchar_master_table, _____ Modified: trunk/reactos/lib/kbdes/kbdes.c --- trunk/reactos/lib/kbdes/kbdes.c 2005-06-20 14:08:06 UTC (rev 16151) +++ trunk/reactos/lib/kbdes/kbdes.c 2005-06-20 14:23:13 UTC (rev 16152) @@ -16,13 +16,16 @@ #include <windows.h> #include <internal/kbd.h> - #ifdef _M_IA64 #define ROSDATA static __declspec(allocate(".data")) #else +#ifdef _MSC_VER #pragma data_seg(".data") #define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) #endif +#endif #define VK_EMPTY 0xff /* The non-existent VK */ @@ -38,50 +41,6 @@ #define SHFT_INVALID 0x0F -/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */ - - -#ifndef VK_OEM_1 -#define VK_OEM_1 0xba /* Tecla `^[ */ -#endif -#ifndef VK_OEM_PLUS -#define VK_OEM_PLUS 0xbb /* Tecla +*] */ -#endif -#ifndef VK_OEM_COMMA -#define VK_OEM_COMMA 0xbc /* Tecla ,; */ -#endif -#ifndef VK_OEM_MINUS -#define VK_OEM_MINUS 0xbd /* Tecla -_ */ -#endif -#ifndef VK_OEM_PERIOD -#define VK_OEM_PERIOD 0xbe /* Tecla .: */ -#endif -#ifndef VK_OEM_2 -#define VK_OEM_2 0xbf /* Tecla þÃ} */ -#endif -#ifndef VK_OEM_3 -#define VK_OEM_3 0xc0 /* Tecla ±Ð */ -#endif -#ifndef VK_OEM_4 -#define VK_OEM_4 0xdb /* Tecla '? */ -#endif -#ifndef VK_OEM_5 -#define VK_OEM_5 0xdc /* Tecla ?¬\ */ -#endif -#ifndef VK_OEM_6 -#define VK_OEM_6 0xdd /* Tecla í? */ -#endif -#ifndef VK_OEM_7 -#define VK_OEM_7 0xde /* Tecla ?¿{ */ -#endif -#ifndef VK_OEM_8 -#define VK_OEM_8 0xdf -#endif -#ifndef VK_OEM_102 -#define VK_OEM_102 0xe2 /* Tecla < > */ -#endif - - ROSDATA USHORT scancode_to_vk[] = { /* 00 */ VK_EMPTY, /* 01 */ VK_ESCAPE, @@ -269,13 +228,7 @@ { 0, 0 } }; -typedef struct _mymod { - PVOID mod_keys; - WORD maxmod; - BYTE mod_max[7]; -} INTERNAL_KBD_MODIFIERS; - -ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = { +ROSDATA MODIFIERS modifier_bits = { modifier_keys, 6, { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } @@ -289,61 +242,61 @@ /* Normal vs Shifted */ /* The numbers */ //Del 1 al 5 tienen tres estados - { '4', NOCAPS, '4', '$' }, - { '5', NOCAPS, '5', '%' }, + { '4', NOCAPS, {'4', '$'} }, + { '5', NOCAPS, {'5', '%'} }, //El 6 tiene 3 estados - { '7', NOCAPS, '7', '/' }, - { '8', NOCAPS, '8', '(' }, - { '9', NOCAPS, '9', ')' }, - { '0', NOCAPS, '0', '=' }, + { '7', NOCAPS, {'7', '/'} }, + { '8', NOCAPS, {'8', '('} }, + { '9', NOCAPS, {'9', ')'} }, + { '0', NOCAPS, {'0', '='} }, /* First letter row */ - { 'Q', CAPS, 'q', 'Q' }, - { 'W', CAPS, 'w', 'W' }, + { 'Q', CAPS, {'q', 'Q'} }, + { 'W', CAPS, {'w', 'W'} }, //La E tiene 3 estados - { 'R', CAPS, 'r', 'R' }, - { 'T', CAPS, 't', 'T' }, - { 'Y', CAPS, 'y', 'Y' }, - { 'U', CAPS, 'u', 'U' }, - { 'I', CAPS, 'i', 'I' }, - { 'O', CAPS, 'o', 'O' }, - { 'P', CAPS, 'p', 'P' }, + { 'R', CAPS, {'r', 'R'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'U', CAPS, {'u', 'U'} }, + { 'I', CAPS, {'i', 'I'} }, + { 'O', CAPS, {'o', 'O'} }, + { 'P', CAPS, {'p', 'P'} }, /* Second letter row */ - { 'A', CAPS, 'a', 'A' }, - { 'S', CAPS, 's', 'S' }, - { 'D', CAPS, 'd', 'D' }, - { 'F', CAPS, 'f', 'F' }, - { 'G', CAPS, 'g', 'G' }, - { 'H', CAPS, 'h', 'H' }, - { 'J', CAPS, 'j', 'J' }, - { 'K', CAPS, 'k', 'K' }, - { 'L', CAPS, 'l', 'L' }, - { VK_OEM_3, CAPS, 0x00F1, 0x00D1 }, // ±Ð + { 'A', CAPS, {'a', 'A'} }, + { 'S', CAPS, {'s', 'S'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'L', CAPS, {'l', 'L'} }, + { VK_OEM_3, CAPS, {0x00F1, 0x00D1} }, // ±Ð /* Third letter row */ - { 'Z', CAPS, 'z', 'Z' }, - { 'X', CAPS, 'x', 'X' }, - { 'C', CAPS, 'c', 'C' }, - { 'V', CAPS, 'v', 'V' }, - { 'B', CAPS, 'b', 'B' }, - { 'N', CAPS, 'n', 'N' }, - { 'M', CAPS, 'm', 'M' }, - + { 'Z', CAPS, {'z', 'Z'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'C', CAPS, {'c', 'C'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'N', CAPS, {'n', 'N'} }, + { 'M', CAPS, {'m', 'M'} }, + /* Specials */ /* Ctrl-_ generates ES */ - { VK_OEM_6 ,NOCAPS, 0x00a1, 0x00bf }, // í? - { VK_OEM_4 ,NOCAPS, 0x0027, '?' }, //'? - { VK_OEM_COMMA ,NOCAPS, ',', ';' }, - { VK_OEM_PERIOD ,NOCAPS, '.', ':' }, - { VK_OEM_MINUS ,NOCAPS, '-', '_' }, - { VK_OEM_102 ,NOCAPS, '<', '>' }, + { VK_OEM_6 ,NOCAPS, {0x00a1, 0x00bf} }, // í? + { VK_OEM_4 ,NOCAPS, {0x0027, '?'} }, //'? + { VK_OEM_COMMA ,NOCAPS, {',', ';'} }, + { VK_OEM_PERIOD ,NOCAPS, {'.', ':'} }, + { VK_OEM_MINUS ,NOCAPS, {'-', '_'} }, + { VK_OEM_102 ,NOCAPS, {'<', '>'} }, /* Keys that do not have shift states */ - { VK_TAB, NOCAPS, '\t', '\t' }, - { VK_ADD, NOCAPS, '+', '+' }, - { VK_SUBTRACT, NOCAPS, '-', '-' }, - { VK_MULTIPLY, NOCAPS, '*', '*'}, - { VK_DIVIDE, NOCAPS, '/', '/' }, - { VK_ESCAPE, NOCAPS, '\x1b', '\x1b' }, - { VK_SPACE, NOCAPS, ' ', ' ' }, + { VK_TAB, NOCAPS, {'\t', '\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_ESCAPE, NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE, NOCAPS, {' ', ' '} }, { 0, 0 } }; @@ -351,46 +304,46 @@ ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ /* Legacy (telnet-style) ascii escapes */ - { VK_RETURN, NOCAPS, '\r', '\r', '\n' }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, { 0,0 } }; ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, shifted, control, Alt+Gr */ - { '1', NOCAPS, '1', '!', WCH_NONE, 0x00a6 }, // 1!| - { '2', NOCAPS, '2', '"', WCH_NONE, '@' }, // 2"@ - { '3', NOCAPS, '3', 0x00B7, WCH_NONE, '#' }, // 3À# - { '6', NOCAPS, '6', '&', WCH_NONE, 0x00AC }, // 6&¼ - { 'E', CAPS, 'e', 'E', WCH_NONE, 0x20AC }, // eEÇ - { VK_OEM_PLUS, NOCAPS, '+', '*', WCH_NONE, 0x005d }, // +*] - { VK_OEM_2, NOCAPS, 0x00e7, 0x00c7, WCH_NONE, '}' }, // þÃ} + { '1', NOCAPS, {'1', '!', WCH_NONE, 0x00a6} }, // 1!| + { '2', NOCAPS, {'2', '"', WCH_NONE, '@'} }, // 2"@ + { '3', NOCAPS, {'3', 0x00B7, WCH_NONE, '#'} }, // 3À# + { '6', NOCAPS, {'6', '&', WCH_NONE, 0x00AC} }, // 6&¼ + { 'E', CAPS, {'e', 'E', WCH_NONE, 0x20AC} }, // eEÇ + { VK_OEM_PLUS, NOCAPS, {'+', '*', WCH_NONE, 0x005d} }, // +*] + { VK_OEM_2, NOCAPS, {0x00e7, 0x00c7, WCH_NONE, '}'} }, // þÃ} - { VK_OEM_7, NOCAPS, WCH_DEAD, WCH_DEAD, WCH_NONE, '{' }, // ?¿{ - { VK_EMPTY, NOCAPS, 0xB4, 0xA8, WCH_NONE, WCH_NONE }, // ?¿{ + { VK_OEM_7, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, '{'} }, // ?¿{ + { VK_EMPTY, NOCAPS, {0xB4, 0xA8, WCH_NONE, WCH_NONE} }, // ?¿{ - { VK_OEM_1, NOCAPS, WCH_DEAD, WCH_DEAD, WCH_NONE, 0x5B }, // `^[ - { VK_EMPTY, NOCAPS, 0x60, 0x5e, WCH_NONE, WCH_NONE }, // `^[ + { VK_OEM_1, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, 0x5B} }, // `^[ + { VK_EMPTY, NOCAPS, {0x60, 0x5e, WCH_NONE, WCH_NONE} }, // `^[ - { VK_OEM_5, NOCAPS, 0x00BA, 0x00AA, WCH_NONE, 0x005c }, // þÃ} + { VK_OEM_5, NOCAPS, {0x00BA, 0x00AA, WCH_NONE, 0x005c} }, // þÃ} { 0, 0 } }; ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_NUMPAD0, 0, '0' }, - { VK_NUMPAD1, 0, '1' }, - { VK_NUMPAD2, 0, '2' }, - { VK_NUMPAD3, 0, '3' }, - { VK_NUMPAD4, 0, '4' }, - { VK_NUMPAD5, 0, '5' }, - { VK_NUMPAD6, 0, '6' }, - { VK_NUMPAD7, 0, '7' }, - { VK_NUMPAD8, 0, '8' }, - { VK_NUMPAD9, 0, '9' }, - { VK_DECIMAL, 0, '.' }, - { VK_BACK, 0, '\010' }, + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {'.'} }, + { VK_BACK, 0, {'\010'} }, { 0,0 } }; @@ -551,7 +504,7 @@ ROSDATA KBDTABLES keyboard_layout_table = { /* modifier assignments */ - (PMODIFIERS)&modifier_bits, + &modifier_bits, /* character from vk tables */ vk_to_wchar_master_table, @@ -563,7 +516,7 @@ /* Key names */ (VSC_LPWSTR *)key_names, (VSC_LPWSTR *)extended_key_names, - NULL, + dead_key_names, /* Dead key names */ /* scan code to virtual key maps */ _____ Modified: trunk/reactos/lib/kbdfr/kbdfr.c --- trunk/reactos/lib/kbdfr/kbdfr.c 2005-06-20 14:08:06 UTC (rev 16151) +++ trunk/reactos/lib/kbdfr/kbdfr.c 2005-06-20 14:23:13 UTC (rev 16152) @@ -12,9 +12,13 @@ #ifdef _M_IA64 #define ROSDATA static __declspec(allocate(".data")) #else +#ifdef _MSC_VER #pragma data_seg(".data") #define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) #endif +#endif #define VK_EMPTY 0xff /* The non-existent VK */ #define KSHIFT 0x001 /* Shift modifier */ @@ -27,50 +31,6 @@ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ -/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */ -#ifndef VK_OEM_1 -#define VK_OEM_1 0xba -#endif -#ifndef VK_OEM_PLUS -#define VK_OEM_PLUS 0xbb -#endif -#ifndef VK_OEM_COMMA -#define VK_OEM_COMMA 0xbc -#endif -#ifndef VK_OEM_MINUS -#define VK_OEM_MINUS 0xbd -#endif -#ifndef VK_OEM_PERIOD -#define VK_OEM_PERIOD 0xbe -#endif -#ifndef VK_OEM_2 -#define VK_OEM_2 0xbf -#endif -#ifndef VK_OEM_3 -#define VK_OEM_3 0xc0 -#endif -#ifndef VK_OEM_4 -#define VK_OEM_4 0xdb -#endif -#ifndef VK_OEM_5 -#define VK_OEM_5 0xdc -#endif -#ifndef VK_OEM_6 -#define VK_OEM_6 0xdd -#endif -#ifndef VK_OEM_7 -#define VK_OEM_7 0xde -#endif -#ifndef VK_OEM_8 -#define VK_OEM_8 0xdf -#endif -#ifndef VK_OEM_102 -#define VK_OEM_102 0xe2 -#endif -#ifndef VK_ZOOM -#define VK_ZOOM 0xfb -#endif - ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ /* - 00 - */ @@ -176,13 +136,7 @@ { 0, 0 } }; -typedef struct _mymod { - PVOID mod_keys; - WORD maxmod; - BYTE mod_max[7]; -} INTERNAL_KBD_MODIFIERS; - -ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = { +ROSDATA MODIFIERS modifier_bits = { modifier_keys, 6, { 0, 1, 2, 4,15,15,3 } @@ -196,122 +150,122 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* Normal vs Shifted */ /* The numbers */ - { '1', NOCAPS, '&', '1' }, - //{ '2', NOCAPS, 'Ú', '2' }, + { '1', NOCAPS, {'&', '1'} }, + //{ '2', NOCAPS, {'Ú', '2'} }, /* Ctrl-2 generates NUL */ - //{ '3', NOCAPS, '"', '3' }, - //{ '4', NOCAPS, '\'', '4' }, - //{ '5', NOCAPS, '(', '5' }, - //{ '6', NOCAPS, '-', '6' }, + //{ '3', NOCAPS, {'"', '3'} }, + //{ '4', NOCAPS, {'\'', '4'} }, + //{ '5', NOCAPS, {'(', '5'} }, + //{ '6', NOCAPS, {'-', '6'} }, /* Ctrl-6 generates RS */ - //{ '7', NOCAPS, 'Þ', '7' }, - //{ '8', NOCAPS, '_', '8' }, - //{ '9', NOCAPS, 'þ', '9' }, - //{ '0', NOCAPS, 'Ó', '0' }, + //{ '7', NOCAPS, {'Þ', '7'} }, + //{ '8', NOCAPS, {'_', '8'} }, + //{ '9', NOCAPS, {'þ', '9'} }, + //{ '0', NOCAPS, {'Ó', '0'} }, /* First letter row */ - { 'A', CAPS, 'a', 'A' }, - { 'Z', CAPS, 'z', 'Z' }, - //{ 'E', CAPS, 'e', 'E' }, - { 'R', CAPS, 'r', 'R' }, - { 'T', CAPS, 't', 'T' }, - { 'Y', CAPS, 'y', 'Y' }, - { 'U', CAPS, 'u', 'U' }, - { 'I', CAPS, 'i', 'I' }, - { 'O', CAPS, 'o', 'O' }, - { 'P', CAPS, 'p', 'P' }, + { 'A', CAPS, {'a', 'A'} }, + { 'Z', CAPS, {'z', 'Z'} }, + //{ 'E', CAPS, {'e', 'E'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'U', CAPS, {'u', 'U'} }, + { 'I', CAPS, {'i', 'I'} }, + { 'O', CAPS, {'o', 'O'} }, + { 'P', CAPS, {'p', 'P'} }, /* Second letter row */ - { 'Q', CAPS, 'q', 'Q' }, - { 'S', CAPS, 's', 'S' }, - { 'D', CAPS, 'd', 'D' }, - { 'F', CAPS, 'f', 'F' }, - { 'G', CAPS, 'g', 'G' }, - { 'H', CAPS, 'h', 'H' }, - { 'J', CAPS, 'j', 'J' }, - { 'K', CAPS, 'k', 'K' }, - { 'L', CAPS, 'l', 'L' }, - { 'M', CAPS, 'm', 'M' }, + { 'Q', CAPS, {'q', 'Q'} }, + { 'S', CAPS, {'s', 'S'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'L', CAPS, {'l', 'L'} }, + { 'M', CAPS, {'m', 'M'} }, /* Third letter row */ - { 'W', CAPS, 'w', 'W' }, - { 'X', CAPS, 'x', 'X' }, - { 'C', CAPS, 'c', 'C' }, - { 'V', CAPS, 'v', 'V' }, - { 'B', CAPS, 'b', 'B' }, - { 'N', CAPS, 'n', 'N' }, + { 'W', CAPS, {'w', 'W'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'C', CAPS, {'c', 'C'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'N', CAPS, {'n', 'N'} }, /* Specials */ /* Ctrl-_ generates US */ - //{ VK_OEM_1 ,NOCAPS, '$', 'ú' }, - { VK_OEM_5 ,NOCAPS, '*','Á'}, - { VK_OEM_3 ,NOCAPS, '¨', '%' }, - { VK_OEM_COMMA ,NOCAPS, ',', '?' }, - { VK_OEM_PERIOD ,NOCAPS, ';', '.' }, - { VK_OEM_2 ,NOCAPS, ':', '/' }, - { VK_OEM_8 ,NOCAPS, '!', 'º' }, + //{ VK_OEM_1 ,NOCAPS, {'$', 'ú'} }, + { VK_OEM_5 ,NOCAPS, {'*','Á'} }, + { VK_OEM_3 ,NOCAPS, {'¨', '%'} }, + { VK_OEM_COMMA ,NOCAPS, {',', '?'} }, + { VK_OEM_PERIOD ,NOCAPS, {';', '.'} }, + { VK_OEM_2 ,NOCAPS, {':', '/'} }, + { VK_OEM_8 ,NOCAPS, {'!', 'º'} }, /* Keys that do not have shift states */ [truncated at 1000 lines; 391 more skipped]

19 years, 3 months

[navaraf] 16151: Fix a cut & paste error.

by navaraf＠svn.reactos.com

Fix a cut & paste error. Modified: trunk/reactos/lib/kbduk/kbduk.c _____ Modified: trunk/reactos/lib/kbduk/kbduk.c --- trunk/reactos/lib/kbduk/kbduk.c 2005-06-20 13:59:40 UTC (rev 16150) +++ trunk/reactos/lib/kbduk/kbduk.c 2005-06-20 14:08:06 UTC (rev 16151) @@ -149,7 +149,6 @@ /* First letter row */ { 'Q', CAPS, {'q', 'Q'} }, { 'W', CAPS, {'w', 'W'} }, - { 'E', CAPS, {'e', 'E'} }, { 'R', CAPS, {'r', 'R'} }, { 'T', CAPS, {'t', 'T'} }, { 'Y', CAPS, {'y', 'Y'} },

19 years, 3 months

[navaraf] 16150: Fix warnings.

by navaraf＠svn.reactos.com

Fix warnings. Modified: trunk/reactos/lib/kbdru/kbdru.c Modified: trunk/reactos/lib/kbdse/kbdse.c Modified: trunk/reactos/lib/kbdsg/kbdsg.c _____ Modified: trunk/reactos/lib/kbdru/kbdru.c --- trunk/reactos/lib/kbdru/kbdru.c 2005-06-20 13:54:52 UTC (rev 16149) +++ trunk/reactos/lib/kbdru/kbdru.c 2005-06-20 13:59:40 UTC (rev 16150) @@ -14,9 +14,13 @@ #ifdef _M_IA64 #define ROSDATA static __declspec(allocate(".data")) #else +#ifdef _MSC_VER #pragma data_seg(".data") #define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) #endif +#endif #define VK_EMPTY 0xff /* The non-existent VK */ #define KSHIFT 0x001 /* Shift modifier */ @@ -31,50 +35,6 @@ #define SHFT_INVALID 0x0F -/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */ -#ifndef VK_OEM_1 -#define VK_OEM_1 0xba -#endif -#ifndef VK_OEM_PLUS -#define VK_OEM_PLUS 0xbb -#endif -#ifndef VK_OEM_COMMA -#define VK_OEM_COMMA 0xbc -#endif -#ifndef VK_OEM_MINUS -#define VK_OEM_MINUS 0xbd -#endif -#ifndef VK_OEM_PERIOD -#define VK_OEM_PERIOD 0xbe -#endif -#ifndef VK_OEM_2 -#define VK_OEM_2 0xbf -#endif -#ifndef VK_OEM_3 -#define VK_OEM_3 0xc0 -#endif -#ifndef VK_OEM_4 -#define VK_OEM_4 0xdb -#endif -#ifndef VK_OEM_5 -#define VK_OEM_5 0xdc -#endif -#ifndef VK_OEM_6 -#define VK_OEM_6 0xdd -#endif -#ifndef VK_OEM_7 -#define VK_OEM_7 0xde -#endif -#ifndef VK_OEM_8 -#define VK_OEM_8 0xdf -#endif -#ifndef VK_OEM_AX -#define VK_OEM_AX 0xe1 -#endif -#ifndef VK_OEM_102 -#define VK_OEM_102 0xe1 -#endif - ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ /* - 00 - */ @@ -203,13 +163,7 @@ { 0, 0 } }; -typedef struct _mymod { - PVOID mod_keys; - WORD maxmod; - BYTE mod_max[7]; -} INTERNAL_KBD_MODIFIERS; - -ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = { +ROSDATA MODIFIERS modifier_bits = { modifier_keys, 3, { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ @@ -219,99 +173,99 @@ #define CAPS KSHIFT /* Caps -> shift */ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { - {VK_OEM_3, CAPS, 0x451, 0x401}, - { '1', NOCAPS, '1', '!' }, - { '3', NOCAPS, '3', 0x2116 }, - { '4', NOCAPS, '4', ';' }, - { '5', NOCAPS, '5', '%' }, - { '7', NOCAPS, '7', '?' }, - { '8', NOCAPS, '8', '*' }, - { '9', NOCAPS, '9', '(' }, - { '0', NOCAPS, '0', ')' }, - { VK_OEM_PLUS, NOCAPS, '=', '+' }, + {VK_OEM_3, CAPS, {0x451, 0x401} }, + { '1', NOCAPS, {'1', '!'} }, + { '3', NOCAPS, {'3', 0x2116} }, + { '4', NOCAPS, {'4', ';'} }, + { '5', NOCAPS, {'5', '%'} }, + { '7', NOCAPS, {'7', '?'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, + { VK_OEM_PLUS, NOCAPS, {'=', '+'} }, /* First letter row */ - { 'Q', CAPS, 0x439, 0x419 }, - { 'W', CAPS, 0x446, 0x426 }, - { 'E', CAPS, 0x443, 0x423 }, - { 'R', CAPS, 0x43a, 0x41a }, - { 'T', CAPS, 0x435, 0x415 }, - { 'Y', CAPS, 0x43d, 0x41d }, - { 'U', CAPS, 0x433, 0x413 }, - { 'I', CAPS, 0x448, 0x428 }, - { 'O', CAPS, 0x449, 0x429 }, - { 'P', CAPS, 0x437, 0x417 }, - { VK_OEM_4, CAPS, 0x445, 0x425 }, - { VK_OEM_6, CAPS, 0x44a, 0x42a }, + { 'Q', CAPS, {0x439, 0x419} }, + { 'W', CAPS, {0x446, 0x426} }, + { 'E', CAPS, {0x443, 0x423} }, + { 'R', CAPS, {0x43a, 0x41a} }, + { 'T', CAPS, {0x435, 0x415} }, + { 'Y', CAPS, {0x43d, 0x41d} }, + { 'U', CAPS, {0x433, 0x413} }, + { 'I', CAPS, {0x448, 0x428} }, + { 'O', CAPS, {0x449, 0x429} }, + { 'P', CAPS, {0x437, 0x417} }, + { VK_OEM_4, CAPS, {0x445, 0x425} }, + { VK_OEM_6, CAPS, {0x44a, 0x42a} }, /* Second letter row */ - { 'A', CAPS, 0x444, 0x424 }, - { 'S', CAPS, 0x44b, 0x42b }, - { 'D', CAPS, 0x432, 0x412 }, - { 'F', CAPS, 0x430, 0x410 }, - { 'G', CAPS, 0x43f, 0x41f }, - { 'H', CAPS, 0x440, 0x420 }, - { 'J', CAPS, 0x43e, 0x41e }, - { 'K', CAPS, 0x43b, 0x41b }, - { 'L', CAPS, 0x434, 0x414 }, - { VK_OEM_1, CAPS, 0x436, 0x416 }, - { VK_OEM_7, CAPS, 0x44d, 0x42d }, + { 'A', CAPS, {0x444, 0x424} }, + { 'S', CAPS, {0x44b, 0x42b} }, + { 'D', CAPS, {0x432, 0x412} }, + { 'F', CAPS, {0x430, 0x410} }, + { 'G', CAPS, {0x43f, 0x41f} }, + { 'H', CAPS, {0x440, 0x420} }, + { 'J', CAPS, {0x43e, 0x41e} }, + { 'K', CAPS, {0x43b, 0x41b} }, + { 'L', CAPS, {0x434, 0x414} }, + { VK_OEM_1, CAPS, {0x436, 0x416} }, + { VK_OEM_7, CAPS, {0x44d, 0x42d} }, /* Third letter row */ - { 'Z', CAPS, 0x44f, 0x42f }, - { 'X', CAPS, 0x447, 0x427 }, - { 'C', CAPS, 0x441, 0x421 }, - { 'V', CAPS, 0x43c, 0x41c }, - { 'B', CAPS, 0x438, 0x418 }, - { 'N', CAPS, 0x442, 0x422 }, - { 'M', CAPS, 0x44c, 0x42c }, - { VK_OEM_COMMA,CAPS, 0x431, 0x411 }, - { VK_OEM_PERIOD,CAPS, 0x44e, 0x42e }, - { VK_OEM_2, NOCAPS, '.', ',' }, + { 'Z', CAPS, {0x44f, 0x42f} }, + { 'X', CAPS, {0x447, 0x427} }, + { 'C', CAPS, {0x441, 0x421} }, + { 'V', CAPS, {0x43c, 0x41c} }, + { 'B', CAPS, {0x438, 0x418} }, + { 'N', CAPS, {0x442, 0x422} }, + { 'M', CAPS, {0x44c, 0x42c} }, + { VK_OEM_COMMA,CAPS, {0x431, 0x411} }, + { VK_OEM_PERIOD,CAPS, {0x44e, 0x42e} }, + { VK_OEM_2, NOCAPS, {'.', ','} }, /* Specials */ - { 0x6e, NOCAPS, ',', ','}, - { VK_TAB, NOCAPS, 9, 9}, - { VK_ADD, NOCAPS, '+', '+' }, - { VK_DIVIDE, NOCAPS, '/', '/' }, - { VK_MULTIPLY, NOCAPS, '*', '*' }, - { VK_SUBTRACT, NOCAPS, '-', '-' }, + { 0x6e, NOCAPS, {',', ','} }, + { VK_TAB, NOCAPS, {9, 9} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ /* Legacy (telnet-style) ascii escapes */ - { VK_OEM_5, NOCAPS, 0x5c,0x2f, 0x1c }, - { VK_OEM_102, NOCAPS, 0x5c,0x2f, 0x1c }, - { VK_BACK, NOCAPS, 0x8, 0x8, 0x7f }, - { VK_ESCAPE, NOCAPS, 0x1b, 0x1b, 0x1b }, - { VK_RETURN,NOCAPS, '\r', '\r', '\n' }, - { VK_SPACE, NOCAPS, ' ', ' ', ' ' }, - { VK_CANCEL, NOCAPS, 0x03, 0x03, 0x03 }, + { VK_OEM_5, NOCAPS, {0x5c, 0x2f, 0x1c} }, + { VK_OEM_102, NOCAPS, {0x5c, 0x2f, 0x1c} }, + { VK_BACK, NOCAPS, {0x8, 0x8, 0x7f} }, + { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + { VK_SPACE, NOCAPS, {' ', ' ', ' '} }, + { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} }, { 0,0 } }; ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Ctrl, Ctrl-Alt */ /* Legacy Ascii generators */ - { '2', NOCAPS, '2', '\"', WCH_NONE,0}, - { '6', NOCAPS, '6', ':', WCH_NONE,0x001e}, - { VK_OEM_MINUS, NOCAPS, 0x2d, '_', WCH_NONE, 0x001f}, // different '-' + { '2', NOCAPS, {'2', '\"', WCH_NONE, 0} }, + { '6', NOCAPS, {'6', ':', WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, NOCAPS, {0x2d, '_', WCH_NONE, 0x001f} }, // different '-' { 0, 0 } }; ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_NUMPAD0, 0, '0' }, - { VK_NUMPAD1, 0, '1' }, - { VK_NUMPAD2, 0, '2' }, - { VK_NUMPAD3, 0, '3' }, - { VK_NUMPAD4, 0, '4' }, - { VK_NUMPAD5, 0, '5' }, - { VK_NUMPAD6, 0, '6' }, - { VK_NUMPAD7, 0, '7' }, - { VK_NUMPAD8, 0, '8' }, - { VK_NUMPAD9, 0, '9' }, + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, { 0,0 } }; @@ -410,7 +364,7 @@ /* Finally, the master table */ ROSDATA KBDTABLES keyboard_layout_table = { /* modifier assignments */ - (PMODIFIERS)&modifier_bits, + &modifier_bits, /* character from vk tables */ vk_to_wchar_master_table, _____ Modified: trunk/reactos/lib/kbdse/kbdse.c --- trunk/reactos/lib/kbdse/kbdse.c 2005-06-20 13:54:52 UTC (rev 16149) +++ trunk/reactos/lib/kbdse/kbdse.c 2005-06-20 13:59:40 UTC (rev 16150) @@ -13,9 +13,13 @@ #ifdef _M_IA64 #define ROSDATA static __declspec(allocate(".data")) #else +#ifdef _MSC_VER #pragma data_seg(".data") #define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) #endif +#endif #define VK_EMPTY 0xff /* The non-existent VK */ #define KSHIFT 0x001 /* Shift modifier */ @@ -30,47 +34,6 @@ #define SHFT_INVALID 0x0F -/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */ -#ifndef VK_OEM_1 -#define VK_OEM_1 0xba -#endif -#ifndef VK_OEM_PLUS -#define VK_OEM_PLUS 0xbb -#endif -#ifndef VK_OEM_COMMA -#define VK_OEM_COMMA 0xbc -#endif -#ifndef VK_OEM_MINUS -#define VK_OEM_MINUS 0xbd -#endif -#ifndef VK_OEM_PERIOD -#define VK_OEM_PERIOD 0xbe -#endif -#ifndef VK_OEM_2 -#define VK_OEM_2 0xbf -#endif -#ifndef VK_OEM_3 -#define VK_OEM_3 0xc0 -#endif -#ifndef VK_OEM_4 -#define VK_OEM_4 0xdb -#endif -#ifndef VK_OEM_5 -#define VK_OEM_5 0xdc -#endif -#ifndef VK_OEM_6 -#define VK_OEM_6 0xdd -#endif -#ifndef VK_OEM_7 -#define VK_OEM_7 0xde -#endif -#ifndef VK_OEM_8 -#define VK_OEM_8 0xdf -#endif -#ifndef VK_OEM_102 -#define VK_OEM_102 0xe1 -#endif - ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ /* - 00 - */ @@ -199,13 +162,7 @@ { 0, 0 } }; -typedef struct _mymod { - PVOID mod_keys; - WORD maxmod; - BYTE mod_max[7]; -} INTERNAL_KBD_MODIFIERS; - -ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = { +ROSDATA MODIFIERS modifier_bits = { modifier_keys, 6, { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ @@ -217,68 +174,68 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* The numbers */ - { '1', NOCAPS, '1', '!' }, + { '1', NOCAPS, {'1', '!'} }, /* Ctrl-2 generates NUL */ /* First letter row */ - { 'Q', CAPS, 'q', 'Q' }, - { 'W', CAPS, 'w', 'W' }, - { 'R', CAPS, 'r', 'R' }, - { 'T', CAPS, 't', 'T' }, - { 'Y', CAPS, 'y', 'Y' }, - { 'U', CAPS, 'u', 'U' }, - { 'I', CAPS, 'i', 'I' }, - { 'O', CAPS, 'o', 'O' }, - { 'P', CAPS, 'p', 'P' }, + { 'Q', CAPS, {'q', 'Q'} }, + { 'W', CAPS, {'w', 'W'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'U', CAPS, {'u', 'U'} }, + { 'I', CAPS, {'i', 'I'} }, + { 'O', CAPS, {'o', 'O'} }, + { 'P', CAPS, {'p', 'P'} }, /* Second letter row */ - { 'A', CAPS, 'a', 'A' }, - { 'S', CAPS, 's', 'S' }, - { 'D', CAPS, 'd', 'D' }, - { 'F', CAPS, 'f', 'F' }, - { 'G', CAPS, 'g', 'G' }, - { 'H', CAPS, 'h', 'H' }, - { 'J', CAPS, 'j', 'J' }, - { 'K', CAPS, 'k', 'K' }, - { 'L', CAPS, 'l', 'L' }, + { 'A', CAPS, {'a', 'A'} }, + { 'S', CAPS, {'s', 'S'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'L', CAPS, {'l', 'L'} }, /* Third letter row */ - { 'Z', CAPS, 'z', 'Z' }, - { 'X', CAPS, 'x', 'X' }, - { 'C', CAPS, 'c', 'C' }, - { 'V', CAPS, 'v', 'V' }, - { 'B', CAPS, 'b', 'B' }, - { 'N', CAPS, 'n', 'N' }, + { 'Z', CAPS, {'z', 'Z'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'C', CAPS, {'c', 'C'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'N', CAPS, {'n', 'N'} }, /* Specials */ - { VK_OEM_4, NOCAPS, WCH_DEAD, WCH_DEAD}, - { VK_OEM_7, CAPS, 0xe4,0xc4}, - { VK_OEM_3, CAPS, 0xf6, 0xd6 }, + { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD} }, + { VK_OEM_7, CAPS, {0xe4,0xc4} }, + { VK_OEM_3, CAPS, {0xf6, 0xd6} }, - { VK_OEM_COMMA, CAPS, ',', ';' }, - { VK_OEM_PERIOD, CAPS, '.', ':' }, - { VK_OEM_2, NOCAPS, '\'', '*' }, + { VK_OEM_COMMA, CAPS, {',', ';'} }, + { VK_OEM_PERIOD, CAPS, {'.', ':'} }, + { VK_OEM_2, NOCAPS, {'\'', '*'} }, - { VK_DECIMAL, NOCAPS, ',',','}, - { VK_TAB, NOCAPS, '\t', '\t' }, - { VK_ADD, NOCAPS, '+', '+' }, - { VK_DIVIDE, NOCAPS, '/', '/' }, - { VK_MULTIPLY, NOCAPS, '*', '*' }, - { VK_SUBTRACT, NOCAPS, '-', '-' }, + { VK_DECIMAL, NOCAPS, {',',','} }, + { VK_TAB, NOCAPS, {'\t', '\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Ctrl */ /* Legacy (telnet-style) ascii escapes */ - {VK_OEM_6, CAPS, 0xe5,0xc5, 0x1d /* GS */ }, - { VK_OEM_5, NOCAPS, 0xa7,0xbd, 0x1c /* FS */ }, - { VK_OEM_MINUS, NOCAPS, '-', '_', 0x1f /* US */ }, - { VK_RETURN,NOCAPS, '\r', '\r', '\n' }, + {VK_OEM_6, CAPS, {0xe5,0xc5, 0x1d /* GS */} }, + { VK_OEM_5, NOCAPS, {0xa7,0xbd, 0x1c /* FS */} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x1f /* US */} }, + { VK_RETURN,NOCAPS, {'\r', '\r', '\n'} }, - { VK_BACK, NOCAPS, '\b', '\b', 0x7f }, - { VK_ESCAPE, NOCAPS, 0x1b, 0x1b, 0x1b }, - { VK_SPACE, NOCAPS, ' ', ' ', ' ' }, - { VK_CANCEL, NOCAPS, 0x03, 0x03, 0x03 }, + { VK_BACK, NOCAPS, {'\b', '\b', 0x7f} }, + { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} }, + { VK_SPACE, NOCAPS, {' ', ' ', ' '} }, + { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} }, { 0,0 } }; @@ -287,40 +244,40 @@ /* Normal, Shifted, Ctrl, Ctrl-Alt */ /* Legacy Ascii generators */ - { '2', NOCAPS, '2', '\"', WCH_NONE,'@'}, - { '3', NOCAPS, '3', '#', WCH_NONE, 0x00a3}, - { '4', NOCAPS, '4', 0xa4, WCH_NONE, '$'}, - { '5', NOCAPS, '5', '%', WCH_NONE, 0x00ac}, - { '7', NOCAPS, '7', '/', WCH_NONE, '{' }, - { '8', NOCAPS, '8', '(', WCH_NONE, '[' }, - { '9', NOCAPS, '9', ')', WCH_NONE, ']' }, - { '0', NOCAPS, '0', '=', WCH_NONE, '}' }, - { VK_OEM_PLUS ,NOCAPS, '+', '?', WCH_NONE, '\\' }, - { 'E', CAPS, 'e', 'E' , WCH_NONE, 0x00ac}, - { VK_OEM_1 ,NOCAPS, 0xa8, '^', 0x001d, '~' }, - { 'M', CAPS, 'm', 'M', WCH_NONE, 0x00b5 }, - {VK_OEM_102, NOCAPS, '<', '>' ,0x001c,'|'}, + { '2', NOCAPS, {'2', '\"', WCH_NONE,'@'} }, + { '3', NOCAPS, {'3', '#', WCH_NONE, 0x00a3} }, + { '4', NOCAPS, {'4', 0xa4, WCH_NONE, '$'} }, + { '5', NOCAPS, {'5', '%', WCH_NONE, 0x00ac} }, + { '7', NOCAPS, {'7', '/', WCH_NONE, '{'} }, + { '8', NOCAPS, {'8', '(', WCH_NONE, '['} }, + { '9', NOCAPS, {'9', ')', WCH_NONE, ']'} }, + { '0', NOCAPS, {'0', '=', WCH_NONE, '}'} }, + { VK_OEM_PLUS ,NOCAPS, {'+', '?', WCH_NONE, '\\'} }, + { 'E', CAPS, {'e', 'E' , WCH_NONE, 0x00ac} }, + { VK_OEM_1 ,NOCAPS, {0xa8, '^', 0x001d, '~'} }, + { 'M', CAPS, {'m', 'M', WCH_NONE, 0x00b5} }, + {VK_OEM_102, NOCAPS, {'<', '>' ,0x001c,'|'} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { /* Normal, Shifted, Ctrl, Ctrl-Alt, C-S-x */ - { '6', NOCAPS, '6', '&', WCH_NONE, WCH_NONE, 0x1e /* RS */ }, + { '6', NOCAPS, {'6', '&', WCH_NONE, WCH_NONE, 0x1e /* RS */} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_DECIMAL, 0, '.' }, - { VK_NUMPAD0, 0, '0' }, - { VK_NUMPAD1, 0, '1' }, - { VK_NUMPAD2, 0, '2' }, - { VK_NUMPAD3, 0, '3' }, - { VK_NUMPAD4, 0, '4' }, - { VK_NUMPAD5, 0, '5' }, - { VK_NUMPAD6, 0, '6' }, - { VK_NUMPAD7, 0, '7' }, - { VK_NUMPAD8, 0, '8' }, - { VK_NUMPAD9, 0, '9' }, + { VK_DECIMAL, 0, {'.'} }, + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, { 0,0 } }; @@ -494,7 +451,7 @@ /* Finally, the master table */ ROSDATA KBDTABLES keyboard_layout_table = { /* modifier assignments */ - (PMODIFIERS)&modifier_bits, + &modifier_bits, /* character from vk tables */ vk_to_wchar_master_table, _____ Modified: trunk/reactos/lib/kbdsg/kbdsg.c --- trunk/reactos/lib/kbdsg/kbdsg.c 2005-06-20 13:54:52 UTC (rev 16149) +++ trunk/reactos/lib/kbdsg/kbdsg.c 2005-06-20 13:59:40 UTC (rev 16150) @@ -15,9 +15,13 @@ #ifdef _M_IA64 #define ROSDATA static __declspec(allocate(".data")) #else +#ifdef _MSC_VER #pragma data_seg(".data") #define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) #endif +#endif #define VK_EMPTY 0xff /* The non-existent VK */ #define KSHIFT 0x001 /* Shift modifier */ @@ -32,47 +36,6 @@ #define SHFT_INVALID 0x0F -/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */ -#ifndef VK_OEM_1 -#define VK_OEM_1 0xba -#endif -#ifndef VK_OEM_PLUS -#define VK_OEM_PLUS 0xbb /* actually this is ¿ ! ] on the Swiss German Keyboard */ -#endif -#ifndef VK_OEM_COMMA -#define VK_OEM_COMMA 0xbc -#endif -#ifndef VK_OEM_MINUS -#define VK_OEM_MINUS 0xbd -#endif -#ifndef VK_OEM_PERIOD -#define VK_OEM_PERIOD 0xbe -#endif -#ifndef VK_OEM_2 -#define VK_OEM_2 0xbf -#endif -#ifndef VK_OEM_3 -#define VK_OEM_3 0xc0 -#endif -#ifndef VK_OEM_4 -#define VK_OEM_4 0xdb -#endif -#ifndef VK_OEM_5 -#define VK_OEM_5 0xdc -#endif -#ifndef VK_OEM_6 -#define VK_OEM_6 0xdd -#endif -#ifndef VK_OEM_7 -#define VK_OEM_7 0xde -#endif -#ifndef VK_OEM_8 -#define VK_OEM_8 0xdf -#endif -#ifndef VK_OEM_102 -#define VK_OEM_102 0xe1 -#endif - ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ /* - 00 - */ @@ -201,13 +164,7 @@ { 0, 0 } }; -typedef struct _mymod { - PVOID mod_keys; - WORD maxmod; - BYTE mod_max[7]; -} INTERNAL_KBD_MODIFIERS; - -ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = { +ROSDATA MODIFIERS modifier_bits = { modifier_keys, 6, { 0, 1, 3, 4, SHFT_INVALID, SHFT_INVALID, 2 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ @@ -224,111 +181,111 @@ #define CAPS KSHIFT /* Caps -> shift */ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { - { VK_OEM_5, NOCAPS, 0xa7, 0xb0}, /* º ? */ + { VK_OEM_5, NOCAPS, {0xa7, 0xb0} }, /* º ? */ /* Normal vs Shifted */ /* The numbers */ /* Ctrl-2 generates NUL */ - { 0xff, NOCAPS, 0xa7, 0x9B }, /* what is this for? */ - { '4', NOCAPS, '4', 0xE7 }, - { '5', NOCAPS, '5', '%' }, - { '9', NOCAPS, '9', ')' }, - { '0', NOCAPS, '0', '=' }, + { 0xff, NOCAPS, {0xa7, 0x9B} }, /* what is this for? */ + { '4', NOCAPS, {'4', 0xE7} }, + { '5', NOCAPS, {'5', '%'} }, + { '9', NOCAPS, {'9', ')'} }, + { '0', NOCAPS, {'0', '='} }, /* First letter row */ - { 'W', CAPS, 'w', 'W' }, - { 'R', CAPS, 'r', 'R' }, - { 'T', CAPS, 't', 'T' }, - { 'Z', CAPS, 'z', 'Z' }, - { 'U', CAPS, 'u', 'U' }, - { 'I', CAPS, 'i', 'I' }, - { 'O', CAPS, 'o', 'O' }, - { 'P', CAPS, 'p', 'P' }, + { 'W', CAPS, {'w', 'W'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'Z', CAPS, {'z', 'Z'} }, + { 'U', CAPS, {'u', 'U'} }, + { 'I', CAPS, {'i', 'I'} }, + { 'O', CAPS, {'o', 'O'} }, + { 'P', CAPS, {'p', 'P'} }, /* Second letter row */ - { 'A', CAPS, 'a', 'A' }, - { 'S', CAPS, 's', 'S' }, - { 'D', CAPS, 'd', 'D' }, - { 'F', CAPS, 'f', 'F' }, - { 'G', CAPS, 'g', 'G' }, - { 'H', CAPS, 'h', 'H' }, - { 'J', CAPS, 'j', 'J' }, - { 'K', CAPS, 'k', 'K' }, - { 'L', CAPS, 'l', 'L' }, + { 'A', CAPS, {'a', 'A'} }, + { 'S', CAPS, {'s', 'S'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'L', CAPS, {'l', 'L'} }, /* Third letter row */ - { 'Y', CAPS, 'y', 'Y' }, - { 'X', CAPS, 'x', 'X' }, - { 'V', CAPS, 'v', 'V' }, - { 'B', CAPS, 'b', 'B' }, - { 'N', CAPS, 'n', 'N' }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'N', CAPS, {'n', 'N'} }, /* Specials */ - { VK_OEM_COMMA, NOCAPS, ',', ';' }, - { VK_OEM_PERIOD, NOCAPS, '.', ':' }, - { VK_OEM_MINUS, NOCAPS, '-', '_' }, - { VK_DECIMAL, NOCAPS, '.', '.' }, - { VK_TAB, NOCAPS, '\t', '\t' }, - { VK_ADD, NOCAPS, '+', '+' }, - { VK_DIVIDE, NOCAPS, 0x2f, 0x2f }, /* '/' */ - { VK_MULTIPLY, NOCAPS, '*', '*' }, - { VK_SUBTRACT, NOCAPS, '-', '-' }, + { VK_OEM_COMMA, NOCAPS, {',', ';'} }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':'} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_'} }, + { VK_DECIMAL, NOCAPS, {'.', '.'} }, + { VK_TAB, NOCAPS, {'\t', '\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {0x2f, 0x2f} }, /* '/' */ + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { /* Normal, Shifted, Alt Gr */ /* Legacy (telnet-style) ascii escapes */ - { VK_OEM_4, NOCAPS, '\'' , '?' , WCH_DEAD }, /* ' ? ? */ - { 0xff, NOCAPS, WCH_NONE, WCH_NONE, 0xb4 }, - { 'Q', CAPS, 'q', 'Q', '@' }, - { 'C', CAPS, 'c', 'C', 0xa9}, /* c C Copyright-Sign */ - { 'E', CAPS, 'e', 'E', 0x20ac }, /* e E Ç */ - { 'M', CAPS, 'm', 'M', 0xb5 }, /* m M mu-Sign */ - { VK_OEM_102, NOCAPS, '<', '>', '\\' }, + { VK_OEM_4, NOCAPS, {'\'' , '?' , WCH_DEAD} }, /* ' ? ? */ + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0xb4} }, + { 'Q', CAPS, {'q', 'Q', '@'} }, + { 'C', CAPS, {'c', 'C', 0xa9} }, /* c C Copyright-Sign */ + { 'E', CAPS, {'e', 'E', 0x20ac} }, /* e E Ç */ + { 'M', CAPS, {'m', 'M', 0xb5} }, /* m M mu-Sign */ + { VK_OEM_102, NOCAPS, {'<', '>', '\\'} }, { 0,0 } }; ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { /* Normal, Shifted, Alt Gr, C-S-x */ /* Legacy Ascii generators */ - { VK_BACK, NOCAPS, '\b', '\b', WCH_NONE, 0x7f }, - { VK_ESCAPE, NOCAPS, 0x1b, 0x1b, WCH_NONE, 0x1b }, - { VK_RETURN, NOCAPS, '\r', '\r', WCH_NONE, '\n' }, - { VK_SPACE, NOCAPS, ' ', ' ', WCH_NONE, ' ' }, - { VK_CANCEL, NOCAPS, 0x03, 0x03, WCH_NONE, 0x03 }, + { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, 0x7f} }, + { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, WCH_NONE, 0x1b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', WCH_NONE, '\n'} }, + { VK_SPACE, NOCAPS, {' ', ' ', WCH_NONE, ' '} }, + { VK_CANCEL, NOCAPS, {0x03, 0x03, WCH_NONE, 0x03} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { /* Normal, Shifted, Alt Gr, Ctrl */ - { '1', NOCAPS, '1', '+', '|', WCH_NONE, 0x00 }, - { '2', NOCAPS, '2', '\"', '@', WCH_NONE, 0x00 }, - { '3', NOCAPS, '3', '*', '#', WCH_NONE, 0x00 }, - { '6', NOCAPS, '6', '&', 0xac, WCH_NONE, 0x00 }, - { '7', NOCAPS, '7', '/', 0xa6, WCH_NONE, 0x00 }, - { '8', NOCAPS, '8', '(', 0xa2, WCH_NONE, 0x00 }, - { VK_OEM_1, KCTRL, 0xfc, 0xe8, 0x5b, 0Xdc, 0xc8 }, /* ³ Þ [ ? ? */ - { VK_OEM_2, NOCAPS, 0x24, 0xa3, 0x7d, WCH_NONE, 0x00 }, /* $ ú } */ - { VK_OEM_3, KCTRL, 0xf6, 0xe9, WCH_NONE, 0xd6, 0xc9 }, /* ÷ Ú Í ?*/ - { VK_OEM_6, NOCAPS, WCH_DEAD, WCH_DEAD, WCH_DEAD, WCH_NONE, 0x00 }, /* ^ ` ~ */ - { 0xff, NOCAPS, 0x5e , 0x27 , 0x7e , WCH_NONE, 0x00 }, - { VK_OEM_7, KCTRL, 0xe4, 0xe0, 0x7b, 0xc4, 0xc0 }, /* õ Ó { ? ? */ - { VK_OEM_PLUS, NOCAPS, WCH_DEAD, 0x21 , 0x5D , WCH_NONE, 0x00 }, /* ¿ ! ] */ - { 0xff, NOCAPS, 0xa8 , WCH_NONE, WCH_NONE, WCH_NONE, 0x00 }, + { '1', NOCAPS, {'1', '+', '|', WCH_NONE, 0x00} }, + { '2', NOCAPS, {'2', '\"', '@', WCH_NONE, 0x00} }, + { '3', NOCAPS, {'3', '*', '#', WCH_NONE, 0x00} }, + { '6', NOCAPS, {'6', '&', 0xac, WCH_NONE, 0x00} }, + { '7', NOCAPS, {'7', '/', 0xa6, WCH_NONE, 0x00} }, + { '8', NOCAPS, {'8', '(', 0xa2, WCH_NONE, 0x00} }, + { VK_OEM_1, KCTRL, {0xfc, 0xe8, 0x5b, 0Xdc, 0xc8} }, /* ³ Þ [ ? ? */ + { VK_OEM_2, NOCAPS, {0x24, 0xa3, 0x7d, WCH_NONE, 0x00} }, /* $ ú } */ + { VK_OEM_3, KCTRL, {0xf6, 0xe9, WCH_NONE, 0xd6, 0xc9} }, /* ÷ Ú Í ?*/ + { VK_OEM_6, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_DEAD, WCH_NONE, 0x00} }, /* ^ ` ~ */ + { 0xff, NOCAPS, {0x5e , 0x27 , 0x7e , WCH_NONE, 0x00} }, + { VK_OEM_7, KCTRL, {0xe4, 0xe0, 0x7b, 0xc4, 0xc0} }, /* õ Ó { ? ? */ + { VK_OEM_PLUS, NOCAPS, {WCH_DEAD, 0x21 , 0x5D , WCH_NONE, 0x00} }, /* ¿ ! ] */ + { 0xff, NOCAPS, {0xa8 , WCH_NONE, WCH_NONE, WCH_NONE, 0x00} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_DECIMAL, 0, '.' }, /* I have no idea why this has to be like this. Shouldn't it be a "."? */ - { VK_NUMPAD0, 0, '0' }, - { VK_NUMPAD1, 0, '1' }, - { VK_NUMPAD2, 0, '2' }, - { VK_NUMPAD3, 0, '3' }, - { VK_NUMPAD4, 0, '4' }, - { VK_NUMPAD5, 0, '5' }, - { VK_NUMPAD6, 0, '6' }, - { VK_NUMPAD7, 0, '7' }, - { VK_NUMPAD8, 0, '8' }, - { VK_NUMPAD9, 0, '9' }, + { VK_DECIMAL, 0, {'.'} }, /* I have no idea why this has to be like this. Shouldn't it be a "."? */ + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, // { VK_BACK, 0, '\010' }, { 0,0 } }; @@ -496,7 +453,7 @@ /* Finally, the master table */ ROSDATA KBDTABLES keyboard_layout_table = { /* modifier assignments */ - (PMODIFIERS)&modifier_bits, + &modifier_bits, /* character from vk tables */ vk_to_wchar_master_table,

19 years, 3 months

← Newer
1
...
18
19
20
21
22
23
24
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005