Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[jimtabor] 34268: Cleanup drawing lines and curves with round rect.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jul 2 13:12:07 2008 New Revision: 34268 URL: http://svn.reactos.org/svn/reactos?rev=34268&view=rev Log: Cleanup drawing lines and curves with round rect. Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Wed Jul 2 13:12:07 2008 @@ -1395,7 +1395,6 @@ app_fill_ellipse(dc, r, FillBrushObj); else // > W < H { - app_fill_arc(dc, rect( r.x, r.y, r.width - 1, Hellipse), 0, 180, FillBrushObj,FALSE); app_fill_arc(dc, rect(r.x, Bottom - Hellipse - 1, r.width - 1, Hellipse), @@ -1411,17 +1410,17 @@ } else // < W < H { - app_fill_arc(dc, rect(r.x, r.y, Wellipse, Hellipse), + app_fill_arc(dc, rect(r.x, r.y, rx+rx, ry+ry), 90, 180, FillBrushObj, FALSE); - app_fill_arc(dc, rect(r.x, Bottom - Hellipse - 1, Wellipse, Hellipse), + app_fill_arc(dc, rect(r.x, r.y+r.height-ry-ry, rx+rx, ry+ry), 180, 270, FillBrushObj, FALSE); - app_fill_arc(dc, rect(Right - Wellipse - 1, Bottom - Hellipse - 1, Wellipse, Hellipse), + app_fill_arc(dc, rect(r.x+r.width-rx-rx, r.y+r.height-ry-ry, rx+rx, ry+ry), 270, 360, FillBrushObj,FALSE); - app_fill_arc(dc, rect(Right - Wellipse - 1, r.y, Wellipse, Hellipse ), - 0, 90, FillBrushObj,FALSE); + app_fill_arc(dc, rect(r.x+r.width-rx-rx, r.y, rx+rx, ry+ry), + 0, 90, FillBrushObj,FALSE); } if (Wellipse < r.width) { @@ -1463,7 +1462,6 @@ app_draw_ellipse(dc, r, PenBrushObj); else // > W < H { - app_draw_arc(dc, rect( r.x, r.y, r.width - 1, Hellipse - 1), 0, 180, PenBrushObj, FALSE); app_draw_arc(dc, rect(r.x, Bottom - Hellipse, r.width - 1, Hellipse - 1), @@ -1479,16 +1477,16 @@ } else // < W < H { - app_draw_arc(dc, rect(r.x, r.y, Wellipse-1, Hellipse - 1), + app_draw_arc(dc, rect(r.x, r.y, rx+rx, ry+ry), 90, 180, PenBrushObj, FALSE); - app_draw_arc(dc, rect(r.x, Bottom - Hellipse, Wellipse - 1, Hellipse - 1), + app_draw_arc(dc, rect(r.x,r.y+r.height-ry-ry,rx+rx,ry+ry), 180, 270, PenBrushObj, FALSE); - app_draw_arc(dc, rect(Right - Wellipse, Bottom - Hellipse, Wellipse - 1, Hellipse - 1), + app_draw_arc(dc, rect(r.x+r.width-rx-rx, r.y+r.height-ry-ry, rx+rx, ry+ry), 270, 360, PenBrushObj, FALSE); - app_draw_arc(dc, rect(Right - Wellipse, r.y, Wellipse - 1, Hellipse - 1 ), + app_draw_arc(dc, rect(r.x+r.width-rx-rx,r.y,rx+rx,ry+ry), 0, 90, PenBrushObj, FALSE); } if ( Hellipse < r.height)

16 years, 5 months

[jmorlan] 34267: - NtGdiAlphaBlend: If hDCSrc == hDCDest and a bitmap can't be locked, don't unlock the DC twice. Fix typo in if condition which prevented detection of bad source bitmap. - NtGdiBitBlt: Fix null pointer access when cleaning up after failure to lock source bitmap. - NtGdiStretchBlt: Fail gracefully if a bitmap can't be locked. Don't delete XlateObj if it couldn't be created. - NtGdiPolyPatBlt: Actually *use* the safe copy that so much code was dedicated to creating. :) - Trim a fe

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Wed Jul 2 12:20:28 2008 New Revision: 34267 URL: http://svn.reactos.org/svn/reactos?rev=34267&view=rev Log: - NtGdiAlphaBlend: If hDCSrc == hDCDest and a bitmap can't be locked, don't unlock the DC twice. Fix typo in if condition which prevented detection of bad source bitmap. - NtGdiBitBlt: Fix null pointer access when cleaning up after failure to lock source bitmap. - NtGdiStretchBlt: Fail gracefully if a bitmap can't be locked. Don't delete XlateObj if it couldn't be created. - NtGdiPolyPatBlt: Actually *use* the safe copy that so much code was dedicated to creating. :) - Trim a few bits of redundant code. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Wed Jul 2 12:20:28 2008 @@ -40,8 +40,8 @@ BLENDFUNCTION BlendFunc, HANDLE hcmXform) { - PDC DCDest = NULL; - PDC DCSrc = NULL; + PDC DCDest; + PDC DCSrc; BITMAPOBJ *BitmapDest, *BitmapSrc; RECTL DestRect, SourceRect; BOOL Status; @@ -106,7 +106,8 @@ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); if (!BitmapDest) { - DC_UnlockDc(DCSrc); + if (hDCSrc != hDCDest) + DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); return FALSE; } @@ -115,10 +116,11 @@ else { BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); - if (!BitmapDest) + if (!BitmapSrc) { BITMAPOBJ_UnlockBitmap(BitmapDest); - DC_UnlockDc(DCSrc); + if (hDCSrc != hDCDest) + DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); return FALSE; } @@ -169,7 +171,7 @@ IN DWORD crBackColor, IN FLONG fl) { - PDC DCDest = NULL; + PDC DCDest; PDC DCSrc = NULL; PDC_ATTR Dc_Attr = NULL; BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; @@ -219,10 +221,6 @@ DCSrc = DCDest; } } - else - { - DCSrc = NULL; - } Dc_Attr = DCDest->pDc_Attr; if (!Dc_Attr) Dc_Attr = &DCDest->Dc_Attr; @@ -265,10 +263,6 @@ goto cleanup; } } - else - { - BitmapSrc = NULL; - } if (UsesPattern) { @@ -280,10 +274,6 @@ } BrushOrigin = *((PPOINTL)&BrushObj->ptOrigin); IntGdiInitBrushInstance(&BrushInst, BrushObj, DCDest->XlateBrush); - } - else - { - BrushObj = NULL; } /* Create the XLATEOBJ. */ @@ -301,7 +291,7 @@ } /* Perform the bitblt operation */ - Status = IntEngBitBlt( BitmapDest ? &BitmapDest->SurfObj : NULL, BitmapSrc ? &BitmapSrc->SurfObj : NULL, NULL, + Status = IntEngBitBlt(&BitmapDest->SurfObj, BitmapSrc ? &BitmapSrc->SurfObj : NULL, NULL, DCDest->CombinedClip, XlateObj, &DestRect, &SourcePoint, NULL, BrushObj ? &BrushInst.BrushObject : NULL, @@ -315,7 +305,7 @@ { BITMAPOBJ_UnlockBitmap(BitmapDest); } - if (UsesSource && BitmapSrc != BitmapDest) + if (BitmapSrc != NULL && BitmapSrc != BitmapDest) { BITMAPOBJ_UnlockBitmap(BitmapSrc); } @@ -734,13 +724,13 @@ DWORD ROP, IN DWORD dwBackColor) { - PDC DCDest = NULL; + PDC DCDest; PDC DCSrc = NULL; PDC_ATTR Dc_Attr; - BITMAPOBJ *BitmapDest, *BitmapSrc; + BITMAPOBJ *BitmapDest, *BitmapSrc = NULL; RECTL DestRect; RECTL SourceRect; - BOOL Status; + BOOL Status = FALSE; XLATEOBJ *XlateObj = NULL; PGDIBRUSHOBJ BrushObj = NULL; BOOL UsesSource = ((ROP & 0xCC0000) >> 2) != (ROP & 0x330000); @@ -790,10 +780,6 @@ DCSrc = DCDest; } } - else - { - DCSrc = NULL; - } /* Offset the destination and source by the origin of their DCs. */ // FIXME: ptlDCOrig is in device coordinates! @@ -817,12 +803,20 @@ /* Determine surfaces to be used in the bitblt */ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap); + if (BitmapDest == NULL) + goto failed; if (UsesSource) { if (DCSrc->w.hBitmap == DCDest->w.hBitmap) + { BitmapSrc = BitmapDest; + } else + { BitmapSrc = BITMAPOBJ_LockBitmap(DCSrc->w.hBitmap); + if (BitmapSrc == NULL) + goto failed; + } int sw = BitmapSrc->SurfObj.sizlBitmap.cx; int sh = BitmapSrc->SurfObj.sizlBitmap.cy; @@ -871,7 +865,6 @@ if (0 == (DestRect.right-DestRect.left) || 0 == (DestRect.bottom-DestRect.top) || 0 == (SourceRect.right-SourceRect.left) || 0 == (SourceRect.bottom-SourceRect.top)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); - Status = FALSE; goto failed; } @@ -880,13 +873,9 @@ if (XlateObj == (XLATEOBJ*)-1) { SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - Status = FALSE; + XlateObj = NULL; goto failed; } - } - else - { - BitmapSrc = NULL; } if (UsesPattern) @@ -897,13 +886,8 @@ if (NULL == BrushObj) { SetLastWin32Error(ERROR_INVALID_HANDLE); - Status = FALSE; goto failed; } - } - else - { - BrushObj = NULL; } /* Perform the bitblt operation */ @@ -921,11 +905,14 @@ { BRUSHOBJ_UnlockBrush(BrushObj); } - if (UsesSource && DCSrc->w.hBitmap != DCDest->w.hBitmap) + if (BitmapSrc && DCSrc->w.hBitmap != DCDest->w.hBitmap) { BITMAPOBJ_UnlockBitmap(BitmapSrc); } - BITMAPOBJ_UnlockBitmap(BitmapDest); + if (BitmapDest) + { + BITMAPOBJ_UnlockBitmap(BitmapDest); + } if (UsesSource && hDCSrc != hDCDest) { DC_UnlockDc(DCSrc); @@ -1162,7 +1149,7 @@ } } - Ret = IntGdiPolyPatBlt(hDC, dwRop, (PPATRECT)pRects, cRects, Mode); + Ret = IntGdiPolyPatBlt(hDC, dwRop, rb, cRects, Mode); if (cRects > 0) ExFreePool(rb);

