Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 34547: Fix build, broken in r34546 Reminder: Never apply patches twice (and test the latest changes before committing) :-)
by cfinck＠svn.reactos.org 16 Jul '08

16 Jul '08

Author: cfinck Date: Wed Jul 16 09:33:47 2008 New Revision: 34547 URL: http://svn.reactos.org/svn/reactos?rev=34547&view=rev Log: Fix build, broken in r34546 Reminder: Never apply patches twice (and test the latest changes before committing) :-) Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c [iso-8859-1] Wed Jul 16 09:33:47 2008 @@ -464,471 +464,3 @@ PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { return &keyboard_layout_table; } - -/* - * ReactOS Slovak (QWERTY) Keyboard layout - * Copyright (C) 2008 ReactOS - * License: LGPL, see: LGPL.txt - * - * Created by Mario Kacmar (kario(a)szm.sk) - * Special thanks to Milan Margus (malin23(a)atlas.sk) - */ - -#include <windows.h> -#include <internal/kbd.h> - -#ifdef _M_IA64 -#define ROSDATA static __declspec(allocate(".data")) -#else -#ifdef _MSC_VER -#pragma data_seg(".data") -#define ROSDATA static -#else -#define ROSDATA static __attribute__((section(".data"))) -#endif -#endif - -#define VK_EMPTY 0xff /* The non-existent VK */ -#define KSHIFT 0x001 /* Shift modifier */ -#define KCTRL 0x002 /* Ctrl modifier */ -#define KALT 0x004 /* Alt modifier */ -#define KEXT 0x100 /* Extended key code */ -#define KMULTI 0x200 /* Multi-key */ -#define KSPEC 0x400 /* Special key */ -#define KNUMP 0x800 /* Number-pad */ -#define KNUMS 0xc00 /* Special + number pad */ -#define KMEXT 0x300 /* Multi + ext */ - -ROSDATA USHORT scancode_to_vk[] = { - /* Numbers Row */ - /* - 00 - */ - /* 1 ... 2 ... 3 ... 4 ... */ - VK_EMPTY, VK_ESCAPE, '1', '2', - '3', '4', '5', '6', - '7', '8', '9', '0', - VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, - /* - 0f - */ - /* First Letters Row */ - VK_TAB, 'Q', 'W', 'E', - 'R', 'T', 'Y', 'U', - 'I', 'O', 'P', - VK_OEM_4, VK_OEM_6, VK_RETURN, - /* - 1d - */ - /* Second Letters Row */ - VK_LCONTROL, - 'A', 'S', 'D', 'F', - 'G', 'H', 'J', 'K', - 'L', VK_OEM_1, VK_OEM_3, VK_OEM_8, - VK_LSHIFT, VK_OEM_7, - /* - 2c - */ - /* Third letters row */ - 'Z', 'X', 'C', 'V', - 'B', 'N', 'M', VK_OEM_COMMA, - VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT|KEXT, - /* - 37 - */ - /* Bottom Row */ - VK_MULTIPLY, VK_MENU, 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_5, 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[] = { - { 0, 0 }, -}; - -ROSDATA VK_TO_BIT modifier_keys[] = { - { VK_SHIFT, KSHIFT }, - { VK_CONTROL, KCTRL }, - { VK_MENU, KALT }, - { 0, 0 } -}; - -ROSDATA MODIFIERS modifier_bits = { - modifier_keys, - 7, - { 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ -}; - -#define NOCAPS 0 -#define CAPS KSHIFT /* Caps -> shift */ - -ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { - /* Normal vs Shifted */ - { VK_OEM_8, NOCAPS, {';', WCH_DEAD} }, // degree sign - { VK_EMPTY, 0, {WCH_NONE, 0x00b0} }, // VK_OEM_8 death - - /* Keys that do not have shift states */ - { VK_TAB, NOCAPS, {'\t','\t'} }, - { VK_ADD, NOCAPS, {'+', '+'} }, - { VK_SUBTRACT, NOCAPS, {'-', '-'} }, - { VK_MULTIPLY, NOCAPS, {'*', '*'} }, - { VK_DIVIDE, NOCAPS, {'/', '/'} }, - { VK_ESCAPE, NOCAPS, {'\x1b','\x1b'} }, - { VK_SPACE, NOCAPS, {' ', ' '} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - /* Normal, Shifted, Ctrl */ - /* Legacy (telnet-style) ascii escapes */ - { VK_RETURN, 0, {'\r', '\r', '\n'} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { - /* Normal, Shifted, Ctrl, Ctrl+Alt */ - - /* The numbers */ - { '1', NOCAPS, {'+', '1', WCH_NONE, '~'} }, - { '2', NOCAPS, {0x013e, '2', WCH_NONE, WCH_DEAD} }, // l with caron - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02c7} }, // 2 death - { '3', NOCAPS, {0x0161, '3', WCH_NONE, WCH_DEAD} }, // s with caron - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x005e} }, // 3 death - { '4', NOCAPS, {0x010d, '4', WCH_NONE, WCH_DEAD} }, // c with caron - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02d8} }, // 4 death - { '5', NOCAPS, {0x0165, '5', WCH_NONE, WCH_DEAD} }, // t with caron - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00b0} }, // 5 death - { '6', NOCAPS, {0x017e, '6', WCH_NONE, WCH_DEAD} }, // z with caron - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02db} }, // 6 death - { '7', NOCAPS, {0x00fd, '7', WCH_NONE, '`'} }, // y with acute - { '8', NOCAPS, {0x00e1, '8', WCH_NONE, WCH_DEAD} }, // a with acute - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02d9} }, // 8 death - { '9', NOCAPS, {0x00ed, '9', WCH_NONE, WCH_DEAD} }, // i with acute - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00b4} }, // 9 death - { '0', NOCAPS, {0x00e9, '0', WCH_NONE, WCH_DEAD} }, // e with acute - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02dd} }, // 0 death - { VK_OEM_MINUS, NOCAPS, {'=', '%', WCH_NONE, WCH_DEAD} }, - { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00a8} }, // = death - { VK_OEM_PLUS, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, WCH_DEAD} }, // dead letters - acute, caron - { VK_EMPTY, 0, {0x00b4, 0x02c7, WCH_NONE, 0x00b8} }, // dead letters death :) - - { VK_OEM_1, NOCAPS, {0x00f4, '\"', WCH_NONE, '$'} }, // o with circumflex - { VK_OEM_2, NOCAPS, {'-', '_', WCH_NONE, '*'} }, - { VK_OEM_3, NOCAPS, {0x00a7, '!', WCH_NONE, 0x00df} }, // section sign - { VK_OEM_4, NOCAPS, {0x00fa, '/', WCH_NONE, 0x00f7} }, // u with acute - { VK_OEM_5, NOCAPS, {'&', '*', WCH_NONE, '<'} }, - { VK_OEM_6, NOCAPS, {0x00E4, '(', WCH_NONE, 0x00d7} }, // a with diaeresis - { VK_OEM_7, NOCAPS, {0x0148, ')', WCH_NONE, 0x00a4} }, // n with caron - { VK_OEM_COMMA, NOCAPS, {',', '?', WCH_NONE, '<'} }, - { VK_OEM_PERIOD, NOCAPS, {'.', ':', WCH_NONE, '>'} }, - - /* The alphabet */ - { 'A', CAPS, {'a', 'A', 0x01, WCH_NONE} }, - { 'B', CAPS, {'b', 'B', 0x02, '{'} }, - { 'C', CAPS, {'c', 'C', 0x03, '&'} }, - { 'D', CAPS, {'d', 'D', 0x04, 0x0110} }, - { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} }, - { 'F', CAPS, {'f', 'F', 0x06, '['} }, - { 'G', CAPS, {'g', 'G', 0x07, ']'} }, - { 'H', CAPS, {'h', 'H', 0x08, WCH_NONE} }, - { 'I', CAPS, {'i', 'I', 0x09, WCH_NONE} }, - { 'J', CAPS, {'j', 'J', 0x0a, WCH_NONE} }, - { 'K', CAPS, {'k', 'K', 0x0b, 0x0142} }, - { 'L', CAPS, {'l', 'L', 0x0c, 0x0141} }, - { 'M', CAPS, {'m', 'M', 0x0d, WCH_NONE} }, - { 'N', CAPS, {'n', 'N', 0x0e, '}'} }, - { 'O', CAPS, {'o', 'O', 0x0f, WCH_NONE} }, - { 'P', CAPS, {'p', 'P', 0x10, '\''} }, - { 'Q', CAPS, {'q', 'Q', 0x11, '\\'} }, - { 'R', CAPS, {'r', 'R', 0x12, WCH_NONE} }, - { 'S', CAPS, {'s', 'S', 0x13, 0x0111} }, - { 'T', CAPS, {'t', 'T', 0x14, WCH_NONE} }, - { 'U', CAPS, {'u', 'U', 0x15, WCH_NONE} }, - { 'V', CAPS, {'v', 'V', 0x16, '@'} }, - { 'W', CAPS, {'w', 'W', 0x17, '|'} }, - { 'X', CAPS, {'x', 'X', 0x18, '#'} }, - { 'Y', CAPS, {'y', 'Y', 0x19, WCH_NONE} }, // qwertY - { 'Z', CAPS, {'z', 'Z', 0x1a, '>'} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { - { VK_DECIMAL, 0, {','} }, - { 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_BACK, 0, {'\010'} }, - { 0, 0 } -}; - -#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } - -ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { - vk_master(1,keypad_numbers), - vk_master(2,key_to_chars_2mod), - vk_master(3,key_to_chars_3mod), - vk_master(4,key_to_chars_4mod), - { 0,0,0 } -}; - -ROSDATA VSC_LPWSTR key_names[] = { - { 0x00, L"" }, - { 0x01, L"Esc" }, - { 0x0e, L"Backspace" }, - { 0x0f, L"Tab" }, - { 0x1c, L"Enter" }, - { 0x1d, L"Ctrl" }, - { 0x2a, L"Shift" }, - { 0x36, L"Right Shift" }, - { 0x37, L"Num *" }, - { 0x38, L"Alt" }, - { 0x39, L"Space" }, - { 0x3a, L"Caps Lock" }, - { 0x3b, L"F1" }, - { 0x3c, L"F2" }, - { 0x3d, L"F3" }, - { 0x3e, L"F4" }, - { 0x3f, L"F5" }, - { 0x40, L"F6" }, - { 0x41, L"F7" }, - { 0x42, L"F8" }, - { 0x43, L"F9" }, - { 0x44, L"F10" }, - { 0x45, L"Pause" }, - { 0x46, L"Scroll Lock" }, - { 0x47, L"Num 7" }, - { 0x48, L"Num 8" }, - { 0x49, L"Num 9" }, - { 0x4a, L"Num -" }, - { 0x4b, L"Num 4" }, - { 0x4c, L"Num 5" }, - { 0x4d, L"Num 6" }, - { 0x4e, L"Num +" }, - { 0x4f, L"Num 1" }, - { 0x50, L"Num 2" }, - { 0x51, L"Num 3" }, - { 0x52, L"Num 0" }, - { 0x53, L"Num Del" }, - { 0x54, L"Sys Req" }, - { 0x57, L"F11" }, - { 0x58, L"F12" }, - { 0x7c, L"F13" }, - { 0x7d, L"F14" }, - { 0x7e, L"F15" }, - { 0x7f, L"F16" }, - { 0x80, L"F17" }, - { 0x81, L"F18" }, - { 0x82, L"F19" }, - { 0x83, L"F20" }, - { 0x84, L"F21" }, - { 0x85, L"F22" }, - { 0x86, L"F23" }, - { 0x87, L"F24" }, - { 0, NULL }, -}; - -ROSDATA VSC_LPWSTR extended_key_names[] = { - { 0x1c, L"Num Enter" }, - { 0x1d, L"Right Ctrl" }, - { 0x35, L"Num /" }, - { 0x37, L"Prnt Scrn" }, - { 0x38, L"Right Alt" }, - { 0x45, L"Num Lock" }, - { 0x46, L"Break" }, - { 0x47, L"Home" }, - { 0x48, L"Up" }, - { 0x49, L"Page Up" }, - { 0x4a, L"Left" }, - { 0x4c, L"Center" }, - { 0x4d, L"Right" }, - { 0x4f, L"End" }, - { 0x50, L"Down" }, - { 0x51, L"Page Down" }, - { 0x52, L"Insert" }, - { 0x53, L"Delete" }, - { 0x54, L"<ReactOS>" }, - { 0x55, L"Help" }, - { 0x56, L"Left Windows" }, - { 0x5b, L"Right Windows" }, - { 0, NULL }, -}; - -#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags - -ROSDATA DEADKEY dead_key[] = { - { DEADTRANS(0x0043, 0x02c7, 0x010c, 0x0000) }, // C with caron - { DEADTRANS(0x0063, 0x02c7, 0x010d, 0x0000) }, // c with caron - { DEADTRANS(0x0044, 0x02c7, 0x010e, 0x0000) }, // D with caron - { DEADTRANS(0x0064, 0x02c7, 0x010f, 0x0000) }, // d with caron - { DEADTRANS(0x004c, 0x02c7, 0x013d, 0x0000) }, // L with caron - { DEADTRANS(0x006c, 0x02c7, 0x013e, 0x0000) }, // l with caron - { DEADTRANS(0x004e, 0x02c7, 0x0147, 0x0000) }, // N with caron - { DEADTRANS(0x006e, 0x02c7, 0x0148, 0x0000) }, // n with caron - { DEADTRANS(0x0053, 0x02c7, 0x0160, 0x0000) }, // S with caron - { DEADTRANS(0x0073, 0x02c7, 0x0161, 0x0000) }, // s with caron - { DEADTRANS(0x0054, 0x02c7, 0x0164, 0x0000) }, // T with caron - { DEADTRANS(0x0074, 0x02c7, 0x0165, 0x0000) }, // t with caron - { DEADTRANS(0x005a, 0x02c7, 0x017d, 0x0000) }, // Z with caron - { DEADTRANS(0x007a, 0x02c7, 0x017e, 0x0000) }, // z with caron - { DEADTRANS(0x0020, 0x02c7, 0x02c7, 0x0000) }, // space > caron - - { DEADTRANS(0x0041, 0x00b4, 0x00c1, 0x0000) }, // A with acute - { DEADTRANS(0x0061, 0x00b4, 0x00e1, 0x0000) }, // a with acute - { DEADTRANS(0x0045, 0x00b4, 0x00c9, 0x0000) }, // E with acute - { DEADTRANS(0x0065, 0x00b4, 0x00e9, 0x0000) }, // e with acute - { DEADTRANS(0x0049, 0x00b4, 0x00cd, 0x0000) }, // I with acute - { DEADTRANS(0x0069, 0x00b4, 0x00ed, 0x0000) }, // i with acute - { DEADTRANS(0x004c, 0x00b4, 0x0139, 0x0000) }, // L with acute - { DEADTRANS(0x006c, 0x00b4, 0x013a, 0x0000) }, // l with acute - { DEADTRANS(0x004f, 0x00b4, 0x00d3, 0x0000) }, // O with acute - { DEADTRANS(0x006f, 0x00b4, 0x00f3, 0x0000) }, // o with acute - { DEADTRANS(0x0052, 0x00b4, 0x0154, 0x0000) }, // R with acute - { DEADTRANS(0x0072, 0x00b4, 0x0155, 0x0000) }, // r with acute - { DEADTRANS(0x0055, 0x00b4, 0x00da, 0x0000) }, // U with acute - { DEADTRANS(0x0075, 0x00b4, 0x00fa, 0x0000) }, // u with acute - { DEADTRANS(0x0059, 0x00b4, 0x00dd, 0x0000) }, // Y with acute - { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) }, // y with acute - { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) }, // space > acute - - { DEADTRANS(0x004f, 0x005e, 0x00d4, 0x0000) }, // O with circumflex - { DEADTRANS(0x006f, 0x005e, 0x00f4, 0x0000) }, // o with circumflex - { DEADTRANS(0x0020, 0x005e, 0x005e, 0x0000) }, // space > circumflex - - { DEADTRANS(0x0041, 0x00a8, 0x00c4, 0x0000) }, // A with diaeresis - { DEADTRANS(0x0061, 0x00a8, 0x00e4, 0x0000) }, // a with diaeresis - { DEADTRANS(0x0045, 0x00a8, 0x00cb, 0x0000) }, // E with diaeresis - { DEADTRANS(0x0065, 0x00a8, 0x00eb, 0x0000) }, // e with diaeresis - { DEADTRANS(0x004f, 0x00a8, 0x00d6, 0x0000) }, // O with diaeresis - { DEADTRANS(0x006f, 0x00a8, 0x00f6, 0x0000) }, // o with diaeresis - { DEADTRANS(0x0055, 0x00a8, 0x00dc, 0x0000) }, // U with diaeresis - { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, // u with diaeresis - { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, // space > diaeresis - - { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with round - { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with round - { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > degree - { 0, 0, 0 }, -}; - -ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"\x02c7" L"\x004D\x00E4\x006B\x010D\x0065\x0148", // mÃ¤kÄeÅ - caron - L"\x00b4" L"\x0044\x013A\x017E\x0065\x0148", // dÄºÅ¾eÅ - acute - L"\x005e" L"\x0056\x006F\x006B\x00E1\x0148", // vokÃ¡Å - circumflex - NULL -}; - -/* Finally, the master table */ -ROSDATA KBDTABLES keyboard_layout_table = { - /* modifier assignments */ - &modifier_bits, - - /* character from vk tables */ - vk_to_wchar_master_table, - - /* diacritical marks -- */ - dead_key, - - /* Key names */ - (VSC_LPWSTR *)key_names, - (VSC_LPWSTR *)extended_key_names, - dead_key_names, /* Dead key names */ - - /* scan code to virtual key maps */ - scancode_to_vk, - sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), - extcode0_to_vk, - extcode1_to_vk, - - - MAKELONG(0,1), /* Version 1.0 */ - - /* Ligatures -- Slovak doesn't have any */ - 0, - 0, - NULL -}; - -PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { - return &keyboard_layout_table; -} - Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def [iso-8859-1] Wed Jul 16 09:33:47 2008 @@ -6,11 +6,3 @@ EXPORTS KbdLayerDescriptor@0 ;EOF -; -; ReactOS Operating System -; -LIBRARY kbdsk1.dll - -EXPORTS -KbdLayerDescriptor@0 -;EOF Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild [iso-8859-1] Wed Jul 16 09:33:47 2008 @@ -8,13 +8,3 @@ <file>kbdsk1.c</file> <file>kbdsk1.rc</file> </module> -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kbdsk1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk1.dll" allowwarnings="true"> - <importlibrary definition="kbdsk1.def" /> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_WIN32_WINNT">0x0500</define> - <file>kbdsk1.c</file> - <file>kbdsk1.rc</file> -</module> Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc [iso-8859-1] Wed Jul 16 09:33:47 2008 @@ -3,8 +3,3 @@ #define REACTOS_STR_INTERNAL_NAME "kbdsk1\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdsk1.dll\0" #include <reactos/version.rc> -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Slovak (QWERTY) Keyboard Layout\0" -#define REACTOS_STR_INTERNAL_NAME "kbdsk1\0" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdsk1.dll\0" -#include <reactos/version.rc>

