Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mpiulachs] 33170: spanish translation for kbswitch
by mpiulachs＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: mpiulachs Date: Sun Apr 27 12:09:51 2008 New Revision: 33170 URL: http://svn.reactos.org/svn/reactos?rev=33170&view=rev Log: spanish translation for kbswitch Added: trunk/reactos/base/applications/kbswitch/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc Added: trunk/reactos/base/applications/kbswitch/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/es-ES.rc [iso-8859-1] Sun Apr 27 12:09:51 2008 @@ -1,0 +1,11 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&Preferencias...", ID_PREFERENCES + MENUITEM "&Salir", ID_EXIT + END +END Propchange: trunk/reactos/base/applications/kbswitch/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Sun Apr 27 12:09:51 2008 @@ -1,4 +1,5 @@ #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/ru-RU.rc"

1 0

[greatlrd] 33169: Getting the pain in the ass api DxDdCreateDirectDrawObject inside ms dxg.sys working it is now returning info now it needs a negtive value set in struct edd_directdraw_global member llAssertModeTimeout.
by greatlrd＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: greatlrd Date: Sun Apr 27 12:00:06 2008 New Revision: 33169 URL: http://svn.reactos.org/svn/reactos?rev=33169&view=rev Log: Getting the pain in the ass api DxDdCreateDirectDrawObject inside ms dxg.sys working it is now returning info now it needs a negtive value set in struct edd_directdraw_global member llAssertModeTimeout. Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Sun Apr 27 12:00:06 2008 @@ -11,7 +11,7 @@ // // GDI Object Header // - DD_BASEOBJECT pobj; +/* 0x00 */ DD_BASEOBJECT pobj; // verify it match windows xp /* 0x10 */ struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal; // verify it match windows xp /* 0x14 */ struct _EDD_SURFACE * peSurface_DdList; /* 0x18 */ ULONG unk_018; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun Apr 27 12:00:06 2008 @@ -252,6 +252,9 @@ /* setup missing data in ddHalInfo */ //pEddgbl->ddHalInfo.GetDriverInfo = (PVOID)pDev->DriverFunctions.GetDirectDrawInfo; + + /* FIXME : hack ? it will let us DxDdQueryDirectDrawObject if the llAssertModeTimeout contain negtive value -1*/ + pEddgbl->llAssertModeTimeout.QuadPart = -1; /* FIXME : remove this when we are done with debuging of dxg */ dump_edd_directdraw_global(pEddgbl);

1 0

[dchapyshev] 33168: - Implement current layout indicator
by dchapyshev＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: dchapyshev Date: Sun Apr 27 10:40:42 2008 New Revision: 33168 URL: http://svn.reactos.org/svn/reactos?rev=33168&view=rev Log: - Implement current layout indicator Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/kbswitch/kbswitch.rbuild Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun Apr 27 10:40:42 2008 @@ -10,24 +10,99 @@ #define WM_NOTIFYICONMSG (WM_USER + 248) +static BOOL +GetLayoutID(LPTSTR szLayoutNum, LPTSTR szLCID); + HINSTANCE hInst; HANDLE hProcessHeap; +static HICON +CreateTrayIcon(LPTSTR szLCID) +{ + LANGID lId; + TCHAR szBuf[3]; + HDC hdc, hdcsrc; + HBITMAP hBitmap, hBmpNew, hBmpOld; + RECT rect; + DWORD bkColor, bkText; + HFONT hFont = NULL; + ICONINFO IconInfo; + HICON hIcon = NULL; + + lId = (LANGID)_tcstoul(szLCID, NULL, 16); + if (GetLocaleInfo(lId, + LOCALE_SISO639LANGNAME, + szBuf, + sizeof(szBuf) / sizeof(TCHAR)) == 0) + { + lstrcpy(szBuf, _T("??\0")); + } + + hdcsrc = GetDC(NULL); + hdc = CreateCompatibleDC(hdcsrc); + hBitmap = CreateCompatibleBitmap(hdcsrc, 16, 16); + ReleaseDC(NULL, hdcsrc); + + if (hdc && hBitmap) + { + hBmpNew = CreateBitmap(16, 16, 1, 1, NULL); + if (hBmpNew) + { + hBmpOld = SelectObject(hdc, hBitmap); + rect.right = 16; + rect.left = 0; + rect.bottom = 16; + rect.top = 0; + + bkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT)); + bkText = SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + + ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""), 0, NULL); + + hFont = CreateFont(-11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FF_DONTCARE, _T("Tahoma")); + + SelectObject(hdc, hFont); + DrawText(hdc, _tcsupr(szBuf), 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER); + SelectObject(hdc, hBmpNew); + PatBlt(hdc, 0, 0, 16, 16, BLACKNESS); + SelectObject(hdc, hBmpOld); + + IconInfo.hbmColor = hBitmap; + IconInfo.hbmMask = hBmpNew; + IconInfo.fIcon = TRUE; + + hIcon = CreateIconIndirect(&IconInfo); + + DeleteObject(hBmpNew); + DeleteObject(hBmpOld); + DeleteObject(hFont); + } + } + + DeleteDC(hdc); + DeleteObject(hBitmap); + + return hIcon; +} + static VOID -AddTrayIcon(HWND hwnd, HICON hIcon) +AddTrayIcon(HWND hwnd) { NOTIFYICONDATA tnid; + TCHAR szLCID[CCH_LAYOUT_ID + 1]; + + GetLayoutID(_T("1"), szLCID); tnid.cbSize = sizeof(NOTIFYICONDATA); tnid.hWnd = hwnd; tnid.uID = 1; tnid.uFlags = NIF_ICON | NIF_MESSAGE; tnid.uCallbackMessage = WM_NOTIFYICONMSG; - tnid.hIcon = hIcon; + tnid.hIcon = CreateTrayIcon(szLCID); Shell_NotifyIcon(NIM_ADD, &tnid); - - if (hIcon) DestroyIcon(hIcon); } static VOID @@ -40,6 +115,21 @@ tnid.uID = 1; Shell_NotifyIcon(NIM_DELETE, &tnid); +} + +static VOID +UpdateTrayIcon(HWND hwnd, LPTSTR szLCID) +{ + NOTIFYICONDATA tnid; + + tnid.cbSize = sizeof(NOTIFYICONDATA); + tnid.hWnd = hwnd; + tnid.uID = 1; + tnid.uFlags = NIF_ICON | NIF_MESSAGE; + tnid.uCallbackMessage = WM_NOTIFYICONMSG; + tnid.hIcon = CreateTrayIcon(szLCID); + + Shell_NotifyIcon(NIM_MODIFY, &tnid); } static BOOL @@ -124,7 +214,7 @@ } static VOID -ActivateLayout(ULONG uLayoutNum) +ActivateLayout(HWND hwnd, ULONG uLayoutNum) { HKL hKl; TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; @@ -132,8 +222,10 @@ _ultot(uLayoutNum, szLayoutNum, 10); GetLayoutID(szLayoutNum, szLCID); + CreateTrayIcon(szLCID); // Switch to the new keyboard layout + UpdateTrayIcon(hwnd, szLCID); hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); SystemParametersInfo(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); EnumWindows(EnumWindowsProc, (LPARAM) hKl); @@ -213,7 +305,7 @@ switch (Message) { case WM_CREATE: - AddTrayIcon(hwnd, LoadIcon(hInst, MAKEINTRESOURCE(IDI_MAIN))); + AddTrayIcon(hwnd); hPopupMenu = BuildPopupMenu(hwnd); break; @@ -258,7 +350,7 @@ } default: - ActivateLayout(LOWORD(wParam)); + ActivateLayout(hwnd, LOWORD(wParam)); break; } break; Modified: trunk/reactos/base/applications/kbswitch/kbswitch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.rbuild [iso-8859-1] Sun Apr 27 10:40:42 2008 @@ -6,6 +6,7 @@ <library>advapi32</library> <library>user32</library> <library>shell32</library> + <library>gdi32</library> <file>kbswitch.c</file> <file>kbswitch.rc</file> </module>