16 years, 5 months

[cfinck] 34266: Simplify the code for fputwc, when the file is opened in text mode. I verified this behaviour with a test app under Windows XP SP2. This is also the code used by the fputwc function of our previous msvcrt.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 2 11:07:01 2008 New Revision: 34266 URL: http://svn.reactos.org/svn/reactos?rev=34266&view=rev Log: Simplify the code for fputwc, when the file is opened in text mode. I verified this behaviour with a test app under Windows XP SP2. This is also the code used by the fputwc function of our previous msvcrt. Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Wed Jul 2 11:07:01 2008 @@ -2475,24 +2475,20 @@ */ wint_t CDECL fputwc(wint_t wc, FILE* file) { - wchar_t mwc=wc; - char mbchar[10]; // MB_CUR_MAX_CONST - int mb_return; - if (file->_flag & _IOBINARY) { + wchar_t mwc = wc; + if (fwrite( &mwc, sizeof(mwc), 1, file) != 1) return WEOF; } else { - /* Convert to multibyte in text mode */ - mb_return = wctomb(mbchar, mwc); - if (mb_return == -1) return WEOF; - - /* Output all characters */ - if (fwrite( mbchar, 1, mb_return, file) != 1) - return WEOF; + /* Convert the character to ANSI */ + char c = (unsigned char)wc; + + if (fwrite( &c, sizeof(c), 1, file) != 1) + return WEOF; } return wc;

16 years, 5 months

[dchapyshev] 34265: - Update Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Jul 2 11:06:19 2008 New Revision: 34265 URL: http://svn.reactos.org/svn/reactos?rev=34265&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] Wed Jul 2 11:06:19 2008 @@ -108,13 +108,13 @@ IDD_SPEAKERS DIALOG 0, 0, 257, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Speakers" +CAPTION "Äèíàìèêè" FONT 8, "MS Shell Dlg" BEGIN ICON 4379, -1, 7, 8, 20, 20 - LTEXT "Select the speaker setup that is most like the setup you have on your computer.", -1, 36, 8, 215, 27 + LTEXT "Óêàæèòå ðàñïîëîæåíèå äèíàìèêîâ, íàèáîëåå ñîîòâåòñòâóþùåå ðåàëüíîìó äëÿ äàííîãî êîìïüþòåðà.", -1, 36, 8, 215, 27 CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT - LTEXT "S&peaker setup:", 8502, 53, 169, 55, 10 + LTEXT "&Ðàñïîëîæåíèå äèíàìèêîâ:", 8502, 53, 169, 55, 10 COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END @@ -123,20 +123,20 @@ CAPTION "Performance" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "These settings control how ReactOS plays audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 218, 23 - GROUPBOX "Audio playback", 8494, 7, 32, 243, 152 + LTEXT "Ýòè ïàðàìåòðû óïðàâëÿþò âîñïðîèçâåäåíèåì çâóêà è ìîãóò ïîìî÷ü ïðè äèàãíîñòèêå íåïîëàäîê ñî çâóêîì.", 8492, 34, 7, 218, 23 + GROUPBOX "Âîñïðîèçâåäåíèå çâóêà", 8494, 7, 32, 243, 152 ICON 4379, 8512, 8, 8, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 56, 111, 14 + LTEXT "&Àïïàðàòíîå óñêîðåíèå:", 8495, 13, 56, 111, 14 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 54, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 123, 103, 14 + LTEXT "&×àñòîòà äèñêðåòèçàöèè:", 8496, 13, 123, 103, 14 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 121, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 7, 191, 110, 14 - LTEXT "None", 8497, 128, 56, 21, 10 - LTEXT "Full", 8498, 214, 56, 21, 9 - LTEXT "Good", 8499, 128, 123, 21, 10 - LTEXT "Best", 8500, 214, 123, 23, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 145, 227, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 78, 227, 22 + PUSHBUTTON "&Âîññòàíîâèòü óìîë÷àíèÿ", 5400, 7, 191, 110, 14 + LTEXT "Íåò", 8497, 128, 56, 21, 10 + LTEXT "Ïîëíîå", 8498, 214, 56, 21, 9 + LTEXT "Íèæå", 8499, 128, 123, 21, 10 + LTEXT "Âûøå", 8500, 214, 123, 23, 9 + LTEXT "Ýòîò ïàðàìåòð îïèñûâàåò íàñòðîéêó óñòðîéñòâà çàõâàòà çâóêà", 5399, 13, 145, 227, 21 + LTEXT "Ýòîò ïàðàìåòð îïèñûâàåò íàñòðîéêó óñòðîéñòâà îáðàáîòêè çâóêà", 5398, 13, 78, 227, 22 END IDD_PERFORMANCE2 DIALOG 0, 0, 257, 218 @@ -144,87 +144,87 @@ CAPTION "Performance" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "These settings control how ReactOS records audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 217, 20 - GROUPBOX "Audio recording", 8494, 7, 29, 242, 122 + LTEXT "Ýòè ïàðàìåòðû óïðàâëÿþò çàïèñüþ çâóêà è ìîãóò ïîìî÷ü ïðè äèàãíîñòèêå íåïîëàäîê ñî çâóêîì.", 8492, 34, 7, 217, 20 + GROUPBOX "Çàïèñü çâóêà", 8494, 7, 29, 242, 122 ICON 4380, 8512, 8, 7, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 46, 103, 17 + LTEXT "&Àïïàðàòíîå óñêîðåíèå:", 8495, 13, 46, 103, 17 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 103, 103, 17 + LTEXT "&×àñòîòà äèñêðåòèçàöèè:", 8496, 13, 103, 103, 17 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18 - PUSHBUTTON "&Restore Defaults", 5400, 9, 158, 110, 14 - LTEXT "None", 8497, 125, 46, 24, 10 - LTEXT "Full", 8498, 217, 46, 19, 9 - LTEXT "Good", 8499, 125, 103, 24, 10 - LTEXT "Best", 8500, 217, 103, 19, 9 - LTEXT "This string describes the hardware setting for the capture device", 5399, 13, 125, 222, 21 - LTEXT "This string describes the hardware setting for the render device", 5398, 13, 68, 218, 24 + PUSHBUTTON "&Âîññòàíîâèòü óìîë÷àíèÿ", 5400, 9, 158, 110, 14 + LTEXT "Íåò", 8497, 125, 46, 24, 10 + LTEXT "Ïîëíîå", 8498, 217, 46, 19, 9 + LTEXT "Íèæå", 8499, 125, 103, 24, 10 + LTEXT "Âûøå", 8500, 217, 103, 19, 9 + LTEXT "Ýòîò ïàðàìåòð îïèñûâàåò íàñòðîéêó óñòðîéñòâà çàõâàòà çâóêà", 5399, 13, 125, 222, 21 + LTEXT "Ýòîò ïàðàìåòð îïèñûâàåò íàñòðîéêó óñòðîéñòâà îáðàáîòêè çâóêà", 5398, 13, 68, 218, 24 END IDD_SETUP1 DIALOG 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Setup" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "ReactOS Audio", 10243, 7, 5, 213, 192 +CAPTION "Óñòàíîâêà" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Çâóê ReactOS", 10243, 7, 5, 213, 192 ICON 4393, 10241, 26, 26, 20, 20 - LTEXT "This computer cannot play audio because the ReactOS Audio service is not enabled.", 10245, 60, 25, 150, 40 - AUTOCHECKBOX "&Enable ReactOS Audio", 10253, 60, 68, 150, 9 + LTEXT "Ýòîò êîìïüþòåð íå ìîæåò âîñïðîèçâîäèòü çâóê ïîêà ñëóæáà çâóêà ReactOS íå âêëþ÷åíà.", 10245, 60, 25, 150, 40 + AUTOCHECKBOX "&Âêëþ÷èòü Çâóê ReactOS", 10253, 60, 68, 150, 9 LTEXT "Ïðèìå÷àíèÿ", 10246, 58, 87, 150, 11 LTEXT "1. You must be an administrator to enable this service. If you are not logged on as administrator, you will be prompted for an administrator name and password.", 10247, 60, 100, 150, 40 - LTEXT "2. After you enable ReactOS Audio you will have to restart the computer.", 10248, 60, 140, 150, 40 + LTEXT "2. Ïîñëå òîãî, êàê âû âêëþ÷èòå Çâóê ReactOS, âû äîëæíû ïåðåçàãðóçèòü êîìïüþòåð.", 10248, 60, 140, 150, 40 END IDD_MULTICHANNEL DIALOG 0, 0, 227, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Multichannel" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Description goes here.", 9506, 8, 4, 212, 24 - LTEXT "Low", 9473, 65, 31, 14, 8 +CAPTION "Ìíîãîêàíàëüíûé" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Îïèñàíèå.", 9506, 8, 4, 212, 24 + LTEXT "Ìèí.", 9473, 65, 31, 14, 8 LTEXT "", 9472, 5, 31, 55, 8 CONTROL "Slider1", 9475, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 29, 108, 17 - LTEXT "High", 9474, 202, 31, 17, 8 - LTEXT "Low", 9477, 65, 50, 14, 8 + LTEXT "Ìàêñ.", 9474, 202, 31, 17, 8 + LTEXT "Ìèí.", 9477, 65, 50, 14, 8 LTEXT "", 9476, 5, 50, 55, 8 CONTROL "Slider1", 9479, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 48, 108, 17 - LTEXT "High", 9478, 202, 50, 17, 8 - LTEXT "Low", 9481, 65, 69, 14, 8 + LTEXT "Ìàêñ.", 9478, 202, 50, 17, 8 + LTEXT "Ìèí.", 9481, 65, 69, 14, 8 LTEXT "", 9480, 5, 69, 55, 8 CONTROL "Slider1", 9483, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 67, 108, 17 - LTEXT "High", 9482, 202, 69, 17, 8 - LTEXT "Low", 9485, 65, 88, 14, 8 + LTEXT "Ìàêñ.", 9482, 202, 69, 17, 8 + LTEXT "Ìèí.", 9485, 65, 88, 14, 8 LTEXT "", 9484, 5, 88, 55, 8 CONTROL "Slider1", 9487, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 86, 108, 17 - LTEXT "High", 9486, 202, 88, 17, 8 - LTEXT "Low", 9489, 65, 107, 14, 8 + LTEXT "Ìàêñ.", 9486, 202, 88, 17, 8 + LTEXT "Ìèí.", 9489, 65, 107, 14, 8 LTEXT "", 9488, 5, 107, 55, 8 CONTROL "Slider1", 9491, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 105, 108, 17 - LTEXT "High", 9490, 202, 107, 17, 8 - LTEXT "Low", 9493, 65, 126, 14, 8 + LTEXT "Ìàêñ.", 9490, 202, 107, 17, 8 + LTEXT "Ìèí.", 9493, 65, 126, 14, 8 LTEXT "", 9492, 5, 126, 55, 8 CONTROL "Slider1", 9495, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 124, 108, 17 - LTEXT "High", 9494, 202, 126, 17, 8 - LTEXT "Low", 9497, 65, 145, 14, 8 + LTEXT "Ìàêñ.", 9494, 202, 126, 17, 8 + LTEXT "Ìèí.", 9497, 65, 145, 14, 8 LTEXT "", 9496, 5, 145, 55, 8 CONTROL "Slider1", 9499, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 143, 108, 17 - LTEXT "High", 9498, 202, 145, 17, 8 - LTEXT "Low", 9501, 65, 164, 14, 8 + LTEXT "Ìàêñ.", 9498, 202, 145, 17, 8 + LTEXT "Ìèí.", 9501, 65, 164, 14, 8 LTEXT "", 9500, 5, 164, 55, 8 CONTROL "Slider1", 9503, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 87, 162, 108, 17 - LTEXT "High", 9502, 202, 164, 17, 8 - AUTOCHECKBOX "&Move all slide indicators at the same time", 9504, 5, 185, 216, 9 + LTEXT "Ìàêñ.", 9502, 202, 164, 17, 8 + AUTOCHECKBOX "Ï&åðåäâèãàòü âñå ðåãóëÿòîðû îäíîâðåìåííî", 9504, 5, 185, 216, 9 PUSHBUTTON "&Âîñòàíîâèòü óìîë÷àíèÿ", 9505, 110, 199, 110, 14 END IDD_SETUP2 DIALOG 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Setup" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "ReactOS Audio", 10259, 7, 5, 213, 192 +CAPTION "Óñòàíîâêà" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Çâóê ReactOS", 10259, 7, 5, 213, 192 ICON 4394, 10257, 25, 25, 20, 20 LTEXT "The ReactOS Audio service is now enabled. However, audio may not function properly until you restart ReactOS. If you want to restart now, first save your work and close all programs.", 10261, 60, 25, 150, 50 - LTEXT "To restart ReactOS, click OK.", 10262, 60, 75, 150, 20 + LTEXT "Äëÿ ïåðåçàãðóçêè ReactOS íàæìèòå ""OK"".", 10262, 60, 75, 150, 20 LTEXT "If you Cancel, you will need to restart later for ReactOS Audio to function properly.", 10263, 60, 100, 150, 40 END @@ -235,32 +235,32 @@ IDS_NO_SOUND "(Íåò)" 5825 "Îøèáêà ïðîãðàììû" - 5826 "Çàêðûòèå ïðîãðàììû" - 5827 "Critical Battery Alarm" - 5828 "Device Connect" - 5829 "Device Disconnect" - 5830 "Device Failed to Connect" + 5826 "Çàêðûòü ïðîãðàììó" + 5827 "Ñèãíàë ïî÷òè ïîëíîé ðàçðÿäêè áàòàðåé" + 5828 "Ïîäêëþ÷åíèå óñòðîéñòâà" + 5829 "Îòêëþ÷åíèå óñòðîéñòâà" + 5830 "Îøèáêà ïîäêëþ÷åíèÿ óñòðîéñòâà" 5831 "Î÷èñòêà êàðçèíû" - 5832 "Low Battery Alarm" - 5833 "Maximize" - 5834 "Menu command" - 5835 "Menu popup" - 5836 "Minimize" - 5837 "New Mail Notification" - 5838 "Start Navigation" + 5832 "Ñèãíàë íèçêîãî çàðÿäà áàòàðåé" + 5833 "Ðàçâåðòûâàíèå" + 5834 "Êîìàíäà ìåíþ" + 5835 "Ðàñêðûòèå ìåíþ" + 5836 "Ñâåðòûâàíèå" + 5837 "Óâåäîìëåíèå î ïîëó÷åíèè ïî÷òû" + 5838 "Íà÷àòü îáçîð" 5839 "Îòêðûòèå ïðîãðàììû" - 5840 "Print Complete" - 5841 "Restore Down" - 5842 "Restore Up" - 5843 "Asterisk" - 5844 "Default sound" - 5845 "Exclamation" - 5846 "Âûõîä èç ReactOS" - 5847 "Critical Stop" - 5848 "System Notification" - 5849 "Question" + 5840 "Ïå÷àòü çàâåðøåíà" + 5841 "Âîññòàíîâëåíèå îêíà ñ ïîëíîãî ýêðàíà" + 5842 "Âîññòàíîâëåíèå îêíà èç çíà÷êà" + 5843 "Çâåçäî÷êà" + 5844 "Ñòàíäàðòíûé çâóê" + 5845 "Âîñêëèöàíèå" + 5846 "Çàâåðøåíèå ðàáîòû ReactOS" + 5847 "Êðèòè÷åñêàÿ îøèáêà" + 5848 "Ñèñòåìíîå óâåäîìëåíèå" + 5849 "Âîïðîñ" 5850 "Çàïóñê ReactOS" - 5851 "Start Menu" - 5852 "Çàâåðøåíèå ñåàíñà ReactOS" - 5853 "ReactOS Logon" -END + 5851 "Ãëàâíîå ìåíþ" + 5852 "Âûõîä èç ReactOS" + 5853 "Âõîä â ReactOS" +END