1 0

[mkupfer] 34546: Mario Kacmar <kario AT szm DOT sk> - Slovak keyboard layout (QWERTY) added. - See #3528 for more details.
by mkupfer＠svn.reactos.org 16 Jul '08

16 Jul '08

Author: mkupfer Date: Wed Jul 16 08:41:23 2008 New Revision: 34546 URL: http://svn.reactos.org/svn/reactos?rev=34546&view=rev Log: Mario Kacmar <kario AT szm DOT sk> - Slovak keyboard layout (QWERTY) added. - See #3528 for more details. Added: trunk/reactos/dll/keyboard/kbdsk1/ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c (with props) trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def (with props) trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild (with props) trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc (with props) Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/keyboard.rbuild Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Wed Jul 16 08:41:23 2008 @@ -219,6 +219,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout File",0x00000000,"kbdsk.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Text",0x00000000,"Slovak" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5039" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout File",0x00000000,"kbdsk1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout Text",0x00000000,"Slovak (QWERTY)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5040" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout File",0x00000000,"kbdsw.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Text",0x00000000,"Swedish" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Jul 16 08:41:23 2008 @@ -215,6 +215,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout File",0x00000000,"kbdsk.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Text",0x00000000,"Slovak" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5039" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout File",0x00000000,"kbdsk1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout Text",0x00000000,"Slovak (QWERTY)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5040" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout File",0x00000000,"kbdsw.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041d","Layout Text",0x00000000,"Swedish" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Jul 16 08:41:23 2008 @@ -197,6 +197,7 @@ dll\keyboard\kbdru1\kbdru1.dll 1 dll\keyboard\kbdsg\kbdsg.dll 1 dll\keyboard\kbdsk\kbdsk.dll 1 +dll\keyboard\kbdsk1\kbdsk1.dll 1 dll\keyboard\kbdsw\kbdsw.dll 1 dll\keyboard\kbdtat\kbdtat.dll 1 dll\keyboard\kbdth0\kbdth0.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Wed Jul 16 08:41:23 2008 @@ -302,6 +302,7 @@ 00000C1A = "Serbian (Cyrillic)" 0000081A = "Serbian (Latin)" 0000041B = "Slovak (QWERTZ)" +0001041B = "Slovak (QWERTY)" 0000040A = "Spanish (traditional short)" 0000041D = "Swedish (Sweden)" 00000444 = "Tatar" @@ -371,6 +372,7 @@ 0000041A = kbdcr.dll 0000081A = kbdycl.dll 0000041B = kbdsk.dll +0001041B = kbdsk1.dll 0000041D = kbdsw.dll 0000041E = kbdth0.dll 0001041E = kbdth1.dll Added: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c (added) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c [iso-8859-1] Wed Jul 16 08:41:23 2008 @@ -1,0 +1,934 @@ +/* + * ReactOS Slovak (QWERTY) Keyboard layout + * Copyright (C) 2008 ReactOS + * License: LGPL, see: LGPL.txt + * + * Created by Mario Kacmar (kario(a)szm.sk) + * Special thanks to Milan Margus (malin23(a)atlas.sk) + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_3, VK_OEM_8, + VK_LSHIFT, VK_OEM_7, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT|KEXT, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, VK_MENU, 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_5, 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[] = { + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 7, + { 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Normal vs Shifted */ + { VK_OEM_8, NOCAPS, {';', WCH_DEAD} }, // degree sign + { VK_EMPTY, 0, {WCH_NONE, 0x00b0} }, // VK_OEM_8 death + + /* Keys that do not have shift states */ + { VK_TAB, NOCAPS, {'\t','\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_ESCAPE, NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE, NOCAPS, {' ', ' '} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_RETURN, 0, {'\r', '\r', '\n'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, Ctrl+Alt */ + + /* The numbers */ + { '1', NOCAPS, {'+', '1', WCH_NONE, '~'} }, + { '2', NOCAPS, {0x013e, '2', WCH_NONE, WCH_DEAD} }, // l with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02c7} }, // 2 death + { '3', NOCAPS, {0x0161, '3', WCH_NONE, WCH_DEAD} }, // s with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x005e} }, // 3 death + { '4', NOCAPS, {0x010d, '4', WCH_NONE, WCH_DEAD} }, // c with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02d8} }, // 4 death + { '5', NOCAPS, {0x0165, '5', WCH_NONE, WCH_DEAD} }, // t with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00b0} }, // 5 death + { '6', NOCAPS, {0x017e, '6', WCH_NONE, WCH_DEAD} }, // z with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02db} }, // 6 death + { '7', NOCAPS, {0x00fd, '7', WCH_NONE, '`'} }, // y with acute + { '8', NOCAPS, {0x00e1, '8', WCH_NONE, WCH_DEAD} }, // a with acute + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02d9} }, // 8 death + { '9', NOCAPS, {0x00ed, '9', WCH_NONE, WCH_DEAD} }, // i with acute + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00b4} }, // 9 death + { '0', NOCAPS, {0x00e9, '0', WCH_NONE, WCH_DEAD} }, // e with acute + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02dd} }, // 0 death + { VK_OEM_MINUS, NOCAPS, {'=', '%', WCH_NONE, WCH_DEAD} }, + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00a8} }, // = death + { VK_OEM_PLUS, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, WCH_DEAD} }, // dead letters - acute, caron + { VK_EMPTY, 0, {0x00b4, 0x02c7, WCH_NONE, 0x00b8} }, // dead letters death :) + + { VK_OEM_1, NOCAPS, {0x00f4, '\"', WCH_NONE, '$'} }, // o with circumflex + { VK_OEM_2, NOCAPS, {'-', '_', WCH_NONE, '*'} }, + { VK_OEM_3, NOCAPS, {0x00a7, '!', WCH_NONE, 0x00df} }, // section sign + { VK_OEM_4, NOCAPS, {0x00fa, '/', WCH_NONE, 0x00f7} }, // u with acute + { VK_OEM_5, NOCAPS, {'&', '*', WCH_NONE, '<'} }, + { VK_OEM_6, NOCAPS, {0x00E4, '(', WCH_NONE, 0x00d7} }, // a with diaeresis + { VK_OEM_7, NOCAPS, {0x0148, ')', WCH_NONE, 0x00a4} }, // n with caron + { VK_OEM_COMMA, NOCAPS, {',', '?', WCH_NONE, '<'} }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':', WCH_NONE, '>'} }, + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01, WCH_NONE} }, + { 'B', CAPS, {'b', 'B', 0x02, '{'} }, + { 'C', CAPS, {'c', 'C', 0x03, '&'} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x0110} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} }, + { 'F', CAPS, {'f', 'F', 0x06, '['} }, + { 'G', CAPS, {'g', 'G', 0x07, ']'} }, + { 'H', CAPS, {'h', 'H', 0x08, WCH_NONE} }, + { 'I', CAPS, {'i', 'I', 0x09, WCH_NONE} }, + { 'J', CAPS, {'j', 'J', 0x0a, WCH_NONE} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0142} }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0141} }, + { 'M', CAPS, {'m', 'M', 0x0d, WCH_NONE} }, + { 'N', CAPS, {'n', 'N', 0x0e, '}'} }, + { 'O', CAPS, {'o', 'O', 0x0f, WCH_NONE} }, + { 'P', CAPS, {'p', 'P', 0x10, '\''} }, + { 'Q', CAPS, {'q', 'Q', 0x11, '\\'} }, + { 'R', CAPS, {'r', 'R', 0x12, WCH_NONE} }, + { 'S', CAPS, {'s', 'S', 0x13, 0x0111} }, + { 'T', CAPS, {'t', 'T', 0x14, WCH_NONE} }, + { 'U', CAPS, {'u', 'U', 0x15, WCH_NONE} }, + { 'V', CAPS, {'v', 'V', 0x16, '@'} }, + { 'W', CAPS, {'w', 'W', 0x17, '|'} }, + { 'X', CAPS, {'x', 'X', 0x18, '#'} }, + { 'Y', CAPS, {'y', 'Y', 0x19, WCH_NONE} }, // qwertY + { 'Z', CAPS, {'z', 'Z', 0x1a, '>'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_DECIMAL, 0, {','} }, + { 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_BACK, 0, {'\010'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(1,keypad_numbers), + vk_master(2,key_to_chars_2mod), + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL }, +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Ctrl" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4a, L"Left" }, + { 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x55, L"Help" }, + { 0x56, L"Left Windows" }, + { 0x5b, L"Right Windows" }, + { 0, NULL }, +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { DEADTRANS(0x0043, 0x02c7, 0x010c, 0x0000) }, // C with caron + { DEADTRANS(0x0063, 0x02c7, 0x010d, 0x0000) }, // c with caron + { DEADTRANS(0x0044, 0x02c7, 0x010e, 0x0000) }, // D with caron + { DEADTRANS(0x0064, 0x02c7, 0x010f, 0x0000) }, // d with caron + { DEADTRANS(0x004c, 0x02c7, 0x013d, 0x0000) }, // L with caron + { DEADTRANS(0x006c, 0x02c7, 0x013e, 0x0000) }, // l with caron + { DEADTRANS(0x004e, 0x02c7, 0x0147, 0x0000) }, // N with caron + { DEADTRANS(0x006e, 0x02c7, 0x0148, 0x0000) }, // n with caron + { DEADTRANS(0x0053, 0x02c7, 0x0160, 0x0000) }, // S with caron + { DEADTRANS(0x0073, 0x02c7, 0x0161, 0x0000) }, // s with caron + { DEADTRANS(0x0054, 0x02c7, 0x0164, 0x0000) }, // T with caron + { DEADTRANS(0x0074, 0x02c7, 0x0165, 0x0000) }, // t with caron + { DEADTRANS(0x005a, 0x02c7, 0x017d, 0x0000) }, // Z with caron + { DEADTRANS(0x007a, 0x02c7, 0x017e, 0x0000) }, // z with caron + { DEADTRANS(0x0020, 0x02c7, 0x02c7, 0x0000) }, // space > caron + + { DEADTRANS(0x0041, 0x00b4, 0x00c1, 0x0000) }, // A with acute + { DEADTRANS(0x0061, 0x00b4, 0x00e1, 0x0000) }, // a with acute + { DEADTRANS(0x0045, 0x00b4, 0x00c9, 0x0000) }, // E with acute + { DEADTRANS(0x0065, 0x00b4, 0x00e9, 0x0000) }, // e with acute + { DEADTRANS(0x0049, 0x00b4, 0x00cd, 0x0000) }, // I with acute + { DEADTRANS(0x0069, 0x00b4, 0x00ed, 0x0000) }, // i with acute + { DEADTRANS(0x004c, 0x00b4, 0x0139, 0x0000) }, // L with acute + { DEADTRANS(0x006c, 0x00b4, 0x013a, 0x0000) }, // l with acute + { DEADTRANS(0x004f, 0x00b4, 0x00d3, 0x0000) }, // O with acute + { DEADTRANS(0x006f, 0x00b4, 0x00f3, 0x0000) }, // o with acute + { DEADTRANS(0x0052, 0x00b4, 0x0154, 0x0000) }, // R with acute + { DEADTRANS(0x0072, 0x00b4, 0x0155, 0x0000) }, // r with acute + { DEADTRANS(0x0055, 0x00b4, 0x00da, 0x0000) }, // U with acute + { DEADTRANS(0x0075, 0x00b4, 0x00fa, 0x0000) }, // u with acute + { DEADTRANS(0x0059, 0x00b4, 0x00dd, 0x0000) }, // Y with acute + { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) }, // y with acute + { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) }, // space > acute + + { DEADTRANS(0x004f, 0x005e, 0x00d4, 0x0000) }, // O with circumflex + { DEADTRANS(0x006f, 0x005e, 0x00f4, 0x0000) }, // o with circumflex + { DEADTRANS(0x0020, 0x005e, 0x005e, 0x0000) }, // space > circumflex + + { DEADTRANS(0x0041, 0x00a8, 0x00c4, 0x0000) }, // A with diaeresis + { DEADTRANS(0x0061, 0x00a8, 0x00e4, 0x0000) }, // a with diaeresis + { DEADTRANS(0x0045, 0x00a8, 0x00cb, 0x0000) }, // E with diaeresis + { DEADTRANS(0x0065, 0x00a8, 0x00eb, 0x0000) }, // e with diaeresis + { DEADTRANS(0x004f, 0x00a8, 0x00d6, 0x0000) }, // O with diaeresis + { DEADTRANS(0x006f, 0x00a8, 0x00f6, 0x0000) }, // o with diaeresis + { DEADTRANS(0x0055, 0x00a8, 0x00dc, 0x0000) }, // U with diaeresis + { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, // u with diaeresis + { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, // space > diaeresis + + { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with round + { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with round + { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > degree + { 0, 0, 0 }, +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x02c7" L"\x004D\x00E4\x006B\x010D\x0065\x0148", // mÃ¤kÄeÅ - caron + L"\x00b4" L"\x0044\x013A\x017E\x0065\x0148", // dÄºÅ¾eÅ - acute + L"\x005e" L"\x0056\x006F\x006B\x00E1\x0148", // vokÃ¡Å - circumflex + NULL +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks -- */ + dead_key, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + dead_key_names, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- Slovak doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +/* + * ReactOS Slovak (QWERTY) Keyboard layout + * Copyright (C) 2008 ReactOS + * License: LGPL, see: LGPL.txt + * + * Created by Mario Kacmar (kario(a)szm.sk) + * Special thanks to Milan Margus (malin23(a)atlas.sk) + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_3, VK_OEM_8, + VK_LSHIFT, VK_OEM_7, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT|KEXT, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, VK_MENU, 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_5, 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[] = { + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 7, + { 0, 1, 2, 0 ,0, 0,3,0} /* Modifier bit order, NONE, SHIFT, CTRL, SHIFT+CTRL,ALT(not used),SHIFT-ALT (not used), CTR+ALT, SHIFT-CTRL-ALT*/ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Normal vs Shifted */ + { VK_OEM_8, NOCAPS, {';', WCH_DEAD} }, // degree sign + { VK_EMPTY, 0, {WCH_NONE, 0x00b0} }, // VK_OEM_8 death + + /* Keys that do not have shift states */ + { VK_TAB, NOCAPS, {'\t','\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_ESCAPE, NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE, NOCAPS, {' ', ' '} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_RETURN, 0, {'\r', '\r', '\n'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, Ctrl+Alt */ + + /* The numbers */ + { '1', NOCAPS, {'+', '1', WCH_NONE, '~'} }, + { '2', NOCAPS, {0x013e, '2', WCH_NONE, WCH_DEAD} }, // l with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02c7} }, // 2 death + { '3', NOCAPS, {0x0161, '3', WCH_NONE, WCH_DEAD} }, // s with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x005e} }, // 3 death + { '4', NOCAPS, {0x010d, '4', WCH_NONE, WCH_DEAD} }, // c with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02d8} }, // 4 death + { '5', NOCAPS, {0x0165, '5', WCH_NONE, WCH_DEAD} }, // t with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00b0} }, // 5 death + { '6', NOCAPS, {0x017e, '6', WCH_NONE, WCH_DEAD} }, // z with caron + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02db} }, // 6 death + { '7', NOCAPS, {0x00fd, '7', WCH_NONE, '`'} }, // y with acute + { '8', NOCAPS, {0x00e1, '8', WCH_NONE, WCH_DEAD} }, // a with acute + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02d9} }, // 8 death + { '9', NOCAPS, {0x00ed, '9', WCH_NONE, WCH_DEAD} }, // i with acute + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00b4} }, // 9 death + { '0', NOCAPS, {0x00e9, '0', WCH_NONE, WCH_DEAD} }, // e with acute + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x02dd} }, // 0 death + { VK_OEM_MINUS, NOCAPS, {'=', '%', WCH_NONE, WCH_DEAD} }, + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, 0x00a8} }, // = death + { VK_OEM_PLUS, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, WCH_DEAD} }, // dead letters - acute, caron + { VK_EMPTY, 0, {0x00b4, 0x02c7, WCH_NONE, 0x00b8} }, // dead letters death :) + + { VK_OEM_1, NOCAPS, {0x00f4, '\"', WCH_NONE, '$'} }, // o with circumflex + { VK_OEM_2, NOCAPS, {'-', '_', WCH_NONE, '*'} }, + { VK_OEM_3, NOCAPS, {0x00a7, '!', WCH_NONE, 0x00df} }, // section sign + { VK_OEM_4, NOCAPS, {0x00fa, '/', WCH_NONE, 0x00f7} }, // u with acute + { VK_OEM_5, NOCAPS, {'&', '*', WCH_NONE, '<'} }, + { VK_OEM_6, NOCAPS, {0x00E4, '(', WCH_NONE, 0x00d7} }, // a with diaeresis + { VK_OEM_7, NOCAPS, {0x0148, ')', WCH_NONE, 0x00a4} }, // n with caron + { VK_OEM_COMMA, NOCAPS, {',', '?', WCH_NONE, '<'} }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':', WCH_NONE, '>'} }, + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01, WCH_NONE} }, + { 'B', CAPS, {'b', 'B', 0x02, '{'} }, + { 'C', CAPS, {'c', 'C', 0x03, '&'} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x0110} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} }, + { 'F', CAPS, {'f', 'F', 0x06, '['} }, + { 'G', CAPS, {'g', 'G', 0x07, ']'} }, + { 'H', CAPS, {'h', 'H', 0x08, WCH_NONE} }, + { 'I', CAPS, {'i', 'I', 0x09, WCH_NONE} }, + { 'J', CAPS, {'j', 'J', 0x0a, WCH_NONE} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0142} }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0141} }, + { 'M', CAPS, {'m', 'M', 0x0d, WCH_NONE} }, + { 'N', CAPS, {'n', 'N', 0x0e, '}'} }, + { 'O', CAPS, {'o', 'O', 0x0f, WCH_NONE} }, + { 'P', CAPS, {'p', 'P', 0x10, '\''} }, + { 'Q', CAPS, {'q', 'Q', 0x11, '\\'} }, + { 'R', CAPS, {'r', 'R', 0x12, WCH_NONE} }, + { 'S', CAPS, {'s', 'S', 0x13, 0x0111} }, + { 'T', CAPS, {'t', 'T', 0x14, WCH_NONE} }, + { 'U', CAPS, {'u', 'U', 0x15, WCH_NONE} }, + { 'V', CAPS, {'v', 'V', 0x16, '@'} }, + { 'W', CAPS, {'w', 'W', 0x17, '|'} }, + { 'X', CAPS, {'x', 'X', 0x18, '#'} }, + { 'Y', CAPS, {'y', 'Y', 0x19, WCH_NONE} }, // qwertY + { 'Z', CAPS, {'z', 'Z', 0x1a, '>'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_DECIMAL, 0, {','} }, + { 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_BACK, 0, {'\010'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(1,keypad_numbers), + vk_master(2,key_to_chars_2mod), + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL }, +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Ctrl" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4a, L"Left" }, + { 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x55, L"Help" }, + { 0x56, L"Left Windows" }, + { 0x5b, L"Right Windows" }, + { 0, NULL }, +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { DEADTRANS(0x0043, 0x02c7, 0x010c, 0x0000) }, // C with caron + { DEADTRANS(0x0063, 0x02c7, 0x010d, 0x0000) }, // c with caron + { DEADTRANS(0x0044, 0x02c7, 0x010e, 0x0000) }, // D with caron + { DEADTRANS(0x0064, 0x02c7, 0x010f, 0x0000) }, // d with caron + { DEADTRANS(0x004c, 0x02c7, 0x013d, 0x0000) }, // L with caron + { DEADTRANS(0x006c, 0x02c7, 0x013e, 0x0000) }, // l with caron + { DEADTRANS(0x004e, 0x02c7, 0x0147, 0x0000) }, // N with caron + { DEADTRANS(0x006e, 0x02c7, 0x0148, 0x0000) }, // n with caron + { DEADTRANS(0x0053, 0x02c7, 0x0160, 0x0000) }, // S with caron + { DEADTRANS(0x0073, 0x02c7, 0x0161, 0x0000) }, // s with caron + { DEADTRANS(0x0054, 0x02c7, 0x0164, 0x0000) }, // T with caron + { DEADTRANS(0x0074, 0x02c7, 0x0165, 0x0000) }, // t with caron + { DEADTRANS(0x005a, 0x02c7, 0x017d, 0x0000) }, // Z with caron + { DEADTRANS(0x007a, 0x02c7, 0x017e, 0x0000) }, // z with caron + { DEADTRANS(0x0020, 0x02c7, 0x02c7, 0x0000) }, // space > caron + + { DEADTRANS(0x0041, 0x00b4, 0x00c1, 0x0000) }, // A with acute + { DEADTRANS(0x0061, 0x00b4, 0x00e1, 0x0000) }, // a with acute + { DEADTRANS(0x0045, 0x00b4, 0x00c9, 0x0000) }, // E with acute + { DEADTRANS(0x0065, 0x00b4, 0x00e9, 0x0000) }, // e with acute + { DEADTRANS(0x0049, 0x00b4, 0x00cd, 0x0000) }, // I with acute + { DEADTRANS(0x0069, 0x00b4, 0x00ed, 0x0000) }, // i with acute + { DEADTRANS(0x004c, 0x00b4, 0x0139, 0x0000) }, // L with acute + { DEADTRANS(0x006c, 0x00b4, 0x013a, 0x0000) }, // l with acute + { DEADTRANS(0x004f, 0x00b4, 0x00d3, 0x0000) }, // O with acute + { DEADTRANS(0x006f, 0x00b4, 0x00f3, 0x0000) }, // o with acute + { DEADTRANS(0x0052, 0x00b4, 0x0154, 0x0000) }, // R with acute + { DEADTRANS(0x0072, 0x00b4, 0x0155, 0x0000) }, // r with acute + { DEADTRANS(0x0055, 0x00b4, 0x00da, 0x0000) }, // U with acute + { DEADTRANS(0x0075, 0x00b4, 0x00fa, 0x0000) }, // u with acute + { DEADTRANS(0x0059, 0x00b4, 0x00dd, 0x0000) }, // Y with acute + { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) }, // y with acute + { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) }, // space > acute + + { DEADTRANS(0x004f, 0x005e, 0x00d4, 0x0000) }, // O with circumflex + { DEADTRANS(0x006f, 0x005e, 0x00f4, 0x0000) }, // o with circumflex + { DEADTRANS(0x0020, 0x005e, 0x005e, 0x0000) }, // space > circumflex + + { DEADTRANS(0x0041, 0x00a8, 0x00c4, 0x0000) }, // A with diaeresis + { DEADTRANS(0x0061, 0x00a8, 0x00e4, 0x0000) }, // a with diaeresis + { DEADTRANS(0x0045, 0x00a8, 0x00cb, 0x0000) }, // E with diaeresis + { DEADTRANS(0x0065, 0x00a8, 0x00eb, 0x0000) }, // e with diaeresis + { DEADTRANS(0x004f, 0x00a8, 0x00d6, 0x0000) }, // O with diaeresis + { DEADTRANS(0x006f, 0x00a8, 0x00f6, 0x0000) }, // o with diaeresis + { DEADTRANS(0x0055, 0x00a8, 0x00dc, 0x0000) }, // U with diaeresis + { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, // u with diaeresis + { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, // space > diaeresis + + { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with round + { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with round + { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > degree + { 0, 0, 0 }, +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x02c7" L"\x004D\x00E4\x006B\x010D\x0065\x0148", // mÃ¤kÄeÅ - caron + L"\x00b4" L"\x0044\x013A\x017E\x0065\x0148", // dÄºÅ¾eÅ - acute + L"\x005e" L"\x0056\x006F\x006B\x00E1\x0148", // vokÃ¡Å - circumflex + NULL +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks -- */ + dead_key, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + dead_key_names, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- Slovak doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + Propchange: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def (added) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def [iso-8859-1] Wed Jul 16 08:41:23 2008 @@ -1,0 +1,16 @@ +; +; ReactOS Operating System +; +LIBRARY kbdsk1.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF +; +; ReactOS Operating System +; +LIBRARY kbdsk1.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Propchange: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild [iso-8859-1] Wed Jul 16 08:41:23 2008 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdsk1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk1.dll" allowwarnings="true"> + <importlibrary definition="kbdsk1.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdsk1.c</file> + <file>kbdsk1.rc</file> +</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdsk1" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdsk1.dll" allowwarnings="true"> + <importlibrary definition="kbdsk1.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdsk1.c</file> + <file>kbdsk1.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc (added) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc [iso-8859-1] Wed Jul 16 08:41:23 2008 @@ -1,0 +1,10 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Slovak (QWERTY) Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdsk1\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdsk1.dll\0" +#include <reactos/version.rc> +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Slovak (QWERTY) Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdsk1\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdsk1.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui… ============================================================================== --- trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] Wed Jul 16 08:41:23 2008 @@ -169,6 +169,9 @@ <directory name="kbdsk"> <xi:include href="kbdsk/kbdsk.rbuild" /> </directory> + <directory name="kbdsk1"> + <xi:include href="kbdsk1/kbdsk1.rbuild" /> + </directory> <directory name="kbdsw"> <xi:include href="kbdsw/kbdsw.rbuild" /> </directory>

