Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[ion] 20693: Fix build

by ion＠svn.reactos.org

Fix build Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2006-01-08 01:18:49 UTC (rev 20692) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2006-01-08 01:24:27 UTC (rev 20693) @@ -54,6 +54,15 @@ CCHAR NumberOfProcessors; } SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION; +LONG +__stdcall +ZwQuerySystemInformation( + IN ULONG SystemInformationClass, + OUT PVOID SystemInformation, + IN ULONG Length, + OUT PULONG ResultLength +); + typedef struct { PHYSICAL_ADDRESS PhysControlStart;

18 years, 8 months

[gedmurphy] 20692: - list items alphabetically

by gedmurphy＠svn.reactos.org

- list items alphabetically - double click opens properties dialog Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-08 00:59:24 UTC (rev 20691) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-08 01:18:49 UTC (rev 20692) @@ -32,6 +32,7 @@ TCHAR szStatus[128]; DWORD NumServices = 0; DWORD Index; + LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); NumServices = GetServiceList(); @@ -67,7 +68,7 @@ DWORD dwValueSize; /* open the registry key for the service */ - _sntprintf(buf, 300, _T("System\\CurrentControlSet\\Services\\%s"), + _sntprintf(buf, 300, Path, pServiceStatus[Index].lpServiceName); if( RegOpenKeyEx(HKEY_LOCAL_MACHINE, _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-08 00:59:24 UTC (rev 20691) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-08 01:18:49 UTC (rev 20692) @@ -39,7 +39,8 @@ hListView = CreateWindow(WC_LISTVIEW, NULL, - WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER | LVS_EDITLABELS, + WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER | + LVS_EDITLABELS | LVS_SORTASCENDING, 0, 0, 0, 0, /* sized via WM_SIZE */ hwnd, (HMENU) IDC_SERVLIST, @@ -196,8 +197,18 @@ break; case WM_NOTIFY: + { + LPNMITEMACTIVATE item; + switch (((LPNMHDR) lParam)->code) { + + case NM_DBLCLK: + item = (LPNMITEMACTIVATE) lParam; + PropSheets(hwnd); + + break; + case TTN_GETDISPINFO: { LPTOOLTIPTEXT lpttt; @@ -246,6 +257,7 @@ default: break; } + } break; case WM_CLOSE: _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-08 00:59:24 UTC (rev 20691) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-08 01:18:49 UTC (rev 20692) @@ -8,6 +8,8 @@ #include <commctrl.h> #include "resource.h" +#define MAX_KEY_LENGTH 256 + BOOL RefreshServiceList(VOID); BOOL CALLBACK

18 years, 8 months

[cwittich] 20691: comment out some more not needed code

by cwittich＠svn.reactos.org

comment out some more not needed code Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-08 00:48:28 UTC (rev 20690) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-08 00:59:24 UTC (rev 20691) @@ -226,14 +226,14 @@ fprintf ( OUT, "\t\t\tName=\"Win32\"/>\r\n" ); fprintf ( OUT, "\t</Platforms>\r\n" ); - fprintf ( OUT, "\t<ToolFiles>\r\n" ); - fprintf ( OUT, "\t\t<ToolFile\r\n" ); + //fprintf ( OUT, "\t<ToolFiles>\r\n" ); + //fprintf ( OUT, "\t\t<ToolFile\r\n" ); - string path = Path::RelativeFromDirectory ( ProjectNode.name, module.GetBasePath() ); - path.erase(path.find(ProjectNode.name, 0), ProjectNode.name.size() + 1); + //string path = Path::RelativeFromDirectory ( ProjectNode.name, module.GetBasePath() ); + //path.erase(path.find(ProjectNode.name, 0), ProjectNode.name.size() + 1); - fprintf ( OUT, "\t\t\tRelativePath=\"%sgccasm.rules\"/>\r\n", path.c_str() ); - fprintf ( OUT, "\t</ToolFiles>\r\n" ); + //fprintf ( OUT, "\t\t\tRelativePath=\"%sgccasm.rules\"/>\r\n", path.c_str() ); + //fprintf ( OUT, "\t</ToolFiles>\r\n" ); int n = 0;

18 years, 8 months

[cwittich] 20690: don't use VCToolsFile anymore because of different include dirs for subprojects

by cwittich＠svn.reactos.org

don't use VCToolsFile anymore because of different include dirs for subprojects Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2006-01-08 00:29:02 UTC (rev 20689) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp 2006-01-08 00:48:28 UTC (rev 20690) @@ -54,19 +54,19 @@ void MSVCBackend::Process() { string filename_sln ( ProjectNode.name ); - string filename_rules = "gccasm.rules"; + //string filename_rules = "gccasm.rules"; if ( configuration.VSProjectVersion == "6.00" ) filename_sln += ".dsw"; else { filename_sln += ".sln"; - m_rulesFile = fopen ( filename_rules.c_str(), "wb" ); - if ( m_rulesFile ) - { - _generate_rules_file ( m_rulesFile ); - } - fclose ( m_rulesFile ); + //m_rulesFile = fopen ( filename_rules.c_str(), "wb" ); + //if ( m_rulesFile ) + //{ + // _generate_rules_file ( m_rulesFile ); + //} + //fclose ( m_rulesFile ); } printf ( "Creating MSVC workspace: %s\n", filename_sln.c_str() ); _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h --- trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2006-01-08 00:29:02 UTC (rev 20689) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h 2006-01-08 00:48:28 UTC (rev 20690) @@ -92,7 +92,7 @@ void _generate_sln_header ( FILE* OUT ); void _generate_sln_footer ( FILE* OUT ); void _generate_sln ( FILE* OUT ); - void _generate_rules_file ( FILE* OUT ); + //void _generate_rules_file ( FILE* OUT ); void _generate_sln_project ( FILE* OUT, const Module& module, _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-08 00:29:02 UTC (rev 20689) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-08 00:48:28 UTC (rev 20690) @@ -493,7 +493,7 @@ fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); } - if (configuration.VSProjectVersion < "8.00") { + //if (configuration.VSProjectVersion < "8.00") { if ((source_file.find(".idl") != string::npos) || ((source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's'))) { fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); @@ -514,7 +514,7 @@ } fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); } - } + //} } fprintf ( OUT, "\t\t\t</File>\r\n" ); } @@ -588,29 +588,29 @@ } -void -MSVCBackend::_generate_rules_file ( FILE* OUT ) -{ - fprintf ( OUT, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" ); - fprintf ( OUT, "<VisualStudioToolFile\r\n" ); - fprintf ( OUT, "\tName=\"GCC Assembler\"\r\n" ); - fprintf ( OUT, "\tVersion=\"%s\"\r\n", _get_solution_verion().c_str() ); - fprintf ( OUT, "\t>\r\n" ); - fprintf ( OUT, "\t<Rules>\r\n" ); - fprintf ( OUT, "\t\t<CustomBuildRule\r\n" ); - fprintf ( OUT, "\t\t\tName=\"Assembler\"\r\n" ); - fprintf ( OUT, "\t\t\tDisplayName=\"Assembler Files\"\r\n" ); - fprintf ( OUT, "\t\t\tCommandLine=\"cl /E "$(InputPath)" | as -o "$(OutDir)\\$(InputName).obj"\"\r\n" ); - fprintf ( OUT, "\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"\r\n" ); - fprintf ( OUT, "\t\t\tFileExtensions=\"*.S\"\r\n" ); - fprintf ( OUT, "\t\t\tExecutionDescription=\"asm\"\r\n" ); - fprintf ( OUT, "\t\t\t>\r\n" ); - fprintf ( OUT, "\t\t\t<Properties>\r\n" ); - fprintf ( OUT, "\t\t\t</Properties>\r\n" ); - fprintf ( OUT, "\t\t</CustomBuildRule>\r\n" ); - fprintf ( OUT, "\t</Rules>\r\n" ); - fprintf ( OUT, "</VisualStudioToolFile>\r\n" ); -} +//void +//MSVCBackend::_generate_rules_file ( FILE* OUT ) +//{ +// fprintf ( OUT, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" ); +// fprintf ( OUT, "<VisualStudioToolFile\r\n" ); +// fprintf ( OUT, "\tName=\"GCC Assembler\"\r\n" ); +// fprintf ( OUT, "\tVersion=\"%s\"\r\n", _get_solution_verion().c_str() ); +// fprintf ( OUT, "\t>\r\n" ); +// fprintf ( OUT, "\t<Rules>\r\n" ); +// fprintf ( OUT, "\t\t<CustomBuildRule\r\n" ); +// fprintf ( OUT, "\t\t\tName=\"Assembler\"\r\n" ); +// fprintf ( OUT, "\t\t\tDisplayName=\"Assembler Files\"\r\n" ); +// fprintf ( OUT, "\t\t\tCommandLine=\"cl /E "$(InputPath)" | as -o "$(OutDir)\\$(InputName).obj"\"\r\n" ); +// fprintf ( OUT, "\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"\r\n" ); +// fprintf ( OUT, "\t\t\tFileExtensions=\"*.S\"\r\n" ); +// fprintf ( OUT, "\t\t\tExecutionDescription=\"asm\"\r\n" ); +// fprintf ( OUT, "\t\t\t>\r\n" ); +// fprintf ( OUT, "\t\t\t<Properties>\r\n" ); +// fprintf ( OUT, "\t\t\t</Properties>\r\n" ); +// fprintf ( OUT, "\t\t</CustomBuildRule>\r\n" ); +// fprintf ( OUT, "\t</Rules>\r\n" ); +// fprintf ( OUT, "</VisualStudioToolFile>\r\n" ); +//} void MSVCBackend::_generate_sln_header ( FILE* OUT )

18 years, 8 months

[cwittich] 20689: fixed a copy/paste error

by cwittich＠svn.reactos.org

fixed a copy/paste error Modified: trunk/reactos/lib/keyboard/directory.xml _____ Modified: trunk/reactos/lib/keyboard/directory.xml --- trunk/reactos/lib/keyboard/directory.xml 2006-01-08 00:26:49 UTC (rev 20688) +++ trunk/reactos/lib/keyboard/directory.xml 2006-01-08 00:29:02 UTC (rev 20689) @@ -33,7 +33,7 @@ <xi:include href="kbdsg/kbdsg.xml" /> </directory> <directory name="kbdsk"> - <xi:include href="kbdsg/kbdsk.xml" /> + <xi:include href="kbdsk/kbdsk.xml" /> </directory> <directory name="kbduk"> <xi:include href="kbduk/kbduk.xml" />

18 years, 8 months

[cwittich] 20688: added slovak keyboard written by Malin <malin23@atlas.sk>

by cwittich＠svn.reactos.org

added slovak keyboard written by Malin <malin23(a)atlas.sk> Modified: trunk/reactos/lib/keyboard/directory.xml Added: trunk/reactos/lib/keyboard/kbdsk/ Added: trunk/reactos/lib/keyboard/kbdsk/kbdsk.c Added: trunk/reactos/lib/keyboard/kbdsk/kbdsk.def Added: trunk/reactos/lib/keyboard/kbdsk/kbdsk.rc Added: trunk/reactos/lib/keyboard/kbdsk/kbdsk.xml _____ Modified: trunk/reactos/lib/keyboard/directory.xml --- trunk/reactos/lib/keyboard/directory.xml 2006-01-08 00:01:16 UTC (rev 20687) +++ trunk/reactos/lib/keyboard/directory.xml 2006-01-08 00:26:49 UTC (rev 20688) @@ -32,6 +32,9 @@ <directory name="kbdsg"> <xi:include href="kbdsg/kbdsg.xml" /> </directory> + <directory name="kbdsk"> + <xi:include href="kbdsg/kbdsk.xml" /> + </directory> <directory name="kbduk"> <xi:include href="kbduk/kbduk.xml" /> </directory> _____ Added: trunk/reactos/lib/keyboard/kbdsk/kbdsk.c --- trunk/reactos/lib/keyboard/kbdsk/kbdsk.c 2006-01-08 00:01:16 UTC (rev 20687) +++ trunk/reactos/lib/keyboard/kbdsk/kbdsk.c 2006-01-08 00:26:49 UTC (rev 20688) @@ -0,0 +1,412 @@ +/* + * ReactOS Slovak ASCII Keyboard layout + * Copyright (C) 2005 ReactOS + * License: LGPL, see: LGPL.txt + * + * Created by Malin (malin23(a)atlas.sk) + * Thanks to creators of others kbdxx.dll + */ + +#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[] = { + {0x1c, VK_RETURN|KEXT}, //Keypad return + {0x1d, VK_RCONTROL|KEXT},//Right control key + {0x35, VK_DIVIDE|KEXT}, // Numpad div + {0x38, VK_RMENU|KEXT}, //AltGr? + {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, 3 ,0, 0,4,5} /* 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 */ + /* The numbers */ + { '1', NOCAPS, {'+', '1'} }, + { '2', NOCAPS, {0x013e, '2'} }, // l with caron + { '3', NOCAPS, {0x0161, '3'} }, // s with caron + { '4', NOCAPS, {0x010d, '4'} }, // c with caron + { '5', NOCAPS, {0x0165, '5'} }, // t with caron + { '6', NOCAPS, {0x017e, '6'} }, // z with caron + { '7', NOCAPS, {0x00fd, '7'} }, // y with acute + { '8', NOCAPS, {0x00e1, '8'} }, // a with acute + { '9', NOCAPS, {0x00ed, '9'} }, // i with acute + { '0', NOCAPS, {0x00e9, '0'} }, // e with acute + { VK_OEM_PLUS, NOCAPS, {WCH_DEAD, WCH_DEAD} }, // dead letters - acute, caron + { VK_EMPTY, 0, {0x00b4, 0x02c7} }, // VK_OEM_PLUS death + { VK_OEM_MINUS, NOCAPS, {'=', '%'} }, + { VK_OEM_1, NOCAPS, {0x00f4, '\"'} }, // o with circumflex + { VK_OEM_2, NOCAPS, {'-', '_'} }, + { VK_OEM_3, NOCAPS, {0x00a7, '!'} }, // section sign + { VK_OEM_4, NOCAPS, {0x00fa, '/'} }, // u with acute + { VK_OEM_5, NOCAPS, {'&', '*'} }, + { VK_OEM_6, NOCAPS, {0x00E4, '('} }, // a with diaeresis + { VK_OEM_7, NOCAPS, {0x0148, ')'} }, // n with caron + { VK_OEM_8, NOCAPS, {';', WCH_DEAD} }, // degree sign + { VK_EMPTY, 0, {WCH_NONE, 0x00b0} }, // VK_OEM_8 death + { VK_OEM_COMMA, NOCAPS, {',', '?'} }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':'} }, + + /* Keys that do not have shift states */ + { VK_TAB, NOCAPS, {'\t','\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_ESCAPE, NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE, NOCAPS, {' ', ' '} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_RETURN, 0, {'\r', '\r', '\n'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, C-Shift */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01, 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, + { 'C', CAPS, {'c', 'C', 0x03, 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, + { 'E', CAPS, {'e', 'E', 0x05, 0x05} }, + { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07, 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09, 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b, 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c, 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x0e, 0x0e} }, + { 'O', CAPS, {'o', 'O', 0x0f, 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13, 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15, 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18, 0x18} }, + { 'Y', CAPS, {'z', 'Z', 0x1a, 0x1a} }, // qwertZ + { 'Z', CAPS, {'y', 'Y', 0x19, 0x19} }, + { 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, 0x02c6, 0x00d4, 0x0000) }, // O with circumflex + { DEADTRANS(0x006f, 0x02c6, 0x00f4, 0x0000) }, // o with circumflex + { DEADTRANS(0x0020, 0x02c6, 0x02c6, 0x0000) }, // space > circumflex + + { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U > + { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u > + { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > degree + { 0, 0, 0 }, +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x00a1" L"\x004D\x00E4\x006B\x010D\x0065\x0148", // caron + L"\x00b4" L"\x0044\x013A\x017E\x0065\x0148", // acute + L"\x005e" L"\x0056\x006F\x006B\x00E1\x0148", // 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() { + return &keyboard_layout_table; +} + Property changes on: trunk/reactos/lib/keyboard/kbdsk/kbdsk.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/keyboard/kbdsk/kbdsk.def --- trunk/reactos/lib/keyboard/kbdsk/kbdsk.def 2006-01-08 00:01:16 UTC (rev 20687) +++ trunk/reactos/lib/keyboard/kbdsk/kbdsk.def 2006-01-08 00:26:49 UTC (rev 20688) @@ -0,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdsk.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Property changes on: trunk/reactos/lib/keyboard/kbdsk/kbdsk.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/keyboard/kbdsk/kbdsk.rc --- trunk/reactos/lib/keyboard/kbdsk/kbdsk.rc 2006-01-08 00:01:16 UTC (rev 20687) +++ trunk/reactos/lib/keyboard/kbdsk/kbdsk.rc 2006-01-08 00:26:49 UTC (rev 20688) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Slovak Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdsk\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdsk.dll\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/lib/keyboard/kbdsk/kbdsk.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/keyboard/kbdsk/kbdsk.xml --- trunk/reactos/lib/keyboard/kbdsk/kbdsk.xml 2006-01-08 00:01:16 UTC (rev 20687) +++ trunk/reactos/lib/keyboard/kbdsk/kbdsk.xml 2006-01-08 00:26:49 UTC (rev 20688) @@ -0,0 +1,9 @@ +<module name="kbdsk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdsk.dll" allowwarnings="true"> + <importlibrary definition="kbdsk.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdsk.c</file> + <file>kbdsk.rc</file> +</module> Property changes on: trunk/reactos/lib/keyboard/kbdsk/kbdsk.xml ___________________________________________________________________ Name: svn:eol-style + native

18 years, 8 months

[cwittich] 20687: fix msvc compile problems

by cwittich＠svn.reactos.org

fix msvc compile problems Modified: trunk/reactos/lib/cpl/intl/es.rc Modified: trunk/reactos/lib/cpl/intl/hu.rc _____ Modified: trunk/reactos/lib/cpl/intl/es.rc --- trunk/reactos/lib/cpl/intl/es.rc 2006-01-07 23:45:59 UTC (rev 20686) +++ trunk/reactos/lib/cpl/intl/es.rc 2006-01-08 00:01:16 UTC (rev 20687) @@ -50,10 +50,10 @@ LTEXT "SÝmbolo &PM:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE - LTEXT "Formato de Notaci¾n del Tiempo\n\n" - "h = hora m = minuto s = segundo t = am ¾ pm\n\n" - "h = 12 houras H = 24 houras\n" - "hh, mm, ss = cero inicial h, m, s = sin cero inicial", + LTEXT "Formato de Notaci¾n del Tiempo\n\n\ + h = hora m = minuto s = segundo t = am ¾ pm\n\n\ + h = 12 houras H = 24 houras\n\ + hh, mm, ss = cero inicial h, m, s = sin cero inicial", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/hu.rc --- trunk/reactos/lib/cpl/intl/hu.rc 2006-01-07 23:45:59 UTC (rev 20686) +++ trunk/reactos/lib/cpl/intl/hu.rc 2006-01-08 00:01:16 UTC (rev 20687) @@ -45,10 +45,10 @@ LTEXT "&DÚlutßn jele:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE - LTEXT "Id§formßtum jel÷lÚse\n\n" - "o = ¾ra p = perc m = mßsodperc n = de. vagy du.\n\n" - "o = 12 ¾rßs O = 24 ¾rßs\n" - "oo, pp, mm = nulla hasznßlata o, p, m = nincs nulla", + LTEXT "Id§formßtum jel÷lÚse\n\n\ + o = ¾ra p = perc m = mßsodperc n = de. vagy du.\n\n\ + o = 12 ¾rßs O = 24 ¾rßs\n\ + oo, pp, mm = nulla hasznßlata o, p, m = nincs nulla", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END

18 years, 8 months

[mbosma] 20686: German translation by DJ_Smith from IRC (dj_smith_reactos@online.de)

by mbosma＠svn.reactos.org

German translation by DJ_Smith from IRC (dj_smith_reactos(a)online.de) Modified: trunk/reactos/subsys/system/servman/De.rc _____ Modified: trunk/reactos/subsys/system/servman/De.rc --- trunk/reactos/subsys/system/servman/De.rc 2006-01-07 23:42:34 UTC (rev 20685) +++ trunk/reactos/subsys/system/servman/De.rc 2006-01-07 23:45:59 UTC (rev 20686) @@ -2,9 +2,9 @@ IDR_MAINMENU MENU BEGIN - POPUP "&File" + POPUP "&Datei" BEGIN - MENUITEM "E&xit",ID_FILE_EXIT + MENUITEM "B&eenden",ID_FILE_EXIT END POPUP "Action" BEGIN @@ -28,6 +28,46 @@ END END +IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,190,182 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "?ber den Service Manager" +FONT 8, "Tahoma" +BEGIN + CONTROL "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,48,7,130,26 + DEFPUSHBUTTON "Schlie?en",IDOK,140,162,44,15,WS_GROUP + ICON IDI_SM_ICON,IDC_STATIC,12,7,30,20 + EDITTEXT IDC_LICENSE_EDIT,8,44,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + + +IDD_DLG_GENERAL DIALOGEX 6,6,253,225 +CAPTION "Allgemein" +FONT 8,"MS Sans Serif",0,0 +STYLE 0x10CF0000 +BEGIN + CONTROL "Dienstname:",IDC_STATIC,"Static",0x50000000,4,11,53,11 + CONTROL "Anzeigename:",IDC_STATIC,"Static",0x50000000,4,29,53,11 + CONTROL "Beschreibung",IDC_STATIC,"Static",0x50000000,4,51,53,11 + CONTROL "",IDC_SERV_NAME,"Static",0x50000000,70,11,176,11 + CONTROL "",IDC_DISP_NAME,"Static",0x50001000,70,29,176,12 + CONTROL "",IDC_DESCRIPTION,"Static",0x50201000,70,46,176,22 + CONTROL "Pfad zum ausf³hrbarem Programm:",IDC_STATIC,"Static",0x50000000,6,73,150,9 + CONTROL "",IDC_STATIC,"Static",0x50001000,6,86,238,12 + CONTROL "Starttyp:",IDC_STATIC,"Static",0x50000000,6,108,53,11 + CONTROL "",IDC_START_TYPE,"ComboBox",0x50010003,70,107,176,11 + CONTROL "Status des Dienstes:",IDC_STATIC,"Static",0x50000000,4,138,100,11 + CONTROL "",IDC_SERV_STATUS,"Static",0x50000000,70,138,176,11 + CONTROL "Start",IDC_START,"Button",0x50010000,6,155,54,15 + CONTROL "Stopp",IDC_STOP,"Button",0x50010000,68,155,54,15 + CONTROL "Pause",IDC_PAUSE,"Button",0x50010000,130,155,54,15 + CONTROL "Fortsetzen",IDC_RESUME,"Button",0x50010000,192,155,54,15 + CONTROL "Sie k÷nnen die Startparameter festlegen, die verwendet werden, wenn Sie den Dienst von hier aus starten.",IDC_STATIC,"Static",0x50000000,6,177,240,15 + CONTROL "Startparameter",IDC_STATIC,"Static",0x50000000,6,199,53,11 + CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 +END + STRINGTABLE DISCARDABLE BEGIN IDS_FIRSTCOLUMN "Name" @@ -43,12 +83,29 @@ IDS_SERVICES_STATUS_STOPPED "Gestoppt" IDS_SERVICES_YES "Ja" IDS_SERVICES_UNKNOWN "Unbekannt" + IDS_SERVICES_AUTO "Automatisch" + IDS_SERVICES_MAN "Manuel" + IDS_SERVICES_DIS "Deaktiviert" END STRINGTABLE DISCARDABLE BEGIN IDS_SERVICES_NUM_SERVICES "Dienste: %d" IDB_START "res/start.bmp" + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." + /*"This program is free software; you can redistribute it " + "and/or modify it under the terms of the GNU Lesser General " + "Public License as published by the Free Software Foundation; " + "either version 2.1 of the License, or (at your option) any " + "later version.\r\n\r\nThis program is distributed in the hope " + "that it will be useful, but WITHOUT ANY WARRANTY; without even " + "the implied warranty of MERCHANTABILITY or FITNESS FOR A " + "PARTICULAR PURPOSE. See the GNU General Public License for more " + "details.\r\n\r\nYou should have received a copy of the GNU " + "General Public License along with this program; if not, write " + "to the Free Software Foundation, Inc., 59 Temple Place - Suite " + "330, Boston, MA 02111-1307, USA." */ + END STRINGTABLE DISCARDABLE

18 years, 8 months

[cwittich] 20685: fix msvc compile problem

by cwittich＠svn.reactos.org

fix msvc compile problem Modified: trunk/reactos/lib/cpl/desk/resource.h _____ Modified: trunk/reactos/lib/cpl/desk/resource.h --- trunk/reactos/lib/cpl/desk/resource.h 2006-01-07 23:41:42 UTC (rev 20684) +++ trunk/reactos/lib/cpl/desk/resource.h 2006-01-07 23:42:34 UTC (rev 20685) @@ -1,6 +1,8 @@ #ifndef __CPL_DESK_RESOURCE_H__ #define __CPL_DESK_RESOURCE_H__ +#include <commctrl.h> + /* metrics */ #define PROPSHEETWIDTH 246 #define PROPSHEETHEIGHT 228

18 years, 8 months

[ros-diffs] [gvg] 20684: inet_addr returns address in network order, the IP address control wants it

by gvg＠svn.reactos.org

inet_addr returns address in network order, the IP address control wants it in host order Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c _____ Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c --- trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2006-01-07 23:34:23 UTC (rev 20683) +++ trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2006-01-07 23:41:42 UTC (rev 20684) @@ -179,15 +179,18 @@ while(pString->Next) pString = pString->Next; dwIPAddr = inet_addr(pString->IpAddress.String); - SendDlgItemMessage(hwndDlg,IDC_IPADDR,IPM_SETADDRESS,0,dwIPAddr); + SendDlgItemMessage(hwndDlg,IDC_IPADDR,IPM_SETADDRESS,0, + ntohl(dwIPAddr)); dwIPAddr = inet_addr(pString->IpMask.String); - SendDlgItemMessage(hwndDlg,IDC_SUBNETMASK,IPM_SETADDRESS,0,dwIPAddr); + SendDlgItemMessage(hwndDlg,IDC_SUBNETMASK,IPM_SETADDRESS,0, + ntohl(dwIPAddr)); pString = &pInfo->GatewayList; while(pString->Next) pString = pString->Next; dwIPAddr = inet_addr(pString->IpAddress.String); - SendDlgItemMessage(hwndDlg,IDC_DEFGATEWAY,IPM_SETADDRESS,0,dwIPAddr); + SendDlgItemMessage(hwndDlg,IDC_DEFGATEWAY,IPM_SETADDRESS,0, + ntohl(dwIPAddr)); } { @@ -208,7 +211,8 @@ while( NextDNSServer && StaticDNS < 2 ) { dwIPAddr = inet_addr(NextDNSServer); if( dwIPAddr != INADDR_NONE ) { - SendDlgItemMessage(hwndDlg,IDC_DNS1 + StaticDNS,IPM_SETADDRESS,0,dwIPAddr); + SendDlgItemMessage(hwndDlg,IDC_DNS1 + StaticDNS, + IPM_SETADDRESS,0,ntohl(dwIPAddr)); StaticDNS++; } NextDNSServer = strchr( pszDNS, ',' );

18 years, 8 months

← Newer
1
...
37
38
39
40
41
42
43
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006