Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[fireball] 14572: Added kbdru.dll into build process
by fireball＠svn.reactos.com 10 Apr '05

10 Apr '05

Added kbdru.dll into build process Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-04-10 11:35:19 UTC (rev 14571) +++ trunk/reactos/Makefile 2005-04-10 11:37:57 UTC (rev 14572) @@ -48,7 +48,7 @@ LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids crt rossym wdmguid # Keyboard layout libraries -DLLS_KBD = kbdda kbddv kbdes kbdfr kbdgr kbdse kbduk kbdus +DLLS_KBD = kbdda kbddv kbdes kbdfr kbdgr kbdru kbdse kbduk kbdus # Control Panels DLLS_CPL = cpl

1 0

[fireball] 14571: Fix incorrect file name of kgbgb.dll to kbduk.dll (by unC0Rr), added kbdru.dll into keyboard layouts
by fireball＠svn.reactos.com 10 Apr '05

10 Apr '05

Fix incorrect file name of kgbgb.dll to kbduk.dll (by unC0Rr), added kbdru.dll into keyboard layouts Modified: trunk/reactos/bootdata/txtsetup.sif _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-04-10 11:18:05 UTC (rev 14570) +++ trunk/reactos/bootdata/txtsetup.sif 2005-04-10 11:35:19 UTC (rev 14571) @@ -34,8 +34,8 @@ [SetupData] DefaultPath = \ReactOS -OsLoadOptions = "/NOGUIBOOT /NODEBUG" -;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1" +;OsLoadOptions = "/NOGUIBOOT /NODEBUG" +OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1 /BAUDRATE=19200 /IRQ=4" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" @@ -77,6 +77,7 @@ 00010409 = "English (USA-Dvorak)" 0000040C = "French (France)" 00000407 = "German (Germany)" +00000419 = "Russian" 0000040A = "Spanish (traditional short)" 0000041D = "Swedish (Sweden)" @@ -85,10 +86,11 @@ 00000407 = kbdgr.dll 00000409 = kbdus.dll 00010409 = kbddv.dll +0000040A = kbdes.dll 0000040C = kbdfr.dll +00000419 = kbdru.dll 0000041D = kbdse.dll -00000809 = kgbgb.dll -0000040A = kbdes.dll +00000809 = kbduk.dll [Mouse] ;<id> = <user friendly name>,<spare>,<service key name>

1 0

[fireball] 14570: Fixed incorrect version (was 1010h) to 1000h, as reported by XP's kbdru.dll
by fireball＠svn.reactos.com 10 Apr '05

10 Apr '05

Fixed incorrect version (was 1010h) to 1000h, as reported by XP's kbdru.dll Modified: trunk/reactos/lib/kbdru/kbdru.c _____ Modified: trunk/reactos/lib/kbdru/kbdru.c --- trunk/reactos/lib/kbdru/kbdru.c 2005-04-10 10:20:10 UTC (rev 14569) +++ trunk/reactos/lib/kbdru/kbdru.c 2005-04-10 11:18:05 UTC (rev 14570) @@ -208,7 +208,7 @@ WORD maxmod; BYTE mod_max[7]; } INTERNAL_KBD_MODIFIERS; -// done + ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = { modifier_keys, 3, @@ -429,7 +429,7 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(1,1), /* Version 1.0 */ + MAKELONG(0,1), /* Version 1.0 */ /* Ligatures -- Russian doesn't have any */ 0,

1 0