16 years, 5 months

[dchapyshev] 34264: - Add Latin American keyboard layout

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Jul 2 10:58:34 2008 New Revision: 34264 URL: http://svn.reactos.org/svn/reactos?rev=34264&view=rev Log: - Add Latin American keyboard layout Added: trunk/reactos/dll/keyboard/kbdla/ trunk/reactos/dll/keyboard/kbdla/kbdla.c (with props) trunk/reactos/dll/keyboard/kbdla/kbdla.def (with props) trunk/reactos/dll/keyboard/kbdla/kbdla.rbuild (with props) trunk/reactos/dll/keyboard/kbdla/kbdla.rc (with props) Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/keyboard.rbuild Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Wed Jul 2 10:58:34 2008 @@ -130,6 +130,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout File",0x00000000,"kbdes.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Text",0x00000000,"Spanish" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5020" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080a","Layout File",0x00000000,"kbdla.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080a","Layout Text",0x00000000,"Latin American" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5017" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040b","Layout File",0x00000000,"kbdfi.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040b","Layout Text",0x00000000,"Finnish" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Jul 2 10:58:34 2008 @@ -130,6 +130,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout File",0x00000000,"kbdes.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Text",0x00000000,"Spanish" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5020" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080a","Layout File",0x00000000,"kbdla.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080a","Layout Text",0x00000000,"Latin American" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000080a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5017" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040b","Layout File",0x00000000,"kbdfi.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040b","Layout Text",0x00000000,"Finnish" 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] Wed Jul 2 10:58:34 2008 @@ -184,6 +184,7 @@ dll\keyboard\kbdit\kbdit.dll 1 dll\keyboard\kbdja\kbdja.dll 1 dll\keyboard\kbdkaz\kbdkaz.dll 1 +dll\keyboard\kbdla\kbdla.dll 1 dll\keyboard\kbdlt\kbdlt.dll 1 dll\keyboard\kbdlv\kbdlv.dll 1 dll\keyboard\kbdmac\kbdmac.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] Wed Jul 2 10:58:34 2008 @@ -287,6 +287,7 @@ 00000411 = "Japanese" 00000412 = "Korean" 0000043F = "Kazakh" +0000080A = "Latin American" 00000426 = "Latvian" 00000427 = "Lithuanian" 0000042F = "Macedonian (FYRO)" @@ -339,6 +340,7 @@ 00050409 = kbdusa.dll 00001809 = kbdir.dll 0000040A = kbdes.dll +0000080A = kbdla.dll 0000040B = kbdfi.dll 0000040C = kbdfr.dll 00030407 = kbdgerg.dll Added: trunk/reactos/dll/keyboard/kbdla/kbdla.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdla/kbdla.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdla/kbdla.c (added) +++ trunk/reactos/dll/keyboard/kbdla/kbdla.c [iso-8859-1] Wed Jul 2 10:58:34 2008 @@ -1,0 +1,463 @@ +/* + * ReactOS Latin American 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, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + { '1', NOCAPS, {'1', '!' } }, + { '2', NOCAPS, {'2', '\"' } }, + { '3', NOCAPS, {'3', '#' } }, + { '4', NOCAPS, {'4', '$' } }, + { '5', NOCAPS, {'5', '%' } }, + { '7', NOCAPS, {'7', '/' } }, + { '8', NOCAPS, {'8', '(' } }, + { '9', NOCAPS, {'9', ')' } }, + { '0', NOCAPS, {'0', '=' } }, + { VK_OEM_6, NOCAPS, {0x00bf, 0x00a1} }, + { 'W', CAPS, {'w', 'W' } }, + { 'E', CAPS, {'e', 'E' } }, + { 'R', CAPS, {'r', 'R' } }, + { 'T', CAPS, {'t', 'T' } }, + { 'Y', CAPS, {'y', 'Y' } }, + { 'U', CAPS, {'u', 'U' } }, + { 'I', CAPS, {'i', 'I' } }, + { 'O', CAPS, {'o', 'O' } }, + { 'P', CAPS, {'p', 'P' } }, + { VK_OEM_1, NOCAPS, {WCH_DEAD,WCH_DEAD} }, + { 0xff, NOCAPS, {0x00b4, 0x00a8} }, + { 'A', CAPS, {'a', 'A' } }, + { 'S', CAPS, {'s', 'S' } }, + { 'D', CAPS, {'d', 'D' } }, + { 'F', CAPS, {'f', 'F' } }, + { 'G', CAPS, {'g', 'G' } }, + { 'H', CAPS, {'h', 'H' } }, + { 'J', CAPS, {'j', 'J' } }, + { 'K', CAPS, {'k', 'K' } }, + { 'L', CAPS, {'l', 'L' } }, + { VK_OEM_3, CAPS, {0x00f1, 0x00d1} }, + { 'Z', CAPS, {'z', 'Z' } }, + { 'X', CAPS, {'x', 'X' } }, + { 'C', CAPS, {'c', 'C' } }, + { 'V', CAPS, {'v', 'V' } }, + { 'B', CAPS, {'b', 'B' } }, + { 'N', CAPS, {'n', 'N' } }, + { 'M', CAPS, {'m', 'M' } }, + { VK_OEM_COMMA, NOCAPS, {',', ';' } }, + { 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[] = { + { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x001f} }, + { 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[] = { + { VK_OEM_5, NOCAPS, {'|', 0x00b0, WCH_NONE, 0x00ac } }, + { VK_OEM_4, NOCAPS, {'\'', '?', 0x001c, '\\' } }, + { 'Q', CAPS, {'q', 'Q', WCH_NONE, '@' } }, + { VK_OEM_PLUS, NOCAPS, {'+', '*', WCH_NONE, '~' } }, + { VK_OEM_2, NOCAPS, {'}', ']', 0x001d, WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, WCH_NONE, '`' } }, + { VK_OEM_7, NOCAPS, {'{', '[', 0x001b, WCH_DEAD} }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, WCH_NONE, '^' } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { '6', NOCAPS, {'6', '&', 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(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" }, +//{ 0x4c, L"Center" }, + { 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"\x00b4" L"AGUDO", + L"`" L"GRAVE", + L"^" L"CIRCUNFLEJO", + L"\x00a8" L"DIERERIS", + NULL +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { 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'^', 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', 0x00b4, 0x00e1, 0x0000) }, + { DEADTRANS(L'e', 0x00b4, 0x00e9, 0x0000) }, + { DEADTRANS(L'i', 0x00b4, 0x00ed, 0x0000) }, + { DEADTRANS(L'o', 0x00b4, 0x00f3, 0x0000) }, + { DEADTRANS(L'u', 0x00b4, 0x00fa, 0x0000) }, + { DEADTRANS(L'y', 0x00b4, 0x00fd, 0x0000) }, + { DEADTRANS(L'A', 0x00b4, 0x00c1, 0x0000) }, + { DEADTRANS(L'E', 0x00b4, 0x00c9, 0x0000) }, + { DEADTRANS(L'I', 0x00b4, 0x00cd, 0x0000) }, + { DEADTRANS(L'O', 0x00b4, 0x00d3, 0x0000) }, + { DEADTRANS(L'U', 0x00b4, 0x00da, 0x0000) }, + { DEADTRANS(L'Y', 0x00b4, 0x00dd, 0x0000) }, + { DEADTRANS(L' ', 0x00b4, 0x00b4, 0x0000) }, + { DEADTRANS(L'a', 0x00a8, 0x00e4, 0x0000) }, + { DEADTRANS(L'e', 0x00a8, 0x00eb, 0x0000) }, + { DEADTRANS(L'i', 0x00a8, 0x00ef, 0x0000) }, + { DEADTRANS(L'o', 0x00a8, 0x00f6, 0x0000) }, + { DEADTRANS(L'u', 0x00a8, 0x00fc, 0x0000) }, + { DEADTRANS(L'y', 0x00a8, 0x00ff, 0x0000) }, + { DEADTRANS(L'A', 0x00a8, 0x00c4, 0x0000) }, + { DEADTRANS(L'E', 0x00a8, 0x00cb, 0x0000) }, + { DEADTRANS(L'I', 0x00a8, 0x00cf, 0x0000) }, + { DEADTRANS(L'O', 0x00a8, 0x00d6, 0x0000) }, + { DEADTRANS(L'U', 0x00a8, 0x00dc, 0x0000) }, + { DEADTRANS(L' ', 0x00a8, 0x00a8, 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 */ + 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/kbdla/kbdla.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdla/kbdla.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdla/kbdla.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdla/kbdla.def (added) +++ trunk/reactos/dll/keyboard/kbdla/kbdla.def [iso-8859-1] Wed Jul 2 10:58:34 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdla.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdla/kbdla.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdla/kbdla.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdla/kbdla.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdla/kbdla.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdla/kbdla.rbuild [iso-8859-1] Wed Jul 2 10:58:34 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdla" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdla.dll" allowwarnings="true"> + <importlibrary definition="kbdla.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdla.c</file> + <file>kbdla.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdla/kbdla.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdla/kbdla.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdla/kbdla.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdla/kbdla.rc (added) +++ trunk/reactos/dll/keyboard/kbdla/kbdla.rc [iso-8859-1] Wed Jul 2 10:58:34 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Latin American Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdla\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdla.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdla/kbdla.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] Wed Jul 2 10:58:34 2008 @@ -130,6 +130,9 @@ <directory name="kbdkaz"> <xi:include href="kbdkaz/kbdkaz.rbuild" /> </directory> + <directory name="kbdla"> + <xi:include href="kbdla/kbdla.rbuild" /> + </directory> <directory name="kbdlt"> <xi:include href="kbdlt/kbdlt.rbuild" /> </directory>

