Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[mbosma] 14562:
by mbosma＠svn.reactos.com 09 Apr '05

09 Apr '05

Added: trunk/rosapps/packmgr/gui/de.rc Added: trunk/rosapps/packmgr/gui/es.rc Modified: trunk/rosapps/packmgr/gui/packmgr.rc Added: trunk/rosapps/packmgr/lib/es.rc Modified: trunk/rosapps/packmgr/lib/package.rc _____ Added: trunk/rosapps/packmgr/gui/de.rc --- trunk/rosapps/packmgr/gui/de.rc 2005-04-09 09:40:44 UTC (rev 14561) +++ trunk/rosapps/packmgr/gui/de.rc 2005-04-09 13:48:31 UTC (rev 14562) @@ -0,0 +1,43 @@ + +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +/* Dialogs */ +IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 180, 200 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Optionen" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Leider gibt es noch keine Optionen.", 0, 50, 95, 80, 8 +END + +IDD_DOIT DIALOG DISCARDABLE 0, 0, 180, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Performing Operations" +FONT 8, "MS Sans Serif" +BEGIN + + CTEXT "{Status}", IDC_TSTATUS, 0, 10, 180, 8 + + CONTROL "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH, 20, 25, 140, 15 + + CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 + + PUSHBUTTON "Abort", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED +END + +IDR_POPUP MENU DISCARDABLE +BEGIN + POPUP "PopUp", MENUBARBREAK + BEGIN + MENUITEM "Keine Action", 1, GRAYED + MENUITEM "Intallieren (empfohlen)", 2, GRAYED + MENUITEM "Intallieren vom Quellcode", 3, GRAYED + MENUITEM "Aktualisieren", 4, GRAYED + MENUITEM "Deinstallieren", 5, GRAYED + MENUITEM SEPARATOR + MENUITEM "Optionen", 8 + MENUITEM SEPARATOR + MENUITEM "DoIt", 6 + END +END + _____ Added: trunk/rosapps/packmgr/gui/es.rc --- trunk/rosapps/packmgr/gui/es.rc 2005-04-09 09:40:44 UTC (rev 14561) +++ trunk/rosapps/packmgr/gui/es.rc 2005-04-09 13:48:31 UTC (rev 14562) @@ -0,0 +1,43 @@ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +/* Dialogs */ +IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 180, 200 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Opciones" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "A·n no hay opciones disponibles.", 0, 50, 95, 80, 8 +END + +IDD_DOIT DIALOG DISCARDABLE 0, 0, 180, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Realizando las operaciones" +FONT 8, "MS Sans Serif" +BEGIN + + CTEXT "{Status}", IDC_TSTATUS, 0, 10, 180, 8 + + CONTROL "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH, 20, 25, 140, 15 + + CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 + + PUSHBUTTON "Abort", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED +END + +IDR_POPUP MENU DISCARDABLE +BEGIN + POPUP "PopUp", MENUBARBREAK + BEGIN + MENUITEM "Ninguna acci¾n", 1, GRAYED + MENUITEM "Instalar (recomendado)", 2, GRAYED + MENUITEM "Instalar desde el c¾digo fuente", 3, GRAYED + MENUITEM "Actualizar", 4, GRAYED + MENUITEM "Desinstalar", 5, GRAYED + MENUITEM SEPARATOR + MENUITEM "Opciones", 8 + MENUITEM SEPARATOR + MENUITEM "íHazlo!", 6 + END +END + _____ Modified: trunk/rosapps/packmgr/gui/packmgr.rc --- trunk/rosapps/packmgr/gui/packmgr.rc 2005-04-09 09:40:44 UTC (rev 14561) +++ trunk/rosapps/packmgr/gui/packmgr.rc 2005-04-09 13:48:31 UTC (rev 14562) @@ -14,5 +14,7 @@ /* Language specific */ #include "en.rc" +#include "es.rc" +#include "de.rc" /* EOF */ _____ Added: trunk/rosapps/packmgr/lib/es.rc --- trunk/rosapps/packmgr/lib/es.rc 2005-04-09 09:40:44 UTC (rev 14561) +++ trunk/rosapps/packmgr/lib/es.rc 2005-04-09 13:48:31 UTC (rev 14562) @@ -0,0 +1,19 @@ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_LOAD "Cargando ..." + ERR_OK "Operaci¾n completada." + ERR_PACK "No todos los paquetes pudieron ser instalados\n\nPor favor, mira el archivo de log para mßs detalles." + ERR_GENERIC "Ocurri¾ un error. \nPor favor, mira el archivo de log para mßs detalles." + ERR_DOWNL "íUn archivo necesario no pudo ser descargado!\nPor favor, mira el archivo de log para mßs detalles." + ERR_FILE "Error durante la ejecuci¾n del Script.\nEl archivo no pudo abrirse." + + ERR_SYNATX "Error durante la ejecuci¾n del Script.\nSintaxis err¾nea." + ERR_CALL "Error durante la ejecuci¾n del Script.\nNo se pudo encontrar la funci¾n." + ERR_PARAMETER "Error durante la ejecuci¾n del Script.\nParametro(s) err¾neo." +END + +/* EOF */ _____ Modified: trunk/rosapps/packmgr/lib/package.rc --- trunk/rosapps/packmgr/lib/package.rc 2005-04-09 09:40:44 UTC (rev 14561) +++ trunk/rosapps/packmgr/lib/package.rc 2005-04-09 13:48:31 UTC (rev 14562) @@ -11,5 +11,6 @@ /* Language specific */ #include "en.rc" +#include "es.rc" /* EOF */