[fireball] 14569: Some minor additions to support newer versions of uhci driver (though doesn't even compile atm).
by fireball＠svn.reactos.com 10 Apr '05

10 Apr '05

Some minor additions to support newer versions of uhci driver (though doesn't even compile atm). Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h --- trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-04-10 10:16:37 UTC (rev 14568) +++ trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-04-10 10:20:10 UTC (rev 14569) @@ -540,7 +540,7 @@ void *ctor, void *dtor); -void my_kmem_cache_destroy(kmem_cache_t *co); +BOOLEAN my_kmem_cache_destroy(kmem_cache_t *co); void *my_kmem_cache_alloc(kmem_cache_t *co, int flags); void my_kmem_cache_free(kmem_cache_t *co, void *ptr); _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h --- trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h 2005-04-10 10:16:37 UTC (rev 14568) +++ trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h 2005-04-10 10:20:10 UTC (rev 14569) @@ -2,12 +2,14 @@ #define PCI_IDS__H #define PCI_VENDOR_ID_NS 0x100b -#define PCI_DEVICE_ID_NS_87560_LIO 0x000e #define PCI_VENDOR_ID_AMD 0x1022 #define PCI_VENDOR_ID_OPTI 0x1045 #define PCI_VENDOR_ID_VIA 0x1106 #define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_DEVICE_ID_NS_87560_LIO 0x000e +#define PCI_DEVICE_ID_INTEL_82371AB_2 0x7112 + #define PCI_CLASS_SERIAL_USB (PCI_CLASS_SERIAL_BUS_CTLR << 8 + PCI_SUBCLASS_SB_USB) #endif _____ Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c --- trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-04-10 10:16:37 UTC (rev 14568) +++ trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-04-10 10:20:10 UTC (rev 14569) @@ -337,11 +337,12 @@ return (kmem_cache_t *)Lookaside; } /*---------------------------------------------------------------------- --*/ -void my_kmem_cache_destroy(kmem_cache_t *co) +BOOLEAN my_kmem_cache_destroy(kmem_cache_t *co) { ExDeleteNPagedLookasideList((PNPAGED_LOOKASIDE_LIST)co); - ExFreePool(co); + ExFreePool(co); + return FALSE; } /*---------------------------------------------------------------------- --*/ void *my_kmem_cache_alloc(kmem_cache_t *co, int flags)

1 0

[hbirr] 14568: - Fixed the destination path for installing freeldr on a floppy.
by hbirr＠svn.reactos.com 10 Apr '05

10 Apr '05

- Fixed the destination path for installing freeldr on a floppy. - Used NtOpenFile for accessing the mbr or the boot sector. Modified: trunk/reactos/subsys/system/usetup/bootsup.c _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2005-04-10 05:00:27 UTC (rev 14567) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2005-04-10 10:16:37 UTC (rev 14568) @@ -1134,19 +1134,15 @@ NULL, NULL); - Status = NtCreateFile(&FileHandle, - FILE_WRITE_ACCESS, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_OVERWRITE_IF, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY, - NULL, - 0); + Status = NtOpenFile(&FileHandle, + FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); if (!NT_SUCCESS(Status)) { + DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); RtlFreeHeap(ProcessHeap, 0, NewBootSector); return(Status); } @@ -1295,19 +1291,15 @@ NULL, NULL); - Status = NtCreateFile(&FileHandle, - FILE_WRITE_ACCESS, - &ObjectAttributes, - &IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_OVERWRITE_IF, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY, - NULL, - 0); + Status = NtOpenFile(&FileHandle, + FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); if (!NT_SUCCESS(Status)) { + DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); RtlFreeHeap(ProcessHeap, 0, NewBootSector); return(Status); } @@ -2080,7 +2072,7 @@ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\freeldr.sys"); - wcscat(DstPath, L"\\Device\\Floppy0\\freeldr.sys"); + wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.sys"); DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath); @@ -2091,7 +2083,7 @@ } /* Create new 'freeldr.ini' */ - wcscat(DstPath, L"\\Device\\Floppy0\\freeldr.ini"); + wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.ini"); DPRINT("Create new 'freeldr.ini'\n"); Status = CreateFreeLoaderIniForReactos(DstPath, @@ -2106,7 +2098,7 @@ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\fat.bin"); - wcscat(DstPath, L"\\Device\\Floppy0"); + wcscpy(DstPath, L"\\Device\\Floppy0"); DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); Status = InstallFat16BootCodeToDisk(SrcPath,

1 0

[phreak] 14567: Fixed freeldr fat16 boot sector to use the bios provided boot device number instead of the ( usually invalid ) one in the boot sector header.
by phreak＠svn.reactos.com 10 Apr '05

10 Apr '05

Fixed freeldr fat16 boot sector to use the bios provided boot device number instead of the ( usually invalid ) one in the boot sector header. Modified: trunk/reactos/boot/freeldr/bootsect/fat.asm _____ Modified: trunk/reactos/boot/freeldr/bootsect/fat.asm --- trunk/reactos/boot/freeldr/bootsect/fat.asm 2005-04-10 04:02:54 UTC (rev 14566) +++ trunk/reactos/boot/freeldr/bootsect/fat.asm 2005-04-10 05:00:27 UTC (rev 14567) @@ -89,9 +89,6 @@ mov es,ax ; Make ES correct - cmp BYTE [BYTE bp+BootDrive],BYTE 0xff ; If they have specified a boot drive then use it - jne GetDriveParameters - mov [BYTE bp+BootDrive],dl ; Save the boot drive

1 0

[navaraf] 14566: - Pass correct parameters to MmLocateMemoryAreaByAddress in MmLockPagableDataSection.
by navaraf＠svn.reactos.com 10 Apr '05

10 Apr '05

- Pass correct parameters to MmLocateMemoryAreaByAddress in MmLockPagableDataSection. - Change UNIMPLEMENTED to DPRINT1 in MmLockPagableSectionByHandle. Modified: trunk/reactos/ntoskrnl/mm/drvlck.c _____ Modified: trunk/reactos/ntoskrnl/mm/drvlck.c --- trunk/reactos/ntoskrnl/mm/drvlck.c 2005-04-09 22:37:15 UTC (rev 14565) +++ trunk/reactos/ntoskrnl/mm/drvlck.c 2005-04-10 04:02:54 UTC (rev 14566) @@ -40,7 +40,7 @@ MmLockPagableSectionByHandle(IN PVOID ImageSectionHandle) { // MmLockMemoryArea((MEMORY_AREA *)ImageSectionHandle); - UNIMPLEMENTED; + DPRINT1("MmLockPagableSectionByHandle is unimplemented\n"); } @@ -63,7 +63,8 @@ MmLockPagableDataSection(IN PVOID AddressWithinSection) { PVOID Handle; - Handle = MmLocateMemoryAreaByAddress(NULL, AddressWithinSection); + Handle = MmLocateMemoryAreaByAddress(MmGetKernelAddressSpace(), + AddressWithinSection); MmLockPagableSectionByHandle(Handle); return(Handle); }

1 0

[gvg] 14565: Fix "make bootcd"
by gvg＠svn.reactos.com 09 Apr '05

09 Apr '05

Fix "make bootcd" Modified: trunk/reactos/boot/freeldr/Makefile _____ Modified: trunk/reactos/boot/freeldr/Makefile --- trunk/reactos/boot/freeldr/Makefile 2005-04-09 17:33:47 UTC (rev 14564) +++ trunk/reactos/boot/freeldr/Makefile 2005-04-09 22:37:15 UTC (rev 14565) @@ -20,6 +20,7 @@ PATH_TO_TOP = ../.. include rules.mak +include $(PATH_TO_TOP)/config all: $(MAKE) -C tools

1 0

[fireball] 14564: Implemented kbdru.dll, tested under Windows XP - works great. Though I would appreciate more thorough testing.
by fireball＠svn.reactos.com 09 Apr '05

09 Apr '05

Implemented kbdru.dll, tested under Windows XP - works great. Though I would appreciate more thorough testing. Added: trunk/reactos/lib/kbdru/ Added: trunk/reactos/lib/kbdru/Jamfile Added: trunk/reactos/lib/kbdru/kbdru.c Added: trunk/reactos/lib/kbdru/kbdru.def Added: trunk/reactos/lib/kbdru/kbdru.rc Added: trunk/reactos/lib/kbdru/makefile _____ Added: trunk/reactos/lib/kbdru/Jamfile --- trunk/reactos/lib/kbdru/Jamfile 2005-04-09 17:10:25 UTC (rev 14563) +++ trunk/reactos/lib/kbdru/Jamfile 2005-04-09 17:33:47 UTC (rev 14564) @@ -0,0 +1,15 @@ +SubDir ROS_TOP lib kbdru ; + +# This stuff should actually be moved to Jamrules +# in order to more easily support other compilers +CCFLAGS += -Wall -fno-builtin ; + +# NOTE - I'm no Jam expert, yet. This stuff should be +# abstracted into the Jamrules file. +LINKFLAGS = -nostartfiles -nostdlib -shared ; +LINKFLAGS += -Wl,--image-base,0x77F00000 -lgcc ; + +SRCS = kbdru + +SharedLibrary kbdru : $(SRCS) ; +LINKLIBS = ; _____ Added: trunk/reactos/lib/kbdru/kbdru.c --- trunk/reactos/lib/kbdru/kbdru.c 2005-04-09 17:10:25 UTC (rev 14563) +++ trunk/reactos/lib/kbdru/kbdru.c 2005-04-09 17:33:47 UTC (rev 14564) @@ -0,0 +1,452 @@ +/* + * ReactOS Russian ASCII Keyboard layout + * Copyright (C) 2005 ReactOS + * Author: Aleksey Bragin + * 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 +#pragma data_seg(".data") +#define ROSDATA static +#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 + +/* Thanks to http://asp.flaaten.dk/pforum/keycode/keycode.htm */ +#ifndef VK_OEM_1 +#define VK_OEM_1 0xba +#endif +#ifndef VK_OEM_PLUS +#define VK_OEM_PLUS 0xbb +#endif +#ifndef VK_OEM_COMMA +#define VK_OEM_COMMA 0xbc +#endif +#ifndef VK_OEM_MINUS +#define VK_OEM_MINUS 0xbd +#endif +#ifndef VK_OEM_PERIOD +#define VK_OEM_PERIOD 0xbe +#endif +#ifndef VK_OEM_2 +#define VK_OEM_2 0xbf +#endif +#ifndef VK_OEM_3 +#define VK_OEM_3 0xc0 +#endif +#ifndef VK_OEM_4 +#define VK_OEM_4 0xdb +#endif +#ifndef VK_OEM_5 +#define VK_OEM_5 0xdc +#endif +#ifndef VK_OEM_6 +#define VK_OEM_6 0xdd +#endif +#ifndef VK_OEM_7 +#define VK_OEM_7 0xde +#endif +#ifndef VK_OEM_8 +#define VK_OEM_8 0xdf +#endif +#ifndef VK_OEM_AX +#define VK_OEM_AX 0xe1 +#endif +#ifndef VK_OEM_102 +#define VK_OEM_102 0xe1 +#endif + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 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 } +}; + +typedef struct _mymod { + PVOID mod_keys; + WORD maxmod; + BYTE mod_max[7]; +} INTERNAL_KBD_MODIFIERS; +// done +ROSDATA INTERNAL_KBD_MODIFIERS modifier_bits[] = { + modifier_keys, + 3, + { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + {VK_OEM_3, CAPS, 0x451, 0x401}, + { '1', NOCAPS, '1', '!' }, + { '3', NOCAPS, '3', 0x2116 }, + { '4', NOCAPS, '4', ';' }, + { '5', NOCAPS, '5', '%' }, + { '7', NOCAPS, '7', '?' }, + { '8', NOCAPS, '8', '*' }, + { '9', NOCAPS, '9', '(' }, + { '0', NOCAPS, '0', ')' }, + { VK_OEM_PLUS, NOCAPS, '=', '+' }, + + /* First letter row */ + { 'Q', CAPS, 0x439, 0x419 }, + { 'W', CAPS, 0x446, 0x426 }, + { 'E', CAPS, 0x443, 0x423 }, + { 'R', CAPS, 0x43a, 0x41a }, + { 'T', CAPS, 0x435, 0x415 }, + { 'Y', CAPS, 0x43d, 0x41d }, + { 'U', CAPS, 0x433, 0x413 }, + { 'I', CAPS, 0x448, 0x428 }, + { 'O', CAPS, 0x449, 0x429 }, + { 'P', CAPS, 0x437, 0x417 }, + { VK_OEM_4, CAPS, 0x445, 0x425 }, + { VK_OEM_6, CAPS, 0x44a, 0x42a }, + + /* Second letter row */ + { 'A', CAPS, 0x444, 0x424 }, + { 'S', CAPS, 0x44b, 0x42b }, + { 'D', CAPS, 0x432, 0x412 }, + { 'F', CAPS, 0x430, 0x410 }, + { 'G', CAPS, 0x43f, 0x41f }, + { 'H', CAPS, 0x440, 0x420 }, + { 'J', CAPS, 0x43e, 0x41e }, + { 'K', CAPS, 0x43b, 0x41b }, + { 'L', CAPS, 0x434, 0x414 }, + { VK_OEM_1, CAPS, 0x436, 0x416 }, + { VK_OEM_7, CAPS, 0x44d, 0x42d }, + + /* Third letter row */ + { 'Z', CAPS, 0x44f, 0x42f }, + { 'X', CAPS, 0x447, 0x427 }, + { 'C', CAPS, 0x441, 0x421 }, + { 'V', CAPS, 0x43c, 0x41c }, + { 'B', CAPS, 0x438, 0x418 }, + { 'N', CAPS, 0x442, 0x422 }, + { 'M', CAPS, 0x44c, 0x42c }, + { VK_OEM_COMMA,CAPS, 0x431, 0x411 }, + { VK_OEM_PERIOD,CAPS, 0x44e, 0x42e }, + { VK_OEM_2, NOCAPS, '.', ',' }, + + /* Specials */ + { 0x6e, NOCAPS, ',', ','}, + { VK_TAB, NOCAPS, 9, 9}, + { VK_ADD, NOCAPS, '+', '+' }, + { VK_DIVIDE, NOCAPS, '/', '/' }, + { VK_MULTIPLY, NOCAPS, '*', '*' }, + { VK_SUBTRACT, NOCAPS, '-', '-' }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_5, NOCAPS, 0x5c,0x2f, 0x1c }, + { VK_OEM_102, NOCAPS, 0x5c,0x2f, 0x1c }, + { VK_BACK, NOCAPS, 0x8, 0x8, 0x7f }, + { VK_ESCAPE, NOCAPS, 0x1b, 0x1b, 0x1b }, + { VK_RETURN,NOCAPS, '\r', '\r', '\n' }, + { VK_SPACE, NOCAPS, ' ', ' ', ' ' }, + { VK_CANCEL, NOCAPS, 0x03, 0x03, 0x03 }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, Ctrl-Alt */ + /* Legacy Ascii generators */ + { '2', NOCAPS, '2', '\"', WCH_NONE,0}, + { '6', NOCAPS, '6', ':', WCH_NONE,0x001e}, + { VK_OEM_MINUS, NOCAPS, 0x2d, '_', WCH_NONE, 0x001f}, // different '-' + { 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" }, +//{ 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 */ + (PMODIFIERS)&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(1,1), /* Version 1.0 */ + + /* Ligatures -- Russian doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor() { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + _____ Added: trunk/reactos/lib/kbdru/kbdru.def --- trunk/reactos/lib/kbdru/kbdru.def 2005-04-09 17:10:25 UTC (rev 14563) +++ trunk/reactos/lib/kbdru/kbdru.def 2005-04-09 17:33:47 UTC (rev 14564) @@ -0,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdru.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF _____ Added: trunk/reactos/lib/kbdru/kbdru.rc --- trunk/reactos/lib/kbdru/kbdru.rc 2005-04-09 17:10:25 UTC (rev 14563) +++ trunk/reactos/lib/kbdru/kbdru.rc 2005-04-09 17:33:47 UTC (rev 14564) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS RU Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdru\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdru.dll\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/lib/kbdru/makefile --- trunk/reactos/lib/kbdru/makefile 2005-04-09 17:10:25 UTC (rev 14563) +++ trunk/reactos/lib/kbdru/makefile 2005-04-09 17:33:47 UTC (rev 14564) @@ -0,0 +1,39 @@ +# $Id: makefile 12852 2005-01-06 13:58:04Z mf $ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = dynlink + +TARGET_NAME = kbdru + +TARGET_BASE = 0x5500000 + +TARGET_CFLAGS = -I$(PATH_TO_TOP)/ntoskrnl/include + +# require os code to explicitly request A/W version of structs/functions +TARGET_CFLAGS += -D_DISABLE_TIDENTS + +TARGET_LFLAGS = -nostartfiles -nostdlib + +TARGET_SDKLIBS = + +TARGET_GCCLIBS = gcc + +TARGET_PCH = + +TARGET_CLEAN = + +TARGET_OBJECTS = kbdru.o + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk + +%/TAGS: + etags -o $(@D)/TAGS $((a)D)/\*.c + +etags: ./TAGS

1 0

[hbirr] 14563: Close the desktop handle after getting the object pointer.
by hbirr＠svn.reactos.com 09 Apr '05

09 Apr '05

Close the desktop handle after getting the object pointer. Modified: trunk/reactos/subsys/win32k/main/dllmain.c _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-04-09 13:48:31 UTC (rev 14562) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-04-09 17:10:25 UTC (rev 14563) @@ -195,23 +195,22 @@ } } - Win32Thread->hDesktop = hDesk; - - Status = ObReferenceObjectByHandle(hDesk, - 0, - ExDesktopObjectType, - KernelMode, - (PVOID*)&Win32Thread->Desktop, - NULL); - - if(!NT_SUCCESS(Status)) + if (hDesk != NULL) { - DPRINT1("Unable to reference thread desktop handle 0x%x\n", hDesk); - Win32Thread->Desktop = NULL; + Status = ObReferenceObjectByHandle(hDesk, + 0, + ExDesktopObjectType, + KernelMode, + (PVOID*)&Win32Thread->Desktop, + NULL); NtClose(hDesk); + if(!NT_SUCCESS(Status)) + { + DPRINT1("Unable to reference thread desktop handle 0x%x\n", hDesk); + Win32Thread->Desktop = NULL; + } } } - Win32Thread->IsExiting = FALSE; IntDestroyCaret(Win32Thread); Win32Thread->MessageQueue = MsqCreateMessageQueue(Thread);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005