16 years, 5 months

[dchapyshev] 34263: - Add Irish keyboard layout

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Jul 2 10:12:55 2008 New Revision: 34263 URL: http://svn.reactos.org/svn/reactos?rev=34263&view=rev Log: - Add Irish keyboard layout Added: trunk/reactos/dll/keyboard/kbdir/ trunk/reactos/dll/keyboard/kbdir/kbdir.c (with props) trunk/reactos/dll/keyboard/kbdir/kbdir.def (with props) trunk/reactos/dll/keyboard/kbdir/kbdir.rbuild (with props) trunk/reactos/dll/keyboard/kbdir/kbdir.rc (with props) Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/keyboard.rbuild Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Wed Jul 2 10:12:55 2008 @@ -122,6 +122,10 @@ 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)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5123" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00001809","Layout File",0x00000000,"kbdir.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00001809","Layout Text",0x00000000,"Irish" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00001809","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5014" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout File",0x00000000,"kbdes.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Text",0x00000000,"Spanish" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Jul 2 10:12:55 2008 @@ -122,6 +122,10 @@ 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)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5123" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00001809","Layout File",0x00000000,"kbdir.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00001809","Layout Text",0x00000000,"Irish" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00001809","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5014" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout File",0x00000000,"kbdes.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Text",0x00000000,"Spanish" 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] Wed Jul 2 10:12:55 2008 @@ -180,6 +180,7 @@ dll\keyboard\kbdindev\kbdindev.dll 1 dll\keyboard\kbdinguj\kbdinguj.dll 1 dll\keyboard\kbdinmal\kbdinmal.dll 1 +dll\keyboard\kbdir\kbdir.dll 1 dll\keyboard\kbdit\kbdit.dll 1 dll\keyboard\kbdja\kbdja.dll 1 dll\keyboard\kbdkaz\kbdkaz.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] Wed Jul 2 10:12:55 2008 @@ -280,8 +280,9 @@ 00010408 = "Greek 220" 00000447 = "Gujarati" 0000040D = "Hebrew" -0000040E = "Hungarian" -0000040F = "Icelandic" +0000040E = "Hungarian" +0000040F = "Icelandic" +00001809 = "Irish" 00000410 = "Italian" 00000411 = "Japanese" 00000412 = "Korean" @@ -336,6 +337,7 @@ 00030409 = kbdusl.dll 00040409 = kbdusr.dll 00050409 = kbdusa.dll +00001809 = kbdir.dll 0000040A = kbdes.dll 0000040B = kbdfi.dll 0000040C = kbdfr.dll Added: trunk/reactos/dll/keyboard/kbdir/kbdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdir/kbdir.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdir/kbdir.c (added) +++ trunk/reactos/dll/keyboard/kbdir/kbdir.c [iso-8859-1] Wed Jul 2 10:12:55 2008 @@ -1,0 +1,442 @@ +/* + * ReactOS Irish 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', '!'} }, + { '2', NOCAPS, {'2', '\"'}}, + { '3', NOCAPS, {'3', 0x00a3} }, + { '5', NOCAPS, {'5', '%'} }, + { '7', NOCAPS, {'7', '&'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, + { VK_OEM_PLUS, NOCAPS, {'=', '+'} }, + { 'Q', CAPS, {'q', 'Q'} }, + { 'W', CAPS, {'w', 'W'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'P', CAPS, {'p', 'P'} }, + { 'S', CAPS, {'s', 'S'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'L', CAPS, {'l', 'L'} }, + { VK_OEM_1, NOCAPS, {';', ':'} }, + { 'Z', CAPS, {'z', 'Z'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'C', CAPS, {'c', 'C'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'N', CAPS, {'n', 'N'} }, + { 'M', CAPS, {'m', 'M'} }, + { VK_OEM_COMMA, NOCAPS, {',', '<'} }, + { VK_OEM_PERIOD,NOCAPS, {'.', '>'} }, + { 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[] = { + { '4', NOCAPS, {'4', '$', 0x20ac} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + { VK_OEM_8, NOCAPS, {WCH_DEAD, 0x00ac, 0x00a6, 0x00a6 } }, + { 0xff, NOCAPS, {'`', WCH_NONE, WCH_NONE, WCH_NONE} }, + { 'E', CAPS, {'e', 'E', 0x00e9, 0x00c9 } }, + { 'U', CAPS, {'u', 'U', 0x00fa, 0x00da } }, + { 'I', CAPS, {'i', 'I', 0x00ed, 0x00cd } }, + { 'O', CAPS, {'o', 'O', 0x00f3, 0x00d3 } }, + { 'A', CAPS, {'a', 'A', 0x00e1, 0x00c1 } }, + { VK_OEM_3, NOCAPS, {'\'', '@', WCH_DEAD, '`' } }, + { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, 0x00b4, WCH_NONE} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + { VK_OEM_4, NOCAPS, {'[', '{', WCH_NONE, WCH_NONE, 0x001b} }, + { VK_OEM_6, NOCAPS, {']', '}', WCH_NONE, WCH_NONE, 0x001d} }, + { VK_OEM_7, NOCAPS, {'#', '~', WCH_NONE, WCH_NONE, 0x001c} }, + { VK_OEM_5, 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[] = { + { '6', NOCAPS, { '6', '^', WCH_NONE, WCH_NONE, WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, NOCAPS, { '-', '_', WCH_NONE, 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" }, +//{ 0x4c, L"Center" }, + { 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"GRAVE", + L"\x00b4" L"ACUTE", + NULL +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { 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', 0x00b4, 0x00e1, 0x0000) }, + { DEADTRANS(L'e', 0x00b4, 0x00e9, 0x0000) }, + { DEADTRANS(L'i', 0x00b4, 0x00ed, 0x0000) }, + { DEADTRANS(L'o', 0x00b4, 0x00f3, 0x0000) }, + { DEADTRANS(L'u', 0x00b4, 0x00fa, 0x0000) }, + { DEADTRANS(L'y', 0x00b4, 0x00fd, 0x0000) }, + { DEADTRANS(L'A', 0x00b4, 0x00c1, 0x0000) }, + { DEADTRANS(L'E', 0x00b4, 0x00c9, 0x0000) }, + { DEADTRANS(L'I', 0x00b4, 0x00cd, 0x0000) }, + { DEADTRANS(L'O', 0x00b4, 0x00d3, 0x0000) }, + { DEADTRANS(L'U', 0x00b4, 0x00da, 0x0000) }, + { DEADTRANS(L'Y', 0x00b4, 0x00dd, 0x0000) }, + { DEADTRANS(L' ', 0x00b4, 0x00b4, 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 */ + 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/kbdir/kbdir.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdir/kbdir.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdir/kbdir.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdir/kbdir.def (added) +++ trunk/reactos/dll/keyboard/kbdir/kbdir.def [iso-8859-1] Wed Jul 2 10:12:55 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdir.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdir/kbdir.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdir/kbdir.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdir/kbdir.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdir/kbdir.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdir/kbdir.rbuild [iso-8859-1] Wed Jul 2 10:12:55 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdir" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdir.dll" allowwarnings="true"> + <importlibrary definition="kbdir.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdir.c</file> + <file>kbdir.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdir/kbdir.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdir/kbdir.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdir/kbdir.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdir/kbdir.rc (added) +++ trunk/reactos/dll/keyboard/kbdir/kbdir.rc [iso-8859-1] Wed Jul 2 10:12:55 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Irish Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdir\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdir.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdir/kbdir.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] Wed Jul 2 10:12:55 2008 @@ -118,6 +118,9 @@ <directory name="kbdinmal"> <xi:include href="kbdinmal/kbdinmal.rbuild" /> </directory> + <directory name="kbdir"> + <xi:include href="kbdir/kbdir.rbuild" /> + </directory> <directory name="kbdit"> <xi:include href="kbdit/kbdit.rbuild" /> </directory>