1 0

[gedmurphy] 34545: - Implement freeaddrinfo and getaddrinfo. - Implement bare boned getprotobyname and getprotobynumber. - Make winsock functions return proper error codes instead of success (will help to identify any probs with network apps) - patch by Yuri Sidorov <jura at cp-lab dot com> For future reference, freeaddrinfo and getaddrinfo should really call GetAddrInfoW and FreeAddrInfoW which should do the work, but our umode network layers are a mess anyway and by no means XP compatible See
by gedmurphy＠svn.reactos.org 16 Jul '08

16 Jul '08

Author: gedmurphy Date: Wed Jul 16 07:49:15 2008 New Revision: 34545 URL: http://svn.reactos.org/svn/reactos?rev=34545&view=rev Log: - Implement freeaddrinfo and getaddrinfo. - Implement bare boned getprotobyname and getprotobynumber. - Make winsock functions return proper error codes instead of success (will help to identify any probs with network apps) - patch by Yuri Sidorov <jura at cp-lab dot com> For future reference, freeaddrinfo and getaddrinfo should really call GetAddrInfoW and FreeAddrInfoW which should do the work, but our umode network layers are a mess anyway and by no means XP compatible See issue #3523 for more details. Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c trunk/reactos/dll/win32/ws2_32/misc/stubs.c Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Wed Jul 16 07:49:15 2008 @@ -35,7 +35,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -52,7 +53,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -66,7 +68,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -80,7 +83,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -96,7 +100,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -112,7 +117,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -127,7 +133,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -142,7 +149,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -155,7 +163,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -168,7 +177,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -183,7 +193,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -198,7 +209,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -211,7 +223,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -227,7 +240,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -243,7 +257,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -256,7 +271,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -271,7 +287,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -286,7 +303,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -798,25 +816,27 @@ * * @unimplemented */ + +static CHAR *no_aliases = 0; +static PROTOENT protocols[] = +{ + {"icmp",&no_aliases, IPPROTO_ICMP}, + {"tcp", &no_aliases, IPPROTO_TCP}, + {"udp", &no_aliases, IPPROTO_UDP}, + {NULL, NULL, 0} +}; + LPPROTOENT EXPORT getprotobyname(IN CONST CHAR FAR* name) { - static CHAR *udp_aliases = 0; - static PROTOENT udp = { "udp", &udp_aliases, 17 }; - static CHAR *tcp_aliases = 0; - static PROTOENT tcp = { "tcp", &tcp_aliases, 6 }; - - if(!_stricmp(name, "udp")) - { - return &udp; - } - else if (!_stricmp( name, "tcp")) - { - return &tcp; - } - - return 0; + UINT i; + for (i = 0; protocols[i].p_name; i++) + { + if (_stricmp(protocols[i].p_name, name) == 0) + return &protocols[i]; + } + return NULL; } /* @@ -826,9 +846,13 @@ EXPORT getprotobynumber(IN INT number) { - UNIMPLEMENTED - - return (LPPROTOENT)NULL; + UINT i; + for (i = 0; protocols[i].p_name; i++) + { + if (protocols[i].p_proto == number) + return &protocols[i]; + } + return NULL; } #define SKIPWS(ptr,act) \ @@ -1324,5 +1348,189 @@ } +/* + * @implemented + */ +VOID +EXPORT +freeaddrinfo(struct addrinfo *pAddrInfo) +{ + struct addrinfo *next, *cur; + cur = pAddrInfo; + while (cur) + { + next = cur->ai_next; + if (cur->ai_addr) + HeapFree(GetProcessHeap(), 0, cur->ai_addr); + if (cur->ai_canonname) + HeapFree(GetProcessHeap(), 0, cur->ai_canonname); + HeapFree(GetProcessHeap(), 0, cur); + cur = next; + } +} + + +struct addrinfo * +new_addrinfo(struct addrinfo *prev) +{ + struct addrinfo *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct addrinfo)); + if (prev) + prev->ai_next = ret; + return ret; +} + +/* + * @implemented + */ +INT +EXPORT +getaddrinfo(const char FAR * nodename, + const char FAR * servname, + const struct addrinfo FAR * hints, + struct addrinfo FAR * FAR * res) +{ + struct addrinfo *ret = NULL, *ai; + ULONG addr; + USHORT port; + struct servent *se; + char *proto; + LPPROTOENT pent; + DNS_STATUS dns_status; + PDNS_RECORD dp, currdns; + struct sockaddr_in *sin; + + if (res == NULL) + return WSAEINVAL; + if (nodename == NULL && servname == NULL) + return WSAHOST_NOT_FOUND; + + if (!WSAINITIALIZED) + return WSANOTINITIALISED; + + /* converting port number */ + port = strtoul(servname, NULL, 10); + /* service name was specified? */ + if (port == 0) + { + /* protocol was specified? */ + if (hints && hints->ai_protocol) + { + pent = getprotobynumber(hints->ai_protocol); + if (pent == NULL) + return WSAEINVAL; + proto = pent->p_name; + } + else + proto = NULL; + se = getservbyname(servname, proto); + if (se == NULL) + return WSAHOST_NOT_FOUND; + port = se->s_port; + } + + if (nodename) + { + /* Is it an IPv6 address? */ + if (strstr(nodename, ":")) + return WSAHOST_NOT_FOUND; + + /* Is it an IPv4 address? */ + addr = inet_addr(nodename); + if (addr != INADDR_NONE) + { + ai = new_addrinfo(NULL); + ai->ai_family = PF_INET; + ai->ai_addrlen = sizeof(struct sockaddr_in); + ai->ai_addr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ai->ai_addrlen); + sin = (struct sockaddr_in *)ai->ai_addr; + sin->sin_family = AF_INET; + sin->sin_port = port; + RtlCopyMemory(&sin->sin_addr, &addr, sizeof(sin->sin_addr)); + if (hints) + { + if (ai->ai_socktype == 0) + ai->ai_socktype = hints->ai_socktype; + if (ai->ai_protocol == 0) + ai->ai_protocol = hints->ai_protocol; + } + ret = ai; + } + else + { + /* resolving host name */ + dns_status = DnsQuery_A(nodename, + DNS_TYPE_A, + DNS_QUERY_STANDARD, + 0, + /* extra dns servers */ &dp, + 0); + + if (dns_status == 0) + { + ai = NULL; + for (currdns = dp; currdns; currdns = currdns->pNext ) + { + /* accept only A records */ + if (currdns->wType != DNS_TYPE_A) continue; + + ai = new_addrinfo(ai); + if (ret == NULL) + ret = ai; + ai->ai_family = PF_INET; + ai->ai_addrlen = sizeof(struct sockaddr_in); + ai->ai_addr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ai->ai_addrlen); + sin = (struct sockaddr_in *)ret->ai_addr; + sin->sin_family = AF_INET; + sin->sin_port = port; + RtlCopyMemory(&sin->sin_addr, &currdns->Data.A.IpAddress, sizeof(sin->sin_addr)); + if (hints) + { + if (ai->ai_socktype == 0) + ai->ai_socktype = hints->ai_socktype; + if (ai->ai_protocol == 0) + ai->ai_protocol = hints->ai_protocol; + } + } + DnsRecordListFree(dp, DnsFreeRecordList); + } + } + } + else + { + ai = new_addrinfo(NULL); + ai->ai_family = PF_INET; + ai->ai_addrlen = sizeof(struct sockaddr_in); + ai->ai_addr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ai->ai_addrlen); + sin = (struct sockaddr_in *)ret->ai_addr; + sin->sin_family = AF_INET; + sin->sin_port = port; + if (hints) + { + if (!(hints->ai_flags & AI_PASSIVE)) + { + sin->sin_addr.S_un.S_un_b.s_b1 = 127; + sin->sin_addr.S_un.S_un_b.s_b2 = 0; + sin->sin_addr.S_un.S_un_b.s_b3 = 0; + sin->sin_addr.S_un.S_un_b.s_b4 = 1; + } + if (ai->ai_socktype == 0) + ai->ai_socktype = hints->ai_socktype; + if (ai->ai_protocol == 0) + ai->ai_protocol = hints->ai_protocol; + } + } + + if (ret == NULL) + return WSAHOST_NOT_FOUND; + + if (hints && hints->ai_family != PF_UNSPEC && hints->ai_family != PF_INET) + { + freeaddrinfo(ret); + return WSAEAFNOSUPPORT; + } + + *res = ret; + return 0; +} + /* EOF */ - Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Wed Jul 16 07:49:15 2008 @@ -307,7 +307,8 @@ UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -340,7 +341,8 @@ UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -396,7 +398,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -411,7 +414,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -470,6 +474,7 @@ { UNIMPLEMENTED + WSASetLastError(WSASYSCALLFAILURE); return FALSE; } @@ -485,7 +490,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -500,7 +506,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -533,6 +540,7 @@ { UNIMPLEMENTED + WSASetLastError(WSASYSCALLFAILURE); return INVALID_SOCKET; } @@ -548,7 +556,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -563,7 +572,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -604,7 +614,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -617,7 +628,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } /* WinSock Service Provider support functions */ @@ -635,7 +647,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -652,7 +665,7 @@ { UNIMPLEMENTED - return 0; + return WSASYSCALLFAILURE; } @@ -666,7 +679,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -682,7 +696,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -698,7 +713,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -715,7 +731,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -729,7 +746,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -746,7 +764,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -759,7 +778,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -773,7 +793,7 @@ { UNIMPLEMENTED - return 0; + return WSASYSCALLFAILURE; } /* @@ -790,9 +810,10 @@ LPDWORD lpcbBytesReturned, LPWSACOMPLETION lpCompletion) { - //UNIMPLEMENTED - - return 0; + UNIMPLEMENTED + + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -809,7 +830,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } /* @@ -822,32 +844,7 @@ { UNIMPLEMENTED - return 0; -} - -/* - * @unimplemented - */ -VOID -EXPORT -freeaddrinfo(struct addrinfo *pAddrInfo) -{ - UNIMPLEMENTED -} - -/* - * @unimplemented - */ -INT -EXPORT -getaddrinfo(const char FAR * nodename, - const char FAR * servname, - const struct addrinfo FAR * hints, - struct addrinfo FAR * FAR * res) -{ - UNIMPLEMENTED - - return EAI_NONAME; + return WSASYSCALLFAILURE; } /* @@ -865,7 +862,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } /* @@ -883,7 +881,7 @@ { UNIMPLEMENTED - return 0; + return FALSE; } /* EOF */