1 0

[greatlrd] 33167: add new : define a new flags for edd_directdraw_global, struct member in edd_directdraw_global Fixed : some comment Add DD_MISCELLANEOUS2CALLBACKS so it works now with ms dxg.sys from user mode with callbacks. it mean follow api from the gf card drv should work now with syscall to win32k from user mode NtGdiDdAlphaBlt, NtGdiDdCreateSurfaceEx, NtGdiDdGetDriverState, NtGdiDdDestroyDDLocal
by greatlrd＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: greatlrd Date: Sun Apr 27 10:31:47 2008 New Revision: 33167 URL: http://svn.reactos.org/svn/reactos?rev=33167&view=rev Log: add new : define a new flags for edd_directdraw_global, struct member in edd_directdraw_global Fixed : some comment Add DD_MISCELLANEOUS2CALLBACKS so it works now with ms dxg.sys from user mode with callbacks. it mean follow api from the gf card drv should work now with syscall to win32k from user mode NtGdiDdAlphaBlt, NtGdiDdCreateSurfaceEx, NtGdiDdGetDriverState, NtGdiDdDestroyDDLocal Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…

1 0

[dreimer] 33166: Fix one warning.
by dreimer＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: dreimer Date: Sun Apr 27 10:18:20 2008 New Revision: 33166 URL: http://svn.reactos.org/svn/reactos?rev=33166&view=rev Log: Fix one warning. Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sun Apr 27 10:18:20 2008 @@ -108,7 +108,7 @@ LTEXT "Para modificar esta configuración, pulse Modificar.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Modificar...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 - LTEXT "La disposición de teclado especifica los caracteres que aparecen cuando "\ + LTEXT "La disposición de teclado especifica los caracteres que aparecen cuando "\ "usted escribe.", IDC_STATIC, 53, 86, 253, 20 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16

1 0

[greatlrd] 33164: add DD_VIDEOPORTCALLBACKS it mean directx video port interface should started working now to user mode, with ms dxg.sys
by greatlrd＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: greatlrd Date: Sun Apr 27 08:05:13 2008 New Revision: 33164 URL: http://svn.reactos.org/svn/reactos?rev=33164&view=rev Log: add DD_VIDEOPORTCALLBACKS it mean directx video port interface should started working now to user mode, with ms dxg.sys Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Sun Apr 27 08:05:13 2008 @@ -96,10 +96,12 @@ /* NOTE : - * if EDDDGBL_MISCCALLBACKS been set in struct EDD_DIRECTDRAW_GLOBAL member dwCallbackFlags, + * if these been set in struct EDD_DIRECTDRAW_GLOBAL member dwCallbackFlags, * it mean that the callback member for it have been fill in from the graphic drv */ -#define EDDDGBL_MISCCALLBACKS 0x01; +#define EDDDGBL_MISCCALLBACKS 0x01; // ddMiscellanousCallbacks +#define EDDDGBL_VIDEOPORTCALLBACKS 0x02; // ddVideoPortCallback + typedef struct _EDD_DIRECTDRAW_GLOBAL { /* 0x000 */ PVOID dhpdev; @@ -110,7 +112,6 @@ /* 0x01C */ ULONG unk_01c; /* 0x020 */ DWORD dwCallbackFlags; /* <-- verify it match windows xp, dwCallbackFlags Flags value - 0x0001 = ddMiscellanousCallbacks 0x0002 = ddVideoPortCallback and GUID_VideoPortCaps 0x0004 = GUID_ColorControlCallbacks 0x0040 = GUID_MotionCompCallbacks @@ -140,7 +141,7 @@ /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; /* 0x460 */ ULONG unk_460[7]; /* 0x47C */ D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; -/* 0x498 */ DD_VIDEOPORTCALLBACKS ddVideoPortCallback; // 0x498 <-- verify it match windows xp, ddVideoPortCallback +/* 0x498 */ DD_VIDEOPORTCALLBACKS ddVideoPortCallback; // 0x498 <-- verify it match windows xp, ddVideoPortCallback /* 0x4E0 */ DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; // 0x4E0 <-- verify it match windows xp, ddMiscellanousCallbacks /* 0x4EC */ ULONG unk_4ec[18]; /* 0x534 */ D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun Apr 27 08:05:13 2008 @@ -164,14 +164,44 @@ return FALSE; } - /* Fill in DD_MISCELLANEOUSCALLBACKS */ GetInfo.dhpdev = pDC->PDev; + /* Note this check will fail on some nvida drv, it is a bug in their drv not in our code, * we doing proper check if GetDriverInfo exists */ if ( ((pEddgbl->ddHalInfo.dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0) && (pEddgbl->ddHalInfo.GetDriverInfo != NULL) ) { + GetInfo.dhpdev = pDC->PDev; + GetInfo.dwSize = sizeof (DD_GETDRIVERINFODATA); + GetInfo.dwFlags = 0x00; + GetInfo.guidInfo = GUID_VideoPortCallbacks; + GetInfo.lpvData = (PVOID)&pEddgbl->ddVideoPortCallback; + GetInfo.dwExpectedSize = sizeof (DD_VIDEOPORTCALLBACKS); + GetInfo.ddRVal = DDERR_GENERIC; + if ( ( pEddgbl->ddHalInfo.GetDriverInfo (&GetInfo) == DDHAL_DRIVER_NOTHANDLED) || + (GetInfo.ddRVal != DD_OK) ) + { + DPRINT1(" Fail : did not get DD_VIDEOPORTCALLBACKS \n"); + } + else + { + pEddgbl->dwCallbackFlags |= EDDDGBL_VIDEOPORTCALLBACKS; + } + + /* FIXME fill in videoport caps */ + } + else + { + DPRINT1(" Fail : did not foundpEddgbl->ddHalInfo.GetDriverInfo \n"); + } + + /* Note this check will fail on some nvida drv, it is a bug in their drv not in our code, + * we doing proper check if GetDriverInfo exists */ + if ( ((pEddgbl->ddHalInfo.dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0) && + (pEddgbl->ddHalInfo.GetDriverInfo != NULL) ) + { + GetInfo.dhpdev = pDC->PDev; GetInfo.dwSize = sizeof (DD_GETDRIVERINFODATA); GetInfo.dwFlags = 0x00; GetInfo.guidInfo = GUID_MiscellaneousCallbacks;

1 0