16 years, 5 months

[dchapyshev] 34262: Add keyboard layouts by Alexey Komarov: - Thai Kedmanee - Thai Pattachote - Thai Pattachote (non-ShiftLock)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Jul 2 09:08:45 2008 New Revision: 34262 URL: http://svn.reactos.org/svn/reactos?rev=34262&view=rev Log: Add keyboard layouts by Alexey Komarov: - Thai Kedmanee - Thai Pattachote - Thai Pattachote (non-ShiftLock) Added: trunk/reactos/dll/keyboard/kbdth0/ trunk/reactos/dll/keyboard/kbdth0/kbdth0.c (with props) trunk/reactos/dll/keyboard/kbdth0/kbdth0.def (with props) trunk/reactos/dll/keyboard/kbdth0/kbdth0.rbuild (with props) trunk/reactos/dll/keyboard/kbdth0/kbdth0.rc (with props) trunk/reactos/dll/keyboard/kbdth1/ trunk/reactos/dll/keyboard/kbdth1/kbdth1.c (with props) trunk/reactos/dll/keyboard/kbdth1/kbdth1.def (with props) trunk/reactos/dll/keyboard/kbdth1/kbdth1.rbuild (with props) trunk/reactos/dll/keyboard/kbdth1/kbdth1.rc (with props) trunk/reactos/dll/keyboard/kbdth3/ trunk/reactos/dll/keyboard/kbdth3/kbdth3.c (with props) trunk/reactos/dll/keyboard/kbdth3/kbdth3.def (with props) trunk/reactos/dll/keyboard/kbdth3/kbdth3.rbuild (with props) trunk/reactos/dll/keyboard/kbdth3/kbdth3.rc (with props) Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/keyboard.rbuild Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -212,9 +212,21 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Text",0x00000000,"Swedish" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5022" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout File",0x00000000,"kbdth0.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Text",0x00000000,"Thai Kedmanee" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5079" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041e","Layout File",0x00000000,"kbdth1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041e","Layout Text",0x00000000,"Thai Pattachote" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5080" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout File",0x00000000,"kbdth2.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Text",0x00000000,"Thai Kedmanee (non-ShiftLock)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5081" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0003041e","Layout File",0x00000000,"kbdth3.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0003041e","Layout Text",0x00000000,"Thai Pattachote (non-ShiftLock)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0003041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5082" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout File",0x00000000,"kbdur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout Text",0x00000000,"Ukrainian" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -212,9 +212,21 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Text",0x00000000,"Swedish" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5022" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout File",0x00000000,"kbdth0.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Text",0x00000000,"Thai Kedmanee" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5079" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041e","Layout File",0x00000000,"kbdth1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041e","Layout Text",0x00000000,"Thai Pattachote" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5080" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout File",0x00000000,"kbdth2.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Text",0x00000000,"Thai Kedmanee (non-ShiftLock)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5081" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0003041e","Layout File",0x00000000,"kbdth3.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0003041e","Layout Text",0x00000000,"Thai Pattachote (non-ShiftLock)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0003041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5082" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout File",0x00000000,"kbdur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout Text",0x00000000,"Ukrainian" 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] Wed Jul 2 09:08:45 2008 @@ -197,7 +197,10 @@ dll\keyboard\kbdsk\kbdsk.dll 1 dll\keyboard\kbdsw\kbdsw.dll 1 dll\keyboard\kbdtat\kbdtat.dll 1 +dll\keyboard\kbdth0\kbdth0.dll 1 +dll\keyboard\kbdth1\kbdth1.dll 1 dll\keyboard\kbdth2\kbdth2.dll 1 +dll\keyboard\kbdth3\kbdth3.dll 1 dll\keyboard\kbdtuf\kbdtuf.dll 1 dll\keyboard\kbdtuq\kbdtuq.dll 1 dll\keyboard\kbduk\kbduk.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] Wed Jul 2 09:08:45 2008 @@ -303,7 +303,10 @@ 0000040A = "Spanish (traditional short)" 0000041D = "Swedish (Sweden)" 00000444 = "Tatar" -0000041E = "Thai (traditional)" +0000041E = "Thai Kedmanee" +0001041E = "Thai Pattachote" +0002041E = "Thai Kedmanee (non-ShiftLock)" +0003041E = "Thai Pattachote (non-ShiftLock)" 0000041F = "Turkish Q" 0001041F = "Turkish F" 00000422 = "Ukrainian" @@ -365,7 +368,10 @@ 0000081A = kbdycl.dll 0000041B = kbdsk.dll 0000041D = kbdsw.dll -0000041E = kbdth.dll +0000041E = kbdth0.dll +0001041E = kbdth1.dll +0002041E = kbdth2.dll +0003041E = kbdth3.dll 00000809 = kbduk.dll 00000422 = kbdur.dll 00010422 = kbdurs.dll Added: trunk/reactos/dll/keyboard/kbdth0/kbdth0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth0/kbdth0… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth0/kbdth0.c (added) +++ trunk/reactos/dll/keyboard/kbdth0/kbdth0.c [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,383 @@ +/* + * ReactOS Thai Kedmanee Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Alexey Komarov + * 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, CAPS, {'_', '%' } }, + { '1', CAPS, {0x0e45, '+' } }, + { '2', CAPS, {'/', 0x0e51} }, + { '3', CAPS, {'-', 0x0e52} }, + { '4', CAPS, {0x0e20, 0x0e53} }, + { '5', CAPS, {0x0e16, 0x0e54} }, + { '7', CAPS, {0x0e36, 0x0e3f} }, + { '8', CAPS, {0x0e04, 0x0e55} }, + { '9', CAPS, {0x0e15, 0x0e56} }, + { '0', CAPS, {0x0e08, 0x0e57} }, + { VK_OEM_PLUS, CAPS, {0x0e0a, 0x0e59} }, + { 'Q', CAPS, {0x0e46, 0x0e50} }, + { 'W', CAPS, {0x0e44, '\"' } }, + { 'E', CAPS, {0x0e33, 0x0e0e} }, + { 'R', CAPS, {0x0e1e, 0x0e11} }, + { 'T', CAPS, {0x0e30, 0x0e18} }, + { 'Y', CAPS, {0x0e31, 0x0e4d} }, + { 'U', CAPS, {0x0e35, 0x0e4a} }, + { 'I', CAPS, {0x0e23, 0x0e13} }, + { 'O', CAPS, {0x0e19, 0x0e2f} }, + { 'P', CAPS, {0x0e22, 0x0e0d} }, + { 'A', CAPS, {0x0e1f, 0x0e24} }, + { 'S', CAPS, {0x0e2b, 0x0e06} }, + { 'D', CAPS, {0x0e01, 0x0e0f} }, + { 'F', CAPS, {0x0e14, 0x0e42} }, + { 'G', CAPS, {0x0e40, 0x0e0c} }, + { 'H', CAPS, {0x0e49, 0x0e47} }, + { 'J', CAPS, {0x0e48, 0x0e4b} }, + { 'K', CAPS, {0x0e32, 0x0e29} }, + { 'L', CAPS, {0x0e2a, 0x0e28} }, + { VK_OEM_1, CAPS, {0x0e27, 0x0e0b} }, + { VK_OEM_7, CAPS, {0x0e07, '.' } }, + { 'Z', CAPS, {0x0e1c, '(' } }, + { 'X', CAPS, {0x0e1b, ')' } }, + { 'C', CAPS, {0x0e41, 0x0e09} }, + { 'V', CAPS, {0x0e2d, 0x0e2e} }, + { 'B', CAPS, {0x0e34, 0x0e3a} }, + { 'N', CAPS, {0x0e37, 0x0e4c} }, + { 'M', CAPS, {0x0e17, '?' } }, + { VK_OEM_COMMA, CAPS, {0x0e21, 0x0e12} }, + { VK_OEM_PERIOD,CAPS, {0x0e43, 0x0e2c} }, + { VK_OEM_2, CAPS, {0x0e1d, 0x0e26} }, + { 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, CAPS, {0x0e1a, 0x0e10, '%' } }, + { VK_OEM_6, CAPS, {0x0e25, ',', 0x0e51} }, + { VK_OEM_5, CAPS, {0x0e03, 0x0e05, '+' } }, + { VK_OEM_102, CAPS, {0x0e03, 0x0e05, 0x0e52} }, + { 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[] = { + { '6', CAPS, {0x0e38, 0x0e39, WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, CAPS, {0x0e02, 0x0e58, 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; +} Propchange: trunk/reactos/dll/keyboard/kbdth0/kbdth0.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdth0/kbdth0.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth0/kbdth0… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth0/kbdth0.def (added) +++ trunk/reactos/dll/keyboard/kbdth0/kbdth0.def [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdth0.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdth0/kbdth0.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdth0/kbdth0.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth0/kbdth0… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth0/kbdth0.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdth0/kbdth0.rbuild [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdth0" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdth0.dll" allowwarnings="true"> + <importlibrary definition="kbdth0.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdth0.c</file> + <file>kbdth0.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdth0/kbdth0.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdth0/kbdth0.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth0/kbdth0… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth0/kbdth0.rc (added) +++ trunk/reactos/dll/keyboard/kbdth0/kbdth0.rc [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Kedmanee Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdth0\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdth0.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdth0/kbdth0.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdth1/kbdth1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth1/kbdth1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth1/kbdth1.c (added) +++ trunk/reactos/dll/keyboard/kbdth1/kbdth1.c [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,383 @@ +/* + * ReactOS Thai Pattachote Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Alexey Komarov + * 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, CAPS, {'_', 0x0e3f} }, + { '1', CAPS, {'=', '+' } }, + { '2', CAPS, {0x0e52, '\"' } }, + { '3', CAPS, {0x0e53, '/' } }, + { '4', CAPS, {0x0e54, ',' } }, + { '5', CAPS, {0x0e55, '?' } }, + { '7', CAPS, {0x0e57, '_' } }, + { '8', CAPS, {0x0e58, '.' } }, + { '9', CAPS, {0x0e59, '(' } }, + { '0', CAPS, {0x0e50, ')' } }, + { VK_OEM_PLUS, CAPS, {0x0e56, '%' } }, + { 'Q', CAPS, {0x0e47, 0x0e4a} }, + { 'W', CAPS, {0x0e15, 0x0e24} }, + { 'E', CAPS, {0x0e22, 0x0e46} }, + { 'R', CAPS, {0x0e2d, 0x0e0d} }, + { 'T', CAPS, {0x0e23, 0x0e29} }, + { 'Y', CAPS, {0x0e48, 0x0e36} }, + { 'U', CAPS, {0x0e14, 0x0e1d} }, + { 'I', CAPS, {0x0e21, 0x0e0b} }, + { 'O', CAPS, {0x0e27, 0x0e16} }, + { 'P', CAPS, {0x0e41, 0x0e12} }, + { 'A', CAPS, {0x0e49, 0x0e4b} }, + { 'S', CAPS, {0x0e17, 0x0e18} }, + { 'D', CAPS, {0x0e07, 0x0e33} }, + { 'F', CAPS, {0x0e01, 0x0e13} }, + { 'G', CAPS, {0x0e31, 0x0e4c} }, + { 'H', CAPS, {0x0e35, 0x0e37} }, + { 'J', CAPS, {0x0e32, 0x0e1c} }, + { 'K', CAPS, {0x0e19, 0x0e0a} }, + { 'L', CAPS, {0x0e40, 0x0e42} }, + { VK_OEM_1, CAPS, {0x0e44, 0x0e06} }, + { VK_OEM_7, CAPS, {0x0e02, 0x0e11} }, + { 'Z', CAPS, {0x0e1a, 0x0e0e} }, + { 'X', CAPS, {0x0e1b, 0x0e0f} }, + { 'C', CAPS, {0x0e25, 0x0e10} }, + { 'V', CAPS, {0x0e2b, 0x0e20} }, + { 'B', CAPS, {0x0e34, 0x0e31} }, + { 'N', CAPS, {0x0e04, 0x0e28} }, + { 'M', CAPS, {0x0e2a, 0x0e2e} }, + { VK_OEM_COMMA, CAPS, {0x0e30, 0x0e1f} }, + { VK_OEM_PERIOD,CAPS, {0x0e08, 0x0e09} }, + { VK_OEM_2, CAPS, {0x0e1e, 0x0e2c} }, + { 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, CAPS, {0x0e43, 0x0e2f, 0x001b} }, + { VK_OEM_6, CAPS, {0x0e0c, 0x0e26, 0x001d} }, + { VK_OEM_5, CAPS, {0xf8c7, 0x0e4d, 0x001c} }, + { VK_OEM_102, CAPS, {0xf8c7, 0x0e4d, 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[] = { + { '6', CAPS, {0x0e39, 0x0e38, WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, CAPS, {0x0e51, '-', 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; +} Propchange: trunk/reactos/dll/keyboard/kbdth1/kbdth1.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdth1/kbdth1.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth1/kbdth1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth1/kbdth1.def (added) +++ trunk/reactos/dll/keyboard/kbdth1/kbdth1.def [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdth1.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdth1/kbdth1.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdth1/kbdth1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth1/kbdth1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth1/kbdth1.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdth1/kbdth1.rbuild [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdth1" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdth1.dll" allowwarnings="true"> + <importlibrary definition="kbdth1.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdth1.c</file> + <file>kbdth1.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdth1/kbdth1.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdth1/kbdth1.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth1/kbdth1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth1/kbdth1.rc (added) +++ trunk/reactos/dll/keyboard/kbdth1/kbdth1.rc [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Pattachote Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdth1\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdth1.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdth1/kbdth1.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdth3/kbdth3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth3/kbdth3… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth3/kbdth3.c (added) +++ trunk/reactos/dll/keyboard/kbdth3/kbdth3.c [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,383 @@ +/* + * ReactOS Thai Pattachote (non-ShiftLock) Keyboard layout + * Copyright (C) 2008 ReactOS + * Author: Alexey Komarov + * 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, {'_', 0x0e3f} }, + { '1', NOCAPS, {'=', '+' } }, + { '2', NOCAPS, {0x0e52, '\"' } }, + { '3', NOCAPS, {0x0e53, '/' } }, + { '4', NOCAPS, {0x0e54, ',' } }, + { '5', NOCAPS, {0x0e55, '?' } }, + { '7', NOCAPS, {0x0e57, '_' } }, + { '8', NOCAPS, {0x0e58, '.' } }, + { '9', NOCAPS, {0x0e59, '(' } }, + { '0', NOCAPS, {0x0e50, ')' } }, + { VK_OEM_PLUS, NOCAPS, {0x0e56, '%' } }, + { 'Q', NOCAPS, {0x0e47, 0x0e4a} }, + { 'W', NOCAPS, {0x0e15, 0x0e24} }, + { 'E', NOCAPS, {0x0e22, 0x0e46} }, + { 'R', NOCAPS, {0x0e2d, 0x0e0d} }, + { 'T', NOCAPS, {0x0e23, 0x0e29} }, + { 'Y', NOCAPS, {0x0e48, 0x0e36} }, + { 'U', NOCAPS, {0x0e14, 0x0e1d} }, + { 'I', NOCAPS, {0x0e21, 0x0e0b} }, + { 'O', NOCAPS, {0x0e27, 0x0e16} }, + { 'P', NOCAPS, {0x0e41, 0x0e12} }, + { 'A', NOCAPS, {0x0e49, 0x0e4b} }, + { 'S', NOCAPS, {0x0e17, 0x0e18} }, + { 'D', NOCAPS, {0x0e07, 0x0e33} }, + { 'F', NOCAPS, {0x0e01, 0x0e13} }, + { 'G', NOCAPS, {0x0e31, 0x0e4c} }, + { 'H', NOCAPS, {0x0e35, 0x0e37} }, + { 'J', NOCAPS, {0x0e32, 0x0e1c} }, + { 'K', NOCAPS, {0x0e19, 0x0e0a} }, + { 'L', NOCAPS, {0x0e40, 0x0e42} }, + { VK_OEM_1, NOCAPS, {0x0e44, 0x0e06} }, + { VK_OEM_7, NOCAPS, {0x0e02, 0x0e11} }, + { 'Z', NOCAPS, {0x0e1a, 0x0e0e} }, + { 'X', NOCAPS, {0x0e1b, 0x0e0f} }, + { 'C', NOCAPS, {0x0e25, 0x0e10} }, + { 'V', NOCAPS, {0x0e2b, 0x0e20} }, + { 'B', NOCAPS, {0x0e34, 0x0e31} }, + { 'N', NOCAPS, {0x0e04, 0x0e28} }, + { 'M', NOCAPS, {0x0e2a, 0x0e2e} }, + { VK_OEM_COMMA, NOCAPS, {0x0e30, 0x0e1f} }, + { VK_OEM_PERIOD,NOCAPS, {0x0e08, 0x0e09} }, + { VK_OEM_2, NOCAPS, {0x0e1e, 0x0e2c} }, + { 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, {0x0e43, 0x0e2f, 0x001b} }, + { VK_OEM_6, NOCAPS, {0x0e0c, 0x0e26, 0x001d} }, + { VK_OEM_5, NOCAPS, {0xf8c7, 0x0e4d, 0x001c} }, + { VK_OEM_102, NOCAPS, {0xf8c7, 0x0e4d, 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[] = { + { '6', NOCAPS, {0x0e39, 0x0e38, WCH_NONE, 0x001e} }, + { VK_OEM_MINUS, NOCAPS, {0x0e51, '-', 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; +} Propchange: trunk/reactos/dll/keyboard/kbdth3/kbdth3.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdth3/kbdth3.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth3/kbdth3… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth3/kbdth3.def (added) +++ trunk/reactos/dll/keyboard/kbdth3/kbdth3.def [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdth3.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdth3/kbdth3.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdth3/kbdth3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth3/kbdth3… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth3/kbdth3.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdth3/kbdth3.rbuild [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdth3" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdth3.dll" allowwarnings="true"> + <importlibrary definition="kbdth3.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdth3.c</file> + <file>kbdth3.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdth3/kbdth3.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdth3/kbdth3.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth3/kbdth3… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth3/kbdth3.rc (added) +++ trunk/reactos/dll/keyboard/kbdth3/kbdth3.rc [iso-8859-1] Wed Jul 2 09:08:45 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Pattachote (non-ShiftLock) Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdth3\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdth3.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdth3/kbdth3.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] Wed Jul 2 09:08:45 2008 @@ -169,9 +169,18 @@ <directory name="kbdtat"> <xi:include href="kbdtat/kbdtat.rbuild" /> </directory> + <directory name="kbdth0"> + <xi:include href="kbdth0/kbdth0.rbuild" /> + </directory> + <directory name="kbdth1"> + <xi:include href="kbdth1/kbdth1.rbuild" /> + </directory> <directory name="kbdth2"> <xi:include href="kbdth2/kbdth2.rbuild" /> </directory> + <directory name="kbdth3"> + <xi:include href="kbdth3/kbdth3.rbuild" /> + </directory> <directory name="kbdtuf"> <xi:include href="kbdtuf/kbdtuf.rbuild" /> </directory>