1 0

[hbirr] 14561: Fixed the dereferencing of an existing named object in IoCreateFile.
by hbirr＠svn.reactos.com 09 Apr '05

09 Apr '05

Fixed the dereferencing of an existing named object in IoCreateFile. Modified: trunk/reactos/ntoskrnl/io/create.c _____ Modified: trunk/reactos/ntoskrnl/io/create.c --- trunk/reactos/ntoskrnl/io/create.c 2005-04-09 09:37:32 UTC (rev 14560) +++ trunk/reactos/ntoskrnl/io/create.c 2005-04-09 09:40:44 UTC (rev 14561) @@ -344,8 +344,8 @@ IN PVOID ExtraCreateParameters OPTIONAL, IN ULONG Options) { - PFILE_OBJECT FileObject; - PDEVICE_OBJECT DeviceObject = NULL; + PFILE_OBJECT FileObject = NULL; + PDEVICE_OBJECT DeviceObject; PIRP Irp; PIO_STACK_LOCATION StackLoc; IO_SECURITY_CONTEXT SecurityContext; @@ -460,23 +460,23 @@ AccessMode, (PVOID*)&DeviceObject, NULL); - ObDereferenceObject (DeviceObject); + ZwClose(LocalHandle); if (!NT_SUCCESS(Status)) { return Status; } if (BODY_TO_HEADER(DeviceObject)->ObjectType != IoDeviceObjectType) { - ZwClose(LocalHandle); + ObDereferenceObject (DeviceObject); return STATUS_OBJECT_NAME_COLLISION; } FileObject = IoCreateStreamFileObject(NULL, DeviceObject); - ZwClose(LocalHandle); + ObDereferenceObject (DeviceObject); } } - if (DeviceObject == NULL) + if (FileObject == NULL) { Status = ObCreateObject(AccessMode, IoFileObjectType,

1 0

[hbirr] 14560: ObCreateObject should return an existing named object if one already exist.
by hbirr＠svn.reactos.com 09 Apr '05

09 Apr '05

ObCreateObject should return an existing named object if one already exist. Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-04-08 22:19:39 UTC (rev 14559) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-04-09 09:37:32 UTC (rev 14560) @@ -712,8 +712,13 @@ if (ParentHeader && RemainingPath.Buffer == NULL) { - ObDereferenceObject(Parent); - return STATUS_OBJECT_NAME_COLLISION; + if (ParentHeader->ObjectType != Type) + { + ObDereferenceObject(Parent); + return STATUS_OBJECT_NAME_COLLISION; + } + *Object = Parent; + return STATUS_OBJECT_EXISTS; } } else

1 0

[hpoussin] 14559: GCC 3.3.3 detects uninitialized variable where it is not the case. Workaround problem by moving initialization at the top of function.
by hpoussin＠svn.reactos.com 08 Apr '05

08 Apr '05

GCC 3.3.3 detects uninitialized variable where it is not the case. Workaround problem by moving initialization at the top of function. Modified: trunk/reactos/drivers/bus/serenum/detect.c _____ Modified: trunk/reactos/drivers/bus/serenum/detect.c --- trunk/reactos/drivers/bus/serenum/detect.c 2005-04-08 20:38:08 UTC (rev 14558) +++ trunk/reactos/drivers/bus/serenum/detect.c 2005-04-08 22:19:39 UTC (rev 14559) @@ -216,7 +216,8 @@ ULONG Size; ULONG Msr, Purge; ULONG i; - BOOLEAN BufferContainsBeginId, BufferContainsEndId; + BOOLEAN BufferContainsBeginId = FALSE; + BOOLEAN BufferContainsEndId = FALSE; SERIAL_LINE_CONTROL Lcr; SERIAL_TIMEOUTS Timeouts; SERIALPERF_STATS PerfStats; @@ -325,7 +326,6 @@ NULL, 0, &PerfStats, &Size); if (!NT_SUCCESS(Status)) return Status; if (PerfStats.FrameErrorCount + PerfStats.ParityErrorCount != 0) goto SerenumConnectIdle; - BufferContainsBeginId = BufferContainsEndId = FALSE; for (i = 0; i < TotalBytesReceived; i++) { if (Buffer[i] == BEGIN_ID) BufferContainsBeginId = TRUE;

1 0

[hbirr] 14558: - Don't allow to create objects in the nt name space for twice.
by hbirr＠svn.reactos.com 08 Apr '05

08 Apr '05

- Don't allow to create objects in the nt name space for twice. - Create a stream file object in IoCreateFile if a deviceobject is opening. Modified: trunk/reactos/ntoskrnl/io/create.c Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/io/create.c --- trunk/reactos/ntoskrnl/io/create.c 2005-04-08 20:29:30 UTC (rev 14557) +++ trunk/reactos/ntoskrnl/io/create.c 2005-04-08 20:38:08 UTC (rev 14558) @@ -238,7 +238,15 @@ DPRINT("DeviceObject %x\n", DeviceObject); - CreatedFileObject->DeviceObject = DeviceObject->Vpb->DeviceObject; + if (DeviceObject->Vpb && + DeviceObject->Vpb->DeviceObject) + { + CreatedFileObject->DeviceObject = DeviceObject->Vpb->DeviceObject; + } + else + { + CreatedFileObject->DeviceObject = DeviceObject; + } CreatedFileObject->Vpb = DeviceObject->Vpb; CreatedFileObject->Type = IO_TYPE_FILE; CreatedFileObject->Flags |= FO_DIRECT_DEVICE_OPEN; @@ -337,11 +345,12 @@ IN ULONG Options) { PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject = NULL; PIRP Irp; PIO_STACK_LOCATION StackLoc; IO_SECURITY_CONTEXT SecurityContext; KPROCESSOR_MODE AccessMode; - HANDLE LocalFileHandle; + HANDLE LocalHandle; IO_STATUS_BLOCK LocalIoStatusBlock; LARGE_INTEGER SafeAllocationSize; PVOID SystemEaBuffer = NULL; @@ -357,7 +366,7 @@ if (IoStatusBlock == NULL || FileHandle == NULL) return STATUS_ACCESS_VIOLATION; - LocalFileHandle = 0; + LocalHandle = 0; if(Options & IO_NO_PARAMETER_CHECKING) AccessMode = KernelMode; @@ -433,21 +442,57 @@ DPRINT1("FIXME: IO_CHECK_CREATE_PARAMETERS not yet supported!\n"); } - Status = ObCreateObject(AccessMode, - IoFileObjectType, - ObjectAttributes, - AccessMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&FileObject); - if (!NT_SUCCESS(Status)) - { + if (CreateDisposition == FILE_OPEN || + CreateDisposition == FILE_OPEN_IF) + { + Status = ObOpenObjectByName(ObjectAttributes, + NULL, + NULL, + AccessMode, + DesiredAccess, + NULL, + &LocalHandle); + if (NT_SUCCESS(Status)) + { + Status = ObReferenceObjectByHandle(LocalHandle, + DesiredAccess, + NULL, + AccessMode, + (PVOID*)&DeviceObject, + NULL); + ObDereferenceObject (DeviceObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + if (BODY_TO_HEADER(DeviceObject)->ObjectType != IoDeviceObjectType) + { + ZwClose(LocalHandle); + return STATUS_OBJECT_NAME_COLLISION; + } + FileObject = IoCreateStreamFileObject(NULL, DeviceObject); + ZwClose(LocalHandle); + } + } + + + if (DeviceObject == NULL) + { + Status = ObCreateObject(AccessMode, + IoFileObjectType, + ObjectAttributes, + AccessMode, + NULL, + sizeof(FILE_OBJECT), + 0, + 0, + (PVOID*)&FileObject); + if (!NT_SUCCESS(Status)) + { DPRINT("ObCreateObject() failed! (Status %lx)\n", Status); return Status; - } - + } + } RtlMapGenericMask(&DesiredAccess, BODY_TO_HEADER(FileObject)->ObjectType->Mapping); @@ -456,7 +501,7 @@ DesiredAccess, 0, NULL, - &LocalFileHandle); + &LocalHandle); if (!NT_SUCCESS(Status)) { DPRINT("ObInsertObject() failed! (Status %lx)\n", Status); @@ -494,7 +539,7 @@ Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, FALSE); if (Irp == NULL) { - ZwClose(LocalFileHandle); + ZwClose(LocalHandle); return STATUS_UNSUCCESSFUL; } @@ -574,13 +619,13 @@ FileObject->DeviceObject = NULL; FileObject->Vpb = NULL; - ZwClose(LocalFileHandle); + ZwClose(LocalHandle); } else { _SEH_TRY { - *FileHandle = LocalFileHandle; + *FileHandle = LocalHandle; *IoStatusBlock = LocalIoStatusBlock; } _SEH_HANDLE _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-04-08 20:29:30 UTC (rev 14557) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-04-08 20:38:08 UTC (rev 14558) @@ -705,6 +705,16 @@ DPRINT1("ObFindObject() failed! (Status 0x%x)\n", Status); return Status; } + if (Parent != NULL) + { + ParentHeader = BODY_TO_HEADER(Parent); + } + if (ParentHeader && + RemainingPath.Buffer == NULL) + { + ObDereferenceObject(Parent); + return STATUS_OBJECT_NAME_COLLISION; + } } else { @@ -749,11 +759,6 @@ RtlInitUnicodeString(&(Header->Name),NULL); DPRINT("Getting Parent and adding entry\n"); - if (Parent != NULL) - { - ParentHeader = BODY_TO_HEADER(Parent); - } - if (ParentHeader != NULL && ParentHeader->ObjectType == ObDirectoryType && RemainingPath.Buffer != NULL)

1 0

[hbirr] 14557: Csrss should only open the '\Windows' directory.
by hbirr＠svn.reactos.com 08 Apr '05

08 Apr '05

Csrss should only open the '\Windows' directory. Modified: trunk/reactos/subsys/csrss/init.c _____ Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-04-08 19:31:08 UTC (rev 14556) +++ trunk/reactos/subsys/csrss/init.c 2005-04-08 20:29:30 UTC (rev 14557) @@ -135,10 +135,9 @@ NULL, NULL); - Status = NtCreateDirectoryObject(&CsrObjectDirectory, - 0xF000F, /* ea:??? */ - &Attributes); - + Status = NtOpenDirectoryObject(&CsrObjectDirectory, + 0xF000F, /* ea:??? */ + &Attributes); return Status; }

1 0

[frik85] 14556: update makefile (add ros-get)
by frik85＠svn.reactos.com 08 Apr '05

08 Apr '05

update makefile (add ros-get) Modified: trunk/rosapps/packmgr/makefile _____ Modified: trunk/rosapps/packmgr/makefile --- trunk/rosapps/packmgr/makefile 2005-04-08 19:18:01 UTC (rev 14555) +++ trunk/rosapps/packmgr/makefile 2005-04-08 19:31:08 UTC (rev 14556) @@ -1,5 +1,5 @@ -all: lib gui +all: lib gui cmd-line lib: dummy $(MAKE) -C lib @@ -7,6 +7,9 @@ gui: dummy $(MAKE) -C gui +cmd-line: dummy + $(MAKE) -C cmd-line + dummy: clean:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs