Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[greatlrd] 20327: addig follow reslution to select betwin vbe_640x480x16, vbe_800x600x8, vbe_1024x768x8, vbe_1024x768x16

by greatlrd＠svn.reactos.com

addig follow reslution to select betwin vbe_640x480x16, vbe_800x600x8, vbe_1024x768x8, vbe_1024x768x16 Modified: trunk/reactos/bootdata/txtsetup.sif _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-12-25 02:55:18 UTC (rev 20326) +++ trunk/reactos/bootdata/txtsetup.sif 2005-12-25 10:35:23 UTC (rev 20327) @@ -68,9 +68,14 @@ [Display] ;<id> = <user friendly name>,<spare>,<service key name>,<hight>,<width>,<bpp> vga = "VGA Display (640x680x8)",,Vga,640,480,8 -vbe_lowres = "VESA Display (640x680x8)",,VBE,640,480,8 +vbe_640x480x8 = "VESA Display (640x680x8)",,VBE,640,480,8 +vbe_640x480x16 = "VESA Display (640x680x16)",,VBE,640,480,16 +vbe_800x600x8 = "VESA Display (800x600x8)",,VBE,800,600,8 vbe = "VESA Display (800x600x16)",,VBE,800,600,16 +vbe_1024x768x8 = "VESA Display (1024x768x8)",,VBE,1024,768,8 +vbe_1024x768x16 = "VESA Display (1024x768x16)",,VBE,1024,768,16 + [Map.Display] ;<id> = <pnp id string> vga = "VGA Display"

18 years, 8 months

[greatlrd] 20326: Adding same bug fix as 20303 to vfprintf.c it did have same problem. thx for GvG bugfix.

by greatlrd＠svn.reactos.com

Adding same bug fix as 20303 to vfprintf.c it did have same problem. thx for GvG bugfix. Modified: trunk/reactos/lib/crt/stdio/vfprintf.c _____ Modified: trunk/reactos/lib/crt/stdio/vfprintf.c --- trunk/reactos/lib/crt/stdio/vfprintf.c 2005-12-25 02:05:50 UTC (rev 20325) +++ trunk/reactos/lib/crt/stdio/vfprintf.c 2005-12-25 02:55:18 UTC (rev 20326) @@ -367,13 +367,20 @@ } tmp = buf; + if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) { j = 0; - while ( j < i && ( *tmp == '0' || *tmp == '.' )) { + while ( j < i && *tmp == L'0' ) { tmp++; i--; } + if ( j < i && *tmp == L'.' ) { + tmp++; + i--; + } } + + // else // while (i < precision--) // putc('0', f);

18 years, 8 months

[greatlrd] 20325: fixing 20 VS waring msg

by greatlrd＠svn.reactos.com

fixing 20 VS waring msg Modified: trunk/reactos/subsys/system/calc/dialog.c Modified: trunk/reactos/subsys/system/calc/stats.c _____ Modified: trunk/reactos/subsys/system/calc/dialog.c --- trunk/reactos/subsys/system/calc/dialog.c 2005-12-24 23:24:40 UTC (rev 20324) +++ trunk/reactos/subsys/system/calc/dialog.c 2005-12-25 02:05:50 UTC (rev 20325) @@ -72,11 +72,11 @@ SetBkMode(hdc, TRANSPARENT); - TextOut(hdc, 10, 10, c1, _tcslen(c1)); - TextOut(hdc, 10, 35, c2, _tcslen(c2)); - TextOut(hdc, 10, 50, c3, _tcslen(c3)); - TextOut(hdc, 10, 75, c4, _tcslen(c4)); - TextOut(hdc, 10, 90, c5, _tcslen(c5)); + TextOut(hdc, 10, 10, c1, (INT) _tcslen(c1)); + TextOut(hdc, 10, 35, c2, (INT) _tcslen(c2)); + TextOut(hdc, 10, 50, c3, (INT) _tcslen(c3)); + TextOut(hdc, 10, 75, c4, (INT) _tcslen(c4)); + TextOut(hdc, 10, 90, c5, (INT) _tcslen(c5)); SelectObject(hdc, hFontOrg); _____ Modified: trunk/reactos/subsys/system/calc/stats.c --- trunk/reactos/subsys/system/calc/stats.c 2005-12-24 23:24:40 UTC (rev 20324) +++ trunk/reactos/subsys/system/calc/stats.c 2005-12-25 02:05:50 UTC (rev 20325) @@ -72,23 +72,23 @@ case ID_STATS_LOAD: { - int i; + INT i; - i = SendMessage(hWndListBox, LB_GETCURSEL, 0, 0); - SendMessage(hWndListBox, LB_GETTEXT, i, (LPARAM)calc.buffer); + i = (INT) SendMessage(hWndListBox, LB_GETCURSEL, 0, 0); + SendMessage(hWndListBox, LB_GETTEXT, i, (LPARAM)calc.buffer); calc_buffer_display(&calc); - } + } return 0; case ID_STATS_CD: { - int i; + INT i; - i = SendMessage(hWndListBox, LB_GETCURSEL, 0, 0); - SendMessage(hWndListBox, LB_DELETESTRING, i, 0); - InvalidateRect(hDlg,NULL,TRUE); + i = (INT) SendMessage(hWndListBox, LB_GETCURSEL, 0, 0); + SendMessage(hWndListBox, LB_DELETESTRING, i, 0); + InvalidateRect(hDlg,NULL,TRUE); UpdateWindow(hDlg); - } + } return 0; case ID_STATS_CAD:

18 years, 8 months

[hpoussin] 20324: Close the key only if we have opened it (it's not the case when the subkey name is empty)

by hpoussin＠svn.reactos.com

Close the key only if we have opened it (it's not the case when the subkey name is empty) Modified: trunk/reactos/lib/setupapi/install.c _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-12-24 17:56:23 UTC (rev 20323) +++ trunk/reactos/lib/setupapi/install.c 2005-12-24 23:24:40 UTC (rev 20324) @@ -433,10 +433,10 @@ /* and now do it */ if (!do_reg_operation( hkey, buffer, &context, flags )) { - RegCloseKey( hkey ); + if (hkey != root_key) RegCloseKey( hkey ); return FALSE; } - RegCloseKey( hkey ); + if (hkey != root_key) RegCloseKey( hkey ); } return TRUE; }

18 years, 8 months

[hpoussin] 20323: Allow more than one USB controller

by hpoussin＠svn.reactos.com

Allow more than one USB controller Modified: trunk/reactos/drivers/usb/miniport/common/main.c _____ Modified: trunk/reactos/drivers/usb/miniport/common/main.c --- trunk/reactos/drivers/usb/miniport/common/main.c 2005-12-24 17:50:01 UTC (rev 20322) +++ trunk/reactos/drivers/usb/miniport/common/main.c 2005-12-24 17:56:23 UTC (rev 20323) @@ -197,7 +197,8 @@ UNICODE_STRING LinkDeviceName; PUSBMP_DRIVER_EXTENSION DriverExtension; PUSBMP_DEVICE_EXTENSION DeviceExtension; - ULONG DeviceNumber; + static ULONG DeviceNumber = 0; + BOOL AlreadyRestarted = FALSE; // Allocate driver extension now DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); @@ -216,18 +217,33 @@ } } - // Create a unicode device name - DeviceNumber = 0; //TODO: Allocate new device number every time - swprintf(DeviceBuffer, L"\\Device\\USBFDO-%lu", DeviceNumber); - RtlInitUnicodeString(&DeviceName, DeviceBuffer); + /* Create a unicode device name. Allocate a new device number every time */ + do + { + DeviceNumber++; + if (DeviceNumber == 9999) + { + /* Hmm. We don't have a free number. */ + if (AlreadyRestarted) + { + Status = STATUS_UNSUCCESSFUL; + break; + } + /* Start again at DeviceNumber = 0 to find a free number */ + DeviceNumber = 0; + AlreadyRestarted = TRUE; + } + swprintf(DeviceBuffer, L"\\Device\\USBFDO-%lu", DeviceNumber); + RtlInitUnicodeString(&DeviceName, DeviceBuffer); - Status = IoCreateDevice(DriverObject, - sizeof(USBMP_DEVICE_EXTENSION), - &DeviceName, - FILE_DEVICE_BUS_EXTENDER, - 0, - FALSE, - &fdo); + Status = IoCreateDevice(DriverObject, + sizeof(USBMP_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_BUS_EXTENDER, + 0, + FALSE, + &fdo); + } while (Status == STATUS_OBJECT_NAME_COLLISION); if (!NT_SUCCESS(Status)) {

18 years, 8 months

[greatlrd] 20322: Fixed Cz.rc to SUBLANG_DEFAULT so make VS happy

by greatlrd＠svn.reactos.com

Fixed Cz.rc to SUBLANG_DEFAULT so make VS happy Fixed Es.rc to SUBLANG_NEUTRAL so make VS happy Modified: trunk/reactos/lib/aclui/aclui_Es.rc Modified: trunk/reactos/lib/cpl/appwiz/Cz.rc Modified: trunk/reactos/lib/cpl/appwiz/Es.rc Modified: trunk/reactos/lib/cpl/control/Cz.rc Modified: trunk/reactos/lib/cpl/control/Es.rc Modified: trunk/reactos/lib/cpl/desk/cz.rc Modified: trunk/reactos/lib/cpl/desk/es.rc Modified: trunk/reactos/lib/cpl/hdwwiz/Es.rc Modified: trunk/reactos/lib/cpl/intl/cz.rc Modified: trunk/reactos/lib/cpl/intl/es.rc Modified: trunk/reactos/lib/cpl/liccpa/Es.rc Modified: trunk/reactos/lib/cpl/main/Es.rc Modified: trunk/reactos/lib/cpl/mmsys/Es.rc Modified: trunk/reactos/lib/cpl/ncpa/cz.rc Modified: trunk/reactos/lib/cpl/ncpa/es.rc Modified: trunk/reactos/lib/cpl/sysdm/cz.rc Modified: trunk/reactos/lib/cpl/sysdm/es.rc Modified: trunk/reactos/lib/cpl/timedate/Cz.rc Modified: trunk/reactos/lib/devmgr/Es.rc Modified: trunk/reactos/lib/newdev/Es.rc Modified: trunk/reactos/lib/shellext/slayer/Es.rc Modified: trunk/reactos/lib/syssetup/syssetup_Cz.rc Modified: trunk/reactos/lib/syssetup/syssetup_Es.rc Modified: trunk/reactos/lib/userenv/Es.rc Modified: trunk/reactos/subsys/system/calc/Cz.rc Modified: trunk/reactos/subsys/system/calc/Es.rc Modified: trunk/reactos/subsys/system/cmd/Es.rc Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc Modified: trunk/reactos/subsys/system/reactos/Cz.rc Modified: trunk/reactos/subsys/system/regedit/Cz.rc Modified: trunk/reactos/subsys/system/sndvol32/Cz.rc Modified: trunk/reactos/subsys/system/taskmgr/Cz.rc Modified: trunk/reactos/subsys/system/taskmgr/Es.rc Modified: trunk/reactos/subsys/system/vmwinst/Cz.rc Modified: trunk/reactos/subsys/system/welcome/Cz.rc Modified: trunk/reactos/subsys/system/welcome/Es.rc Modified: trunk/reactos/subsys/system/winlogon/Cz.rc Modified: trunk/reactos/subsys/system/winlogon/Es.rc _____ Modified: trunk/reactos/lib/aclui/aclui_Es.rc --- trunk/reactos/lib/aclui/aclui_Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/aclui/aclui_Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -6,7 +6,7 @@ */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_SECPAGE DIALOGEX 0, 0, 227, 215 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/Cz.rc --- trunk/reactos/lib/cpl/appwiz/Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/appwiz/Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/appwiz/Es.rc --- trunk/reactos/lib/cpl/appwiz/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/appwiz/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -4,7 +4,7 @@ */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/control/Cz.rc --- trunk/reactos/lib/cpl/control/Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/control/Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,6 +1,6 @@ // Czech language resource file (potapnik, 2005-04-30) -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/control/Es.rc --- trunk/reactos/lib/cpl/control/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/control/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -4,7 +4,7 @@ */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL //////////////////////////////////////////////////////////////////////// ///// // _____ Modified: trunk/reactos/lib/cpl/desk/cz.rc --- trunk/reactos/lib/cpl/desk/cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/desk/cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/desk/es.rc --- trunk/reactos/lib/cpl/desk/es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/desk/es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -5,7 +5,7 @@ * */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/hdwwiz/Es.rc --- trunk/reactos/lib/cpl/hdwwiz/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/hdwwiz/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN _____ Modified: trunk/reactos/lib/cpl/intl/cz.rc --- trunk/reactos/lib/cpl/intl/cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/intl/cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,6 +1,6 @@ /* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/intl/es.rc --- trunk/reactos/lib/cpl/intl/es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/intl/es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -4,7 +4,7 @@ *ReactOs (c) 2005 Samuel Serapi¾n Vega */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/liccpa/Es.rc --- trunk/reactos/lib/cpl/liccpa/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/liccpa/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_PROPPAGE1 DIALOG DISCARDABLE 20, 40, 315, 104 STYLE DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU _____ Modified: trunk/reactos/lib/cpl/main/Es.rc --- trunk/reactos/lib/cpl/main/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/main/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/mmsys/Es.rc --- trunk/reactos/lib/cpl/mmsys/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/mmsys/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_HARDWARE DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/cz.rc --- trunk/reactos/lib/cpl/ncpa/cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/ncpa/cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/ncpa/es.rc --- trunk/reactos/lib/cpl/ncpa/es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/ncpa/es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -4,7 +4,7 @@ */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/cpl/sysdm/cz.rc --- trunk/reactos/lib/cpl/sysdm/cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/sysdm/cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT RC_LICENSE RTDATA "resources/gpl.txt" _____ Modified: trunk/reactos/lib/cpl/sysdm/es.rc --- trunk/reactos/lib/cpl/sysdm/es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/sysdm/es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -2,7 +2,7 @@ // React Operating System 2005 // Samuel Serapi¾n Vega -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL RC_LICENSE RTDATA "resources/gpl.txt" _____ Modified: trunk/reactos/lib/cpl/timedate/Cz.rc --- trunk/reactos/lib/cpl/timedate/Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/cpl/timedate/Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/devmgr/Es.rc --- trunk/reactos/lib/devmgr/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/devmgr/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,6 +1,6 @@ // Spanish language resource file (Samuel Serapion Vega 2005-12-10) -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN _____ Modified: trunk/reactos/lib/newdev/Es.rc --- trunk/reactos/lib/newdev/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/newdev/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | _____ Modified: trunk/reactos/lib/shellext/slayer/Es.rc --- trunk/reactos/lib/shellext/slayer/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/shellext/slayer/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -3,7 +3,7 @@ *ReactOs (c) 2005 Samuel Serapi¾n Vega */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/lib/syssetup/syssetup_Cz.rc --- trunk/reactos/lib/syssetup/syssetup_Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/syssetup/syssetup_Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -16,7 +16,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/lib/syssetup/syssetup_Es.rc --- trunk/reactos/lib/syssetup/syssetup_Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/syssetup/syssetup_Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -23,7 +23,7 @@ */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 _____ Modified: trunk/reactos/lib/userenv/Es.rc --- trunk/reactos/lib/userenv/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/lib/userenv/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -21,7 +21,7 @@ *ReactOs (c) 2005 Samuel Serapi¾n Vega */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN _____ Modified: trunk/reactos/subsys/system/calc/Cz.rc --- trunk/reactos/subsys/system/calc/Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/calc/Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -24,7 +24,7 @@ #include "resource.h" #include "winecalc.h" -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { _____ Modified: trunk/reactos/subsys/system/calc/Es.rc --- trunk/reactos/subsys/system/calc/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/calc/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -22,7 +22,7 @@ #include "resource.h" #include "winecalc.h" -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { _____ Modified: trunk/reactos/subsys/system/cmd/Es.rc --- trunk/reactos/subsys/system/cmd/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/cmd/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -5,7 +5,7 @@ * Jose Pedro Fernßndez Pascual 2005 */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { _____ Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc --- trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -20,7 +20,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY) #ifdef _WIN32 -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT #pragma code_page(1250) #endif //_WIN32 _____ Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc --- trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -17,7 +17,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESP) #ifdef _WIN32 -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL #pragma code_page(1252) #endif //_WIN32 _____ Modified: trunk/reactos/subsys/system/reactos/Cz.rc --- trunk/reactos/subsys/system/reactos/Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/reactos/Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,6 +1,6 @@ /* $Id: En.rc 12852 2005-01-06 13:58:04Z denzil $ */ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* String Tables */ STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/regedit/Cz.rc --- trunk/reactos/subsys/system/regedit/Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/regedit/Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* * Menu _____ Modified: trunk/reactos/subsys/system/sndvol32/Cz.rc --- trunk/reactos/subsys/system/sndvol32/Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/sndvol32/Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE BEGIN _____ Modified: trunk/reactos/subsys/system/taskmgr/Cz.rc --- trunk/reactos/subsys/system/taskmgr/Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/taskmgr/Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -3,7 +3,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT #pragma code_page(1250) #endif //_WIN32 _____ Modified: trunk/reactos/subsys/system/taskmgr/Es.rc --- trunk/reactos/subsys/system/taskmgr/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/taskmgr/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -4,7 +4,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL #pragma code_page(1252) #endif //_WIN32 _____ Modified: trunk/reactos/subsys/system/vmwinst/Cz.rc --- trunk/reactos/subsys/system/vmwinst/Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/vmwinst/Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION _____ Modified: trunk/reactos/subsys/system/welcome/Cz.rc --- trunk/reactos/subsys/system/welcome/Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/welcome/Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,6 +1,6 @@ /* $Id$ */ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* String Tables */ _____ Modified: trunk/reactos/subsys/system/welcome/Es.rc --- trunk/reactos/subsys/system/welcome/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/welcome/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,6 +1,6 @@ /* $Id$ */ -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* String Tables */ _____ Modified: trunk/reactos/subsys/system/winlogon/Cz.rc --- trunk/reactos/subsys/system/winlogon/Cz.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/winlogon/Cz.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,4 +1,4 @@ -LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU _____ Modified: trunk/reactos/subsys/system/winlogon/Es.rc --- trunk/reactos/subsys/system/winlogon/Es.rc 2005-12-24 14:28:05 UTC (rev 20321) +++ trunk/reactos/subsys/system/winlogon/Es.rc 2005-12-24 17:50:01 UTC (rev 20322) @@ -1,6 +1,6 @@ //Spanish translation by Lucio Diaz-Flores Varela. Reviewed by Jose Pedro Fernandez Pascual. -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

18 years, 8 months

[gvg] 20321: Fix transfer summary

by gvg＠svn.reactos.com

Fix transfer summary Modified: trunk/reactos/apps/utils/net/ftp/fake.c Modified: trunk/reactos/apps/utils/net/ftp/ftp.c _____ Modified: trunk/reactos/apps/utils/net/ftp/fake.c --- trunk/reactos/apps/utils/net/ftp/fake.c 2005-12-24 09:33:35 UTC (rev 20320) +++ trunk/reactos/apps/utils/net/ftp/fake.c 2005-12-24 14:28:05 UTC (rev 20321) @@ -317,8 +317,8 @@ if (tv) { GetSystemTimeAsFileTime(&ft); - //li.LowPart = ft.dwLowDateTime; - //li.HighPart = ft.dwHighDateTime; + li.LowPart = ft.dwLowDateTime; + li.HighPart = ft.dwHighDateTime; t = li.QuadPart; /* In 100-nanosecond intervals */ t -= EPOCHFILETIME; /* Offset to the Epoch time */ t /= 10; /* In microseconds */ _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.c --- trunk/reactos/apps/utils/net/ftp/ftp.c 2005-12-24 09:33:35 UTC (rev 20320) +++ trunk/reactos/apps/utils/net/ftp/ftp.c 2005-12-24 14:28:05 UTC (rev 20321) @@ -1294,7 +1294,7 @@ s = td.tv_sec + (td.tv_usec / 1000000.); #define nz(x) ((x) == 0 ? 1 : (x)) bs = bytes / nz(s); - printf("%ld bytes %s in %.2g seconds (%.2g Kbytes/s)\n", + printf("%ld bytes %s in %.1f seconds (%.0f Kbytes/s)\n", bytes, direction, s, bs / 1024.); (void) fflush(stdout); }

18 years, 8 months

[gvg] 20320: There's a difference between a handle and an object... Sorry about this

by gvg＠svn.reactos.com

There's a difference between a handle and an object... Sorry about this Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c --- trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-24 07:21:22 UTC (rev 20319) +++ trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-24 09:33:35 UTC (rev 20320) @@ -419,9 +419,8 @@ return STATUS_SUCCESS; WaitForThread.QuadPart = -2500000; /* 250 ms */ - KeSetEvent(&TimerLoopEvent, IO_NO_INCREMENT, TRUE); - KeWaitForSingleObject(&TimerThreadHandle, Executive, KernelMode, - FALSE, &WaitForThread); + KeSetEvent(&TimerLoopEvent, IO_NO_INCREMENT, FALSE); + ZwWaitForSingleObject(TimerThreadHandle, FALSE, &WaitForThread); /* Deregister this protocol with IP layer */ IPRegisterProtocol(IPPROTO_TCP, NULL);

18 years, 8 months

[royce] 20319: fixed typo

by royce＠svn.reactos.com

fixed typo Modified: trunk/reactos/lib/keyboard/kbdheb/kbdheb.c _____ Modified: trunk/reactos/lib/keyboard/kbdheb/kbdheb.c --- trunk/reactos/lib/keyboard/kbdheb/kbdheb.c 2005-12-24 05:36:38 UTC (rev 20318) +++ trunk/reactos/lib/keyboard/kbdheb/kbdheb.c 2005-12-24 07:21:22 UTC (rev 20319) @@ -60,7 +60,7 @@ RAFE, PASEQ, SHIN_DOT, - SIN_DIT, + SIN_DOT, SOF_PASUQ, YIDDISH_DOUBLE_VAV = 0x5F0, YIDDISH_VAV_YUD,

18 years, 8 months

[royce] 20318: first attempt at a hebrew keyboard

by royce＠svn.reactos.com

first attempt at a hebrew keyboard Modified: trunk/reactos/lib/keyboard/directory.xml Added: trunk/reactos/lib/keyboard/kbdheb/ Added: trunk/reactos/lib/keyboard/kbdheb/kbdheb.c Added: trunk/reactos/lib/keyboard/kbdheb/kbdheb.def Added: trunk/reactos/lib/keyboard/kbdheb/kbdheb.rc Added: trunk/reactos/lib/keyboard/kbdheb/kbdheb.xml _____ Modified: trunk/reactos/lib/keyboard/directory.xml --- trunk/reactos/lib/keyboard/directory.xml 2005-12-24 02:50:22 UTC (rev 20317) +++ trunk/reactos/lib/keyboard/directory.xml 2005-12-24 05:36:38 UTC (rev 20318) @@ -17,6 +17,9 @@ <directory name="kbdhe"> <xi:include href="kbdhe/kbdhe.xml" /> </directory> + <directory name="kbdheb"> + <xi:include href="kbdheb/kbdheb.xml" /> + </directory> <directory name="kbdhu"> <xi:include href="kbdhu/kbdhu.xml" /> </directory> Property changes on: trunk/reactos/lib/keyboard/kbdheb ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Added: trunk/reactos/lib/keyboard/kbdheb/kbdheb.c --- trunk/reactos/lib/keyboard/kbdheb/kbdheb.c 2005-12-24 02:50:22 UTC (rev 20317) +++ trunk/reactos/lib/keyboard/kbdheb/kbdheb.c 2005-12-24 05:36:38 UTC (rev 20318) @@ -0,0 +1,477 @@ +/* + * ReactOS Hebrew ASCII Keyboard layout + * Copyright (C) 2005 ReactOS + * License: LGPL, see: LGPL.txt + * author: Royce Mitchell III + * + * 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 _MSC_VER +#ifndef STDCALL +#define STDCALL __stdcall +#endif +#endif//_MSC_VER + +#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 */ + +enum +{ + // vowels, etc + SHEVA = 0x5B0, + HATAF_SEGOL, + HATAF_PATAH, + HATAF_QAMATS, + HIRIQ, + TSERE, + SEGOL, + PATAH, + QAMATS, + HOLAM, + QUBUTS = 0x5BB, + DAGESH, + MAPIQ = DAGESH, + METEG, + MAQAF, + RAFE, + PASEQ, + SHIN_DOT, + SIN_DIT, + SOF_PASUQ, + YIDDISH_DOUBLE_VAV = 0x5F0, + YIDDISH_VAV_YUD, + YIDDISH_DOUBLE_YUD, + GERESH, + GERSHAYIM, + + // consonants + ALEF = 0x5D0, + BET, + GIMEL, + DALET, + HEY, + VAV, + ZAYIN, + HET, + TET, + YUD, + KAF_SOFIT, + KAF, + LAMED, + MEM_SOFIT, + MEM, + NUN_SOFIT, + NUN, + SAMEKH, + AYIN, + PEY_SOFIT, + PEY, + TSADI_SOFIT, + TSADI, + QOF, + RESH, + SHIN, + TAV +}; + +ROSDATA USHORT scancode_to_vk[] = +{ + /* Numbers Row */ + + /* - 00 - */ + VK_EMPTY, // 00: ? + VK_ESCAPE, // 01: esc + '1', // 02: '1' + '2', // 03: '2' + '3', // 04: '3' + '4', // 05: '4' + '5', // 06: '5' + '6', // 07: '6' + '7', // 08: '7' + '8', // 09: '8' + '9', // 0A: '9' + '0', // 0B: '0' + VK_OEM_MINUS, // 0C: '-' + VK_OEM_PLUS, // OD: '+' + VK_BACK, // OE: backspace + + /* - 0f - */ + /* First Letters Row */ + VK_TAB, // 0F: tab + VK_OEM_2, // 10: 'Q' + VK_OEM_7, // 11: 'W' + 'E', // 12: 'E' + 'R', // 13: 'R' + 'T', // 14: 'T' + 'Y', // 15: 'Y' + 'U', // 16: 'U' + 'I', // 17: 'I' + 'O', // 18: 'O' + 'P', // 19: 'P' + VK_OEM_4, // 1A: '{' + VK_OEM_6, // 1B: '}' + VK_RETURN, // 1C: enter + + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, // 1D: lctrl + 'A', // 1E: 'A' + 'S', // 1F: 'S' + 'D', // 20: 'D' + 'F', // 21: 'F' + 'G', // 22: 'G' + 'H', // 23: 'H' + 'J', // 24: 'J' + 'K', // 25: 'K' + 'L', // 26: 'L' + VK_OEM_1, // 27: ';' + VK_OEM_COMMA, // 28: '\'' + VK_OEM_3, // 29: ? + VK_LSHIFT, // 2A: lshift + VK_OEM_5, // 2B: ? + + /* - 2c - */ + /* Third letters row */ + 'Z', // 2C: 'Z' + 'X', // 2D: 'X' + 'C', // 2E: 'C' + 'V', // 2F: 'V' + 'B', // 30: 'B' + 'N', // 31: 'N' + 'M', // 32: 'M' + 'Q', // 33: ',' + 'W', // 34: '.' + VK_OEM_PERIOD,// 35: '/' + VK_RSHIFT, // 36: rshift + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, // 37: ? + VK_LMENU, // 38: lalt + VK_SPACE, // 39: space + VK_CAPITAL, // 3A: caps lock? + + /* - 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_EMPTY, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* 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_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 72 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ + VK_EMPTY, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 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, NONE, SHIFT, CTRL, ALT */ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Normal vs Shifted */ + /* The numbers */ + { '1', NOCAPS, {'1', '!'} }, + /* Ctrl-2 generates NUL */ + { '3', NOCAPS, {'3', '#'} }, + { '4', NOCAPS, {'4', '$'} }, + { '5', NOCAPS, {'5', '%'} }, + /* Ctrl-6 generates RS */ + { '7', NOCAPS, {'7', '&'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, + + /* Specials */ + /* Ctrl-_ generates ? */ + { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, + { VK_OEM_1 ,NOCAPS, {PEY_SOFIT, PEY_SOFIT} }, + { 'Q' ,NOCAPS, {TAV, TAV} }, + { 'W' ,NOCAPS, {TSADI_SOFIT, TSADI_SOFIT} }, + { VK_OEM_7 ,NOCAPS, {'\'','\"'} }, + { VK_OEM_3 ,NOCAPS, {'`', '~'} }, + { VK_OEM_COMMA ,NOCAPS, {',', '<'} }, + { VK_OEM_PERIOD ,NOCAPS, {'.', '>'} }, + { VK_OEM_2 ,NOCAPS, {'/', '?'} }, + /* Keys that do not have shift states */ + { VK_TAB ,NOCAPS, {'\t','\t'} }, + { VK_ADD ,NOCAPS, {'+', '+'} }, + { VK_SUBTRACT,NOCAPS, {'-', '-'} }, + { VK_MULTIPLY,NOCAPS, {'*', '*'} }, + { VK_DIVIDE ,NOCAPS, {'/', '/'} }, + { VK_ESCAPE ,NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE ,NOCAPS, {' ', ' '} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_4, 0, {'[', '{', 0x1b /* ESC */} }, + { VK_OEM_6, 0, {']', '}', 0x1d /* GS */} }, + { VK_OEM_5, 0, {'\\','|', 0x1c /* FS */} }, + { VK_RETURN,0, {'\r', '\r', '\n'} }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, C-S-x */ + + /* The alphabet */ + { 'A', NOCAPS, {SHIN, SHIN, 0x01, 0x01} }, + { 'B', NOCAPS, {NUN, NUN, 0x02, 0x02} }, + { 'C', NOCAPS, {BET, BET, 0x03, 0x03} }, + { 'D', NOCAPS, {GIMEL, GIMEL, 0x04, 0x04} }, + { 'E', NOCAPS, {QOF, QOF, 0x05, 0x05} }, + { 'F', NOCAPS, {KAF, KAF, 0x06, 0x06} }, + { 'G', NOCAPS, {AYIN, AYIN, 0x07, 0x07} }, + { 'H', NOCAPS, {QOF, QOF, 0x08, 0x08} }, + { 'I', NOCAPS, {NUN_SOFIT, NUN_SOFIT, 0x09, 0x09} }, + { 'J', NOCAPS, {HET, HET, 0x0a, 0x0a} }, + { 'K', NOCAPS, {LAMED, LAMED, 0x0b, 0x0b} }, + { 'L', NOCAPS, {KAF_SOFIT, KAF_SOFIT, 0x0c, 0x0c} }, + { 'M', NOCAPS, {TSADI, TSADI, 0x0d, 0x0d} }, + { 'N', NOCAPS, {MEM, MEM, 0x0e, 0x0e} }, + { 'O', NOCAPS, {MEM_SOFIT, MEM_SOFIT, 0x0f, 0x0f} }, + { 'P', NOCAPS, {PEY, PEY, 0x10, 0x10} }, + { VK_OEM_2, NOCAPS, {'/', '?', 0x11, 0x11} }, + { 'R', NOCAPS, {RESH, RESH, 0x12, 0x12} }, + { 'S', NOCAPS, {DALET, DALET, 0x13, 0x13} }, + { 'T', NOCAPS, {ALEF, ALEF, 0x14, 0x14} }, + { 'U', NOCAPS, {VAV, VAV, 0x15, 0x15} }, + { 'V', NOCAPS, {HEY, HEY, 0x16, 0x16} }, + { VK_OEM_7, NOCAPS, {'\'', '\"', 0x17, 0x17} }, + { 'X', NOCAPS, {SAMEKH, SAMEKH, 0x18, 0x18} }, + { 'Y', NOCAPS, {TET, TET, 0x19, 0x19} }, + { 'Z', NOCAPS, {ZAYIN, ZAYIN, 0x1a, 0x1a} }, + + /* Legacy Ascii generators */ + { '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, + { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, 0x1f /* US */} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = +{ + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {'.'} }, + { VK_BACK, 0, {'\010'} }, + { 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 Ctrl" }, + { 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" }, + { 0x4a, 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>" }, + { 0x55, L"Help" }, + { 0x56, L"Left Windows" }, + { 0x5b, L"Right Windows" }, + { 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 */ + /* English doesn't have any, anyway */ + 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 -- does Hebrew have any? */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor() +{ + return &keyboard_layout_table; +} + Property changes on: trunk/reactos/lib/keyboard/kbdheb/kbdheb.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/keyboard/kbdheb/kbdheb.def --- trunk/reactos/lib/keyboard/kbdheb/kbdheb.def 2005-12-24 02:50:22 UTC (rev 20317) +++ trunk/reactos/lib/keyboard/kbdheb/kbdheb.def 2005-12-24 05:36:38 UTC (rev 20318) @@ -0,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdheb.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF \ No newline at end of file _____ Added: trunk/reactos/lib/keyboard/kbdheb/kbdheb.rc --- trunk/reactos/lib/keyboard/kbdheb/kbdheb.rc 2005-12-24 02:50:22 UTC (rev 20317) +++ trunk/reactos/lib/keyboard/kbdheb/kbdheb.rc 2005-12-24 05:36:38 UTC (rev 20318) @@ -0,0 +1,6 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Hebrew Ascii Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdheb\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdheb.dll\0" +#include <reactos/version.rc> + _____ Added: trunk/reactos/lib/keyboard/kbdheb/kbdheb.xml --- trunk/reactos/lib/keyboard/kbdheb/kbdheb.xml 2005-12-24 02:50:22 UTC (rev 20317) +++ trunk/reactos/lib/keyboard/kbdheb/kbdheb.xml 2005-12-24 05:36:38 UTC (rev 20318) @@ -0,0 +1,9 @@ +<module name="kbdheb" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdheb.dll" allowwarnings="true"> + <importlibrary definition="kbdheb.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdheb.c</file> + <file>kbdheb.rc</file> +</module> \ No newline at end of file

18 years, 8 months

← Newer
1
...
15
16
17
18
19
20
21
...
71
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 December 2005