16 years, 5 months

[dchapyshev] 34261: - Rename kbdth to kbdth2 (part 2/2)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Jul 2 08:47:42 2008 New Revision: 34261 URL: http://svn.reactos.org/svn/reactos?rev=34261&view=rev Log: - Rename kbdth to kbdth2 (part 2/2) Added: trunk/reactos/dll/keyboard/kbdth2/kbdth2.c - copied unchanged from r34260, trunk/reactos/dll/keyboard/kbdth2/kbdth.c trunk/reactos/dll/keyboard/kbdth2/kbdth2.def - copied, changed from r34260, trunk/reactos/dll/keyboard/kbdth2/kbdth.def trunk/reactos/dll/keyboard/kbdth2/kbdth2.rbuild - copied, changed from r34260, trunk/reactos/dll/keyboard/kbdth2/kbdth.rbuild trunk/reactos/dll/keyboard/kbdth2/kbdth2.rc - copied, changed from r34260, trunk/reactos/dll/keyboard/kbdth2/kbdth.rc Removed: trunk/reactos/dll/keyboard/kbdth2/kbdth.c trunk/reactos/dll/keyboard/kbdth2/kbdth.def trunk/reactos/dll/keyboard/kbdth2/kbdth.rbuild trunk/reactos/dll/keyboard/kbdth2/kbdth.rc Modified: trunk/reactos/dll/keyboard/keyboard.rbuild Removed: trunk/reactos/dll/keyboard/kbdth2/kbdth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth.… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth.c (removed) @@ -1,384 +1,0 @@ -/* - * ReactOS Thai keyboard layout (traditional) - * Copyright (C) 2007 ReactOS - * License: LGPL, see: LGPL.txt - * - */ - -#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 */ - -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 */ - VK_MULTIPLY, 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 } /* Modifier bit order */ -}; - -#define NOCAPS 0 -#define CAPS KSHIFT /* Caps -> shift */ - -ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { - { VK_OEM_3, 0, {'_', '%' } }, - { '1', 0, {0x0e45, '+' } }, - { '2', 0, {'/', 0x0e51} }, - { '3', 0, {'-', 0x0e52} }, - { '4', 0, {0x0e20, 0x0e53} }, - { '5', 0, {0x0e16, 0x0e54} }, - { '6', 0, {0x0e38, 0x0e39} }, - { '7', 0, {0x0e36, 0x0e3f} }, - { '8', 0, {0x0e04, 0x0e55} }, - { '9', 0, {0x0e15, 0x0e56} }, - { '0', 0, {0x0e08, 0x0e57} }, - { VK_OEM_MINUS, 0, {0x0e02, 0x0e58} }, - { VK_OEM_PLUS, 0, {0x0e0a, 0x0e59} }, - { VK_OEM_5, 0, {0x0e03, 0x0e05} }, - - { VK_OEM_4, 0, {0x0e1a, 0x0e10} }, - { VK_OEM_6, 0, {0x0e25, ',' } }, - { VK_OEM_1, 0, {0x0e27, 0x0e0b} }, - { VK_OEM_7, 0, {0x0e07, '.' } }, - { VK_OEM_COMMA, 0, {0x0e21, 0x0e12} }, - { VK_OEM_PERIOD,0, {0x0e43, 0x0e2c} }, - { VK_OEM_2, 0, {0x0e1d, 0x0e26} }, - - { VK_TAB, 0, {'\t', '\t'} }, - { VK_ADD, 0, {'+', '+' } }, - { VK_SUBTRACT, 0, {'-', '-' } }, - { VK_MULTIPLY, 0, {'*', '*' } }, - { VK_DIVIDE, 0, {'/', '/' } }, - { VK_ESCAPE, 0, {0x1b, 0x1b} }, - { VK_SPACE, 0, {' ', ' ' } }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - { VK_BACK, 0, {'\b', '\b', 0x7f} }, - { VK_RETURN, 0, {'\r', '\r', '\n'} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { - { 'Q', 0, {0x0e46, 0x0e50, 0x11, 0x11} }, - { 'W', 0, {0x0e44, '\"' , 0x17, 0x17} }, - { 'E', 0, {0x0e33, 0x0e0e, 0x05, 0x05} }, - { 'R', 0, {0x0e1e, 0x0e11, 0x12, 0x12} }, - { 'T', 0, {0x0e30, 0x0e18, 0x14, 0x14} }, - { 'Y', 0, {0x0e31, 0x0e4d, 0x19, 0x19} }, - { 'U', 0, {0x0e35, 0x0e4a, 0x15, 0x15} }, - { 'I', 0, {0x0e23, 0x0e13, 0x09, 0x09} }, - { 'O', 0, {0x0e19, 0x0e2f, 0x0f, 0x0f} }, - { 'P', 0, {0x0e22, 0x0e0d, 0x10, 0x10} }, - - { 'A', 0, {0x0e1f, 0x0e24, 0x01, 0x01} }, - { 'S', 0, {0x0e2b, 0x0e06, 0x13, 0x13} }, - { 'D', 0, {0x0e01, 0x0e0f, 0x04, 0x04} }, - { 'F', 0, {0x0e14, 0x0e42, 0x06, 0x06} }, - { 'G', 0, {0x0e40, 0x0e0c, 0x07, 0x07} }, - { 'H', 0, {0x0e49, 0x0e47, 0x08, 0x08} }, - { 'J', 0, {0x0e48, 0x0e4b, 0x0a, 0x0a} }, - { 'K', 0, {0x0e32, 0x0e29, 0x0b, 0x0b} }, - { 'L', 0, {0x0e2a, 0x0e28, 0x0c, 0x0c} }, - - { 'Z', 0, {0x0e1c, '(' , 0x1a, 0x1a} }, - { 'X', 0, {0x0e1b, ')' , 0x18, 0x18} }, - { 'C', 0, {0x0e41, 0x0e09, 0x03, 0x03} }, - { 'V', 0, {0x0e2d, 0x0e2e, 0x16, 0x16} }, - { 'B', 0, {0x0e34, 0x0e3a, 0x02, 0x02} }, - { 'N', 0, {0x0e37, 0x0e4c, 0x0e, 0x0e} }, - { 'M', 0, {0x0e17, '?' , 0x0d, 0x0d} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_NUMPAD0, 0, {'0'} }, - { VK_NUMPAD1, 0, {'1'} }, - { VK_NUMPAD2, 0, {'2'} }, - { VK_NUMPAD3, 0, {'3'} }, - { VK_NUMPAD4, 0, {'4'} }, - { VK_NUMPAD5, 0, {'5'} }, - { VK_NUMPAD6, 0, {'6'} }, - { VK_NUMPAD7, 0, {'7'} }, - { VK_NUMPAD8, 0, {'8'} }, - { VK_NUMPAD9, 0, {'9'} }, - { VK_DECIMAL, 0, {'.'} }, - { 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(1, keypad_numbers), - vk_master(2, key_to_chars_2mod), - vk_master(3, key_to_chars_3mod), - vk_master(4, key_to_chars_4mod), - { 0, 0, 0 } -}; - -ROSDATA VSC_LPWSTR key_names[] = { - { 0x00, L"" }, - { 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" }, - { 0x4c, L"Center" }, - { 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 -- currently implemented by wine code */ - 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; -} - -/* EOF */ Removed: trunk/reactos/dll/keyboard/kbdth2/kbdth.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth.… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth.def [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth.def (removed) @@ -1,8 +1,0 @@ -; -; ReactOS Operating System -; -LIBRARY kbdth.dll - -EXPORTS -KbdLayerDescriptor@0 -;EOF Removed: trunk/reactos/dll/keyboard/kbdth2/kbdth.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth.… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth.rbuild (removed) @@ -1,10 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdth2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth2.dll" allowwarnings="true"> - <importlibrary definition="kbdth.def" /> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_WIN32_WINNT">0x0500</define> - <file>kbdth.c</file> - <file>kbdth.rc</file> -</module> Removed: trunk/reactos/dll/keyboard/kbdth2/kbdth.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth.… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth.rc (removed) @@ -1,5 +1,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Keyboard Layout (traditional)\0" -#define REACTOS_STR_INTERNAL_NAME "kbdth\0" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdth.dll\0" -#include <reactos/version.rc> Copied: trunk/reactos/dll/keyboard/kbdth2/kbdth2.def (from r34260, trunk/reactos/dll/keyboard/kbdth2/kbdth.def) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth2… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth.def [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth2.def [iso-8859-1] Wed Jul 2 08:47:42 2008 @@ -1,7 +1,7 @@ ; ; ReactOS Operating System ; -LIBRARY kbdth.dll +LIBRARY kbdth2.dll EXPORTS KbdLayerDescriptor@0 Copied: trunk/reactos/dll/keyboard/kbdth2/kbdth2.rbuild (from r34260, trunk/reactos/dll/keyboard/kbdth2/kbdth.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth2… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth2.rbuild [iso-8859-1] Wed Jul 2 08:47:42 2008 @@ -1,10 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="kbdth2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth2.dll" allowwarnings="true"> - <importlibrary definition="kbdth.def" /> + <importlibrary definition="kbdth2.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="_WIN32_WINNT">0x0500</define> - <file>kbdth.c</file> - <file>kbdth.rc</file> + <file>kbdth2.c</file> + <file>kbdth2.rc</file> </module> Copied: trunk/reactos/dll/keyboard/kbdth2/kbdth2.rc (from r34260, trunk/reactos/dll/keyboard/kbdth2/kbdth.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth2… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth2.rc [iso-8859-1] Wed Jul 2 08:47:42 2008 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Thai Keyboard Layout (traditional)\0" -#define REACTOS_STR_INTERNAL_NAME "kbdth\0" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdth.dll\0" +#define REACTOS_STR_INTERNAL_NAME "kbdth2\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdth2.dll\0" #include <reactos/version.rc> 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] Wed Jul 2 08:47:42 2008 @@ -170,7 +170,7 @@ <xi:include href="kbdtat/kbdtat.rbuild" /> </directory> <directory name="kbdth2"> - <xi:include href="kbdth2/kbdth.rbuild" /> + <xi:include href="kbdth2/kbdth2.rbuild" /> </directory> <directory name="kbdtuf"> <xi:include href="kbdtuf/kbdtuf.rbuild" />