1 0

[dreimer] 34544: same fix for the unix Version. Now we can re revert hpoussin's Patch.
by dreimer＠svn.reactos.org 16 Jul '08

16 Jul '08

Author: dreimer Date: Wed Jul 16 04:40:12 2008 New Revision: 34544 URL: http://svn.reactos.org/svn/reactos?rev=34544&view=rev Log: same fix for the unix Version. Now we can re revert hpoussin's Patch. Modified: trunk/tools/RosBE/RosBE-Unix/scripts/build-shared.sh trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh trunk/tools/RosBE/RosBE-Unix/scripts/help.sh Modified: trunk/tools/RosBE/RosBE-Unix/scripts/build-shared.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/build-shared.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/build-shared.sh [iso-8859-1] Wed Jul 16 04:40:12 2008 @@ -16,4 +16,3 @@ exit 1 fi fi - Modified: trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/clean.sh [iso-8859-1] Wed Jul 16 04:40:12 2008 @@ -14,7 +14,7 @@ rm -rf "obj-i386" rm -rf "output-i386" rm -rf "reactos." - rm -f "makefile.auto" + rm -f "makefile*.auto" echo "Done cleaning ReactOS source directory." else Modified: trunk/tools/RosBE/RosBE-Unix/scripts/help.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/help.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/help.sh [iso-8859-1] Wed Jul 16 04:40:12 2008 @@ -22,4 +22,3 @@ echo " version - Show information about the tool versions." echo -

