Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 16528: The return size calculation's of GetEnvironmentVariable string was wrong. Thx to <Bizzy_D> to find out cd %windir% did not work. Now it will
by greatlrd＠svn.reactos.com 10 Jul '05

10 Jul '05

The return size calculation's of GetEnvironmentVariable string was wrong. Thx to <Bizzy_D> to find out cd %windir% did not work. Now it will Modified: trunk/reactos/lib/kernel32/misc/env.c _____ Modified: trunk/reactos/lib/kernel32/misc/env.c --- trunk/reactos/lib/kernel32/misc/env.c 2005-07-10 22:05:48 UTC (rev 16527) +++ trunk/reactos/lib/kernel32/misc/env.c 2005-07-10 22:12:07 UTC (rev 16528) @@ -70,7 +70,7 @@ SetLastErrorByStatus (Status); if (Status == STATUS_BUFFER_TOO_SMALL) { - return VarValueU.Length / sizeof(WCHAR) + 1; + return VarValueU.Length / sizeof(WCHAR) + sizeof(WCHAR); } else { @@ -91,7 +91,7 @@ /* free unicode variable name string */ RtlFreeUnicodeString (&VarNameU); - return (VarValueU.Length / sizeof(WCHAR)); + return (VarValueU.Length / sizeof(WCHAR) + sizeof(WCHAR)); } @@ -125,7 +125,7 @@ SetLastErrorByStatus (Status); if (Status == STATUS_BUFFER_TOO_SMALL) { - return (VarValue.Length / sizeof(WCHAR)) + 1; + return (VarValue.Length / sizeof(WCHAR)) + sizeof(WCHAR); } else { @@ -133,7 +133,7 @@ } } - return (VarValue.Length / sizeof(WCHAR)); + return (VarValue.Length / sizeof(WCHAR) + sizeof(WCHAR)); }

1 0

[gvg] 16527: i386DX . <i386dx@hotmail.com>
by gvg＠svn.reactos.com 10 Jul '05

10 Jul '05

i386DX . <i386dx(a)hotmail.com> Belgian (point/Flemish) keyboard layout Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/bootdata/txtsetup.sif Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/kbdbe/ Added: trunk/reactos/lib/kbdbe/kbdbe.c Added: trunk/reactos/lib/kbdbe/kbdbe.def Added: trunk/reactos/lib/kbdbe/kbdbe.rc Added: trunk/reactos/lib/kbdbe/kbdbe.xml _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-07-10 21:26:51 UTC (rev 16526) +++ trunk/reactos/bootdata/hivesys.inf 2005-07-10 22:05:48 UTC (rev 16527) @@ -69,6 +69,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout Text",0x00000000,"UK" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout File",0x00000000,"kbdsg.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout Text",0x00000000,"SG" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layou t File",0x00000000,"kbdbe.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layou t Text",0x00000000,"BE (point)" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}",,0x00000000,"Network Adapters" @@ -171,10 +173,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","041d",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0809",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0807",0x00000000," l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0813",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x0000000 0,"0409" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0 x00000000,"0409" -; Suported and installed locales +; Supported and installed locales HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00010001 ,"5" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00010001 ,"1" _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-07-10 21:26:51 UTC (rev 16526) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-07-10 22:05:48 UTC (rev 16527) @@ -96,6 +96,7 @@ lib\kbdsg\kbdsg.dll 1 lib\kbduk\kbduk.dll 1 lib\kbdus\kbdus.dll 1 +lib\kbdbe\kbdbe.dll 1 lib\kernel32\kernel32.dll 1 lib\lzexpand\lz32.dll 1 lib\mesa32\mesa32.dll 1 _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-07-10 21:26:51 UTC (rev 16526) +++ trunk/reactos/bootdata/txtsetup.sif 2005-07-10 22:05:48 UTC (rev 16527) @@ -73,6 +73,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" [KeyboardLayout] +00000813 = "Belgian (point)" 00000406 = "Danish (Denmark)" 00000809 = "English (United Kingdom)" 00000409 = "English (USA)" @@ -84,6 +85,7 @@ 0000041D = "Swedish (Sweden)" 00000807 = "German (Swiss)" + [Files.KeyboardLayout] 00000406 = kbdda.dll 00000407 = kbdgr.dll @@ -95,6 +97,7 @@ 0000041D = kbdse.dll 00000809 = kbduk.dll 00000807 = kbdsg.dll +00000813 = kbdbe.dll [HiveInfs.Install] AddReg=hivecls.inf,AddReg _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-07-10 21:26:51 UTC (rev 16526) +++ trunk/reactos/lib/directory.xml 2005-07-10 22:05:48 UTC (rev 16527) @@ -124,6 +124,9 @@ <directory name="kbdus"> <xi:include href="kbdus/kbdus.xml" /> </directory> +<directory name="kbdbe"> + <xi:include href="kbdbe/kbdbe.xml" /> +</directory> <directory name="kernel32"> <xi:include href="kernel32/kernel32.xml" /> </directory> Property changes on: trunk/reactos/lib/kbdbe ___________________________________________________________________ Name: svn:ignore + makefile _____ Added: trunk/reactos/lib/kbdbe/kbdbe.c --- trunk/reactos/lib/kbdbe/kbdbe.c 2005-07-10 21:26:51 UTC (rev 16526) +++ trunk/reactos/lib/kbdbe/kbdbe.c 2005-07-10 22:05:48 UTC (rev 16527) @@ -0,0 +1,498 @@ +/* + * Belgian (point) Keyboard layout + * Copyright (C) 2005 ReactOS Development Team + * Autor: i386DX + */ + +/* ToDo - ToFix + * Dead keys + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_2, VK_OEM_MINUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'A', 'Z', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', VK_OEM_4, + VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'Q', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', 'M', VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'W', 'X', 'C', 'V', + 'B', 'N', VK_OEM_COMMA, VK_OEM_PERIOD, + VK_OEM_1, VK_OEM_PLUS, VK_RSHIFT, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_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[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 6, + { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } /* 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[] = { + /* Normal vs Shifted */ + /* The numbers */ + { '4', NOCAPS, {0x27, '4'} }, + { '5', NOCAPS, {'(', '5'} }, + { '7', NOCAPS, {0xE8, '7'} }, + { '8', NOCAPS, {'!', '8'} }, + { VK_OEM_2, NOCAPS, {')', 0xB0} }, + + /* First letter row */ + { 'A', CAPS, {'a', 'A'} }, + { 'Z', CAPS, {'z', 'Z'} }, + { 'R', CAPS, {'r', 'R'} }, + { 'T', CAPS, {'t', 'T'} }, + { 'Y', CAPS, {'y', 'Y'} }, + { 'U', CAPS, {'u', 'U'} }, + { 'I', CAPS, {'i', 'I'} }, + { 'O', CAPS, {'o', 'O'} }, + { 'P', CAPS, {'p', 'P'} }, + + /* Second letter row */ + { 'Q', CAPS, {'q', 'Q'} }, + { 'S', CAPS, {'s', 'S'} }, + { 'D', CAPS, {'d', 'D'} }, + { 'F', CAPS, {'f', 'F'} }, + { 'G', CAPS, {'g', 'G'} }, + { 'H', CAPS, {'h', 'H'} }, + { 'J', CAPS, {'j', 'J'} }, + { 'K', CAPS, {'k', 'K'} }, + { 'L', CAPS, {'l', 'L'} }, + { 'M', CAPS, {'m', 'M'} }, + + /* Third letter row */ + { 'W', CAPS, {'w', 'W'} }, + { 'X', CAPS, {'x', 'X'} }, + { 'C', CAPS, {'c', 'C'} }, + { 'V', CAPS, {'v', 'V'} }, + { 'B', CAPS, {'b', 'B'} }, + { 'N', CAPS, {'n', 'N'} }, + + /* Specials */ + { VK_OEM_COMMA, CAPS, {',', '?'} }, + { VK_OEM_PERIOD, CAPS, {';', '.'} }, + + { VK_OEM_1, CAPS, {':', '/'} }, + { VK_OEM_3, NOCAPS, {0xB2, 0xB3 } }, + { VK_DECIMAL, NOCAPS, {'.', '.'} }, + { VK_TAB, NOCAPS, {'\t', '\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x1f} }, //0x1f unit separator + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + + { VK_BACK, NOCAPS, {'\b', '\b', 0x7f} }, + { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} }, + { 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 */ + { '1', NOCAPS, {'&', '1', WCH_NONE, '|' } }, + { '2', NOCAPS, {0xE9, '2', WCH_NONE, '@' } }, + { '3', NOCAPS, {'"', '3', WCH_NONE, '#' } }, + { '6', NOCAPS, {0xA7, '6', WCH_NONE, WCH_DEAD} }, + { '9', NOCAPS, {0xE7, '9', WCH_NONE, '{' } }, + { '0', NOCAPS, {0xE0, '0', WCH_NONE, '}' } }, + { VK_OEM_PLUS, NOCAPS, {'=', '+', WCH_NONE, WCH_DEAD} }, + + { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD,WCH_NONE, '[' } }, + { VK_OEM_5, CAPS, {0xB5, 0xA3, WCH_NONE, WCH_DEAD} }, + { VK_OEM_6, NOCAPS, {'$', '*', WCH_NONE, ']' } }, + { VK_OEM_7, NOCAPS, {0xF9, '%', WCH_NONE, WCH_DEAD} }, + { VK_EMPTY , NOCAPS, {0xb4, '`', '|', WCH_NONE} }, + + { 'E', CAPS, {'e', 'E', WCH_NONE, 0x20ac} }, + { VK_EMPTY , NOCAPS, {0xa8, '^', WCH_NONE, '~'} }, + + { VK_OEM_102, NOCAPS, {'<', '>', 0x001c, '\\'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + /* Normal, Shifted, Ctrl, Ctrl-Alt, C-S-x */ + { '6', NOCAPS, {'6', '&', WCH_NONE, WCH_NONE, 0x1e /* RS */} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {'.'} }, + { 0,0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3, key_to_chars_3mod), + vk_master(4, key_to_chars_4mod), + vk_master(5, key_to_chars_5mod), + vk_master(2, key_to_chars_2mod), + vk_master(1, keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 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"Spatie" }, + { 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 }, +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x005e" L"Circumflex", + L"\x007e" L"Tilde", + L"\x0060" L"Grave", + NULL +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + /* ¿ */ + { DEADTRANS(0x0061, 0x00a8, 0x00e4, 0x0000) }, // a -> õ + { DEADTRANS(0x0065, 0x00a8, 0x00eb, 0x0000) }, // e -> Ù + { DEADTRANS(0x0069, 0x00a8, 0x00ef, 0x0000) }, // i -> ´ + { DEADTRANS(0x006f, 0x00a8, 0x00f6, 0x0000) }, // o -> ÷ + { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, // u -> ³ + { DEADTRANS(0x0079, 0x00a8, 0x00ff, 0x0000) }, // y -> + { DEADTRANS(0x0041, 0x00a8, 0x00c4, 0x0000) }, // A -> ? + { DEADTRANS(0x0045, 0x00a8, 0x00cb, 0x0000) }, // E -> ? + { DEADTRANS(0x0049, 0x00a8, 0x00cf, 0x0000) }, // I -> ¤ + { DEADTRANS(0x004f, 0x00a8, 0x00d6, 0x0000) }, // O -> Í + { DEADTRANS(0x0055, 0x00a8, 0x00dc, 0x0000) }, // U -> ? + { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, // Space -> ¿ + + /* ^ */ + { DEADTRANS(0x0061, 0x005e, 0x00e2, 0x0000) }, // a -> Ô + { DEADTRANS(0x0065, 0x005e, 0x00ea, 0x0000) }, // e -> Û + { DEADTRANS(0x0069, 0x005e, 0x00ee, 0x0000) }, // i -> ¯ + { DEADTRANS(0x006f, 0x005e, 0x00f4, 0x0000) }, // o -> ¶ + { DEADTRANS(0x0075, 0x005e, 0x00fb, 0x0000) }, // u -> ¹ + { DEADTRANS(0x0041, 0x005e, 0x00c2, 0x0000) }, // A -> ? + { DEADTRANS(0x0045, 0x005e, 0x00ca, 0x0000) }, // E -> ? + { DEADTRANS(0x0049, 0x005e, 0x00ce, 0x0000) }, // I -> ? + { DEADTRANS(0x004f, 0x005e, 0x00d4, 0x0000) }, // O -> È + { DEADTRANS(0x0055, 0x005e, 0x00db, 0x0000) }, // U -> ? + { DEADTRANS(0x0020, 0x005e, 0x005e, 0x0000) }, // Space -> ^ + + /* ~ */ + { DEADTRANS(0x0061, 0x007e, 0x00e3, 0x0000) }, // a -> Ò + { DEADTRANS(0x006f, 0x007e, 0x00f5, 0x0000) }, // o -> § + { DEADTRANS(0x006e, 0x007e, 0x00f1, 0x0000) }, // n -> ± + { DEADTRANS(0x0041, 0x007e, 0x00c3, 0x0000) }, // A -> ? + { DEADTRANS(0x004f, 0x007e, 0x00d5, 0x0000) }, // O -> i + { DEADTRANS(0x004e, 0x007e, 0x00d1, 0x0000) }, // N -> Ð + { DEADTRANS(0x0020, 0x007e, 0x007e, 0x0000) }, // Space -> ~ + + /* ? */ + { DEADTRANS(0x0061, 0x00b4, 0x00e1, 0x0000) }, // a -> ß + { DEADTRANS(0x0065, 0x00b4, 0x00e9, 0x0000) }, // e -> Ú + { DEADTRANS(0x0069, 0x00b4, 0x00ed, 0x0000) }, // i -> Ý + { DEADTRANS(0x006f, 0x00b4, 0x00f3, 0x0000) }, // o -> ¾ + { DEADTRANS(0x0075, 0x00b4, 0x00fa, 0x0000) }, // u -> · + { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) }, // y -> ² + { DEADTRANS(0x0041, 0x00b4, 0x00c1, 0x0000) }, // A -> ? + { DEADTRANS(0x0045, 0x00b4, 0x00c9, 0x0000) }, // E -> ? + { DEADTRANS(0x0049, 0x00b4, 0x00cd, 0x0000) }, // I -> ? + { DEADTRANS(0x004f, 0x00b4, 0x00d3, 0x0000) }, // O -> Ë + { DEADTRANS(0x0055, 0x00b4, 0x00da, 0x0000) }, // U -> ? + { DEADTRANS(0x0059, 0x00b4, 0x00dd, 0x0000) }, // Y -> ¦ + { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) }, // Space -> ? + + /* ` */ + { DEADTRANS(0x0061, 0x0060, 0x00e0, 0x0000) }, // a -> Ó + { DEADTRANS(0x0065, 0x0060, 0x00e8, 0x0000) }, // e -> Þ + { DEADTRANS(0x0069, 0x0060, 0x00ec, 0x0000) }, // i -> ý + { DEADTRANS(0x006f, 0x0060, 0x00f2, 0x0000) }, // o -> ? + { DEADTRANS(0x0075, 0x0060, 0x00f9, 0x0000) }, // u -> ¨ + { DEADTRANS(0x0041, 0x0060, 0x00c0, 0x0000) }, // A -> ? + { DEADTRANS(0x0045, 0x0060, 0x00c8, 0x0000) }, // E -> ? + { DEADTRANS(0x0049, 0x0060, 0x00cc, 0x0000) }, // I -> ? + { DEADTRANS(0x004f, 0x0060, 0x00d2, 0x0000) }, // O -> Ê + { DEADTRANS(0x0055, 0x0060, 0x00d9, 0x0000) }, // U -> ? + { DEADTRANS(0x0020, 0x0060, 0x0060, 0x0000) }, // Space -> ` + { 0, 0 } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks -- currently implemented by wine code */ + dead_key, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + dead_key_names, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- None in Dutch */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor() { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} Property changes on: trunk/reactos/lib/kbdbe/kbdbe.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/kbdbe/kbdbe.def --- trunk/reactos/lib/kbdbe/kbdbe.def 2005-07-10 21:26:51 UTC (rev 16526) +++ trunk/reactos/lib/kbdbe/kbdbe.def 2005-07-10 22:05:48 UTC (rev 16527) @@ -0,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdbe.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Property changes on: trunk/reactos/lib/kbdbe/kbdbe.def ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/kbdbe/kbdbe.rc --- trunk/reactos/lib/kbdbe/kbdbe.rc 2005-07-10 21:26:51 UTC (rev 16526) +++ trunk/reactos/lib/kbdbe/kbdbe.rc 2005-07-10 22:05:48 UTC (rev 16527) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Belgian Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdbe\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdbe.dll\0" +#include <reactos/version.rc> \ No newline at end of file Property changes on: trunk/reactos/lib/kbdbe/kbdbe.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/kbdbe/kbdbe.xml --- trunk/reactos/lib/kbdbe/kbdbe.xml 2005-07-10 21:26:51 UTC (rev 16526) +++ trunk/reactos/lib/kbdbe/kbdbe.xml 2005-07-10 22:05:48 UTC (rev 16527) @@ -0,0 +1,9 @@ +<module name="kbdbe" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdbe.dll" warnings="true"> + <importlibrary definition="kbdbe.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdbe.c</file> + <file>kbdbe.rc</file> +</module> Property changes on: trunk/reactos/lib/kbdbe/kbdbe.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

1 0

[greatlrd] 16526: quick dirty hack getting our copy working with 1>null by me
by greatlrd＠svn.reactos.com 10 Jul '05

10 Jul '05

quick dirty hack getting our copy working with 1>null by me so we can create reactos iso on ros. bug reported by harteex and Brandon Turner, thanks to Brandon to hunt down where the bug was. Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-10 11:49:10 UTC (rev 16525) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-10 21:26:51 UTC (rev 16526) @@ -232,8 +232,23 @@ source = 0; count = 0; + ConOutPrintf(_T("here\n")); + + + /* hack geting pipe 1>null working */ + for (i = 0; i < argc; i++) + { + if (arg[i][0] != _T('/')) + count++; + } + if (count==3) argc=2; + /* end hack */ + + + for (i = 0; i < argc; i++) - { + { + if (arg[i][0] == _T('/')) { if (!DoSwitches (arg[i], lpdwFlags)) @@ -645,6 +660,7 @@ BOOL bDestFound; DWORD dwFlags = 0; + ConOutPrintf(_T("string : %s\n"),rest); if (!_tcsncmp (rest, _T("/?"), 2)) { ConOutResPaging(TRUE,STRING_COPY_HELP2);

1 0

[ekohl] 16525: - Implement CM_Get_Global_State/CM_Get_Global_State_Ex.
by ekohl＠svn.reactos.com 10 Jul '05

10 Jul '05

- Implement CM_Get_Global_State/CM_Get_Global_State_Ex. - All RPC-Calls to umpnpmgr return CONFIGRET. Modified: trunk/reactos/include/idl/pnp.idl Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/rpc.c Added: trunk/reactos/lib/setupapi/rpc_private.h Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/ddk/cfg.h Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/include/idl/pnp.idl --- trunk/reactos/include/idl/pnp.idl 2005-07-09 15:22:07 UTC (rev 16524) +++ trunk/reactos/include/idl/pnp.idl 2005-07-10 11:49:10 UTC (rev 16525) @@ -1,8 +1,9 @@ /* - * Plug and Play Manager interface definition + * Plug and Play Manager RPC interface definition */ #define WORD unsigned short +#define DWORD unsigned long #define CONFIGRET unsigned long [ @@ -13,9 +14,14 @@ ] interface pnp { -// unsigned long PNP_GetRootDeviceInstance(handle_t BindingHandle, -// [out, string, size_is(Length)] wchar_t *DeviceInstance, -// [in] unsigned long Length); CONFIGRET PNP_GetVersion(handle_t BindingHandle, [out] WORD *Version); + + CONFIGRET PNP_GetGlobalState(handle_t BindingHandle, + [out] unsigned long *State, + [in] unsigned long Flags); + +// CONFIGRET PNP_GetRootDeviceInstance(handle_t BindingHandle, +// [out, string, size_is(Length)] wchar_t *DeviceInstance, +// [in] DWORD Length); } _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-07-09 15:22:07 UTC (rev 16524) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-07-10 11:49:10 UTC (rev 16525) @@ -31,25 +31,47 @@ typedef HMACHINE *PHMACHINE; typedef DWORD DEVINST; typedef DEVINST *PDEVINST; +typedef ULONG REGDISPOSITION; typedef CHAR *DEVINSTID_A; typedef WCHAR *DEVINSTID_W; DECL_WINELIB_CFGMGR32_TYPE_AW(DEVINSTID) -#define CR_SUCCESS 0x00000000 -#define CR_OUT_OF_MEMORY 0x00000002 -#define CR_FAILURE 0x00000013 -#define CR_BUFFER_SMALL 0x0000001A -#define CR_INVALID_DATA 0x0000001F +#define CR_SUCCESS 0x00000000 +#define CR_OUT_OF_MEMORY 0x00000002 +#define CR_INVALID_POINTER 0x00000003 +#define CR_INVALID_FLAG 0x00000004 +#define CR_INVALID_DEVNODE 0x00000005 +#define CR_INVALID_DEVINST CR_INVALID_DEVNODE +#define CR_NO_SUCH_DEVNODE 0x0000000D +#define CR_NO_SUCH_DEVINST CR_NO_SUCH_DEVNODE +#define CR_FAILURE 0x00000013 +#define CR_BUFFER_SMALL 0x0000001A +#define CR_REGISTRY_ERROR 0x0000001D +#define CR_INVALID_DEVICE_ID 0x0000001E +#define CR_INVALID_DATA 0x0000001F #define CR_NO_SUCH_VALUE 0x00000025 -#define CR_INVALID_MACHINENAME 0x0000002F -#define CR_ACCESS_DENIED 0x00000033 +#define CR_NO_SUCH_REGISTRY_KEY 0x0000002E +#define CR_INVALID_MACHINENAME 0x0000002F +#define CR_ACCESS_DENIED 0x00000033 #define MAX_CLASS_NAME_LEN 32 #define MAX_GUID_STRING_LEN 39 #define MAX_PROFILE_LEN 80 +#define MAX_DEVICE_ID_LEN 200 +#define MAX_DEVNODE_ID_LEN MAX_DEVICE_ID_LEN +/* Disposition values for CM_Open_Class_Key[_Ex] */ +#define RegDisposition_OpenAlways 0x00000000 +#define RegDisposition_OpenExisting 0x00000001 +#define RegDisposition_Bits 0x00000001 +/* ulFlags for CM_Open_Class_Key[_Ex] */ +#define CM_OPEN_CLASS_KEY_INSTALLER 0x00000000 +#define CM_OPEN_CLASS_KEY_INTERFACE 0x00000001 +#define CM_OPEN_CLASS_KEY_BITS 0x00000001 + + CONFIGRET WINAPI CM_Connect_MachineA( PCSTR, PHMACHINE ); CONFIGRET WINAPI CM_Connect_MachineW( PCWSTR, PHMACHINE ); #define CM_Connect_Machine WINELIB_NAME_AW(CM_Connect_Machine) @@ -71,6 +93,8 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExA( PULONG, PCSTR, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExW( PULONG, PCWSTR, ULONG, HMACHINE ); #define CM_Get_Device_ID_List_Size_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Size_Ex) +CONFIGRET WINAPI CM_Get_Global_State( PULONG, ULONG ); +CONFIGRET WINAPI CM_Get_Global_State_Ex( PULONG, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Parent( PDEVINST, DEVINST, ULONG ); CONFIGRET WINAPI CM_Get_Parent_Ex( PDEVINST, DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Sibling( PDEVINST, DEVINST, ULONG ); @@ -85,4 +109,12 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW(PDEVINST, DEVINSTID_W, ULONG, HMACHINE); #define CM_Locate_DevNode_Ex WINELIB_NAME_AW(CM_Locate_DevNode_Ex) +CONFIGRET WINAPI CM_Open_Class_KeyA(LPGUID, LPCSTR, REGSAM, REGDISPOSITION, PHKEY, ULONG); +CONFIGRET WINAPI CM_Open_Class_KeyW(LPGUID, LPCWSTR, REGSAM, REGDISPOSITION, PHKEY, ULONG); +#define CM_Open_Class_Key WINELIB_NAME_AW(CM_Open_Class_Key) +CONFIGRET WINAPI CM_Open_Class_Key_ExA(LPGUID, LPCSTR, REGSAM, REGDISPOSITION, PHKEY, ULONG, HMACHINE); +CONFIGRET WINAPI CM_Open_Class_Key_ExW(LPGUID, LPCWSTR, REGSAM, REGDISPOSITION, PHKEY, ULONG, HMACHINE); +#define CM_Open_Class_Key_Ex WINELIB_NAME_AW(CM_Open_Class_Key_Ex) + + #endif /* _CFGMGR32_H_ */ _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-09 15:22:07 UTC (rev 16524) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-10 11:49:10 UTC (rev 16525) @@ -32,6 +32,7 @@ #include "setupapi_private.h" #include "rpc.h" +#include "rpc_private.h" #include "pnp_c.h" @@ -41,9 +42,9 @@ /* Registry key and value names */ static const WCHAR ControlClass[] = {'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , - 'C','o','n','t','r','o','l','\\', - 'C','l','a','s','s',0}; + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s',0}; typedef struct _MACHINE_INFO @@ -137,17 +138,32 @@ static CONFIGRET GetCmCodeFromErrorCode(DWORD ErrorCode) { - switch (ErrorCode) - { - case ERROR_SUCCESS: return CR_SUCCESS; - case ERROR_ACCESS_DENIED: return CR_ACCESS_DENIED; - case ERROR_INSUFFICIENT_BUFFER: return CR_BUFFER_SMALL; - case ERROR_INVALID_DATA: return CR_INVALID_DATA; - case ERROR_INVALID_PARAMETER: return CR_INVALID_DATA; - case ERROR_NO_MORE_ITEMS: return CR_NO_SUCH_VALUE; - case ERROR_NO_SYSTEM_RESOURCES: return CR_OUT_OF_MEMORY; - default: return CR_FAILURE; - } + switch (ErrorCode) + { + case ERROR_SUCCESS: + return CR_SUCCESS; + + case ERROR_ACCESS_DENIED: + return CR_ACCESS_DENIED; + + case ERROR_INSUFFICIENT_BUFFER: + return CR_BUFFER_SMALL; + + case ERROR_INVALID_DATA: + return CR_INVALID_DATA; + + case ERROR_INVALID_PARAMETER: + return CR_INVALID_DATA; + + case ERROR_NO_MORE_ITEMS: + return CR_NO_SUCH_VALUE; + + case ERROR_NO_SYSTEM_RESOURCES: + return CR_OUT_OF_MEMORY; + + default: + return CR_FAILURE; + } } @@ -194,7 +210,7 @@ Buffer[37] = UNICODE_NULL; /* Convert the buffer to a GUID */ if (UuidFromStringW(&Buffer[1], ClassGuid) != RPC_S_OK) - return CR_FAILURE; + return CR_FAILURE; } return GetCmCodeFromErrorCode(rc); @@ -218,7 +234,7 @@ CONFIGRET WINAPI CM_Get_Child_Ex( PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) { - TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + FIXME("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); return CR_SUCCESS; } @@ -229,9 +245,9 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { - FIXME("%p %p %ld %ld\n", pszFilter, Buffer, BufferLen, ulFlags); - memset(Buffer,0,2); - return CR_SUCCESS; + TRACE("%p %p %ld %ld\n", pszFilter, Buffer, BufferLen, ulFlags); + return CM_Get_Device_ID_List_ExA(pszFilter, Buffer, BufferLen, + ulFlags, NULL); } @@ -281,9 +297,8 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( PULONG pulLen, PCSTR pszFilter, ULONG ulFlags) { - FIXME("%p %s %ld\n", pulLen, pszFilter, ulFlags); - *pulLen = 2; - return CR_SUCCESS; + TRACE("%p %s %ld\n", pulLen, pszFilter, ulFlags); + return CM_Get_Device_ID_List_Size_ExA(pulLen, pszFilter, ulFlags, NULL); } @@ -323,6 +338,51 @@ /*********************************************************************** + * CM_Get_Global_State [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Global_State( + PULONG pulState, ULONG ulFlags) +{ + TRACE("%p %lx\n", pulState, ulFlags); + return CM_Get_Global_State_Ex(pulState, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Get_Global_State_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Global_State_Ex( + PULONG pulState, ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + RPC_STATUS Status; + + TRACE("%p %lx %lx\n", pulState, ulFlags, hMachine); + + if (pulState == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + Status = PnpGetLocalBindingHandle(&BindingHandle); + if (Status != RPC_S_OK) + return CR_FAILURE; + } + + return PNP_GetGlobalState(BindingHandle, pulState, ulFlags); +} + + +/********************************************************************** * * CM_Get_Parent [SETUPAPI.@] */ CONFIGRET WINAPI CM_Get_Parent( @@ -339,7 +399,7 @@ CONFIGRET WINAPI CM_Get_Parent_Ex( PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) { - TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + FIXME("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); return CR_SUCCESS; } @@ -361,7 +421,7 @@ CONFIGRET WINAPI CM_Get_Sibling_Ex( PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) { - TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + FIXME("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); return CR_SUCCESS; } @@ -385,7 +445,7 @@ RPC_STATUS Status; WORD Version = 0; - FIXME("%lx\n", hMachine); + TRACE("%lx\n", hMachine); if (hMachine != NULL) { @@ -413,8 +473,8 @@ CONFIGRET WINAPI CM_Locate_DevNodeA( PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags) { - FIXME("%p %p %lu\n", pdnDevInst, pDeviceID, ulFlags); - return CR_SUCCESS; + TRACE("%p %s %lu\n", pdnDevInst, pDeviceID, ulFlags); + return CM_Locate_DevNode_ExA(pdnDevInst, pDeviceID, ulFlags, NULL); } @@ -424,8 +484,8 @@ CONFIGRET WINAPI CM_Locate_DevNodeW( PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags) { - TRACE("%p %p %lu\n", pdnDevInst, pDeviceID, ulFlags); - return CM_Locate_DevNode_ExW(pdnDevInst, pDeviceID, ulFlags, NULL); + TRACE("%p %s %lu\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags); + return CM_Locate_DevNode_ExW(pdnDevInst, pDeviceID, ulFlags, NULL); } @@ -435,8 +495,23 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExA( PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %p %lu %lx\n", pdnDevInst, pDeviceID, ulFlags, hMachine); - return CR_SUCCESS; + DEVINSTID_W pDevIdW = NULL; + CONFIGRET rc = CR_SUCCESS; + + TRACE("%p %s %lu %lx\n", pdnDevInst, pDeviceID, ulFlags, hMachine); + + if (pDeviceID != NULL) + { + if (CaptureAndConvertAnsiArg(pDeviceID, &pDevIdW)) + return CR_INVALID_DEVICE_ID; + } + + rc = CM_Locate_DevNode_ExW(pdnDevInst, pDevIdW, ulFlags, hMachine); + + if (pDevIdW != NULL) + MyFree(pDevIdW); + + return rc; } @@ -446,6 +521,6 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW( PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %p %lu %lx\n", pdnDevInst, pDeviceID, ulFlags, hMachine); - return CR_SUCCESS; + FIXME("%p %s %lu %lx\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine); + return CR_SUCCESS; } _____ Modified: trunk/reactos/lib/setupapi/rpc.c --- trunk/reactos/lib/setupapi/rpc.c 2005-07-09 15:22:07 UTC (rev 16524) +++ trunk/reactos/lib/setupapi/rpc.c 2005-07-10 11:49:10 UTC (rev 16525) @@ -1,82 +1,101 @@ -/* rpc.c */ +/* + * RPC support routines + * + * Copyright 2005 Eric Kohl + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ #include <windows.h> #include <rpc.h> #include <rpcdce.h> +#include "rpc_private.h" static RPC_BINDING_HANDLE LocalBindingHandle = NULL; RPC_STATUS -PnpBindRpc(LPWSTR pszMachine, +PnpBindRpc(LPCWSTR pszMachine, RPC_BINDING_HANDLE* BindingHandle) { - PWSTR pszStringBinding = NULL; - RPC_STATUS Status; + PWSTR pszStringBinding = NULL; + RPC_STATUS Status; - Status = RpcStringBindingComposeW(NULL, - L"ncacn_np", - pszMachine, - L"\\pipe\\umpnpmgr", - NULL, - &pszStringBinding); - if (Status != RPC_S_OK) - return Status; + Status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + (LPWSTR)pszMachine, + L"\\pipe\\umpnpmgr", + NULL, + &pszStringBinding); + if (Status != RPC_S_OK) + return Status; - Status = RpcBindingFromStringBindingW(pszStringBinding, - BindingHandle); + Status = RpcBindingFromStringBindingW(pszStringBinding, + BindingHandle); - RpcStringFreeW(&pszStringBinding); + RpcStringFreeW(&pszStringBinding); - return Status; + return Status; } RPC_STATUS PnpUnbindRpc(RPC_BINDING_HANDLE *BindingHandle) { - if (BindingHandle != NULL) - { - RpcBindingFree(*BindingHandle); - *BindingHandle = NULL; - } + if (BindingHandle != NULL) + { + RpcBindingFree(*BindingHandle); + *BindingHandle = NULL; + } - return RPC_S_OK; + return RPC_S_OK; } RPC_STATUS PnpGetLocalBindingHandle(RPC_BINDING_HANDLE *BindingHandle) { - if (LocalBindingHandle != NULL) - { - BindingHandle = LocalBindingHandle; - return RPC_S_OK; - } + if (LocalBindingHandle != NULL) + { + BindingHandle = LocalBindingHandle; + return RPC_S_OK; + } - return PnpBindRpc(NULL, BindingHandle); + return PnpBindRpc(NULL, BindingHandle); } RPC_STATUS PnpUnbindLocalBindingHandle(VOID) { - return PnpUnbindRpc(&LocalBindingHandle); + return PnpUnbindRpc(&LocalBindingHandle); } void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } void __RPC_USER midl_user_free(void __RPC_FAR * ptr) { - HeapFree(GetProcessHeap(), 0, ptr); + HeapFree(GetProcessHeap(), 0, ptr); } /* EOF */ _____ Added: trunk/reactos/lib/setupapi/rpc_private.h --- trunk/reactos/lib/setupapi/rpc_private.h 2005-07-09 15:22:07 UTC (rev 16524) +++ trunk/reactos/lib/setupapi/rpc_private.h 2005-07-10 11:49:10 UTC (rev 16525) @@ -0,0 +1,29 @@ +/* + * Copyright 2005 Eric Kohl + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __RPC_PRIVATE_H +#define __RPC_PRIVATE_H + +RPC_STATUS PnpBindRpc(LPCWSTR pszMachine, + RPC_BINDING_HANDLE* BindingHandle); +RPC_STATUS PnpUnbindRpc(RPC_BINDING_HANDLE *BindingHandle); + +RPC_STATUS PnpGetLocalBindingHandle(RPC_BINDING_HANDLE *BindingHandle); +RPC_STATUS PnpUnbindLocalHandles(VOID); + +#endif /* __RPC_PRIVATE_H */ _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-07-09 15:22:07 UTC (rev 16524) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-07-10 11:49:10 UTC (rev 16525) @@ -99,8 +99,8 @@ @ stub CM_Get_Device_Interface_List_Size_ExW @ stub CM_Get_First_Log_Conf @ stub CM_Get_First_Log_Conf_Ex -@ stub CM_Get_Global_State -@ stub CM_Get_Global_State_Ex +@ stdcall CM_Get_Global_State(ptr long) +@ stdcall CM_Get_Global_State_Ex(ptr long long) @ stub CM_Get_HW_Prof_FlagsA @ stub CM_Get_HW_Prof_FlagsW @ stub CM_Get_HW_Prof_Flags_ExA _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-07-09 15:22:07 UTC (rev 16524) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-07-10 11:49:10 UTC (rev 16525) @@ -107,15 +107,25 @@ } -//WORD PNP_GetVersion(RPC_BINDING_HANDLE BindingHandle) +//CONFIRET PNP_GetVersion(RPC_BINDING_HANDLE BindingHandle, +// WORD *Version) unsigned long PNP_GetVersion(handle_t BindingHandle, unsigned short *Version) { *Version = 0x0400; - return 0; + return 0; /* CR_SUCCESS */ } +unsigned long PNP_GetGlobalState(handle_t BindingHandle, + unsigned long *State, + unsigned long Flags) +{ + *State = 5; + return 0; /* CR_SUCCESS */ +} + + static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { _____ Modified: trunk/reactos/w32api/include/ddk/cfg.h --- trunk/reactos/w32api/include/ddk/cfg.h 2005-07-09 15:22:07 UTC (rev 16524) +++ trunk/reactos/w32api/include/ddk/cfg.h 2005-07-10 11:49:10 UTC (rev 16525) @@ -31,7 +31,7 @@ extern "C" { #endif -#define CM_PROB_NOT_CONFIGURED 0x00000001 +#define CM_PROB_NOT_CONFIGURED 0x00000001 #define CM_PROB_DEVLOADER_FAILED 0x00000002 #define CM_PROB_OUT_OF_MEMORY 0x00000003 #define CM_PROB_ENTRY_IS_WRONG_TYPE 0x00000004 @@ -62,13 +62,13 @@ #define CM_PROB_HARDWARE_DISABLED 0x0000001D #define CM_PROB_CANT_SHARE_IRQ 0x0000001E #define CM_PROB_FAILED_ADD 0x0000001F -#define CM_PROB_DISABLED_SERVICE 0x00000020 -#define CM_PROB_TRANSLATION_FAILED 0x00000021 -#define CM_PROB_NO_SOFTCONFIG 0x00000022 -#define CM_PROB_BIOS_TABLE 0x00000023 -#define CM_PROB_IRQ_TRANSLATION_FAILED 0x00000024 -#define CM_PROB_FAILED_DRIVER_ENTRY 0x00000025 -#define CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD 0x00000026 +#define CM_PROB_DISABLED_SERVICE 0x00000020 +#define CM_PROB_TRANSLATION_FAILED 0x00000021 +#define CM_PROB_NO_SOFTCONFIG 0x00000022 +#define CM_PROB_BIOS_TABLE 0x00000023 +#define CM_PROB_IRQ_TRANSLATION_FAILED 0x00000024 +#define CM_PROB_FAILED_DRIVER_ENTRY 0x00000025 +#define CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD 0x00000026 #define CM_PROB_DRIVER_FAILED_LOAD 0x00000027 #define CM_PROB_DRIVER_SERVICE_KEY_INVALID 0x00000028 #define CM_PROB_LEGACY_SERVICE_NO_DEVICES 0x00000029 @@ -79,7 +79,7 @@ #define CM_PROB_SYSTEM_SHUTDOWN 0x0000002E #define CM_PROB_HELD_FOR_EJECT 0x0000002F #define CM_PROB_DRIVER_BLOCKED 0x00000030 -#define CM_PROB_REGISTRY_TOO_LARGE 0x00000031 +#define CM_PROB_REGISTRY_TOO_LARGE 0x00000031 #define LCPRI_FORCECONFIG 0x00000000 #define LCPRI_BOOTCONFIG 0x00000001 @@ -97,25 +97,25 @@ #define LCPRI_DISABLED 0x0000FFFF #define MAX_LCPRI 0x0000FFFF -#define DN_ROOT_ENUMERATED 0x00000001 /* Was enumerated by ROOT */ -#define DN_DRIVER_LOADED 0x00000002 /* Has Register_Device_Driver */ -#define DN_ENUM_LOADED 0x00000004 /* Has Register_Enumerator */ -#define DN_STARTED 0x00000008 /* Is currently configured */ -#define DN_MANUAL 0x00000010 /* Manually installed */ -#define DN_NEED_TO_ENUM 0x00000020 /* May need reenumeration */ -#define DN_NOT_FIRST_TIME 0x00000040 /* Has received a config */ -#define DN_HARDWARE_ENUM 0x00000080 /* Enum generates hardware ID */ -#define DN_LIAR 0x00000100 /* Lied about can reconfig once */ -#define DN_HAS_MARK 0x00000200 /* Not CM_Create_DevNode lately */ -#define DN_HAS_PROBLEM 0x00000400 /* Need device installer */ -#define DN_FILTERED 0x00000800 /* Is filtered */ -#define DN_MOVED 0x00001000 /* Has been moved */ -#define DN_DISABLEABLE 0x00002000 /* Can be rebalanced */ -#define DN_REMOVABLE 0x00004000 /* Can be removed */ -#define DN_PRIVATE_PROBLEM 0x00008000 /* Has a private problem */ -#define DN_MF_PARENT 0x00010000 /* Multi function parent */ -#define DN_MF_CHILD 0x00020000 /* Multi function child */ -#define DN_WILL_BE_REMOVED 0x00040000 /* Devnode is being removed */ +#define DN_ROOT_ENUMERATED 0x00000001 /* Was enumerated by ROOT */ +#define DN_DRIVER_LOADED 0x00000002 /* Has Register_Device_Driver */ +#define DN_ENUM_LOADED 0x00000004 /* Has Register_Enumerator */ +#define DN_STARTED 0x00000008 /* Is currently configured */ +#define DN_MANUAL 0x00000010 /* Manually installed */ +#define DN_NEED_TO_ENUM 0x00000020 /* May need reenumeration */ +#define DN_NOT_FIRST_TIME 0x00000040 /* Has received a config */ +#define DN_HARDWARE_ENUM 0x00000080 /* Enum generates hardware ID */ +#define DN_LIAR 0x00000100 /* Lied about can reconfig once */ +#define DN_HAS_MARK 0x00000200 /* Not CM_Create_DevNode lately */ +#define DN_HAS_PROBLEM 0x00000400 /* Need device installer */ +#define DN_FILTERED 0x00000800 /* Is filtered */ +#define DN_MOVED 0x00001000 /* Has been moved */ +#define DN_DISABLEABLE 0x00002000 /* Can be rebalanced */ +#define DN_REMOVABLE 0x00004000 /* Can be removed */ +#define DN_PRIVATE_PROBLEM 0x00008000 /* Has a private problem */ +#define DN_MF_PARENT 0x00010000 /* Multi function parent */ +#define DN_MF_CHILD 0x00020000 /* Multi function child */ +#define DN_WILL_BE_REMOVED 0x00040000 /* Devnode is being removed */ typedef enum _PNP_VETO_TYPE { PNP_VetoTypeUnknown, _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-07-09 15:22:07 UTC (rev 16524) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-07-10 11:49:10 UTC (rev 16525) @@ -41,27 +41,27 @@ #include <pshpack1.h> -#define CR_SUCCESS 0x00000000 +#define CR_SUCCESS 0x00000000 #define CR_DEFAULT 0x00000001 #define CR_OUT_OF_MEMORY 0x00000002 #define CR_INVALID_POINTER 0x00000003 #define CR_INVALID_FLAG 0x00000004 #define CR_INVALID_DEVNODE 0x00000005 -#define CR_INVALID_DEVINST CR_INVALID_DEVNODE +#define CR_INVALID_DEVINST CR_INVALID_DEVNODE #define CR_INVALID_RES_DES 0x00000006 #define CR_INVALID_LOG_CONF 0x00000007 #define CR_INVALID_ARBITRATOR 0x00000008 #define CR_INVALID_NODELIST 0x00000009 #define CR_DEVNODE_HAS_REQS 0x0000000A -#define CR_DEVINST_HAS_REQS CR_DEVNODE_HAS_REQS +#define CR_DEVINST_HAS_REQS CR_DEVNODE_HAS_REQS #define CR_INVALID_RESOURCEID 0x0000000B #define CR_DLVXD_NOT_FOUND 0x0000000C #define CR_NO_SUCH_DEVNODE 0x0000000D -#define CR_NO_SUCH_DEVINST CR_NO_SUCH_DEVNODE +#define CR_NO_SUCH_DEVINST CR_NO_SUCH_DEVNODE #define CR_NO_MORE_LOG_CONF 0x0000000E #define CR_NO_MORE_RES_DES 0x0000000F #define CR_ALREADY_SUCH_DEVNODE 0x00000010 -#define CR_ALREADY_SUCH_DEVINST CR_ALREADY_SUCH_DEVNODE +#define CR_ALREADY_SUCH_DEVINST CR_ALREADY_SUCH_DEVNODE #define CR_INVALID_RANGE_LIST 0x00000011 #define CR_INVALID_RANGE 0x00000012 #define CR_FAILURE 0x00000013 @@ -150,21 +150,21 @@ typedef ULONG RESOURCEID; typedef RESOURCEID *PRESOURCEID; -#define CM_RESDES_WIDTH_DEFAULT 0x00000000 -#define CM_RESDES_WIDTH_32 0x00000001 -#define CM_RESDES_WIDTH_64 0x00000002 -#define CM_RESDES_WIDTH_BITS 0x00000003 +#define CM_RESDES_WIDTH_DEFAULT 0x00000000 +#define CM_RESDES_WIDTH_32 0x00000001 +#define CM_RESDES_WIDTH_64 0x00000002 +#define CM_RESDES_WIDTH_BITS 0x00000003 -#define MAX_CONFIG_VALUE 9999 -#define MAX_INSTANCE_VALUE 9999 +#define MAX_CONFIG_VALUE 9999 +#define MAX_INSTANCE_VALUE 9999 -#define MAX_DEVICE_ID_LEN 200 -#define MAX_DEVNODE_ID_LEN MAX_DEVICE_ID_LEN +#define MAX_DEVICE_ID_LEN 200 +#define MAX_DEVNODE_ID_LEN MAX_DEVICE_ID_LEN -#define MAX_CLASS_NAME_LEN 32 -#define MAX_GUID_STRING_LEN 39 -#define MAX_PROFILE_LEN 80 +#define MAX_CLASS_NAME_LEN 32 +#define MAX_GUID_STRING_LEN 39 +#define MAX_PROFILE_LEN 80 #define ResType_All 0x00000000 @@ -183,7 +183,7 @@ #define ResType_PcCardConfig 0x00008002 #define ResType_MfCardConfig 0x00008003 -#define CM_GETIDLIST_FILTER_NONE 0x00000000 +#define CM_GETIDLIST_FILTER_NONE 0x00000000 #define CM_GETIDLIST_FILTER_ENUMERATOR 0x00000001 #define CM_GETIDLIST_FILTER_SERVICE 0x00000002 #define CM_GETIDLIST_FILTER_EJECTRELATIONS 0x00000004 @@ -193,9 +193,9 @@ #define CM_GETIDLIST_DONOTGENERATE 0x10000040 #define CM_GETIDLIST_FILTER_BITS 0x1000007F -#define CM_GET_DEVICE_INTERFACE_LIST_PRESENT 0x00000000 -#define CM_GET_DEVICE_INTERFACE_LIST_ALL_DEVICES 0x00000001 -#define CM_GET_DEVICE_INTERFACE_LIST_BITS 0x00000001 +#define CM_GET_DEVICE_INTERFACE_LIST_PRESENT 0x00000000 +#define CM_GET_DEVICE_INTERFACE_LIST_ALL_DEVICES 0x00000001 +#define CM_GET_DEVICE_INTERFACE_LIST_BITS 0x00000001 typedef struct BusNumber_Des_s {

1 0

[ekohl] 16524: Fix a string length calculation bug in StringTableDuplicate.
by ekohl＠svn.reactos.com 09 Jul '05

09 Jul '05

Fix a string length calculation bug in StringTableDuplicate. Modified: trunk/reactos/lib/setupapi/stringtable.c _____ Modified: trunk/reactos/lib/setupapi/stringtable.c --- trunk/reactos/lib/setupapi/stringtable.c 2005-07-09 13:23:05 UTC (rev 16523) +++ trunk/reactos/lib/setupapi/stringtable.c 2005-07-09 15:22:07 UTC (rev 16524) @@ -276,7 +276,7 @@ { if (pSourceTable->pSlots[i] != NULL) { - length = lstrlenW((pSourceTable->pSlots[i]) + 1) * sizeof(WCHAR); + length = (lstrlenW(pSourceTable->pSlots[i]) + 1) * sizeof(WCHAR); pDestinationTable->pSlots[i] = MyMalloc(length); if (pDestinationTable->pSlots[i] != NULL) {

1 0

[fireball] 16523: Add dependence from pnp_client also, since in fact it uses it (includes pnp_c.h). It worked before only because lib/setupapi depends on pnp_c, and it's build earlier than umpnpmgr.
by fireball＠svn.reactos.com 09 Jul '05

09 Jul '05

Add dependence from pnp_client also, since in fact it uses it (includes pnp_c.h). It worked before only because lib/setupapi depends on pnp_c, and it's build earlier than umpnpmgr. Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.xml _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.xml --- trunk/reactos/services/umpnpmgr/umpnpmgr.xml 2005-07-09 10:31:30 UTC (rev 16522) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.xml 2005-07-09 13:23:05 UTC (rev 16523) @@ -1,6 +1,7 @@ <module name="umpnpmgr" type="win32cui" installbase="system32" installname="umpnpmgr.exe"> <include base="umpnpmgr">.</include> <include base="pnp_server">.</include> + <include base="pnp_client">.</include> <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_UNICODE" />

1 0

[ros-diffs] [weiden] 16522: fixed the prototypes of GetConsoleAlias, GetConsoleAliasExes and GetConsoleAliasesLength
by weiden＠svn.reactos.com 09 Jul '05

09 Jul '05

fixed the prototypes of GetConsoleAlias, GetConsoleAliasExes and GetConsoleAliasesLength Modified: trunk/reactos/lib/kernel32/misc/console.c _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-07-09 08:54:43 UTC (rev 16521) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-07-09 10:31:30 UTC (rev 16522) @@ -255,15 +255,15 @@ * @unimplemented */ DWORD STDCALL -GetConsoleAliasW (DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) +GetConsoleAliasW (LPWSTR lpSource, + LPWSTR lpTargetBuffer, + DWORD TargetBufferLength, + LPWSTR lpExeName) /* * Undocumented */ { - DPRINT1("GetConsoleAliasW(0x%x, 0x%x, 0x%x, 0x%x) UNIMPLEMENTED!\n", Unknown0, Unknown1, Unknown2, Unknown3); + DPRINT1("GetConsoleAliasW(0x%p, 0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", lpSource, lpTargetBuffer, TargetBufferLength, lpExeName); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -273,15 +273,15 @@ * @unimplemented */ DWORD STDCALL -GetConsoleAliasA (DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) +GetConsoleAliasA (LPSTR lpSource, + LPSTR lpTargetBuffer, + DWORD TargetBufferLength, + LPSTR lpExeName) /* * Undocumented */ { - DPRINT1("GetConsoleAliasA(0x%x, 0x%x, 0x%x, 0x%x) UNIMPLEMENTED!\n", Unknown0, Unknown1, Unknown2, Unknown3); + DPRINT1("GetConsoleAliasA(0x%p, 0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", lpSource, lpTargetBuffer, TargetBufferLength, lpExeName); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -291,13 +291,13 @@ * @unimplemented */ DWORD STDCALL -GetConsoleAliasExesW (DWORD Unknown0, - DWORD Unknown1) +GetConsoleAliasExesW (LPWSTR lpExeNameBuffer, + DWORD ExeNameBufferLength) /* * Undocumented */ { - DPRINT1("GetConsoleAliasExesW(0x%x, 0x%x) UNIMPLEMENTED!\n", Unknown0, Unknown1); + DPRINT1("GetConsoleAliasExesW(0x%p, 0x%x) UNIMPLEMENTED!\n", lpExeNameBuffer, ExeNameBufferLength); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -307,13 +307,13 @@ * @unimplemented */ DWORD STDCALL -GetConsoleAliasExesA (DWORD Unknown0, - DWORD Unknown1) +GetConsoleAliasExesA (LPSTR lpExeNameBuffer, + DWORD ExeNameBufferLength) /* * Undocumented */ { - DPRINT1("GetConsoleAliasExesA(0x%x, 0x%x) UNIMPLEMENTED!\n", Unknown0, Unknown1); + DPRINT1("GetConsoleAliasExesA(0x%p, 0x%x) UNIMPLEMENTED!\n", lpExeNameBuffer, ExeNameBufferLength); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -387,12 +387,12 @@ * @unimplemented */ DWORD STDCALL -GetConsoleAliasesLengthW (DWORD Unknown0) +GetConsoleAliasesLengthW (LPWSTR lpExeName) /* * Undocumented */ { - DPRINT1("GetConsoleAliasesLengthW(0x%x) UNIMPLEMENTED!\n", Unknown0); + DPRINT1("GetConsoleAliasesLengthW(0x%p) UNIMPLEMENTED!\n", lpExeName); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -402,12 +402,12 @@ * @unimplemented */ DWORD STDCALL -GetConsoleAliasesLengthA (DWORD Unknown0) +GetConsoleAliasesLengthA (LPSTR lpExeName) /* * Undocumented */ { - DPRINT1("GetConsoleAliasesLengthA(0x%x) UNIMPLEMENTED!\n", Unknown0); + DPRINT1("GetConsoleAliasesLengthA(0x%p) UNIMPLEMENTED!\n", lpExeName); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; }

1 0

[jimtabor] 16521: Implement MDICascade, MDITile and WIN_ListChildren. This will help Winefile cascade and tile windows. WIN_ListChildren is tmp located here in mdi.c for now.
by jimtabor＠svn.reactos.com 09 Jul '05

09 Jul '05

Implement MDICascade, MDITile and WIN_ListChildren. This will help Winefile cascade and tile windows. WIN_ListChildren is tmp located here in mdi.c for now. Modified: trunk/reactos/lib/user32/windows/mdi.c _____ Modified: trunk/reactos/lib/user32/windows/mdi.c --- trunk/reactos/lib/user32/windows/mdi.c 2005-07-09 07:50:48 UTC (rev 16520) +++ trunk/reactos/lib/user32/windows/mdi.c 2005-07-09 08:54:43 UTC (rev 16521) @@ -143,6 +143,47 @@ static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); + +static +HWND* WIN_ListChildren (HWND hWndparent) +{ + + DWORD dwCount = 0; + HWND* pHwnd = NULL; + HANDLE hHeap; + + SetLastError(0); + + dwCount = NtUserBuildHwndList ( NULL, hWndparent, FALSE, 0, 0, NULL, 0 ); + + if ( !dwCount || GetLastError() ) + return FALSE; + + /* allocate buffer to receive HWND handles */ + hHeap = GetProcessHeap(); + + pHwnd = HeapAlloc ( hHeap, 0, sizeof(HWND)*(dwCount+1) ); + if ( !pHwnd ) + { + SetLastError ( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + /* now call kernel again to fill the buffer this time */ + dwCount = NtUserBuildHwndList (NULL, hWndparent, FALSE, 0, 0, pHwnd, dwCount ); + + if ( !dwCount || GetLastError() ) + { + if ( pHwnd ) + HeapFree ( hHeap, 0, pHwnd ); + return FALSE; + } + + return pHwnd; +} + + + #ifdef __REACTOS__ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); void WINAPI CalcChildScroll(HWND hwnd, INT scroll); @@ -912,19 +953,20 @@ return hbCopy; } + + + /********************************************************************** * MDICascade */ static LONG MDICascade( HWND client, MDICLIENTINFO *ci ) { -#ifdef __REACTOS__ - /* FIXME */ - return 0; -#else HWND *win_array; BOOL has_icons = FALSE; int i, total; +DbgPrint("MDICascade\n"); + if (ci->hwndChildMaximized) SendMessageA( client, WM_MDIRESTORE, (WPARAM)ci->hwndChildMaximized, 0); @@ -968,7 +1010,6 @@ if (has_icons) ArrangeIconicWindows( client ); return 0; -#endif } /********************************************************************** @@ -976,14 +1017,12 @@ */ static void MDITile( HWND client, MDICLIENTINFO *ci, WPARAM wParam ) { -#ifdef __REACTOS__ - /* FIXME */ - return; -#else HWND *win_array; int i, total; BOOL has_icons = FALSE; +DbgPrint("MDITile\n"); + if (ci->hwndChildMaximized) SendMessageA( client, WM_MDIRESTORE, (WPARAM)ci->hwndChildMaximized, 0); @@ -1056,7 +1095,6 @@ } HeapFree( GetProcessHeap(), 0, win_array ); if (has_icons) ArrangeIconicWindows( client ); -#endif } /* ----------------------- Frame window ---------------------------- */

1 0

[chorns] 16520: Don't rebuild the module if a library is changed. Relinking the module is enough.
by chorns＠svn.reactos.com 09 Jul '05

09 Jul '05

Don't rebuild the module if a library is changed. Relinking the module is enough. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-09 05:21:10 UTC (rev 16519) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-09 07:50:48 UTC (rev 16520) @@ -874,7 +874,9 @@ dependencies += " " + GetPrecompiledHeaderFilename (); /* WIDL generated headers may be used */ - dependencies += " " + GetLinkingDependenciesMacro (); + vector<string> rpcDependencies; + GetRpcHeaderDependencies ( rpcDependencies ); + dependencies += " " + v2s ( rpcDependencies, 5 ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string objectFilename = GetObjectFilename ( @@ -1598,7 +1600,7 @@ void MingwModuleHandler::GetRpcHeaderDependencies ( - string_list& dependencies ) const + vector<string>& dependencies ) const { for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ ) { @@ -1640,7 +1642,7 @@ module.non_if_data, &module.linkerFlags ); - string_list s; + vector<string> s; if ( module.importLibrary ) { const vector<File*>& files = module.non_if_data.files; @@ -1652,7 +1654,6 @@ GetSpecObjectDependencies ( s, file.name ); } } - GetRpcHeaderDependencies ( s ); if ( s.size () > 0 ) { fprintf ( _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-09 05:21:10 UTC (rev 16519) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-09 07:50:48 UTC (rev 16520) @@ -179,7 +179,7 @@ void GenerateBuildMapCode (); void GenerateBuildNonSymbolStrippedCode (); void CleanupFileVector ( std::vector<File*>& sourceFiles ); - void GetRpcHeaderDependencies ( string_list& dependencies ) const; + void GetRpcHeaderDependencies ( std::vector<std::string>& dependencies ) const; std::string GetRpcServerHeaderFilename ( std::string basename ) const; std::string GetRpcClientHeaderFilename ( std::string basename ) const; public:

1 0

[jimtabor] 16519: Fix masking.
by jimtabor＠svn.reactos.com 09 Jul '05

09 Jul '05

Fix masking. Modified: trunk/reactos/subsys/win32k/ntuser/input.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-07-09 04:54:01 UTC (rev 16518) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-07-09 05:21:10 UTC (rev 16519) @@ -1059,14 +1059,14 @@ Msg.message = WM_XBUTTONUP; if(mi->mouseData & XBUTTON1) { - QueueKeyStateTable[VK_XBUTTON1] &= 0x80; + QueueKeyStateTable[VK_XBUTTON1] &= ~0x80; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); CurInfo->ButtonsDown &= ~XBUTTON1; MsqInsertSystemMessage(&Msg); } if(mi->mouseData & XBUTTON2) { - QueueKeyStateTable[VK_XBUTTON2] &= 0x80; + QueueKeyStateTable[VK_XBUTTON2] &= ~0x80; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); CurInfo->ButtonsDown &= ~XBUTTON2; MsqInsertSystemMessage(&Msg);

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