16 years, 5 months

[dchapyshev] 34260: - Rename kbdth to kbdth2 (part 1/2)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Jul 2 08:43:51 2008 New Revision: 34260 URL: http://svn.reactos.org/svn/reactos?rev=34260&view=rev Log: - Rename kbdth to kbdth2 (part 1/2) Added: trunk/reactos/dll/keyboard/kbdth2/ - copied from r34257, trunk/reactos/dll/keyboard/kbdth/ Removed: trunk/reactos/dll/keyboard/kbdth/ Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/keyboard/kbdth2/kbdth.rbuild trunk/reactos/dll/keyboard/keyboard.rbuild Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Wed Jul 2 08:43:51 2008 @@ -212,9 +212,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Text",0x00000000,"Swedish" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5022" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout File",0x00000000,"kbdth.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Text",0x00000000,"Thai Kedmanee" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5079" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout File",0x00000000,"kbdth2.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Text",0x00000000,"Thai Kedmanee (non-ShiftLock)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5081" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout File",0x00000000,"kbdur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout Text",0x00000000,"Ukrainian" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Jul 2 08:43:51 2008 @@ -212,9 +212,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Text",0x00000000,"Swedish" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5022" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout File",0x00000000,"kbdth.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Text",0x00000000,"Thai Kedmanee" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5079" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout File",0x00000000,"kbdth2.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Text",0x00000000,"Thai Kedmanee (non-ShiftLock)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0002041e","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5081" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout File",0x00000000,"kbdur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000422","Layout Text",0x00000000,"Ukrainian" 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] Wed Jul 2 08:43:51 2008 @@ -197,7 +197,7 @@ 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\kbdth2\kbdth2.dll 1 dll\keyboard\kbdtuf\kbdtuf.dll 1 dll\keyboard\kbdtuq\kbdtuq.dll 1 dll\keyboard\kbduk\kbduk.dll 1 Modified: trunk/reactos/dll/keyboard/kbdth2/kbdth.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth.… ============================================================================== --- trunk/reactos/dll/keyboard/kbdth2/kbdth.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdth2/kbdth.rbuild [iso-8859-1] Wed Jul 2 08:43:51 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdth" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth.dll" allowwarnings="true"> +<module name="kbdth2" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdth2.dll" allowwarnings="true"> <importlibrary definition="kbdth.def" /> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> 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] Wed Jul 2 08:43:51 2008 @@ -169,8 +169,8 @@ <directory name="kbdtat"> <xi:include href="kbdtat/kbdtat.rbuild" /> </directory> - <directory name="kbdth"> - <xi:include href="kbdth/kbdth.rbuild" /> + <directory name="kbdth2"> + <xi:include href="kbdth2/kbdth.rbuild" /> </directory> <directory name="kbdtuf"> <xi:include href="kbdtuf/kbdtuf.rbuild" />