1 0

[dreimer] 34543: Fix for hpoussin's renaming of the generated makefile. Even compatible to older revs.
by dreimer＠svn.reactos.org 16 Jul '08

16 Jul '08

Author: dreimer Date: Wed Jul 16 04:09:06 2008 New Revision: 34543 URL: http://svn.reactos.org/svn/reactos?rev=34543&view=rev Log: Fix for hpoussin's renaming of the generated makefile. Even compatible to older revs. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Wed Jul 16 04:09:06 2008 @@ -64,8 +64,8 @@ if exist "reactos\." ( rd /s /q "reactos" 1> NUL 2> NUL ) - if exist "makefile.auto" ( - del "makefile.auto" 1> NUL 2> NUL + if exist "makefile*.auto" ( + del "makefile*.auto" 1> NUL 2> NUL ) echo Done cleaning ReactOS source directory. ) else (

1 0

[jimtabor] 34542: Fix build.
by jimtabor＠svn.reactos.org 16 Jul '08

16 Jul '08

Author: jimtabor Date: Tue Jul 15 21:07:55 2008 New Revision: 34542 URL: http://svn.reactos.org/svn/reactos?rev=34542&view=rev Log: Fix build. Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=34542&r1=3454… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Tue Jul 15 21:07:55 2008 @@ -167,20 +167,20 @@ .SUFFIXES: ifeq ($(HOST),) - ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) - ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) - export OSTYPE = msys - HOST=mingw32-linux - HOST_CFLAGS+=-fshort-wchar - HOST_CPPFLAGS+=-fshort-wchar - else - HOST=mingw32-windows - endif - else - HOST=mingw32-linux - HOST_CFLAGS+=-fshort-wchar - HOST_CPPFLAGS+=-fshort-wchar - endif +ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) +ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) +export OSTYPE = msys +HOST=mingw32-linux +HOST_CFLAGS+=-fshort-wchar +HOST_CPPFLAGS+=-fshort-wchar +else +HOST=mingw32-windows +endif +else +HOST=mingw32-linux +HOST_CFLAGS+=-fshort-wchar +HOST_CPPFLAGS+=-fshort-wchar +endif endif # Default to half-verbose mode

1 0

[jimtabor] 34541: Sorry for commit my test tree, , , , good for testing Bug 2451.
by jimtabor＠svn.reactos.org 16 Jul '08

16 Jul '08