[greatlrd] 33163: ms dxg.sys can now found and execute GetAvailDriverMemory it works from usermode with syscall,
by greatlrd＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: greatlrd Date: Sun Apr 27 07:47:28 2008 New Revision: 33163 URL: http://svn.reactos.org/svn/reactos?rev=33163&view=rev Log: ms dxg.sys can now found and execute GetAvailDriverMemory it works from usermode with syscall, Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Sun Apr 27 07:47:28 2008 @@ -95,6 +95,11 @@ } EDD_SURFACE, *PEDD_SURFACE; +/* NOTE : + * if EDDDGBL_MISCCALLBACKS been set in struct EDD_DIRECTDRAW_GLOBAL member dwCallbackFlags, + * it mean that the callback member for it have been fill in from the graphic drv + */ +#define EDDDGBL_MISCCALLBACKS 0x01; typedef struct _EDD_DIRECTDRAW_GLOBAL { /* 0x000 */ PVOID dhpdev; @@ -105,7 +110,7 @@ /* 0x01C */ ULONG unk_01c; /* 0x020 */ DWORD dwCallbackFlags; /* <-- verify it match windows xp, dwCallbackFlags Flags value - 0x0001 = GUID_MiscellaneousCallbacks + 0x0001 = ddMiscellanousCallbacks 0x0002 = ddVideoPortCallback and GUID_VideoPortCaps 0x0004 = GUID_ColorControlCallbacks 0x0040 = GUID_MotionCompCallbacks @@ -117,26 +122,26 @@ /* 0x024 */ ULONG unk_024; #ifdef _WIN32 -/* 0x028 */ LARGE_INTEGER llAssertModeTimeout; // 0x028 <-- verify it match windows xp, llAssertModeTimeout +/* 0x028 */ LARGE_INTEGER llAssertModeTimeout; // 0x028 <-- verify it match windows xp, llAssertModeTimeout #else /* 0x028 */ DWORD llAssertModeTimeoutLowPart; /* 0x02C */ DWORD llAssertModeTimeoutHighPart; #endif -/* 0x030 */ DWORD dwNumHeaps; // 0x030 <-- verify it match windows xp, dwNumHeaps -/* 0x034 */ VIDEOMEMORY *pvmList; // 0x034 <-- verify it match windows xp, pvmList +/* 0x030 */ DWORD dwNumHeaps; // 0x030 <-- verify it match windows xp, dwNumHeaps +/* 0x034 */ VIDEOMEMORY *pvmList; // 0x034 <-- verify it match windows xp, pvmList /* 0x038 */ DWORD dwNumFourCC; /* 0x03C */ PDWORD pdwFourCC; /* 0x040 */ DD_HALINFO ddHalInfo; /* 0x1E0 */ ULONG unk_1e0[46]; -/* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verify it match windows xp, ddCallbacks -/* 0x2C0 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C0 <-- verify it match windows xp, ddSurfaceCallbacks -/* 0x304 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x304 <-- verify it match windows xp, ddPaletteCallbacks +/* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verify it match windows xp, ddCallbacks +/* 0x2C0 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C0 <-- verify it match windows xp, ddSurfaceCallbacks +/* 0x304 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x304 <-- verify it match windows xp, ddPaletteCallbacks /* 0x314 */ ULONG unk_314[46]; /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; /* 0x460 */ ULONG unk_460[7]; /* 0x47C */ D3DNTHAL_CALLBACKS2 d3dNtHalCallbacks2; -/* 0x498 */ DD_VIDEOPORTCALLBACKS ddVideoPortCallback; // 0x498 <-- verify it match windows xp, ddVideoPortCallback -/* 0x4E0 */ DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; +/* 0x498 */ DD_VIDEOPORTCALLBACKS ddVideoPortCallback; // 0x498 <-- verify it match windows xp, ddVideoPortCallback +/* 0x4E0 */ DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; // 0x4E0 <-- verify it match windows xp, ddMiscellanousCallbacks /* 0x4EC */ ULONG unk_4ec[18]; /* 0x534 */ D3DNTHAL_CALLBACKS3 d3dNtHalCallbacks3; /* 0x5A4 */ ULONG unk_544; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun Apr 27 07:47:28 2008 @@ -182,6 +182,10 @@ (GetInfo.ddRVal != DD_OK) ) { DPRINT1(" Fail : did not get DD_MISCELLANEOUSCALLBACKS \n"); + } + else + { + pEddgbl->dwCallbackFlags |= EDDDGBL_MISCCALLBACKS; } } else @@ -950,8 +954,10 @@ DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.GetVideoSignalStatus : 0x%08lx\n",(((DWORD)&pEddgbl->ddVideoPortCallback.GetVideoSignalStatus) - (DWORD)pEddgbl),pEddgbl->ddVideoPortCallback.GetVideoSignalStatus); DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddVideoPortCallback.ColorControl : 0x%08lx\n",(((DWORD)&pEddgbl->ddVideoPortCallback.ColorControl) - (DWORD)pEddgbl),pEddgbl->ddVideoPortCallback.ColorControl); - // DD_MISCELLANEOUSCALLBACKS ddMiscellanousCallbacks; - DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddMiscellanousCallbacks : 0x%08lx\n",(((DWORD)&pEddgbl->ddMiscellanousCallbacks) - (DWORD)pEddgbl),pEddgbl->ddMiscellanousCallbacks); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddMiscellanousCallbacks.dwSize : 0x%08lx\n",(((DWORD)&pEddgbl->ddMiscellanousCallbacks.dwSize) - (DWORD)pEddgbl),pEddgbl->ddMiscellanousCallbacks.dwSize); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddMiscellanousCallbacks.dwFlags : 0x%08lx\n",(((DWORD)&pEddgbl->ddMiscellanousCallbacks.dwFlags) - (DWORD)pEddgbl),pEddgbl->ddMiscellanousCallbacks.dwFlags); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddMiscellanousCallbacks.GetAvailDriverMemory : 0x%08lx\n",(((DWORD)&pEddgbl->ddMiscellanousCallbacks.GetAvailDriverMemory) - (DWORD)pEddgbl),pEddgbl->ddMiscellanousCallbacks.GetAvailDriverMemory); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->unk_4ec[0] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_4ec[0]) - (DWORD)pEddgbl),pEddgbl->unk_4ec[0]); DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->unk_4ec[1] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_4ec[1]) - (DWORD)pEddgbl),pEddgbl->unk_4ec[1]); DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->unk_4ec[2] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_4ec[2]) - (DWORD)pEddgbl),pEddgbl->unk_4ec[2]);

1 0

[greatlrd] 33162: adding more code for init the drv in intEnableReactXDriver
by greatlrd＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: greatlrd Date: Sun Apr 27 07:11:00 2008 New Revision: 33162 URL: http://svn.reactos.org/svn/reactos?rev=33162&view=rev Log: adding more code for init the drv in intEnableReactXDriver Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Sun Apr 27 07:11:00 2008 @@ -129,8 +129,8 @@ /* 0x040 */ DD_HALINFO ddHalInfo; /* 0x1E0 */ ULONG unk_1e0[46]; /* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verify it match windows xp, ddCallbacks -/* 0x2C0 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C0 <-- verify it match windows xp, ddCallbacks -/* 0x304 */ DD_PALETTECALLBACKS ddPaletteCallbacks; +/* 0x2C0 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C0 <-- verify it match windows xp, ddSurfaceCallbacks +/* 0x304 */ DD_PALETTECALLBACKS ddPaletteCallbacks; // 0x304 <-- verify it match windows xp, ddPaletteCallbacks /* 0x314 */ ULONG unk_314[46]; /* 0x3D4 */ D3DNTHAL_CALLBACKS d3dNtHalCallbacks; /* 0x460 */ ULONG unk_460[7]; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun Apr 27 07:11:00 2008 @@ -34,6 +34,7 @@ { PGDIDEVICE pDev = (PGDIDEVICE)pDC->pPDev; BOOLEAN success = FALSE; + DD_GETDRIVERINFODATA GetInfo; /*clean up some of the cache entry */ RtlZeroMemory(pEddgbl,sizeof(EDD_DIRECTDRAW_GLOBAL)); @@ -163,8 +164,33 @@ return FALSE; } + /* Fill in DD_MISCELLANEOUSCALLBACKS */ + GetInfo.dhpdev = pDC->PDev; + + /* Note this check will fail on some nvida drv, it is a bug in their drv not in our code, + * we doing proper check if GetDriverInfo exists */ + if ( ((pEddgbl->ddHalInfo.dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0) && + (pEddgbl->ddHalInfo.GetDriverInfo != NULL) ) + { + GetInfo.dwSize = sizeof (DD_GETDRIVERINFODATA); + GetInfo.dwFlags = 0x00; + GetInfo.guidInfo = GUID_MiscellaneousCallbacks; + GetInfo.lpvData = (PVOID)&pEddgbl->ddMiscellanousCallbacks; + GetInfo.dwExpectedSize = sizeof (DD_MISCELLANEOUSCALLBACKS); + GetInfo.ddRVal = DDERR_GENERIC; + if ( ( pEddgbl->ddHalInfo.GetDriverInfo (&GetInfo) == DDHAL_DRIVER_NOTHANDLED) || + (GetInfo.ddRVal != DD_OK) ) + { + DPRINT1(" Fail : did not get DD_MISCELLANEOUSCALLBACKS \n"); + } + } + else + { + DPRINT1(" Fail : did not foundpEddgbl->ddHalInfo.GetDriverInfo \n"); + } + /* setup missing data in ddHalInfo */ - pEddgbl->ddHalInfo.GetDriverInfo = (PVOID)pDev->DriverFunctions.GetDirectDrawInfo; + //pEddgbl->ddHalInfo.GetDriverInfo = (PVOID)pDev->DriverFunctions.GetDirectDrawInfo; /* FIXME : remove this when we are done with debuging of dxg */ dump_edd_directdraw_global(pEddgbl); @@ -844,10 +870,10 @@ DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.UpdateOverlay : 0x%08lx\n",(((DWORD)&pEddgbl->ddSurfaceCallbacks.UpdateOverlay) - (DWORD)pEddgbl),pEddgbl->ddSurfaceCallbacks.UpdateOverlay); DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.SetOverlayPosition : 0x%08lx\n",(((DWORD)&pEddgbl->ddSurfaceCallbacks.SetOverlayPosition) - (DWORD)pEddgbl),pEddgbl->ddSurfaceCallbacks.SetOverlayPosition); DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.reserved4 : 0x%08lx\n",(((DWORD)&pEddgbl->ddSurfaceCallbacks.reserved4) - (DWORD)pEddgbl),pEddgbl->ddSurfaceCallbacks.reserved4); - DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddSurfaceCallbacks.SetPalette : 0x%08lx\n",(((DWORD)&pEddgbl->ddSurfaceCallbacks.SetPalette) - (DWORD)pEddgbl),pEddgbl->ddSurfaceCallbacks.SetPalette); - - // DD_PALETTECALLBACKS ddPaletteCallbacks; - DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks : 0x%08lx\n",(((DWORD)&pEddgbl->ddPaletteCallbacks) - (DWORD)pEddgbl),pEddgbl->ddPaletteCallbacks); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.dwSize : 0x%08lx\n",(((DWORD)&pEddgbl->ddPaletteCallbacks.dwSize) - (DWORD)pEddgbl),pEddgbl->ddPaletteCallbacks.dwSize); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.dwFlags : 0x%08lx\n",(((DWORD)&pEddgbl->ddPaletteCallbacks.dwFlags) - (DWORD)pEddgbl),pEddgbl->ddPaletteCallbacks.dwFlags); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.DestroyPalette : 0x%08lx\n",(((DWORD)&pEddgbl->ddPaletteCallbacks.DestroyPalette) - (DWORD)pEddgbl),pEddgbl->ddPaletteCallbacks.DestroyPalette); + DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->ddPaletteCallbacks.SetEntries : 0x%08lx\n",(((DWORD)&pEddgbl->ddPaletteCallbacks.SetEntries) - (DWORD)pEddgbl),pEddgbl->ddPaletteCallbacks.SetEntries); DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->unk_314[0] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_314[0]) - (DWORD)pEddgbl),pEddgbl->unk_314[0]); DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->unk_314[1] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_314[1]) - (DWORD)pEddgbl),pEddgbl->unk_314[1]); DPRINT1("0x%08lx PEDD_DIRECTDRAW_GLOBAL->unk_314[2] : 0x%08lx\n",(((DWORD)&pEddgbl->unk_314[2]) - (DWORD)pEddgbl),pEddgbl->unk_314[2]); Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sun Apr 27 07:11:00 2008 @@ -183,6 +183,7 @@ <library>ntdll</library> <library>hal</library> <library>freetype</library> + <library>dxguid</library> <file>win32k.rc</file> </module> </group>

1 0

[dchapyshev] 33161: - Add new layouts to bootcd
by dchapyshev＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: dchapyshev Date: Sun Apr 27 07:02:29 2008 New Revision: 33161 URL: http://svn.reactos.org/svn/reactos?rev=33161&view=rev Log: - Add new layouts to bootcd Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Apr 27 07:02:29 2008 @@ -65,6 +65,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010409","Layout File",0x00000000,"kbddv.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010409","Layout Id", 0x00000000,"0002" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010409","Layout Text",0x00000000,"US-Dvorak" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020409","Layout File",0x00000000,"kbdusx.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020409","Layout Id", 0x00000000,"0001" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020409","Layout Text",0x00000000,"US International" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030409","Layout File",0x00000000,"kbdusl.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030409","Layout Id", 0x00000000,"001A" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00030409","Layout Text",0x00000000,"US Dvorak for left hand" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040409","Layout File",0x00000000,"kbdusr.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040409","Layout Id", 0x00000000,"001B" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00040409","Layout Text",0x00000000,"US Dvorak for right hand" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout File",0x00000000,"kbdusa.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Id", 0x00000000,"000B" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Text",0x00000000,"US English (IBM Arabic 238_L)" @@ -94,6 +103,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000415","Layout Text",0x00000000,"Polish (programmer's)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout File",0x00000000,"kbdpo.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout Text",0x00000000,"Portuguese" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000418","Layout File",0x00000000,"kbdro.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000418","Layout Text",0x00000000,"Romanian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout File",0x00000000,"kbdru.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout Text",0x00000000,"Russian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010419","Layout File",0x00000000,"kbdru1.dll" @@ -116,6 +127,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000042f","Layout Text",0x00000000,"Macedonian (FYRO)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout File",0x00000000,"kbdgeo.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000437","Layout Text",0x00000000,"Georgian" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000444","Layout File",0x00000000,"kbdtat.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000444","Layout Text",0x00000000,"Tatar" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout File",0x00000000,"kbdbur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000455","Layout Text",0x00000000,"Burmese" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000414","Layout File",0x00000000,"kbdno.dll" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Apr 27 07:02:29 2008 @@ -171,16 +171,21 @@ dll\keyboard\kbdno\kbdno.dll 1 dll\keyboard\kbdpl1\kbdpl1.dll 1 dll\keyboard\kbdpo\kbdpo.dll 1 +dll\keyboard\kbdro\kbdro.dll 1 dll\keyboard\kbdru\kbdru.dll 1 dll\keyboard\kbdru1\kbdru1.dll 1 dll\keyboard\kbdsg\kbdsg.dll 1 dll\keyboard\kbdsk\kbdsk.dll 1 dll\keyboard\kbdsw\kbdsw.dll 1 +dll\keyboard\kbdtat\kbdtat.dll 1 dll\keyboard\kbdth\kbdth.dll 1 dll\keyboard\kbduk\kbduk.dll 1 dll\keyboard\kbdur\kbdur.dll 1 dll\keyboard\kbdus\kbdus.dll 1 dll\keyboard\kbdusa\kbdusa.dll 1 +dll\keyboard\kbdusl\kbdusl.dll 1 +dll\keyboard\kbdusr\kbdusr.dll 1 +dll\keyboard\kbdusx\kbdusx.dll 1 dll\ntdll\ntdll.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Apr 27 07:02:29 2008 @@ -168,14 +168,19 @@ 00000414 = "Norwegian" 00000415 = "Polish (programmer's)" 00000816 = "Portuguese (Portugal)" +00000418 = "Romanian" 00000419 = "Russian" 00010419 = "Russian (Typewriter)" 0000041B = "Slovak (QWERTZ)" 0000040A = "Spanish (traditional short)" 0000041D = "Swedish (Sweden)" +00000444 = "Tatar" 0000041E = "Thai (traditional)" 00000422 = "Ukrainian" +00030409 = "US Dvorak for left hand" +00040409 = "US Dvorak for right hand" 00050409 = "US English (IBM Arabic 238_L)" +00020409 = "US International" [Files.KeyboardLayout] 00020402 = kbdbgt.dll @@ -188,6 +193,9 @@ 00000406 = kbdda.dll 00000409 = kbdus.dll 00010409 = kbddv.dll +00020409 = kbdusx.dll +00030409 = kbdusl.dll +00040409 = kbdusr.dll 00050409 = kbdusa.dll 0000040A = kbdes.dll 0000040B = kbdfi.dll @@ -209,6 +217,7 @@ 00000414 = kbdno.dll 00000415 = kbdpl1.dll 00000816 = kbdpo.dll +00000418 = kbdro.dll 00000419 = kbdru.dll 00010419 = kbdru1.dll 00000807 = kbdsg.dll @@ -221,6 +230,7 @@ 00000426 = kbdlv.dll 0000042F = kbdmac.dll 00000437 = kbdgeo.dll +00000444 = kbdtat.dll 00011009 = kbdcan.dll 00000C0C = kbdfc.dll

1 0

[dchapyshev] 33160: Add keyboard layouts: - Romanian - Tatar - US Dvorak for left hand - US Dvorak for right hand - US International
by dchapyshev＠svn.reactos.org 27 Apr '08

27 Apr '08

Author: dchapyshev Date: Sun Apr 27 07:01:38 2008 New Revision: 33160 URL: http://svn.reactos.org/svn/reactos?rev=33160&view=rev Log: Add keyboard layouts: - Romanian - Tatar - US Dvorak for left hand - US Dvorak for right hand - US International Added: trunk/reactos/dll/keyboard/kbdro/ trunk/reactos/dll/keyboard/kbdro/kbdro.c (with props) trunk/reactos/dll/keyboard/kbdro/kbdro.def (with props) trunk/reactos/dll/keyboard/kbdro/kbdro.rbuild (with props) trunk/reactos/dll/keyboard/kbdro/kbdro.rc (with props) trunk/reactos/dll/keyboard/kbdtat/ trunk/reactos/dll/keyboard/kbdtat/kbdtat.c (with props) trunk/reactos/dll/keyboard/kbdtat/kbdtat.def (with props) trunk/reactos/dll/keyboard/kbdtat/kbdtat.rbuild (with props) trunk/reactos/dll/keyboard/kbdtat/kbdtat.rc (with props) trunk/reactos/dll/keyboard/kbdusl/ trunk/reactos/dll/keyboard/kbdusl/kbdusl.c (with props) trunk/reactos/dll/keyboard/kbdusl/kbdusl.def (with props) trunk/reactos/dll/keyboard/kbdusl/kbdusl.rbuild (with props) trunk/reactos/dll/keyboard/kbdusl/kbdusl.rc (with props) trunk/reactos/dll/keyboard/kbdusr/ trunk/reactos/dll/keyboard/kbdusr/kbdusr.c (with props) trunk/reactos/dll/keyboard/kbdusr/kbdusr.def (with props) trunk/reactos/dll/keyboard/kbdusr/kbdusr.rbuild (with props) trunk/reactos/dll/keyboard/kbdusr/kbdusr.rc (with props) trunk/reactos/dll/keyboard/kbdusx/ trunk/reactos/dll/keyboard/kbdusx/kbdusx.c (with props) trunk/reactos/dll/keyboard/kbdusx/kbdusx.def (with props) trunk/reactos/dll/keyboard/kbdusx/kbdusx.rbuild (with props) trunk/reactos/dll/keyboard/kbdusx/kbdusx.rc (with props) Modified: trunk/reactos/dll/keyboard/keyboard.rbuild Added: trunk/reactos/dll/keyboard/kbdro/kbdro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdro/kbdro.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdro/kbdro.c (added) +++ trunk/reactos/dll/keyboard/kbdro/kbdro.c [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,398 @@ +/* + * ReactOS Romanian Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + */ + +#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 */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + /* - 37 - */ + /* Bottom Row */ + 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 6, + { 0, 1, 3, 4, SHFT_INVALID, SHFT_INVALID, 2 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_OEM_3, NOCAPS, {']', '[' } }, + { 'E', CAPS, {'e', 'E' } }, + { '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' } }, + { 'A', CAPS, {'a', 'A' } }, + { 'F', CAPS, {'f', 'F' } }, + { 'G', CAPS, {'g', 'G' } }, + { 'H', CAPS, {'h', 'H' } }, + { 'J', CAPS, {'j', 'J' } }, + { 'Y', CAPS, {'y', 'Y' } }, + { 'X', CAPS, {'x', 'X' } }, + { 'C', CAPS, {'c', 'C' } }, + { VK_OEM_2, 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[] = { + { '1', NOCAPS, {'1', '!', '~' } }, + { '3', NOCAPS, {'3', '#', '^' } }, + { '4', NOCAPS, {'4', 0x00a4, 0x02d8} }, + { '5', NOCAPS, {'5', '%', 0x00b0} }, + { '7', NOCAPS, {'7', '/', '`' } }, + { '8', NOCAPS, {'8', '(', 0x00b7} }, + { '9', NOCAPS, {'9', ')', 0x00b4} }, + { '0', NOCAPS, {'0', '=', 0x02dd} }, + { VK_OEM_PLUS, NOCAPS, {'\'', '*', 0x00b8} }, + { 'Q', CAPS, {'q', 'Q', '\\' } }, + { 'W', CAPS, {'w', 'W', '|' } }, + { 'S', CAPS, {'s', 'S', 0x0111} }, + { 'D', CAPS, {'d', 'D', 0x0110} }, + { 'K', CAPS, {'k', 'K', 0x0142} }, + { 'L', CAPS, {'l', 'L', 0x0141} }, + { VK_OEM_1, NOCAPS, {0x015f, 0x015e, '$' } }, + { VK_OEM_7, NOCAPS, {0x0163, 0x0162, 0x00df} }, + { 'V', CAPS, {'v', 'V', '@' } }, + { 'B', CAPS, {'b', 'B', '{' } }, + { 'N', CAPS, {'n', 'N', '}' } }, + { 'M', CAPS, {'m', 'M', 0x00a7} }, + { VK_OEM_COMMA, NOCAPS, {',', ';', '<' } }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':', '>' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { VK_OEM_4, NOCAPS, {0x0103, 0x0102, 0x00f7, 0x001b} }, + { VK_OEM_6, NOCAPS, {0x00ee, 0x00ce, 0x00d7, 0x001d} }, + { VK_OEM_5, NOCAPS, {0x00e2, 0x00c2, WCH_NONE, 0x001c} }, + { VK_OEM_102, NOCAPS, {'<', '>', WCH_NONE, 0x001c} }, + { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, 0x007f} }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, WCH_NONE, 0x001b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', WCH_NONE, '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', WCH_NONE, ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, WCH_NONE, 0x0003} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { '2', NOCAPS, {'2', '\"', 0x02c7, WCH_NONE, 0x0000} }, + { '6', NOCAPS, {'6', '&', 0x02db, WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, NOCAPS, {'+', '?', 0x00a8, WCH_NONE, 0x001f} }, + { 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'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(5,key_to_chars_5mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdro/kbdro.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdro/kbdro.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdro/kbdro.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdro/kbdro.def (added) +++ trunk/reactos/dll/keyboard/kbdro/kbdro.def [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdro.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdro/kbdro.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdro/kbdro.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdro/kbdro.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdro/kbdro.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdro/kbdro.rbuild [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdro" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdro.dll" allowwarnings="true"> + <importlibrary definition="kbdro.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdro.c</file> + <file>kbdro.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdro/kbdro.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdro/kbdro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdro/kbdro.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdro/kbdro.rc (added) +++ trunk/reactos/dll/keyboard/kbdro/kbdro.rc [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Romanian Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdro\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdro.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdro/kbdro.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdtat/kbdtat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtat/kbdtat… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtat/kbdtat.c (added) +++ trunk/reactos/dll/keyboard/kbdtat/kbdtat.c [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,403 @@ +/* + * ReactOS Tatar Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + */ + +#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 */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + /* - 37 - */ + /* Bottom Row */ + 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 7, + { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + {'1', NOCAPS, {'1', '!' } }, + {'5', NOCAPS, {'5', '%' } }, + {VK_OEM_PLUS, NOCAPS, {'=', '+' } }, + {'Q', CAPS, {0x0439, 0x0419} }, + {'E', CAPS, {0x0443, 0x0423} }, + {'R', CAPS, {0x043a, 0x041a} }, + {'T', CAPS, {0x0435, 0x0415} }, + {'Y', CAPS, {0x043d, 0x041d} }, + {'U', CAPS, {0x0433, 0x0413} }, + {'I', CAPS, {0x0448, 0x0428} }, + {'P', CAPS, {0x0437, 0x0417} }, + {VK_OEM_4, CAPS, {0x0445, 0x0425} }, + {'A', CAPS, {0x0444, 0x0424} }, + {'S', CAPS, {0x044b, 0x042b} }, + {'D', CAPS, {0x0432, 0x0412} }, + {'F', CAPS, {0x0430, 0x0410} }, + {'G', CAPS, {0x043f, 0x041f} }, + {'H', CAPS, {0x0440, 0x0420} }, + {'J', CAPS, {0x043e, 0x041e} }, + {'K', CAPS, {0x043b, 0x041b} }, + {'L', CAPS, {0x0434, 0x0414} }, + {'Z', CAPS, {0x044f, 0x042f} }, + {'X', CAPS, {0x0447, 0x0427} }, + {'C', CAPS, {0x0441, 0x0421} }, + {'V', CAPS, {0x043c, 0x041c} }, + {'B', CAPS, {0x0438, 0x0418} }, + {'N', CAPS, {0x0442, 0x0422} }, + {VK_OEM_2, 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[] = { + { '2', NOCAPS, {'2', '\"', '@'} }, + { '3', NOCAPS, {'3', 0x2116, '#'} }, + { '4', NOCAPS, {'4', ';', '$'} }, + { '7', NOCAPS, {'7', '?', '['} }, + { '8', NOCAPS, {'8', '*', ']'} }, + { '9', NOCAPS, {'9', '(', '{'} }, + { '0', NOCAPS, {'0', ')', '}'} }, + { VK_OEM_7, CAPS, {0x044d, 0x042d, '\''} }, + { VK_OEM_COMMA, CAPS, {0x0431, 0x0411, '<'} }, + { VK_OEM_PERIOD, CAPS, {0x044e, 0x042e, '>'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { VK_OEM_3, CAPS, {0x04bb, 0x04ba, 0x0451, 0x0401} }, + { 'W', CAPS, {0x04e9, 0x04e8, 0x0446, 0x0426} }, + { 'O', CAPS, {0x04d9, 0x04d8, 0x0449, 0x0429} }, + { 'M', CAPS, {0x0497, 0x0496, 0x044c, 0x042c} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, WCH_NONE, 0x001f} }, + { VK_OEM_6, CAPS, {0x04af, 0x04ae, 0x044a, 0x042a, 0x001b} }, + { VK_OEM_5, NOCAPS, {'\\', '/', WCH_NONE, WCH_NONE, 0x001c} }, + { VK_OEM_1, CAPS, {0x04a3, 0x04a2, 0x0436, 0x0416, 0x001d} }, + { VK_OEM_102, CAPS, {0x0491, 0x0490, WCH_NONE, WCH_NONE, 0x001c} }, + { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, WCH_NONE, 0x007f} }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, WCH_NONE, WCH_NONE, 0x001b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', WCH_NONE, WCH_NONE, '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', WCH_NONE, WCH_NONE, ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, WCH_NONE, WCH_NONE, 0x0003} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { + { '6', NOCAPS, {'6', ':', WCH_NONE, WCH_NONE, WCH_NONE, 0x001e} }, + { 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'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(5,key_to_chars_5mod), + vk_master(6,key_to_chars_6mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- Russian doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdtat/kbdtat.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdtat/kbdtat.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtat/kbdtat… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtat/kbdtat.def (added) +++ trunk/reactos/dll/keyboard/kbdtat/kbdtat.def [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdtat.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdtat/kbdtat.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdtat/kbdtat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtat/kbdtat… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtat/kbdtat.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdtat/kbdtat.rbuild [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdtat" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdtat.dll" allowwarnings="true"> + <importlibrary definition="kbdtat.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdtat.c</file> + <file>kbdtat.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdtat/kbdtat.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdtat/kbdtat.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtat/kbdtat… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtat/kbdtat.rc (added) +++ trunk/reactos/dll/keyboard/kbdtat/kbdtat.rc [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Tatar Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdtat\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdtat.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdtat/kbdtat.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusl/kbdusl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusl/kbdusl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusl/kbdusl.c (added) +++ trunk/reactos/dll/keyboard/kbdusl/kbdusl.c [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,393 @@ +/* + * ReactOS US-Dvorak for left hand Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + */ + +#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 */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + /* - 37 - */ + /* Bottom Row */ + 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 3, + { 0, 1, 2, 3 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_OEM_3, NOCAPS, {'`', '~'} }, + { VK_OEM_2, NOCAPS, {'/', '?'} }, + { 'P', CAPS, {'p', 'P'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'M', CAPS, {'m', 'M'} }, + { 'L', CAPS, {'l', 'L'} }, + { 'J', CAPS, {'j', 'J'} }, + { '4', NOCAPS, {'4', '$'} }, + { '3', NOCAPS, {'3', '#'} }, + { '1', NOCAPS, {'1', '!'} }, + { VK_OEM_1, NOCAPS, {';', ':'} }, + { 'Q', CAPS, {'q', 'Q'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'U', CAPS, {'u', 'U'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'S', CAPS, {'s', 'S'} }, + { 'O', CAPS, {'o', 'O'} }, + { VK_OEM_PERIOD, NOCAPS, {'.', '>'} }, + { '5', NOCAPS, {'5', '%'} }, + { VK_OEM_PLUS, NOCAPS, {'=', '+'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'C', CAPS, {'c', 'C'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'E', CAPS, {'e', 'E'} }, + { 'A', CAPS, {'a', 'A'} }, + { 'Z', CAPS, {'z', 'Z'} }, + { '8', NOCAPS, {'8', '*'} }, + { '7', NOCAPS, {'7', '&'} }, + { VK_OEM_7, NOCAPS, {'\'','\"'}}, + { 'X', CAPS, {'x', 'X'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'W', CAPS, {'w', 'W'} }, + { 'N', CAPS, {'n', 'N'} }, + { 'I', CAPS, {'i', 'I'} }, + { VK_OEM_COMMA, NOCAPS, {',', '<'} }, + { '0', NOCAPS, {'0', ')'} }, + { '9', NOCAPS, {'9', '('} }, + { 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[] = { + { VK_OEM_4, NOCAPS, {'[', '{', 0x001b} }, + { VK_OEM_6, NOCAPS, {']', '}', 0x001d} }, + { VK_OEM_5, NOCAPS, {'\\', '|', 0x001c} }, + { VK_OEM_102, NOCAPS, {'\\', '|', 0x001c} }, + { VK_BACK, NOCAPS, {'\b', '\b', 0x007f} }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, 0x001b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, 0x0003} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { '2', NOCAPS, {'2', '@', WCH_NONE, 0x0000} }, + { '6', NOCAPS, {'6', '^', WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, 0x001f} }, + { 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'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- Russian doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdusl/kbdusl.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusl/kbdusl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusl/kbdusl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusl/kbdusl.def (added) +++ trunk/reactos/dll/keyboard/kbdusl/kbdusl.def [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdusl.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdusl/kbdusl.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusl/kbdusl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusl/kbdusl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusl/kbdusl.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdusl/kbdusl.rbuild [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdusl" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdusl.dll" allowwarnings="true"> + <importlibrary definition="kbdusl.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdusl.c</file> + <file>kbdusl.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdusl/kbdusl.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusl/kbdusl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusl/kbdusl… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusl/kbdusl.rc (added) +++ trunk/reactos/dll/keyboard/kbdusl/kbdusl.rc [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS US-Dvorak for left hand Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdusl\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdusl.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdusl/kbdusl.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusr/kbdusr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusr/kbdusr… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusr/kbdusr.c (added) +++ trunk/reactos/dll/keyboard/kbdusr/kbdusr.c [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,393 @@ +/* + * ReactOS US-Dvorak for right hand Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + */ + +#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 */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + /* - 37 - */ + /* Bottom Row */ + 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 3, + { 0, 1, 2, 3 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_OEM_3, NOCAPS, {'`' ,'~'} }, + { '1', NOCAPS, {'1' ,'!'} }, + { '3', NOCAPS, {'3' ,'#'} }, + { '4', NOCAPS, {'4' ,'$'} }, + { 'J', CAPS, {'j' ,'J'} }, + { 'L', CAPS, {'l' ,'L'} }, + { 'M', CAPS, {'m' ,'M'} }, + { 'F', CAPS, {'f' ,'F'} }, + { 'P', CAPS, {'p' ,'P'} }, + { VK_OEM_2, NOCAPS, {'/' ,'?'} }, + { '5', NOCAPS, {'5' ,'%'} }, + { 'Q', CAPS, {'q' ,'Q'} }, + { VK_OEM_PERIOD, NOCAPS, {'.' ,'>'} }, + { 'O', CAPS, {'o' ,'O'} }, + { 'R', CAPS, {'r' ,'R'} }, + { 'S', CAPS, {'s' ,'S'} }, + { 'U', CAPS, {'u' ,'U'} }, + { 'Y', CAPS, {'y' ,'Y'} }, + { 'B', CAPS, {'b' ,'B'} }, + { VK_OEM_1, NOCAPS, {';' ,':'} }, + { VK_OEM_PLUS, NOCAPS, {'=' ,'+'} }, + { '7', NOCAPS, {'7' ,'&'} }, + { '8', NOCAPS, {'8' ,'*'} }, + { 'Z', CAPS, {'z' ,'Z'} }, + { 'A', CAPS, {'a' ,'A'} }, + { 'E', CAPS, {'e' ,'E'} }, + { 'H', CAPS, {'h' ,'H'} }, + { 'T', CAPS, {'t' ,'T'} }, + { 'D', CAPS, {'d' ,'D'} }, + { 'C', CAPS, {'c' ,'C'} }, + { 'K', CAPS, {'k' ,'K'} }, + { '9', NOCAPS, {'9' ,'('} }, + { '0', NOCAPS, {'0' ,')'} }, + { 'X', CAPS, {'x' ,'X'} }, + { VK_OEM_COMMA, NOCAPS, {',' ,'<'} }, + { 'I', CAPS, {'i' ,'I'} }, + { 'N', CAPS, {'n' ,'N'} }, + { 'W', CAPS, {'w' ,'W'} }, + { 'V', CAPS, {'v' ,'V'} }, + { 'G', CAPS, {'g' ,'G'} }, + { VK_OEM_7, 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[] = { + { VK_OEM_4, NOCAPS, {'[', '{', 0x001b} }, + { VK_OEM_6, NOCAPS, {']', '}', 0x001d} }, + { VK_OEM_5, NOCAPS, {'\\', '|', 0x001c} }, + { VK_OEM_102, NOCAPS, {'\\', '|', 0x001c} }, + { VK_BACK, NOCAPS, {'\b', '\b', 0x007f} }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, 0x001b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, 0x0003} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { '2', NOCAPS, {'2', '@', WCH_NONE, 0x0000} }, + { '6', NOCAPS, {'6', '^', WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, 0x001f} }, + { 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'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- Russian doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdusr/kbdusr.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusr/kbdusr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusr/kbdusr… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusr/kbdusr.def (added) +++ trunk/reactos/dll/keyboard/kbdusr/kbdusr.def [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdusr.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdusr/kbdusr.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusr/kbdusr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusr/kbdusr… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusr/kbdusr.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdusr/kbdusr.rbuild [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdusr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdusr.dll" allowwarnings="true"> + <importlibrary definition="kbdusr.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdusr.c</file> + <file>kbdusr.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdusr/kbdusr.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusr/kbdusr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusr/kbdusr… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusr/kbdusr.rc (added) +++ trunk/reactos/dll/keyboard/kbdusr/kbdusr.rc [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS US-Dvorak for right hand Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdusr\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdusr.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdusr/kbdusr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusx/kbdusx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusx/kbdusx… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusx/kbdusx.c (added) +++ trunk/reactos/dll/keyboard/kbdusx/kbdusx.c [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,482 @@ +/* + * ReactOS US-International Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Dmitry Chapyshev + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + */ + +#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 */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + /* - 37 - */ + /* Bottom Row */ + 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 6, + { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { VK_OEM_3, NOCAPS, {WCH_DEAD, WCH_DEAD} }, + { 0xff, NOCAPS, {'`', '~'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'B', CAPS, {'b', 'B'} }, + { VK_OEM_PERIOD,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[] = { + { '3', NOCAPS, {'3', '#', 0x00b3} }, + { '5', NOCAPS, {'5', '%', 0x20ac} }, + { '7', NOCAPS, {'7', '&', 0x00bd} }, + { '8', NOCAPS, {'8', '*', 0x00be} }, + { '9', NOCAPS, {'9', '(', 0x2018} }, + { '0', NOCAPS, {'0', ')', 0x2019} }, + { 'R', CAPS, {'r', 'R', 0x00ae} }, + { 'M', CAPS, {'m', 'M', 0x00b5} }, + { VK_OEM_2, NOCAPS, {'/', '?', 0x00bf} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { '1', NOCAPS, {'1', '!', 0x00a1, 0x00b9 } }, + { '4', NOCAPS, {'4', '$', 0x00a4, 0x00a3 } }, + { VK_OEM_PLUS, NOCAPS, {'=', '+', 0x00d7, 0x00f7 } }, + { 'Q', CAPS|CAPLOKALTGR, {'q', 'Q', 0x00e4, 0x00c4 } }, + { 'W', CAPS|CAPLOKALTGR, {'w', 'W', 0x00e5, 0x00c5 } }, + { 'E', CAPS|CAPLOKALTGR, {'e', 'E', 0x00e9, 0x00c9 } }, + { 'T', CAPS|CAPLOKALTGR, {'t', 'T', 0x00fe, 0x00de } }, + { 'Y', CAPS|CAPLOKALTGR, {'y', 'Y', 0x00fc, 0x00dc } }, + { 'U', CAPS|CAPLOKALTGR, {'u', 'U', 0x00fa, 0x00da } }, + { 'I', CAPS|CAPLOKALTGR, {'i', 'I', 0x00ed, 0x00cd } }, + { 'O', CAPS|CAPLOKALTGR, {'o', 'O', 0x00f3, 0x00d3 } }, + { 'P', CAPS|CAPLOKALTGR, {'p', 'P', 0x00f6, 0x00d6 } }, + { 'A', CAPS|CAPLOKALTGR, {'a', 'A', 0x00e1, 0x00c1 } }, + { 'S', CAPS, {'s', 'S', 0x00df, 0x00a7 } }, + { 'D', CAPS|CAPLOKALTGR, {'d', 'D', 0x00f0, 0x00d0 } }, + { 'L', CAPS|CAPLOKALTGR, {'l', 'L', 0x00f8, 0x00d8 } }, + { VK_OEM_1, NOCAPS, {';', ':', 0x00b6, 0x00b0 } }, + { VK_OEM_7, NOCAPS, {WCH_DEAD, WCH_DEAD, 0x00b4, 0x00a8 } }, + { 0xff, NOCAPS, {'\'', '\"', WCH_NONE, WCH_NONE} }, + { 'Z', CAPS|CAPLOKALTGR, {'z', 'Z', 0x00e6, 0x00c6 } }, + { 'C', CAPS, {'c', 'C', 0x00a9, 0x00a2 } }, + { 'N', CAPS|CAPLOKALTGR, {'n', 'N', 0x00f1, 0x00d1 } }, + { VK_OEM_COMMA, CAPLOKALTGR, {',', '<', 0x00e7, 0x00c7 } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { VK_OEM_4, NOCAPS, {'[', '{', 0x00ab, WCH_NONE, 0x001b} }, + { VK_OEM_6, NOCAPS, {']', '}', 0x00bb, WCH_NONE, 0x001d} }, + { VK_OEM_5, NOCAPS, {'\\', '|', 0x00ac, 0x00a6, 0x001c} }, + { VK_OEM_102, NOCAPS, {'\\', '|', WCH_NONE, WCH_NONE, 0x001c} }, + { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, WCH_NONE, 0x007f} }, + { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, WCH_NONE, WCH_NONE, 0x001b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', WCH_NONE, WCH_NONE, '\n' } }, + { VK_SPACE, NOCAPS, {' ', ' ', WCH_NONE, WCH_NONE, ' ' } }, + { VK_CANCEL, NOCAPS, {0x0003, 0x0003, WCH_NONE, WCH_NONE, 0x0003} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { + { '2', NOCAPS, {'2', '@', 0x00b2, WCH_NONE, WCH_NONE, 0x0000 } }, + { '6', NOCAPS, {'6', WCH_DEAD, 0x00bc, WCH_NONE, WCH_NONE, 0x001e } }, + { 0xff, NOCAPS, {WCH_NONE, '^', WCH_NONE, WCH_NONE, WCH_NONE, WCH_NONE} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x00a5, WCH_NONE, WCH_NONE, 0x001f } }, + { 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'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(5,key_to_chars_5mod), + vk_master(6,key_to_chars_6mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\'" L"ACUTE/CEDILLA", + L"`" L"GRAVE", + L"^" L"CIRCUMFLEX", + L"\"" L"UMLAUT", + L"~" L"TILDE", + NULL +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { DEADTRANS(L'a', '\'', 0x00e1, 0x0000) }, + { DEADTRANS(L'e', '\'', 0x00e9, 0x0000) }, + { DEADTRANS(L'i', '\'', 0x00ed, 0x0000) }, + { DEADTRANS(L'o', '\'', 0x00f3, 0x0000) }, + { DEADTRANS(L'u', '\'', 0x00fa, 0x0000) }, + { DEADTRANS(L'y', '\'', 0x00fd, 0x0000) }, + { DEADTRANS(L'A', '\'', 0x00c1, 0x0000) }, + { DEADTRANS(L'E', '\'', 0x00c9, 0x0000) }, + { DEADTRANS(L'I', '\'', 0x00cd, 0x0000) }, + { DEADTRANS(L'O', '\'', 0x00d3, 0x0000) }, + { DEADTRANS(L'U', '\'', 0x00da, 0x0000) }, + { DEADTRANS(L'Y', '\'', 0x00dd, 0x0000) }, + { DEADTRANS(L' ', '\'', '\'', 0x0000) }, + { DEADTRANS(L'c', '\'', 0x00e7, 0x0000) }, + { DEADTRANS(L'C', '\'', 0x00c7, 0x0000) }, + + { DEADTRANS(L'a', '\"', 0x00e4, 0x0000) }, + { DEADTRANS(L'e', '\"', 0x00eb, 0x0000) }, + { DEADTRANS(L'i', '\"', 0x00ef, 0x0000) }, + { DEADTRANS(L'o', '\"', 0x00f6, 0x0000) }, + { DEADTRANS(L'u', '\"', 0x00fc, 0x0000) }, + { DEADTRANS(L'y', '\"', 0x00ff, 0x0000) }, + { DEADTRANS(L'A', '\"', 0x00c4, 0x0000) }, + { DEADTRANS(L'E', '\"', 0x00cb, 0x0000) }, + { DEADTRANS(L'I', '\"', 0x00cf, 0x0000) }, + { DEADTRANS(L'O', '\"', 0x00d6, 0x0000) }, + { DEADTRANS(L'U', '\"', 0x00dc, 0x0000) }, + { DEADTRANS(L' ', '\"', '\"', 0x0000) }, + + { DEADTRANS(L'a', L'^', 0x00e2, 0x0000) }, + { DEADTRANS(L'e', L'^', 0x00ea, 0x0000) }, + { DEADTRANS(L'i', L'^', 0x00ee, 0x0000) }, + { DEADTRANS(L'o', L'^', 0x00f4, 0x0000) }, + { DEADTRANS(L'u', L'^', 0x00fb, 0x0000) }, + { DEADTRANS(L'A', L'^', 0x00c2, 0x0000) }, + { DEADTRANS(L'E', L'^', 0x00ca, 0x0000) }, + { DEADTRANS(L'I', L'^', 0x00ce, 0x0000) }, + { DEADTRANS(L'O', L'^', 0x00d4, 0x0000) }, + { DEADTRANS(L'U', L'^', 0x00db, 0x0000) }, + { DEADTRANS(L' ', L'^', L'^', 0x0000) }, + + { DEADTRANS(L'a', L'`', 0x00e0, 0x0000) }, + { DEADTRANS(L'e', L'`', 0x00e8, 0x0000) }, + { DEADTRANS(L'i', L'`', 0x00ec, 0x0000) }, + { DEADTRANS(L'o', L'`', 0x00f2, 0x0000) }, + { DEADTRANS(L'u', L'`', 0x00f9, 0x0000) }, + { DEADTRANS(L'A', L'`', 0x00c0, 0x0000) }, + { DEADTRANS(L'E', L'`', 0x00c8, 0x0000) }, + { DEADTRANS(L'I', L'`', 0x00cc, 0x0000) }, + { DEADTRANS(L'O', L'`', 0x00d2, 0x0000) }, + { DEADTRANS(L'U', L'`', 0x00d9, 0x0000) }, + { DEADTRANS(L' ', L'`', L'`', 0x0000) }, + + { DEADTRANS(L'a', L'~', 0x00e3, 0x0000) }, + { DEADTRANS(L'o', L'~', 0x00f5, 0x0000) }, + { DEADTRANS(L'n', L'~', 0x00f1, 0x0000) }, + { DEADTRANS(L'A', L'~', 0x00c3, 0x0000) }, + { DEADTRANS(L'O', L'~', 0x00d5, 0x0000) }, + { DEADTRANS(L'N', L'~', 0x00d1, 0x0000) }, + { DEADTRANS(L' ', L'~', L'~', 0x0000) }, + + {0, 0} +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + dead_key, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + dead_key_names, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- Russian doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Propchange: trunk/reactos/dll/keyboard/kbdusx/kbdusx.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusx/kbdusx.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusx/kbdusx… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusx/kbdusx.def (added) +++ trunk/reactos/dll/keyboard/kbdusx/kbdusx.def [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdusx.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdusx/kbdusx.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusx/kbdusx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusx/kbdusx… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusx/kbdusx.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdusx/kbdusx.rbuild [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdusx" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdusx.dll" allowwarnings="true"> + <importlibrary definition="kbdusx.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdusx.c</file> + <file>kbdusx.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdusx/kbdusx.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdusx/kbdusx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusx/kbdusx… ============================================================================== --- trunk/reactos/dll/keyboard/kbdusx/kbdusx.rc (added) +++ trunk/reactos/dll/keyboard/kbdusx/kbdusx.rc [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS US-International Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdusx\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdusx.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdusx/kbdusx.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui… ============================================================================== --- trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] Sun Apr 27 07:01:38 2008 @@ -100,6 +100,9 @@ <directory name="kbdpo"> <xi:include href="kbdpo/kbdpo.rbuild" /> </directory> + <directory name="kbdro"> + <xi:include href="kbdro/kbdro.rbuild" /> + </directory> <directory name="kbdru"> <xi:include href="kbdru/kbdru.rbuild" /> </directory> @@ -114,6 +117,9 @@ </directory> <directory name="kbdsw"> <xi:include href="kbdsw/kbdsw.rbuild" /> + </directory> + <directory name="kbdtat"> + <xi:include href="kbdtat/kbdtat.rbuild" /> </directory> <directory name="kbdth"> <xi:include href="kbdth/kbdth.rbuild" /> @@ -130,4 +136,13 @@ <directory name="kbdusa"> <xi:include href="kbdusa/kbdusa.rbuild" /> </directory> + <directory name="kbdusl"> + <xi:include href="kbdusl/kbdusl.rbuild" /> + </directory> + <directory name="kbdusr"> + <xi:include href="kbdusr/kbdusr.rbuild" /> + </directory> + <directory name="kbdusx"> + <xi:include href="kbdusx/kbdusx.rbuild" /> + </directory> </group>

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