16 years, 5 months

[janderwald] 34259: - don't trim spaces at the end of a value as it might be part of the value - fixes the boot menu timeout text disalignment from bug 3437 - behaviour verified with Microsoft Windows Vista SP2+

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jul 2 08:40:49 2008 New Revision: 34259 URL: http://svn.reactos.org/svn/reactos?rev=34259&view=rev Log: - don't trim spaces at the end of a value as it might be part of the value - fixes the boot menu timeout text disalignment from bug 3437 - behaviour verified with Microsoft Windows Vista SP2+ Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Wed Jul 2 08:40:49 2008 @@ -435,7 +435,7 @@ /* get rid of white space */ while (szLineStart < szLineEnd && PROFILE_isspaceW(*szLineStart)) szLineStart++; - while ((szLineEnd > szLineStart) && ((szLineEnd[-1] == '\n') || PROFILE_isspaceW(szLineEnd[-1]))) szLineEnd--; + while ((szLineEnd > szLineStart) && ((szLineEnd[-1] == '\n') || (PROFILE_isspaceW(szLineEnd[-1]) && szLineEnd[-1] != ' '))) szLineEnd--; if (szLineStart >= szLineEnd) continue;

16 years, 5 months

← Newer
1
...
70
71
72
73
74
75
76
77
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008