Author: jimtabor Date: Tue Jul 15 21:06:05 2008 New Revision: 34541 URL: http://svn.reactos.org/svn/reactos?rev=34541&view=rev Log: Sorry for commit my test tree,,,, good for testing Bug 2451. Modified: trunk/reactos/Makefile trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=34541&r1=3454… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Tue Jul 15 21:06:05 2008 @@ -167,20 +167,20 @@ .SUFFIXES: ifeq ($(HOST),) -ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) -ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) -export OSTYPE = msys -HOST=mingw32-linux -HOST_CFLAGS+=-fshort-wchar -HOST_CPPFLAGS+=-fshort-wchar -else -HOST=mingw32-windows -endif -else -HOST=mingw32-linux -HOST_CFLAGS+=-fshort-wchar -HOST_CPPFLAGS+=-fshort-wchar -endif + ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) + ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) + export OSTYPE = msys + HOST=mingw32-linux + HOST_CFLAGS+=-fshort-wchar + HOST_CPPFLAGS+=-fshort-wchar + else + HOST=mingw32-windows + endif + else + HOST=mingw32-linux + HOST_CFLAGS+=-fshort-wchar + HOST_CPPFLAGS+=-fshort-wchar + endif endif # Default to half-verbose mode Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Tue Jul 15 21:06:05 2008 @@ -742,12 +742,8 @@ LRESULT DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { -// WINDOWPLACEMENT wp; + WINDOWPLACEMENT wp; POINT Pt; - - // ATM, This is for Hook call. - if (NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, 0, NUMC_DEFWINDOWPROC, FALSE)) - return 0; switch (wParam & 0xfff0) { @@ -756,40 +752,28 @@ DefWndDoSizeMove(hWnd, wParam); break; case SC_MINIMIZE: - FIXME("SysCommand SC_MINIMIZE\n"); -/* wp.length = sizeof(WINDOWPLACEMENT); + wp.length = sizeof(WINDOWPLACEMENT); if(GetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_MINIMIZE; SetWindowPlacement(hWnd, &wp); - }*/ - if (hWnd == GetForegroundWindow()) - ShowOwnedPopups(hWnd,FALSE); - ShowWindow( hWnd, SW_MINIMIZE ); + } break; case SC_MAXIMIZE: - FIXME("SysCommand SC_MAXIMIZE\n"); -/* wp.length = sizeof(WINDOWPLACEMENT); + wp.length = sizeof(WINDOWPLACEMENT); if(GetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_MAXIMIZE; SetWindowPlacement(hWnd, &wp); - }*/ - if (IsIconic(hWnd) && hWnd == GetForegroundWindow()) - ShowOwnedPopups(hWnd,TRUE); - ShowWindow( hWnd, SW_MAXIMIZE ); + } break; case SC_RESTORE: - FIXME("SysCommand SC_RESTORE\n"); -/* wp.length = sizeof(WINDOWPLACEMENT); + wp.length = sizeof(WINDOWPLACEMENT); if(GetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_RESTORE; SetWindowPlacement(hWnd, &wp); - }*/ - if (IsIconic(hWnd) && hWnd == GetForegroundWindow()) - ShowOwnedPopups(hWnd,TRUE); - ShowWindow( hWnd, SW_RESTORE ); + } break; case SC_CLOSE: SendMessageA(hWnd, WM_CLOSE, 0, 0); @@ -1426,8 +1410,7 @@ case WM_SHOWWINDOW: { - if (lParam) // Call when it is necessary. - NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, NUMC_DEFWINDOWPROC, FALSE); + NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, NUMC_DEFWINDOWPROC, FALSE); break; } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue Jul 15 21:06:05 2008 @@ -1617,7 +1617,6 @@ int cy, UINT uFlags) { - FIXME("SetWindowPos\n"); return NtUserSetWindowPos(hWnd,hWndInsertAfter, X, Y, cx, cy, uFlags); } @@ -1714,7 +1713,6 @@ ShowWindow(HWND hWnd, int nCmdShow) { - FIXME("ShowWindow\n"); return NtUserShowWindow(hWnd, nCmdShow); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Tue Jul 15 21:06:05 2008 @@ -13,15 +13,7 @@ #define NDEBUG #include <debug.h> -LRESULT FASTCALL -IntDefWinHandleSysCommand( PWINDOW_OBJECT Window, WPARAM wParam, LPARAM lParam ) -{ - DPRINT1("hwnd %p WM_SYSCOMMAND %lx %lx\n", Window->hSelf, wParam, lParam ); - if (co_HOOK_CallHooks(WH_CBT, HCBT_SYSCOMMAND, wParam, lParam)) - return 1; - return 0; -} /* Win32k counterpart of User DefWindowProc */ @@ -33,7 +25,6 @@ LPARAM lParam) { PWINDOW Wnd; - LRESULT lResult = 0; if (Msg > WM_USER) return 0; @@ -42,11 +33,6 @@ switch (Msg) { - case WM_SYSCOMMAND: - { - lResult = IntDefWinHandleSysCommand( Window, wParam, lParam ); - break; - } case WM_SHOWWINDOW: { if ((Wnd->Style & WS_VISIBLE) && wParam) break; @@ -68,7 +54,7 @@ break; } - return lResult; + return 0; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Jul 15 21:06:05 2008 @@ -107,14 +107,11 @@ Hook->Thread = Thread; Hook->HookId = HookId; - if (Thread) - { - W32Thread = ((PW32THREAD)Thread->Tcb.Win32Thread); - ASSERT(W32Thread != NULL); - W32Thread->Hooks |= HOOKID_TO_FLAG(HookId); - if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; - } + W32Thread = ((PW32THREAD)Thread->Tcb.Win32Thread); + ASSERT(W32Thread != NULL); + W32Thread->Hooks |= HOOKID_TO_FLAG(HookId); + if (W32Thread->ThreadInfo != NULL) + W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; RtlInitUnicodeString(&Hook->ModuleName, NULL); @@ -321,7 +318,7 @@ return IntCallLowLevelHook(HookId, Code, wParam, lParam, Hook); } - if ((Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL)) + if (Hook->Thread != PsGetCurrentThread()) { DPRINT1("Calling hooks in other threads not implemented yet"); return 0; @@ -573,7 +570,7 @@ /* We only (partially) support local WH_CBT hooks and * WH_KEYBOARD_LL/WH_MOUSE_LL hooks for now */ if ((WH_CBT != HookId || Global) - && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId && WH_GETMESSAGE != HookId) + && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId) // && WH_GETMESSAGE != HookId) { #if 0 /* Removed to get winEmbed working again */ UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Tue Jul 15 21:06:05 2008 @@ -736,7 +736,6 @@ case HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW: Ret = co_IntSetForegroundWindow(Window); - DPRINT1("Leave NtUserCallHwndLock SetForegroundWindow, ret=%i\n",Ret); break; case HWNDLOCK_ROUTINE_UPDATEWINDOW: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jul 15 21:06:05 2008 @@ -3333,7 +3333,6 @@ break; case GW_HWNDNEXT: - DPRINT1("GW_HWNDNEXT\n"); if (Window->NextSibling) hWndResult = Window->NextSibling->hSelf; break; @@ -3375,13 +3374,13 @@ { DECLARE_RETURN(HWND); - DPRINT1("Enter NtUserGetWindow\n"); + DPRINT("Enter NtUserGetWindow\n"); UserEnterShared(); RETURN(UserGetWindow(hWnd, Relationship)); CLEANUP: - DPRINT1("Leave NtUserGetWindow, ret=%i\n",_ret_); + DPRINT("Leave NtUserGetWindow, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } @@ -4245,7 +4244,7 @@ BOOL ret; USER_REFERENCE_ENTRY Ref; - DPRINT1("Enter NtUserSetWindowPos\n"); + DPRINT("Enter NtUserSetWindowPos\n"); UserEnterExclusive(); if (!(Window = UserGetWindowObject(hWnd))) @@ -4260,7 +4259,7 @@ RETURN(ret); CLEANUP: - DPRINT1("Leave NtUserSetWindowPos, ret=%i\n",_ret_); + DPRINT("Leave NtUserSetWindowPos, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } @@ -4408,7 +4407,7 @@ DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; - DPRINT1("Enter NtUserShowWindow\n"); + DPRINT("Enter NtUserShowWindow\n"); UserEnterExclusive(); if (!(Window = UserGetWindowObject(hWnd))) @@ -4423,7 +4422,7 @@ RETURN(ret); CLEANUP: - DPRINT1("Leave NtUserShowWindow, ret=%i\n",_ret_); + DPRINT("Leave NtUserShowWindow, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Tue Jul 15 21:06:05 2008 @@ -306,24 +306,15 @@ Size.x = Wnd->WindowRect.left; Size.y = Wnd->WindowRect.top; WinPosInitInternalPos(Window, &Size, &Wnd->WindowRect); - - if (co_HOOK_CallHooks(WH_CBT, HCBT_MINMAX, (WPARAM)Window->hSelf, ShowFlag)) - return SWP_NOSIZE | SWP_NOMOVE; - - if (Wnd->Style & WS_MINIMIZE) - { - switch (ShowFlag) - { - case SW_MINIMIZE: - return SWP_NOSIZE | SWP_NOMOVE; - } - if (!co_IntSendMessage(Window->hSelf, WM_QUERYOPEN, 0, 0)) - { - return(SWP_NOSIZE | SWP_NOMOVE); - } - SwpFlags |= SWP_NOCOPYBITS; - } - + + if (Wnd->Style & WS_MINIMIZE) + { + if (!co_IntSendMessage(Window->hSelf, WM_QUERYOPEN, 0, 0)) + { + return(SWP_NOSIZE | SWP_NOMOVE); + } + SwpFlags |= SWP_NOCOPYBITS; + } switch (ShowFlag) { case SW_MINIMIZE: @@ -1225,7 +1216,7 @@ if (RgnType != ERROR && RgnType != NULLREGION) { /* old code - NtGdiOffsetRgn(DirtyRgn, Window->Wnd->WindowRect.left, Window->Wnd->WindowRect.top); + NtGdiOffsetRgn(DirtyRgn, Window->WindowRect.left, Window->WindowRect.top); IntInvalidateWindows(Window, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } @@ -1323,7 +1314,7 @@ { BOOLEAN WasVisible; UINT Swp = 0; - RECT NewPos = {0, 0, 0, 0}; + RECT NewPos; BOOLEAN ShowFlag; // HRGN VisibleRgn; PWINDOW Wnd; @@ -1343,29 +1334,53 @@ } Swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (Window->hSelf != UserGetActiveWindow()) -// if (Wnd->Style & WS_CHILD) Swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; } case SW_SHOWMINNOACTIVE: - case SW_MINIMIZE: Swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* Fall through. */ case SW_SHOWMINIMIZED: - DPRINT1("ShowWindow _MINIMIZE\n"); - Swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; - Swp |= co_WinPosMinMaximize(Window, SW_MINIMIZE, &NewPos); -// if ((Wnd->Style & WS_MINIMIZE) && WasVisible) return TRUE; - break; + Swp |= SWP_SHOWWINDOW; + /* Fall through. */ + case SW_MINIMIZE: + { + Swp |= SWP_NOACTIVATE; + if (!(Wnd->Style & WS_MINIMIZE)) + { + Swp |= co_WinPosMinMaximize(Window, SW_MINIMIZE, &NewPos) | + SWP_FRAMECHANGED; + } + else + { + Swp |= SWP_NOSIZE | SWP_NOMOVE; + if (! WasVisible) + { + Swp |= SWP_FRAMECHANGED; + } + } + break; + } case SW_SHOWMAXIMIZED: - DPRINT1("ShowWindow _MAXIMIZE\n"); - if (!WasVisible) Swp |= SWP_SHOWWINDOW; - Swp |= SWP_FRAMECHANGED; - Swp |= co_WinPosMinMaximize(Window, SW_MAXIMIZE, &NewPos); -// if ((Wnd->Style & WS_MAXIMIZE) && WasVisible) return TRUE; - break; + { + Swp |= SWP_SHOWWINDOW; + if (!(Wnd->Style & WS_MAXIMIZE)) + { + Swp |= co_WinPosMinMaximize(Window, SW_MAXIMIZE, &NewPos) | + SWP_FRAMECHANGED; + } + else + { + Swp |= SWP_NOSIZE | SWP_NOMOVE; + if (! WasVisible) + { + Swp |= SWP_FRAMECHANGED; + } + } + break; + } case SW_SHOWNA: Swp |= SWP_NOACTIVATE | SWP_NOZORDER; @@ -1377,32 +1392,27 @@ break; case SW_SHOWNOACTIVATE: + //Swp |= SWP_NOZORDER; Swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* Fall through. */ case SW_SHOWNORMAL: case SW_SHOWDEFAULT: case SW_RESTORE: - DPRINT1("ShowWindow _RESTORE\n"); - if (!WasVisible) Swp |= SWP_SHOWWINDOW; + Swp |= SWP_SHOWWINDOW; if (Wnd->Style & (WS_MINIMIZE | WS_MAXIMIZE)) { - Swp |= SWP_FRAMECHANGED; - Swp |= co_WinPosMinMaximize(Window, SW_RESTORE, &NewPos); + Swp |= co_WinPosMinMaximize(Window, SW_RESTORE, &NewPos) | + SWP_FRAMECHANGED; } else { -// if (WasVisible) return TRUE; Swp |= SWP_NOSIZE | SWP_NOMOVE; - } - if (Wnd->Style & WS_CHILD) Swp |= SWP_NOACTIVATE | SWP_NOZORDER; + if (! WasVisible) + { + Swp |= SWP_FRAMECHANGED; + } + } break; - - case SW_FORCEMINIMIZE: - // Fixme! - DPRINT1("Force hung application down! pWindow: %x\n",Window); - return WasVisible; - default: - return WasVisible; } ShowFlag = (Cmd != SW_HIDE); Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Tue Jul 15 21:06:05 2008 @@ -869,8 +869,6 @@ ASSERT ( counts ); ASSERT ( polygons ); - if (polygons == 1) return PATH_Polygon ( dc, pts, *counts ); - pPath = PATH_LockPath( dc->DcLevel.hPath ); if (!pPath) return FALSE; @@ -880,9 +878,6 @@ PATH_UnlockPath( pPath ); return FALSE; } - - startpt.x = 0; - startpt.y = 0; for(i = 0, poly = 0; poly < polygons; poly++) { @@ -891,7 +886,7 @@ pt = pts[i]; CoordLPtoDP ( dc, &pt ); if(point == 0) startpt = pt; - PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO); + PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO); } /* win98 adds an extra line to close the figure for some reason */ PATH_AddEntry(pPath, &startpt, PT_LINETO | PT_CLOSEFIGURE); Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Tue Jul 15 21:06:05 2008 @@ -34,7 +34,6 @@ #include <freetype/ftglyph.h> #include <freetype/ftoutln.h> #include <freetype/ftwinfnt.h> -#include <freetype/ftmodapi.h> #define NDEBUG #include <debug.h> @@ -136,35 +135,6 @@ { DEFAULT_CHARSET, 0, FS(0)}, { SYMBOL_CHARSET, 42 /* CP_SYMBOL */, FS(31)}, }; - -static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); - -static -BOOL -is_hinting_enabled(void) -{ - /* Use the >= 2.2.0 function if available */ - if(pFT_Get_TrueType_Engine_Type) - { - FT_TrueTypeEngineType type = pFT_Get_TrueType_Engine_Type(library); - return type == FT_TRUETYPE_ENGINE_TYPE_PATENTED; - } -#ifdef FT_DRIVER_HAS_HINTER - else - { - FT_Module mod; - - /* otherwise if we've been compiled with < 2.2.0 headers - use the internal macro */ - mod = pFT_Get_Module(library, "truetype"); - if(mod && FT_DRIVER_HAS_HINTER(mod)) - return TRUE; - } -#endif - - return FALSE; -} - BOOL FASTCALL InitFontSupport(VOID) @@ -3325,12 +3295,7 @@ OUT LPRASTERIZER_STATUS praststat, IN ULONG cjBytes) { - static int hinting = -1; - - if(hinting == -1) - { - hinting = is_hinting_enabled(); - } + UNIMPLEMENTED; return FALSE; } @@ -3937,23 +3902,11 @@ BOOL STDCALL NtGdiSetTextJustification(HDC hDC, - int BreakExtra, - int BreakCount) -{ - PDC Dc; - PDC_ATTR Dc_Attr; - Dc = DC_LockDc(hDC); - if (!Dc) - { - return FALSE; - } - Dc_Attr = Dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; - - Dc_Attr->cBreak = BreakCount; - Dc_Attr->lBreakExtra = BreakExtra; - DC_UnlockDc(Dc); - return TRUE; + int BreakExtra, + int BreakCount) +{ + UNIMPLEMENTED; + return FALSE; } DWORD STDCALL

1 0

[jimtabor] 34540: make does like tabs, right? Fix build.
by jimtabor＠svn.reactos.org 16 Jul '08

16 Jul '08

Author: jimtabor Date: Tue Jul 15 20:22:26 2008 New Revision: 34540 URL: http://svn.reactos.org/svn/reactos?rev=34540&view=rev Log: make does like tabs, right? Fix build. Modified: trunk/reactos/Makefile trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=34540&r1=3453… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Tue Jul 15 20:22:26 2008 @@ -167,20 +167,20 @@ .SUFFIXES: ifeq ($(HOST),) - ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) - ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) - export OSTYPE = msys - HOST=mingw32-linux - HOST_CFLAGS+=-fshort-wchar - HOST_CPPFLAGS+=-fshort-wchar - else - HOST=mingw32-windows - endif - else - HOST=mingw32-linux - HOST_CFLAGS+=-fshort-wchar - HOST_CPPFLAGS+=-fshort-wchar - endif +ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) +ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) +export OSTYPE = msys +HOST=mingw32-linux +HOST_CFLAGS+=-fshort-wchar +HOST_CPPFLAGS+=-fshort-wchar +else +HOST=mingw32-windows +endif +else +HOST=mingw32-linux +HOST_CFLAGS+=-fshort-wchar +HOST_CPPFLAGS+=-fshort-wchar +endif endif # Default to half-verbose mode Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Tue Jul 15 20:22:26 2008 @@ -742,8 +742,12 @@ LRESULT DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { - WINDOWPLACEMENT wp; +// WINDOWPLACEMENT wp; POINT Pt; + + // ATM, This is for Hook call. + if (NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, 0, NUMC_DEFWINDOWPROC, FALSE)) + return 0; switch (wParam & 0xfff0) { @@ -752,28 +756,40 @@ DefWndDoSizeMove(hWnd, wParam); break; case SC_MINIMIZE: - wp.length = sizeof(WINDOWPLACEMENT); + FIXME("SysCommand SC_MINIMIZE\n"); +/* wp.length = sizeof(WINDOWPLACEMENT); if(GetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_MINIMIZE; SetWindowPlacement(hWnd, &wp); - } + }*/ + if (hWnd == GetForegroundWindow()) + ShowOwnedPopups(hWnd,FALSE); + ShowWindow( hWnd, SW_MINIMIZE ); break; case SC_MAXIMIZE: - wp.length = sizeof(WINDOWPLACEMENT); + FIXME("SysCommand SC_MAXIMIZE\n"); +/* wp.length = sizeof(WINDOWPLACEMENT); if(GetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_MAXIMIZE; SetWindowPlacement(hWnd, &wp); - } + }*/ + if (IsIconic(hWnd) && hWnd == GetForegroundWindow()) + ShowOwnedPopups(hWnd,TRUE); + ShowWindow( hWnd, SW_MAXIMIZE ); break; case SC_RESTORE: - wp.length = sizeof(WINDOWPLACEMENT); + FIXME("SysCommand SC_RESTORE\n"); +/* wp.length = sizeof(WINDOWPLACEMENT); if(GetWindowPlacement(hWnd, &wp)) { wp.showCmd = SW_RESTORE; SetWindowPlacement(hWnd, &wp); - } + }*/ + if (IsIconic(hWnd) && hWnd == GetForegroundWindow()) + ShowOwnedPopups(hWnd,TRUE); + ShowWindow( hWnd, SW_RESTORE ); break; case SC_CLOSE: SendMessageA(hWnd, WM_CLOSE, 0, 0); @@ -1410,7 +1426,8 @@ case WM_SHOWWINDOW: { - NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, NUMC_DEFWINDOWPROC, FALSE); + if (lParam) // Call when it is necessary. + NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, NUMC_DEFWINDOWPROC, FALSE); break; } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue Jul 15 20:22:26 2008 @@ -1617,6 +1617,7 @@ int cy, UINT uFlags) { + FIXME("SetWindowPos\n"); return NtUserSetWindowPos(hWnd,hWndInsertAfter, X, Y, cx, cy, uFlags); } @@ -1713,6 +1714,7 @@ ShowWindow(HWND hWnd, int nCmdShow) { + FIXME("ShowWindow\n"); return NtUserShowWindow(hWnd, nCmdShow); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Tue Jul 15 20:22:26 2008 @@ -13,7 +13,15 @@ #define NDEBUG #include <debug.h> +LRESULT FASTCALL +IntDefWinHandleSysCommand( PWINDOW_OBJECT Window, WPARAM wParam, LPARAM lParam ) +{ + DPRINT1("hwnd %p WM_SYSCOMMAND %lx %lx\n", Window->hSelf, wParam, lParam ); + if (co_HOOK_CallHooks(WH_CBT, HCBT_SYSCOMMAND, wParam, lParam)) + return 1; + return 0; +} /* Win32k counterpart of User DefWindowProc */ @@ -25,6 +33,7 @@ LPARAM lParam) { PWINDOW Wnd; + LRESULT lResult = 0; if (Msg > WM_USER) return 0; @@ -33,6 +42,11 @@ switch (Msg) { + case WM_SYSCOMMAND: + { + lResult = IntDefWinHandleSysCommand( Window, wParam, lParam ); + break; + } case WM_SHOWWINDOW: { if ((Wnd->Style & WS_VISIBLE) && wParam) break; @@ -54,7 +68,7 @@ break; } - return 0; + return lResult; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Jul 15 20:22:26 2008 @@ -107,11 +107,14 @@ Hook->Thread = Thread; Hook->HookId = HookId; - W32Thread = ((PW32THREAD)Thread->Tcb.Win32Thread); - ASSERT(W32Thread != NULL); - W32Thread->Hooks |= HOOKID_TO_FLAG(HookId); - if (W32Thread->ThreadInfo != NULL) - W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; + if (Thread) + { + W32Thread = ((PW32THREAD)Thread->Tcb.Win32Thread); + ASSERT(W32Thread != NULL); + W32Thread->Hooks |= HOOKID_TO_FLAG(HookId); + if (W32Thread->ThreadInfo != NULL) + W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; + } RtlInitUnicodeString(&Hook->ModuleName, NULL); @@ -318,7 +321,7 @@ return IntCallLowLevelHook(HookId, Code, wParam, lParam, Hook); } - if (Hook->Thread != PsGetCurrentThread()) + if ((Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL)) { DPRINT1("Calling hooks in other threads not implemented yet"); return 0; @@ -570,7 +573,7 @@ /* We only (partially) support local WH_CBT hooks and * WH_KEYBOARD_LL/WH_MOUSE_LL hooks for now */ if ((WH_CBT != HookId || Global) - && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId) // && WH_GETMESSAGE != HookId) + && WH_KEYBOARD_LL != HookId && WH_MOUSE_LL != HookId && WH_GETMESSAGE != HookId) { #if 0 /* Removed to get winEmbed working again */ UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Tue Jul 15 20:22:26 2008 @@ -736,6 +736,7 @@ case HWNDLOCK_ROUTINE_SETFOREGROUNDWINDOW: Ret = co_IntSetForegroundWindow(Window); + DPRINT1("Leave NtUserCallHwndLock SetForegroundWindow, ret=%i\n",Ret); break; case HWNDLOCK_ROUTINE_UPDATEWINDOW: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jul 15 20:22:26 2008 @@ -3333,6 +3333,7 @@ break; case GW_HWNDNEXT: + DPRINT1("GW_HWNDNEXT\n"); if (Window->NextSibling) hWndResult = Window->NextSibling->hSelf; break; @@ -3374,13 +3375,13 @@ { DECLARE_RETURN(HWND); - DPRINT("Enter NtUserGetWindow\n"); + DPRINT1("Enter NtUserGetWindow\n"); UserEnterShared(); RETURN(UserGetWindow(hWnd, Relationship)); CLEANUP: - DPRINT("Leave NtUserGetWindow, ret=%i\n",_ret_); + DPRINT1("Leave NtUserGetWindow, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } @@ -4244,7 +4245,7 @@ BOOL ret; USER_REFERENCE_ENTRY Ref; - DPRINT("Enter NtUserSetWindowPos\n"); + DPRINT1("Enter NtUserSetWindowPos\n"); UserEnterExclusive(); if (!(Window = UserGetWindowObject(hWnd))) @@ -4259,7 +4260,7 @@ RETURN(ret); CLEANUP: - DPRINT("Leave NtUserSetWindowPos, ret=%i\n",_ret_); + DPRINT1("Leave NtUserSetWindowPos, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } @@ -4407,7 +4408,7 @@ DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; - DPRINT("Enter NtUserShowWindow\n"); + DPRINT1("Enter NtUserShowWindow\n"); UserEnterExclusive(); if (!(Window = UserGetWindowObject(hWnd))) @@ -4422,7 +4423,7 @@ RETURN(ret); CLEANUP: - DPRINT("Leave NtUserShowWindow, ret=%i\n",_ret_); + DPRINT1("Leave NtUserShowWindow, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Tue Jul 15 20:22:26 2008 @@ -306,15 +306,24 @@ Size.x = Wnd->WindowRect.left; Size.y = Wnd->WindowRect.top; WinPosInitInternalPos(Window, &Size, &Wnd->WindowRect); - - if (Wnd->Style & WS_MINIMIZE) - { - if (!co_IntSendMessage(Window->hSelf, WM_QUERYOPEN, 0, 0)) - { - return(SWP_NOSIZE | SWP_NOMOVE); - } - SwpFlags |= SWP_NOCOPYBITS; - } + + if (co_HOOK_CallHooks(WH_CBT, HCBT_MINMAX, (WPARAM)Window->hSelf, ShowFlag)) + return SWP_NOSIZE | SWP_NOMOVE; + + if (Wnd->Style & WS_MINIMIZE) + { + switch (ShowFlag) + { + case SW_MINIMIZE: + return SWP_NOSIZE | SWP_NOMOVE; + } + if (!co_IntSendMessage(Window->hSelf, WM_QUERYOPEN, 0, 0)) + { + return(SWP_NOSIZE | SWP_NOMOVE); + } + SwpFlags |= SWP_NOCOPYBITS; + } + switch (ShowFlag) { case SW_MINIMIZE: @@ -1216,7 +1225,7 @@ if (RgnType != ERROR && RgnType != NULLREGION) { /* old code - NtGdiOffsetRgn(DirtyRgn, Window->WindowRect.left, Window->WindowRect.top); + NtGdiOffsetRgn(DirtyRgn, Window->Wnd->WindowRect.left, Window->Wnd->WindowRect.top); IntInvalidateWindows(Window, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } @@ -1314,7 +1323,7 @@ { BOOLEAN WasVisible; UINT Swp = 0; - RECT NewPos; + RECT NewPos = {0, 0, 0, 0}; BOOLEAN ShowFlag; // HRGN VisibleRgn; PWINDOW Wnd; @@ -1334,53 +1343,29 @@ } Swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (Window->hSelf != UserGetActiveWindow()) +// if (Wnd->Style & WS_CHILD) Swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; } case SW_SHOWMINNOACTIVE: + case SW_MINIMIZE: Swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* Fall through. */ case SW_SHOWMINIMIZED: - Swp |= SWP_SHOWWINDOW; - /* Fall through. */ - case SW_MINIMIZE: - { - Swp |= SWP_NOACTIVATE; - if (!(Wnd->Style & WS_MINIMIZE)) - { - Swp |= co_WinPosMinMaximize(Window, SW_MINIMIZE, &NewPos) | - SWP_FRAMECHANGED; - } - else - { - Swp |= SWP_NOSIZE | SWP_NOMOVE; - if (! WasVisible) - { - Swp |= SWP_FRAMECHANGED; - } - } - break; - } + DPRINT1("ShowWindow _MINIMIZE\n"); + Swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; + Swp |= co_WinPosMinMaximize(Window, SW_MINIMIZE, &NewPos); +// if ((Wnd->Style & WS_MINIMIZE) && WasVisible) return TRUE; + break; case SW_SHOWMAXIMIZED: - { - Swp |= SWP_SHOWWINDOW; - if (!(Wnd->Style & WS_MAXIMIZE)) - { - Swp |= co_WinPosMinMaximize(Window, SW_MAXIMIZE, &NewPos) | - SWP_FRAMECHANGED; - } - else - { - Swp |= SWP_NOSIZE | SWP_NOMOVE; - if (! WasVisible) - { - Swp |= SWP_FRAMECHANGED; - } - } - break; - } + DPRINT1("ShowWindow _MAXIMIZE\n"); + if (!WasVisible) Swp |= SWP_SHOWWINDOW; + Swp |= SWP_FRAMECHANGED; + Swp |= co_WinPosMinMaximize(Window, SW_MAXIMIZE, &NewPos); +// if ((Wnd->Style & WS_MAXIMIZE) && WasVisible) return TRUE; + break; case SW_SHOWNA: Swp |= SWP_NOACTIVATE | SWP_NOZORDER; @@ -1392,27 +1377,32 @@ break; case SW_SHOWNOACTIVATE: - //Swp |= SWP_NOZORDER; Swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* Fall through. */ case SW_SHOWNORMAL: case SW_SHOWDEFAULT: case SW_RESTORE: - Swp |= SWP_SHOWWINDOW; + DPRINT1("ShowWindow _RESTORE\n"); + if (!WasVisible) Swp |= SWP_SHOWWINDOW; if (Wnd->Style & (WS_MINIMIZE | WS_MAXIMIZE)) { - Swp |= co_WinPosMinMaximize(Window, SW_RESTORE, &NewPos) | - SWP_FRAMECHANGED; + Swp |= SWP_FRAMECHANGED; + Swp |= co_WinPosMinMaximize(Window, SW_RESTORE, &NewPos); } else { +// if (WasVisible) return TRUE; Swp |= SWP_NOSIZE | SWP_NOMOVE; - if (! WasVisible) - { - Swp |= SWP_FRAMECHANGED; - } - } + } + if (Wnd->Style & WS_CHILD) Swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; + + case SW_FORCEMINIMIZE: + // Fixme! + DPRINT1("Force hung application down! pWindow: %x\n",Window); + return WasVisible; + default: + return WasVisible; } ShowFlag = (Cmd != SW_HIDE); Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Tue Jul 15 20:22:26 2008 @@ -869,6 +869,8 @@ ASSERT ( counts ); ASSERT ( polygons ); + if (polygons == 1) return PATH_Polygon ( dc, pts, *counts ); + pPath = PATH_LockPath( dc->DcLevel.hPath ); if (!pPath) return FALSE; @@ -878,6 +880,9 @@ PATH_UnlockPath( pPath ); return FALSE; } + + startpt.x = 0; + startpt.y = 0; for(i = 0, poly = 0; poly < polygons; poly++) { @@ -886,7 +891,7 @@ pt = pts[i]; CoordLPtoDP ( dc, &pt ); if(point == 0) startpt = pt; - PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO); + PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO); } /* win98 adds an extra line to close the figure for some reason */ PATH_AddEntry(pPath, &startpt, PT_LINETO | PT_CLOSEFIGURE); Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Tue Jul 15 20:22:26 2008 @@ -34,6 +34,7 @@ #include <freetype/ftglyph.h> #include <freetype/ftoutln.h> #include <freetype/ftwinfnt.h> +#include <freetype/ftmodapi.h> #define NDEBUG #include <debug.h> @@ -135,6 +136,35 @@ { DEFAULT_CHARSET, 0, FS(0)}, { SYMBOL_CHARSET, 42 /* CP_SYMBOL */, FS(31)}, }; + +static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); + +static +BOOL +is_hinting_enabled(void) +{ + /* Use the >= 2.2.0 function if available */ + if(pFT_Get_TrueType_Engine_Type) + { + FT_TrueTypeEngineType type = pFT_Get_TrueType_Engine_Type(library); + return type == FT_TRUETYPE_ENGINE_TYPE_PATENTED; + } +#ifdef FT_DRIVER_HAS_HINTER + else + { + FT_Module mod; + + /* otherwise if we've been compiled with < 2.2.0 headers + use the internal macro */ + mod = pFT_Get_Module(library, "truetype"); + if(mod && FT_DRIVER_HAS_HINTER(mod)) + return TRUE; + } +#endif + + return FALSE; +} + BOOL FASTCALL InitFontSupport(VOID) @@ -3295,7 +3325,12 @@ OUT LPRASTERIZER_STATUS praststat, IN ULONG cjBytes) { - UNIMPLEMENTED; + static int hinting = -1; + + if(hinting == -1) + { + hinting = is_hinting_enabled(); + } return FALSE; } @@ -3902,11 +3937,23 @@ BOOL STDCALL NtGdiSetTextJustification(HDC hDC, - int BreakExtra, - int BreakCount) -{ - UNIMPLEMENTED; - return FALSE; + int BreakExtra, + int BreakCount) +{ + PDC Dc; + PDC_ATTR Dc_Attr; + Dc = DC_LockDc(hDC); + if (!Dc) + { + return FALSE; + } + Dc_Attr = Dc->pDc_Attr; + if(!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; + + Dc_Attr->cBreak = BreakCount; + Dc_Attr->lBreakExtra = BreakExtra; + DC_UnlockDc(Dc); + return TRUE; } DWORD STDCALL

1 0

[jmorlan] 34539: Increment a console's initial screen buffer's reference count *after* calling CsrInitConsoleScreenBuffer (which sets the reference count to 0). Fixes bug 3524.
by jmorlan＠svn.reactos.org 16 Jul '08

16 Jul '08

Author: jmorlan Date: Tue Jul 15 19:24:54 2008 New Revision: 34539 URL: http://svn.reactos.org/svn/reactos?rev=34539&view=rev Log: Increment a console's initial screen buffer's reference count *after* calling CsrInitConsoleScreenBuffer (which sets the reference count to 0). Fixes bug 3524. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Tue Jul 15 19:24:54 2008 @@ -191,9 +191,6 @@ /* make console active, and insert into console list */ Console->ActiveBuffer = (PCSRSS_SCREEN_BUFFER) NewBuffer; Console->hActiveBuffer = INVALID_HANDLE_VALUE; - /* add a reference count because the buffer is tied to the console */ - InterlockedIncrement(&Console->ActiveBuffer->Header.ReferenceCount); - if (! GuiMode) { @@ -229,6 +226,9 @@ DPRINT1("CsrInitConsoleScreenBuffer: failed\n"); return Status; } + + /* add a reference count because the buffer is tied to the console */ + InterlockedIncrement(&Console->ActiveBuffer->Header.ReferenceCount); /* copy buffer contents to screen */ ConioDrawConsole(Console);

1 0

[silverblade] 34538: Implemented WOM_OPEN, WOM_DONE and WOM_CLOSE callbacks. Added missing prototype of DriverCallback to digitalv.h in the PSDK (as per MSDN). Looped buffers aren't meant to be marked "done" until all loops are finished. But even then, NT4's own sndblst.dll seems to horde looped buffers if we break out of the loop. (Give the damn things back!) So, don't expect WOM_DONE from looped buffers. MSDN states that you shouldn't call any wave functions within the wave callback, or a dead
by silverblade＠svn.reactos.org 15 Jul '08

15 Jul '08

Author: silverblade Date: Tue Jul 15 17:42:34 2008 New Revision: 34538 URL: http://svn.reactos.org/svn/reactos?rev=34538&view=rev Log: Implemented WOM_OPEN, WOM_DONE and WOM_CLOSE callbacks. Added missing prototype of DriverCallback to digitalv.h in the PSDK (as per MSDN). Looped buffers aren't meant to be marked "done" until all loops are finished. But even then, NT4's own sndblst.dll seems to horde looped buffers if we break out of the loop. (Give the damn things back!) So, don't expect WOM_DONE from looped buffers. MSDN states that you shouldn't call any wave functions within the wave callback, or a deadlock will occur. Since buffer submission is dealt with inside the streaming thread, as is the callback, this situation holds true for my implementation. Things are almost at a state now where it may be possible to drop this in-place of the original sndblst.dll on an NT4 installation and have it function for wave audio playback. But there are still issues to be sorted out. Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/psdk/digitalv.h branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -126,6 +126,19 @@ WORD Buffer[5347700 / 2]; WAVEHDR WaveHeaders[534]; + +VOID CALLBACK +callback( + HWAVEOUT Handle, + UINT Message, + DWORD_PTR Instance, + DWORD_PTR Parameter1, + DWORD_PTR Parameter2) +{ + printf("Callback called! Handle %d, message %d, instance %d, parameters %d %d\n", + (int) Handle, (int) Message, (int) Instance, (int) Parameter1, + (int) Parameter2); +} int APIENTRY wWinMain( HINSTANCE hInstance, @@ -178,7 +191,9 @@ //SOUND_DEBUG(L"WODM_OPEN test 2"); OpenDesc.lpFormat = &Format; - Result = wodMessage(0, WODM_OPEN, (DWORD) &InstanceData, (DWORD) &OpenDesc, 0); + OpenDesc.dwCallback = (DWORD) &callback; + OpenDesc.dwInstance = 0x69696969; + Result = wodMessage(0, WODM_OPEN, (DWORD) &InstanceData, (DWORD) &OpenDesc, CALLBACK_FUNCTION); /*SOUND_DEBUG_HEX(Result);*/ POPUP("Click for WODM_WRITE test"); Modified: branches/silverblade-audio/include/psdk/digitalv.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/psdk/… ============================================================================== --- branches/silverblade-audio/include/psdk/digitalv.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/psdk/digitalv.h [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -857,6 +857,20 @@ LPWSTR lpstrText; } MCI_DGV_WINDOW_PARMSW, *LPMCI_DGV_WINDOW_PARMSW; +/* Driver callback for multimedia components (implemented in winmm) */ + +WINAPI BOOL +DriverCallback( + DWORD dwCallBack, + DWORD dwFlags, + HDRVR hdrvr, + DWORD msg, + DWORD dwUser, + DWORD dwParam1, + DWORD dwParam2 +); + + #ifdef __cplusplus } #endif Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -293,7 +293,10 @@ /* Stuff generously donated to us from WinMM */ struct { + HDRVR Handle; + DWORD Flags; DWORD ClientCallback; + DWORD ClientCallbackInstanceData; } WinMM; /* Device-specific parameters */ @@ -699,4 +702,15 @@ DWORD parameter2); +/* + mme/callback.c +*/ + +VOID +NotifySoundClient( + PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + DWORD Message, + DWORD Parameter); + + #endif Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -11,11 +11,30 @@ #include <windows.h> #include <mmsystem.h> +#include <digitalv.h> + +#include <mmebuddy.h> VOID NotifySoundClient( + PSOUND_DEVICE_INSTANCE SoundDeviceInstance, DWORD Message, DWORD Parameter) { - /* TODO... DriverCallback */ + ASSERT( SoundDeviceInstance ); + + TRACE_("MME client callback - message %d, parameter %d\n", + (int) Message, + (int) Parameter); + + if ( SoundDeviceInstance->WinMM.ClientCallback ) + { + DriverCallback(SoundDeviceInstance->WinMM.ClientCallback, + HIWORD(SoundDeviceInstance->WinMM.Flags), + SoundDeviceInstance->WinMM.Handle, + Message, + SoundDeviceInstance->WinMM.ClientCallbackInstanceData, + Parameter, + 0); + } } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -11,6 +11,7 @@ <file>utility.c</file> <directory name="mme"> <file>DriverProc.c</file> + <file>callback.c</file> </directory> <directory name="wave"> <file>wodMessage.c</file> Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -237,12 +237,36 @@ WaveHeader->reserved += BytesWritten; ASSERT(WaveHeader->reserved <= WaveHeader->dwBufferLength); + StreamInfo = &SoundDeviceInstance->Streaming.Wave; + + /* Did we complete a header sent by the client? */ if ( WaveHeader->reserved == WaveHeader->dwBufferLength ) { TRACE_("* Completed wavehdr %p (length %d)\n", WaveHeader, (int) WaveHeader->dwBufferLength); - /* TODO: Give it back to the client */ + + if ( StreamInfo->LoopsRemaining > 0 ) + { + /* Let's go round again... */ + WaveHeader->reserved = 0; + + /* + FIXME: + I have no idea wtf happens with completions - tests with the NT4 + mmdrv indicate that they just randomly throw back completed + buffers later on. Like, a lot later on... Like, when the device + is being reset. + */ + } + else + { + /* Mark the header as done */ + WaveHeader->dwFlags |= WHDR_DONE; + + /* Notify the client */ + NotifySoundClient(SoundDeviceInstance, WOM_DONE, (DWORD) WaveHeader); + } } else { @@ -251,8 +275,6 @@ (int) WaveHeader->reserved, (int) WaveHeader->dwBufferLength); } - - StreamInfo = &SoundDeviceInstance->Streaming.Wave; /* Decrease the number of outstanding buffers */ ASSERT(StreamInfo->BuffersOutstanding > 0); @@ -422,6 +444,8 @@ /* ugly HACK to stop sound playback... FIXME */ SoundDeviceInstance->Streaming.Wave.CurrentBuffer = NULL; + /* TODO: Return all audio buffers to the client, marking as DONE */ + return Functions->ResetWaveDevice(SoundDeviceInstance); } Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Tue Jul 15 17:42:34 2008 @@ -95,10 +95,18 @@ return Result; } + /* Set up the callback - TODO: Put this somewhere else? */ + Instance->WinMM.ClientCallback = OpenParameters->dwCallback; + Instance->WinMM.ClientCallbackInstanceData = + OpenParameters->dwInstance; + Instance->WinMM.Handle = (HDRVR) OpenParameters->hWave; + Instance->WinMM.Flags = parameter2; + /* Provide winmm with instance handle */ *((PSOUND_DEVICE_INSTANCE*)private_handle) = Instance; - /* TODO: Send callback... */ + /* Notify the client */ + NotifySoundClient(Instance, WOM_OPEN, 0); return MMSYSERR_NOERROR; } @@ -118,10 +126,11 @@ if ( State != WAVE_DD_IDLE ) return WAVERR_STILLPLAYING; + /* Notify the client */ + NotifySoundClient(Instance, WOM_CLOSE, 0); + Result = DestroySoundDeviceInstance(Instance); ASSERT(Result == MMSYSERR_NOERROR); - - /* TODO: Send the callback */ return Result; }

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