Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[hpoussin] 31668: By default, display ERROR level debug output Let KDBG change default output mask
by hpoussin＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: hpoussin Date: Tue Jan 8 12:51:53 2008 New Revision: 31668 URL: http://svn.reactos.org/svn/reactos?rev=31668&view=rev Log: By default, display ERROR level debug output Let KDBG change default output mask Modified: trunk/reactos/include/reactos/debug.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h (original) +++ trunk/reactos/include/reactos/debug.h Tue Jan 8 12:51:53 2008 @@ -82,6 +82,7 @@ #endif /* Print stuff only on Debug Builds*/ +#define DPFLTR_DEFAULT_ID -1 #ifdef DBG /* These are always printed */ @@ -119,13 +120,13 @@ #define INFO_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, ##args) #elif defined(_MSC_VER) - #define ERR_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ + #define ERR_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, __VA_ARGS__) - #define WARN_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ + #define WARN_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, __VA_ARGS__) - #define TRACE_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ + #define TRACE_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, __VA_ARGS__) - #define INFO_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ + #define INFO_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, __VA_ARGS__) #else #error Unknown compiler Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c Tue Jan 8 12:51:53 2008 @@ -30,6 +30,8 @@ #define MAX_KD_COMPONENT_TABLE_ENTRIES 128 KD_COMPONENT_DATA KdComponentTable[MAX_KD_COMPONENT_TABLE_ENTRIES]; ULONG KdComponentTableEntries = 0; + +ULONG Kd_DEFAULT_MASK = 1 << DPFLTR_ERROR_LEVEL; /* PRIVATE FUNCTIONS *********************************************************/ @@ -295,58 +297,86 @@ NTSTATUS -STDCALL +NTAPI NtQueryDebugFilterState(IN ULONG ComponentId, IN ULONG Level) { - unsigned int i; - - /* convert Level to mask if it isn't already one */ - if ( Level < 32 ) - Level = 1 << Level; - - for ( i = 0; i < KdComponentTableEntries; i++ ) - { - if ( ComponentId == KdComponentTable[i].ComponentId ) - { - if ( Level & KdComponentTable[i].Level ) - return TRUE; - break; - } - } - return FALSE; -} - -NTSTATUS -STDCALL + ULONG i; + + /* Convert Level to mask if it isn't already one */ + if (Level < 32) + Level = 1 << Level; + + /* Check if it is not the default component */ + if (ComponentId != DPFLTR_DEFAULT_ID) + { + /* No, search for an existing entry in the table */ + for (i = 0; i < KdComponentTableEntries; i++) + { + /* Check if it is the right component */ + if (ComponentId == KdComponentTable[i].ComponentId) + { + /* Check if mask are matching */ + return (Level & KdComponentTable[i].Level) != 0; + } + } + } + + /* Entry not found in the table, use default mask */ + return (Level & Kd_DEFAULT_MASK) != 0; +} + +NTSTATUS +NTAPI NtSetDebugFilterState(IN ULONG ComponentId, IN ULONG Level, IN BOOLEAN State) { - unsigned int i; - for ( i = 0; i < KdComponentTableEntries; i++ ) - { - if ( ComponentId == KdComponentTable[i].ComponentId ) - break; - } - if ( i == KdComponentTableEntries ) - { - if ( i == MAX_KD_COMPONENT_TABLE_ENTRIES ) - return STATUS_INVALID_PARAMETER_1; - ++KdComponentTableEntries; - KdComponentTable[i].ComponentId = ComponentId; - KdComponentTable[i].Level = 0; - } - - /* Convert level to mask, if needed */ + ULONG i; + + /* Convert Level to mask if it isn't already one */ if (Level < 32) Level = 1 << Level; - if ( State ) - KdComponentTable[i].Level |= Level; - else - KdComponentTable[i].Level &= ~Level; - return STATUS_SUCCESS; + /* Check if it is the default component */ + if (ComponentId == DPFLTR_DEFAULT_ID) + { + /* Yes, modify the default mask */ + if (State) + Kd_DEFAULT_MASK |= Level; + else + Kd_DEFAULT_MASK &= ~Level; + + return STATUS_SUCCESS; + } + + /* Search for an existing entry */ + for (i = 0; i < KdComponentTableEntries; i++ ) + { + if (ComponentId == KdComponentTable[i].ComponentId) + break; + } + + /* Check if we have found an existing entry */ + if (i == KdComponentTableEntries) + { + /* Check if we have enough space in the table */ + if (i == MAX_KD_COMPONENT_TABLE_ENTRIES) + return STATUS_INVALID_PARAMETER_1; + + /* Add a new entry */ + ++KdComponentTableEntries; + KdComponentTable[i].ComponentId = ComponentId; + KdComponentTable[i].Level = Kd_DEFAULT_MASK; + } + + /* Update entry table */ + if (State) + KdComponentTable[i].Level |= Level; + else + KdComponentTable[i].Level &= ~Level; + + return STATUS_SUCCESS; } /* Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Tue Jan 8 12:51:53 2008 @@ -173,6 +173,7 @@ PCCH Name; ULONG Id; } ComponentTable[] = { + { "DEFAULT", DPFLTR_DEFAULT_ID }, { "SYSTEM", DPFLTR_SYSTEM_ID }, { "SMSS", DPFLTR_SMSS_ID }, { "SETUP", DPFLTR_SETUP_ID }, @@ -382,7 +383,7 @@ if (Argc < 2) { - KdbpPrint("filter: component id argument required!\n"); + KdbpPrint("filter: component name argument required!\n"); return TRUE; } if (!KdbpGetComponentId(Argv[1], &ComponentId))

1 0

[hpoussin] 31667: Fix debug message
by hpoussin＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: hpoussin Date: Tue Jan 8 12:49:22 2008 New Revision: 31667 URL: http://svn.reactos.org/svn/reactos?rev=31667&view=rev Log: Fix debug message Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Tue Jan 8 12:49:22 2008 @@ -2202,8 +2202,8 @@ IN ULONG ProcessHandleCount, IN ULONG SystemHandleCount) { - DPRINT("MmpCloseSection(OB %x, HC %d) RC %d\n", - Object, ProcessHandleCount, ObGetObjectPointerCount(Object)); + DPRINT("MmpCloseSection(OB %x, HC %d)\n", + Object, ProcessHandleCount); } NTSTATUS

1 0

[hpoussin] 31666: No need to link to ntdll for such a simply functionality
by hpoussin＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: hpoussin Date: Tue Jan 8 12:34:47 2008 New Revision: 31666 URL: http://svn.reactos.org/svn/reactos?rev=31666&view=rev Log: No need to link to ntdll for such a simply functionality Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c (original) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.c Tue Jan 8 12:34:47 2008 @@ -52,7 +52,7 @@ } offset++; } - DbgPrint(buf); + OutputDebugString(buf); HeapFree(GetProcessHeap(), 0, buf); return 0; } Modified: trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild (original) +++ trunk/reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild Tue Jan 8 12:34:47 2008 @@ -4,6 +4,5 @@ <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <library>kernel32</library> - <library>ntdll</library> <file>dbgprint.c</file> </module>

1 0

[dreimer] 31665: Bug 2942: Ukrainian translation update (temarez<AT>yandex<DOT>ru)
by dreimer＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: dreimer Date: Tue Jan 8 11:06:08 2008 New Revision: 31665 URL: http://svn.reactos.org/svn/reactos?rev=31665&view=rev Log: Bug 2942: Ukrainian translation update (temarez<AT>yandex<DOT>ru) Added: trunk/rosapps/roscalc/lang/uk-UA.rc (with props) Modified: trunk/rosapps/roscalc/resource.rc Added: trunk/rosapps/roscalc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/uk-UA.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/uk-UA.rc (added) +++ trunk/rosapps/roscalc/lang/uk-UA.rc Tue Jan 8 11:06:08 2008 @@ -1,0 +1,372 @@ +/* + * PROJECT: ReactOS Calculator + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/roscalc/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for roscalc + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Êàëüêóëÿòîð ReactOS" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, + 10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, + 10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, + 10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, + 26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "8 áàéò",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "4 áàéò",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "2 áàéò",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "1 áàéò",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "Ãðàäóñè",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "Ðàä³àíè",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "Ãðàäè",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Êàëüêóëÿòîð ReactOS" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ïðî Êàëüêóëÿòîð ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,105,148,52,16 + CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "Êàëüêóëÿòîð ReactOS",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "Âåðñ³ÿ ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "Íàïèñàâ Êàðëî Áðàì³í³",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ñòàòèñòèêà" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "Ïðàâêà" + BEGIN + MENUITEM "Êîï³þâàòè\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Âñòàâèòè\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Âèãëÿä" + BEGIN + MENUITEM "Çâè÷àéíèé", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàóêîâèé", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïåðåòâîðåííÿ", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Ø³ñòíàäöÿòêîâèé\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Äåñÿòêîâèé\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Â³ñ³ìêîâèé\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Äâ³éêîâèé\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Ãðàäóñè\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Ðàä³àíè\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Ãðàäè\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "Ê³ëüê³ñòü öèôð ó ãðóï³", IDM_VIEW_GROUP, CHECKED + END + POPUP "Äîâ³äêà" + BEGIN + MENUITEM "Çì³ñò", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Ïðî Êàëüêóëÿòîð ReactOS", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "Ïðàâêà" + BEGIN + MENUITEM "Êîï³þâàòè\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Âñòàâèòè\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Âèãëÿä" + BEGIN + MENUITEM "Çâè÷àéíèé", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàóêîâèé", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïåðåòâîðåííÿ", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Ø³ñòíàäöÿòêîâèé\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Äåñÿòêîâèé\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Â³ñ³ìêîâèé\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Äâ³éêîâèé\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "8 áàéò\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "4 áàéò\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "2 áàéò\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "1 áàéò\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "Ê³ëüê³ñòü öèôð ó ãðóï³", IDM_VIEW_GROUP, CHECKED + END + POPUP "Äîâ³äêà" + BEGIN + MENUITEM "Çì³ñò", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Ïðî Êàëüêóëÿòîð ReactOS", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "Ïðàâêà" + BEGIN + MENUITEM "Êîï³þâàòè\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Âñòàâèòè\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Âèãëÿä" + BEGIN + MENUITEM "Çâè÷àéíèé", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàóêîâèé", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïåðåòâîðåííÿ", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Ê³ëüê³ñòü öèôð ó ãðóï³", IDM_VIEW_GROUP, CHECKED + END + POPUP "Äîâ³äêà" + BEGIN + MENUITEM "Çì³ñò", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Ïðî Êàëüêóëÿòîð ReactOS", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "Êàëüêóëÿòîð ReactOS - â³ëüíå ïðîãðàìíå çàáåçïå÷åííÿ, âèïóùåíå çà ë³öåíç³ºþ GNU GPL.\r\n\r\nÂè ìîæåòå îòðèìàòè êîï³þ ë³öåíç³¿ GNU GPL òóò:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nÂè ìîæåòå òàêîæ îòðèìàòè ïåðåêëàä ë³öåíç³¿ GNU GPL òóò:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_MATH_ERROR "Ïîìèëêà" + IDS_QUICKHELP "Øâèäêà äîâ³äêà" +END Propchange: trunk/rosapps/roscalc/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/roscalc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/resource.rc?rev=31… ============================================================================== --- trunk/rosapps/roscalc/resource.rc (original) +++ trunk/rosapps/roscalc/resource.rc Tue Jan 8 11:06:08 2008 @@ -47,4 +47,4 @@ #include "lang/es-ES.rc" #include "lang/it-IT.rc" #include "lang/ru-RU.rc" - +#include "lang/uk-UA.rc"

1 0

[dreimer] 31664: Bug 2942: Ukrainian translation update (temarez<AT>yandex<DOT>ru)
by dreimer＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: dreimer Date: Tue Jan 8 11:06:08 2008 New Revision: 31664 URL: http://svn.reactos.org/svn/reactos?rev=31664&view=rev Log: Bug 2942: Ukrainian translation update (temarez<AT>yandex<DOT>ru) Modified: trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/rasdlg/lang/uk-UA.rc Tue Jan 8 11:06:08 2008 @@ -746,46 +746,46 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Enter this router's IP address on the remote network or if you expect the remote router to provide the address, leave as 0.0.0.0. Usually the operator of the remote network or router will tell you what to use.", 1331, 5, 4, 308, 35 - LTEXT "My &IP address:", 1332, 4, 51, 100, 8, NOT WS_GROUP + LTEXT "Ââåä³òü IP-àäðåñó öüîãî ìàðøðóòèçàòîðà â â³ääàëåí³é ìåðåæ³ àáî çàëèøòå íóëüîâó àäðåñó (0.0.0.0), ÿêùî ¿¿ ïîâèíåí íàäàòè â³ääàëåíèé ìàðøðóòèçàòîð. Íåîáõ³äí³ â³äîìîñò³ ìîæíà îòðèìàòè â³ä îïåðàòîðà â³ääàëåíî¿ ìåðåæ³ àáî ìàðøðóòèçàòîðà.", 1331, 5, 4, 308, 35 + LTEXT "&Ìîÿ IP-àäðåñà:", 1332, 4, 51, 100, 8, NOT WS_GROUP CONTROL "", 1330, "RASIPADDRESS", WS_TABSTOP, 21, 62, 104, 12 - LTEXT "Note: If you have a network adapter installed, you should NOT choose the same address as your network adapter.", 1333, 5, 94, 306, 36, NOT WS_GROUP + LTEXT "Ïðèì³òêà: ÿêùî óñòàíîâëåíî ìåðåæíó ïëàòó, ÍÅ ÑË²Ä âèêîðèñòîâóâàòè òó ñàìó àäðåñó, ùî é ó âàøî¿ ìåðåæíî¿ ïëàòè.", 1333, 5, 94, 306, 36, NOT WS_GROUP END 172 DIALOG 6, 18, 317, 144 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Some dial-up servers and routers require an interactive login after connecting. You can run a script automatically to respond for you.", 1339, 5, 3, 309, 27 - AUTOCHECKBOX "Show &terminal window", 1462, 15, 31, 162, 10 - AUTOCHECKBOX "&Run script:", 1463, 15, 45, 58, 10 + LTEXT "Äåÿê³ ñåðâåðè é ìàðøðóòèçàòîðè â³ääàëåíîãî äîñòóïó ï³ñëÿ ç'ºäíàííÿ ïîòðåáóþòü â³ä êîðèñòóâà÷à ââ³éòè äî íèõ. Äëÿ àâòîìàòè÷íîãî ââîäó ³íôîðìàö³¿ ìîæíà âèêîðèñòîâóâàòè ñöåíàð³¿.", 1339, 5, 3, 309, 27 + AUTOCHECKBOX "&Ïîêàçàòè â³êíî òåðì³íàëà", 1462, 15, 31, 162, 10 + AUTOCHECKBOX "&Ñöåíàð³é:", 1463, 15, 45, 58, 10 COMBOBOX 1334, 30, 60, 275, 88, CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - PUSHBUTTON "&Edit...", 1335, 180, 77, 60, 14 - PUSHBUTTON "&Browse...", 1465, 244, 77, 60, 14 + PUSHBUTTON "Ç&ì³íèòè...", 1335, 180, 77, 60, 14 + PUSHBUTTON "Î&ãëÿä...", 1465, 244, 77, 60, 14 END 173 DIALOGEX 6, 18, 230, 215 STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Dialing" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Dialing policy", 1344, 9, 4, 213, 53, WS_GROUP - LTEXT "&Number of redial attempts:", 1349, 16, 22, 140, 8, NOT WS_GROUP +CAPTION "Íàá³ð íîìåðà" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ïîë³òèêà íàáîðó íîìåðà", 1344, 9, 4, 213, 53, WS_GROUP + LTEXT "&Ê³ëüê³ñòü ñïðîá ïîâòîðíîãî íàáîðó:", 1349, 16, 22, 140, 8, NOT WS_GROUP EDITTEXT 1340, 158, 19, 56, 14, ES_AUTOHSCROLL - LTEXT "&Seconds between redial attempts:", 1351, 16, 38, 140, 8, NOT WS_GROUP + LTEXT "²íòåðâàë ì³æ ñïðîáàì&è íàáîðó (ñ):", 1351, 16, 38, 140, 8, NOT WS_GROUP EDITTEXT 1342, 158, 36, 56, 14, ES_AUTOHSCROLL - GROUPBOX "Connection type", 1343, 9, 63, 213, 56, WS_GROUP - LTEXT "Idl&e seconds before hanging up:", 1350, 28, 88, 124, 8, NOT WS_GROUP - AUTORADIOBUTTON "&Demand dial connection", 1347, 16, 78, 135, 10, WS_GROUP - AUTORADIOBUTTON "&Persistent connection", 1348, 16, 103, 199, 10, NOT WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Òèï ï³äêëþ÷åííÿ", 1343, 9, 63, 213, 56, WS_GROUP + LTEXT "&×àñ ïðîñòîþ äî ðîç'ºäíàííÿ (ñ):", 1350, 28, 88, 124, 8, NOT WS_GROUP + AUTORADIOBUTTON "Ï³äêë&þ÷åííÿ íà âèìîãó", 1347, 16, 78, 135, 10, WS_GROUP + AUTORADIOBUTTON "&Ïîñò³éíå ï³äêëþ÷åííÿ", 1348, 16, 103, 199, 10, NOT WS_TABSTOP, WS_EX_TRANSPARENT EDITTEXT 1341, 159, 85, 56, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Callback...", 1345, 150, 125, 70, 14, WS_GROUP - PUSHBUTTON "&Multiple Lines...", 1346, 74, 125, 70, 14 + PUSHBUTTON "&Â³äïîâ³äíèé âèêëèê...", 1345, 150, 125, 70, 14, WS_GROUP + PUSHBUTTON "&Äåê³ëüêà ë³í³é...", 1346, 74, 125, 70, 14 END 174 DIALOG 0, 0, 215, 226 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Router" +CAPTION "Ìàðøðóòèçàòîð" FONT 8, "MS Shell Dlg" BEGIN CTEXT "NYI...need spec from KCrocker", -1, 57, 86, 106, 28 @@ -795,74 +795,74 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the demand dial interface wizard.", 1352, 122, 5, 192, 32 - LTEXT "To create this interface and enable it on the router, click Finish.", 1354, 122, 41, 192, 26, NOT WS_GROUP - LTEXT "To edit this interface in the Routing and RemoteAccess Manager, select it in Routing Interfaces and press Properties.", 1355, 122, 68, 190, 39, NOT WS_GROUP + LTEXT "Çàâåðøåííÿ ðîáîòè ìàéñòðà ³íòåðôåéñó âèêëèêó íà âèìîãó.", 1352, 122, 5, 192, 32 + LTEXT "Ùîá ñòâîðèòè öåé ³íòåðôåéñ ³ ï³äêëþ÷èòè éîãî äî ìàðøðóòèçàòîðà, íàòèñí³òü êíîïêó ""Ãîòîâî"".", 1354, 122, 41, 192, 26, NOT WS_GROUP + LTEXT "Ùîá çì³íèòè öåé ³íòåðôåéñ çà äîïîìîãîþ äèñïåò÷åðà ìàðøðóòèçàö³¿ òà â³ääàëåíîãî äîñòóïó, âèáåð³òü éîãî ñåðåä ³íòåðôåéñ³â ìàðøðóòèçàòîðà é íàòèñí³òü êíîïêó ""Âëàñòèâîñò³"".", 1355, 122, 68, 190, 39, NOT WS_GROUP END 179 DIALOG 6, 18, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the &modem or adapter this interface will use.", 1356, 7, 4, 306, 11 + LTEXT "&Âèáåð³òü ìîäåì àáî àäàïòåð, ÿêèé âèêîðèñòîâóâàòèìåòüñÿ öèì ³íòåðôåéñîì.", 1356, 7, 4, 306, 11 CONTROL "", 1355, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C415, 6, 15, 305, 80 - LTEXT "The list shows devices set up for routing.", 1357, 15, 98, 288, 37, NOT WS_GROUP + LTEXT "Ó öüîìó ñïèñêó íàâåäåí³ ïðèñòðî¿, âèáðàí³ äëÿ ìàðøðóòèçàö³¿.", 1357, 15, 98, 288, 37, NOT WS_GROUP END 180 DIALOG 6, 18, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Enter the phone number of the dial-up server or router you are calling. Alternate phone numbers, if any, are dialed automatically if the primary number cannot be reached.", 1360, 7, 4, 305, 42 - LTEXT "&Phone number or address:", 1361, 7, 50, 275, 8, NOT WS_GROUP + LTEXT "Ââåä³òü íîìåð òåëåôîíó ñåðâåðà àáî ìàðøðóòèçàòîðà â³ääàëåíîãî äîñòóïó, ÿêèé ñë³ä âèêëèêàòè. ßêùî ïåðøèé íîìåð âèÿâèòüñÿ íåäîñòóïíèì, áóäå àâòîìàòè÷íî ïðîäîâæåíî íàá³ð äîäàòêîâèõ íîìåð³â, ÿêùî âîíè º.", 1360, 7, 4, 305, 42 + LTEXT "&Íîìåð òåëåôîíó àáî àäðåñà:", 1361, 7, 50, 275, 8, NOT WS_GROUP EDITTEXT 1358, 7, 62, 304, 14, ES_AUTOHSCROLL - PUSHBUTTON "Alternates...", 1359, 250, 80, 60, 14 + PUSHBUTTON "²íø³...", 1359, 250, 80, 60, 14 END 181 DIALOG 6, 18, 230, 215 STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Security" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Authentication and encryption policy", 1367, 6, 8, 216, 103, WS_GROUP - AUTORADIOBUTTON "A&ccept any authentication including clear text", 1370, 16, 20, 195, 10, BS_TOP | BS_MULTILINE - AUTORADIOBUTTON "Acc&ept only encrypted authentication", 1373, 16, 36, 195, 10, BS_TOP | BS_MULTILINE - AUTORADIOBUTTON "Accept &only MS encrypted authentication", 1374, 16, 52, 195, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "&Require data encryption", 1363, 27, 65, 184, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTOCHECKBOX "Require &strong data encryption", 1364, 41, 80, 172, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Use t&wo-way authentication", 1362, 17, 95, 194, 10, BS_TOP | BS_MULTILINE - PUSHBUTTON "&Unsave Password", 1369, 59, 117, 80, 14, WS_GROUP - PUSHBUTTON "Ad&vanced...", 1368, 142, 117, 80, 14, NOT WS_VISIBLE | WS_DISABLED - AUTOCHECKBOX "&Detect file and print sharing before dialing", 1365, 7, 198, 218, 10, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED +CAPTION "Áåçïåêà" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ïîë³òèêà ïåðåâ³ðêè àâòåíòè÷íîñò³ é øèôðóâàííÿ", 1367, 6, 8, 216, 103, WS_GROUP + AUTORADIOBUTTON "Äîçâîëèòè áóäü-ÿêó &ïåðåâ³ðêó àâòåíòè÷íîñò³, âêëþ÷àþ÷è â³äêðèòèé òåêñò", 1370, 16, 20, 195, 10, BS_TOP | BS_MULTILINE + AUTORADIOBUTTON "Äî&çâîëèòè ëèøå øèôðîâàíó ïåðåâ³ðêó àâòåíòè÷íîñò³", 1373, 16, 36, 195, 10, BS_TOP | BS_MULTILINE + AUTORADIOBUTTON "Äîçâîëèòè ëèø&å ïåðåâ³ðêó àâòåíòè÷íîñò³ ç øèôðóâàííÿì MS", 1374, 16, 52, 195, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Âèìàãà&òè øèôðóâàííÿ äàíèõ", 1363, 27, 65, 184, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&Âèìàãàòè ñò³éêîãî øèôðóâàííÿ äàíèõ", 1364, 41, 80, 172, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Äâî&á³÷íà ïåðåâ³ðêà àâòåíòè÷íîñò³", 1362, 17, 95, 194, 10, BS_TOP | BS_MULTILINE + PUSHBUTTON "Â&èäàëèòè çáåðåæåíèé ïàðîëü", 1369, 59, 117, 80, 14, WS_GROUP + PUSHBUTTON "&Äîäàòêîâî...", 1368, 142, 117, 80, 14, NOT WS_VISIBLE | WS_DISABLED + AUTOCHECKBOX "Âèÿâëÿòè ñï³ëüí³ ôàéëè é ïðè&íòåðè äî óñòàíîâêè çâ'ÿçêó", 1365, 7, 198, 218, 10, BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_DISABLED END 182 DIALOG 6, 18, 248, 148 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Security" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Authentication and encryption policy", 1367, 7, 8, 200, 98, WS_GROUP - AUTORADIOBUTTON "Accept any authentication including &clear text", 1370, 14, 24, 183, 10 - AUTORADIOBUTTON "Accept only &encrypted authentication", 1373, 14, 39, 183, 10 - AUTORADIOBUTTON "Accept only &MS encrypted authentication", 1374, 14, 53, 184, 10 - AUTOCHECKBOX "Require &data encryption", 1363, 33, 67, 165, 10, WS_GROUP - AUTOCHECKBOX "Require &strong data encryption", 1364, 48, 79, 152, 10 - AUTOCHECKBOX "&Use current username and password ", 1366, 31, 91, 165, 10 - PUSHBUTTON "Unsave &password", 1369, 6, 114, 100, 14, WS_GROUP - PUSHBUTTON "&Advanced...", 1368, 109, 114, 60, 14, NOT WS_VISIBLE | WS_DISABLED - AUTOCHECKBOX "Detect &file and print sharing before dialing", 1365, 14, 134, 193, 10, NOT WS_VISIBLE | WS_DISABLED +CAPTION "Áåçïåêà" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ïîë³òèêà ïåðåâ³ðêè àâòåíòè÷íîñò³ é øèôðóâàííÿ", 1367, 7, 8, 200, 98, WS_GROUP + AUTORADIOBUTTON "Äîçâîëèòè áóäü-ÿêó &ïåðåâ³ðêó àâòåíòè÷íîñò³, âêëþ÷àþ÷è â³äêðèòèé òåêñò", 1370, 14, 24, 183, 10 + AUTORADIOBUTTON "Äîçâîëèòè ëèøå &øèôðîâàíó ïåðåâ³ðêó àâòåíòè÷íîñò³", 1373, 14, 39, 183, 10 + AUTORADIOBUTTON "Äîçâîëèòè ëèø&å ïåðåâ³ðêó àâòåíòè÷íîñò³ ç øèôðóâàííÿì MS", 1374, 14, 53, 184, 10 + AUTOCHECKBOX "Âèìàãà&òè øèôðóâàííÿ äàíèõ", 1363, 33, 67, 165, 10, WS_GROUP + AUTOCHECKBOX "&Âèìàãàòè ñò³éêîãî øèôðóâàííÿ äàíèõ", 1364, 48, 79, 152, 10 + AUTOCHECKBOX "Â&èêîðèñòîâóâàòè ïîòî÷í³ ³ì'ÿ é ïàðîëü ", 1366, 31, 91, 165, 10 + PUSHBUTTON "Âèäàëèòè &çáåðåæåíèé ïàðîëü", 1369, 6, 114, 100, 14, WS_GROUP + PUSHBUTTON "&Äîäàòêîâî...", 1368, 109, 114, 60, 14, NOT WS_VISIBLE | WS_DISABLED + AUTOCHECKBOX "Âèÿâëÿòè ñï³ëüí³ ôàéëè é ïðè&íòåðè äî óñòàíîâêè çâ'ÿçêó", 1365, 14, 134, 193, 10, NOT WS_VISIBLE | WS_DISABLED END 183 DIALOG 6, 18, 317, 144 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Check all that apply:", 1388, 7, 4, 296, 9 - AUTOCHECKBOX "Route &IP packets on this interface.", 1386, 20, 19, 285, 11, BS_LEFT | BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Route IP&X packets on this interface.", 1387, 20, 35, 287, 11, BS_LEFT | BS_TOP | BS_MULTILINE - AUTOCHECKBOX "&Add a user account so a remote router can dial in.", 1382, 20, 52, 287, 11, BS_LEFT | BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Send a &plain-text password if that is the only way to connect.", 1385, 20, 70, 287, 11, BS_LEFT | BS_TOP | BS_MULTILINE - AUTOCHECKBOX "&Use scripting to complete the connection with the remote router.", 1384, 20, 87, 289, 22, BS_LEFT | BS_TOP | BS_MULTILINE + LTEXT "Ïîçíà÷òå âñ³ çàñòîñîâí³ ïàðàìåòðè:", 1388, 7, 4, 296, 9 + AUTOCHECKBOX "&Ïåðåñïðÿìîâóâàòè ïàêåòè IP íà öåé ³íòåðôåéñ.", 1386, 20, 19, 285, 11, BS_LEFT | BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Ï&åðåñïðÿìîâóâàòè ïàêåòè IPX íà öåé ³íòåðôåéñ.", 1387, 20, 35, 287, 11, BS_LEFT | BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Äîäàòè î&áë³êîâèé çàïèñ äëÿ âõ³äíèõ äçâ³íê³â â³ääàëåíîãî ìàðøðóòèçàòîðà.", 1382, 20, 52, 287, 11, BS_LEFT | BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Íàäñ&èëàòè íåçàøèôðîâàíèé ïàðîëü, ÿêùî öå ºäèíèé ñïîñ³á ï³äêëþ÷åííÿ.", 1385, 20, 70, 287, 11, BS_LEFT | BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Âèêîðè&ñòîâóâàòè ñöåíàð³é äëÿ çàâåðøåííÿ ï³äêëþ÷åííÿ äî â³ääàëåíîãî ìàðøðóòèçàòîðà.", 1384, 20, 87, 289, 22, BS_LEFT | BS_TOP | BS_MULTILINE END 184 DIALOG 0, 0, 317, 143 @@ -873,13 +873,13 @@ 186 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "New Connection Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "A connection that is created for your use only is saved in your user account and is not available unless you are logged on.", -1, 7, 4, 306, 23 - LTEXT "Create this connection for:", -1, 14, 27, 288, 12 - AUTORADIOBUTTON "&Anyone's use", 1400, 26, 40, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP - AUTORADIOBUTTON "&My use only", 1401, 26, 55, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP +CAPTION "Ìàéñòåð íîâèõ ï³äêëþ÷åíü" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ï³äêëþ÷åííÿ, ñòâîðåíå ëèøå äëÿ âàøîãî âèêîðèñòàííÿ, çáåð³ãàºòüñÿ â ïðîô³ë³ âàøîãî îáë³êîâîãî çàïèñó é íåäîñòóïíå, ïîêè âè íå ââ³éäåòå äî ñèñòåìè.", -1, 7, 4, 306, 23 + LTEXT "Ñòâîðèòè öå ï³äêëþ÷åííÿ:", -1, 14, 27, 288, 12 + AUTORADIOBUTTON "äëÿ â&ñ³õ êîðèñòóâà÷³â", 1400, 26, 40, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP + AUTORADIOBUTTON "ëèøå äë&ÿ ìåíå", 1401, 26, 55, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP END 498 DIALOG 12, 16, 215, 126 @@ -887,12 +887,12 @@ CAPTION "Ï³äêëþ÷åííÿ äî %1" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS was unable to connect to the network using the user name and password you provided. Please re-enter the user name and password.", 1396, 7, 6, 206, 36 - LTEXT "&User name:", 1399, 8, 51, 49, 8 + LTEXT "ReactOS íå âäàëîñÿ ï³äêëþ÷èòèñÿ äî ìåðåæ³ ç âèêîðèñòàííÿì íàäàíèõ ³ìåí³ êîðèñòóâà÷à é ïàðîëÿ. Ââåä³òü ³ì'ÿ êîðèñòóâà÷à é ïàðîëü çàíîâî.", 1396, 7, 6, 206, 36 + LTEXT "&Êîðèñòóâà÷:", 1399, 8, 51, 49, 8 EDITTEXT 1394, 66, 46, 143, 14, ES_AUTOHSCROLL - LTEXT "&Password:", 1397, 8, 70, 49, 8, NOT WS_GROUP + LTEXT "Ïàðîë&ü:", 1397, 8, 70, 49, 8, NOT WS_GROUP EDITTEXT 1393, 66, 64, 143, 14, ES_PASSWORD | ES_AUTOHSCROLL - AUTOCHECKBOX "&Save password", 1391, 66, 84, 143, 10 + AUTOCHECKBOX "&Çáåðåãòè ïàðîëü", 1391, 66, 84, 143, 10 CONTROL "", 1398, "STATIC", SS_ETCHEDHORZ | WS_GROUP, 7, 98, 200, 1 DEFPUSHBUTTON "OK", 1, 81, 104, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 145, 104, 60, 14 @@ -903,73 +903,73 @@ CAPTION "Ï³äêëþ÷åííÿ äî %1" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS was unable to connect to the network using the user name and password you provided. Please re-enter the user name and password.", 1396, 7, 6, 209, 26 - LTEXT "&User name:", 1399, 7, 72, 44, 8 + LTEXT "ReactOS íå âäàëîñÿ ï³äêëþ÷èòèñÿ äî ìåðåæ³ ç âèêîðèñòàííÿì íàäàíèõ ³ìåí³ êîðèñòóâà÷à é ïàðîëÿ. Ââåä³òü ³ì'ÿ êîðèñòóâà÷à é ïàðîëü çàíîâî.", 1396, 7, 6, 209, 26 + LTEXT "&Êîðèñòóâà÷:", 1399, 7, 72, 44, 8 EDITTEXT 1394, 97, 69, 115, 14, ES_AUTOHSCROLL - LTEXT "&Password:", 1397, 7, 90, 45, 8, NOT WS_GROUP + LTEXT "Ïàðîë&ü:", 1397, 7, 90, 45, 8, NOT WS_GROUP EDITTEXT 1393, 97, 87, 115, 14, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&Domain:", 1395, 7, 108, 53, 8, NOT WS_GROUP + LTEXT "&Äîìåí:", 1395, 7, 108, 53, 8, NOT WS_GROUP EDITTEXT 1392, 97, 105, 115, 14, ES_UPPERCASE | ES_AUTOHSCROLL - AUTOCHECKBOX "&Save user name and password", 1391, 85, 125, 123, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Çáåðåãòè ïàðîëü", 1391, 85, 125, 123, 10, BS_TOP | BS_MULTILINE DEFPUSHBUTTON "OK", 1, 87, 146, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 151, 146, 60, 14 CONTROL "", 1398, "STATIC", SS_ETCHEDHORZ | WS_GROUP, 7, 140, 205, 1 - LTEXT "You can enter a domain name or leave the domain field empty.\n(Domain names are not required for connections to the Internet)", -1, 8, 38, 209, 26 + LTEXT "Ïîëå ³ìåí³ äîìåíó ìîæíà çàïîâíèòè àáî çàëèøèòè \nïóñòèì. (Äëÿ ï³äêëþ÷åííÿ äî ²íòåðíåòó ³ì'ÿ äîìåíó íå º îáîâ'ÿçêîâèì)", -1, 8, 38, 209, 26 END 502 DIALOG 20, 60, 215, 73 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "PPP Settings" -FONT 8, "MS Shell Dlg" -BEGIN - AUTOCHECKBOX "&Enable LCP extensions", 1423, 9, 7, 200, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "E&nable software compression", 1424, 9, 22, 201, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Negotiate &multi-link for single link connections", 1557, 9, 37, 202, 10, BS_TOP | BS_MULTILINE +CAPTION "Ïàðàìåòðè PPP" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Óâ³ìêíóòè ðîçøèðåííÿ LCP", 1423, 9, 7, 200, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Âèêîðèñòîâóâàòè ïðîãðàìíå ñòèñêàííÿ äàíèõ", 1424, 9, 22, 201, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Ó&çãîäæóâàòè áàãàòîêàíàëüí³ñòü äëÿ îäíîêàíàëüíèõ ï³äêëþ÷åíü", 1557, 9, 37, 202, 10, BS_TOP | BS_MULTILINE DEFPUSHBUTTON "OK", 1, 82, 53, 60, 14 PUSHBUTTON "Ñêàñóâàòè", 2, 148, 53, 60, 14 END 509 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "New Connection Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Choose the role you want for this computer:", -1, 10, 5, 275, 9 - AUTORADIOBUTTON "&Host", 1483, 31, 20, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "&Guest", 1484, 31, 44, 265, 10, BS_TOP | BS_MULTILINE - LTEXT "This computer has the information you want to access.", -1, 45, 31, 253, 13, NOT WS_GROUP | WS_TABSTOP - LTEXT "This computer is used to access information on the host computer.", -1, 43, 56, 253, 23, NOT WS_GROUP +CAPTION "Ìàéñòåð íîâèõ ï³äêëþ÷åíü" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Âèáåð³òü ðîëü äëÿ öüîãî êîìï'þòåðà:", -1, 10, 5, 275, 9 + AUTORADIOBUTTON "&Âåäåíèé êîìï'þòåð", 1483, 31, 20, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "&Ïðîâ³äíèé êîìï'þòåð", 1484, 31, 44, 265, 10, BS_TOP | BS_MULTILINE + LTEXT "Öåé êîìï'þòåð ì³ñòèòü ³íôîðìàö³þ, äî ÿêî¿ ïîòð³áíî îòðèìàòè äîñòóï.", -1, 45, 31, 253, 13, NOT WS_GROUP | WS_TABSTOP + LTEXT "Öåé êîìï'þòåð âèêîðèñòîâóºòüñÿ äëÿ äîñòóïó äî ³íôîðìàö³¿ íà âåäåíîìó êîìï'þòåð³.", -1, 43, 56, 253, 23, NOT WS_GROUP END 511 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Select a device:", -1, 8, 5, 261, 8 + LTEXT "&Âèáåð³òü ïðèñòð³é:", -1, 8, 5, 261, 8 COMBOBOX 1485, 9, 18, 302, 62, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP END 528 DIALOG 0, 0, 227, 215 STYLE DS_SETFONT | WS_CHILD | WS_CAPTION -CAPTION "Connections" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Logon privileges", 1582, 8, 10, 213, 63 - LTEXT "Non-administrators may be allowed to create or modify connections before logging on.", 1581, 16, 21, 194, 30 - AUTOCHECKBOX "Allo&w creating and modifying connections before logon", 1497, 16, 56, 195, 10, BS_TOP | BS_MULTILINE +CAPTION "Ï³äêëþ÷åííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ïðèâ³ëå¿ âõîäó", 1582, 8, 10, 213, 63 + LTEXT "Êîðèñòóâà÷àì, ÿê³ íå º àäì³í³ñòðàòîðàìè, ìîæå áóòè äîçâîëåíî ñòâîðþâàòè àáî çì³íþâàòè ï³äêëþ÷åííÿ ïåðåä âõîäîì äî ìåðåæ³.", 1581, 16, 21, 194, 30 + AUTOCHECKBOX "Äîçâîëèòè ñòâî&ðåííÿ é çì³íó ï³äêëþ÷åíü ïåðåä âõîäîì äî ìåðåæ³", 1497, 16, 56, 195, 10, BS_TOP | BS_MULTILINE END 532 DIALOGEX 0, 0, 263, 263 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Router Callback" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "When you dial into a router, it may offer to call you back to reduce your phone charges or to increase security. Specify whether you want callback or not.", 1043, 7, 5, 253, 24 - AUTORADIOBUTTON "&No callback", 1501, 9, 36, 252, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "Al&ways call me back at the number(s) below:", 1502, 9, 48, 252, 10, BS_TOP | BS_MULTILINE, WS_EX_TRANSPARENT +CAPTION "Â³äïîâ³äíèé âèêëèê ìàðøðóòèçàòîðà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ï³ñëÿ óñòàíîâêè çâ'ÿçêó ç ìàðøðóòèçàòîðîì â³í ìîæå çðîáèòè âèêëèê ó â³äïîâ³äü, ùî çìåíøèòü âàø³ âèòðàòè íà òåëåôîíóâàííÿ òà ï³äâèùèòü áåçïåêó ç'ºäíàííÿ. Âèêîðèñòîâóâàòè çâîðîòíèé âèêëèê?", 1043, 7, 5, 253, 24 + AUTORADIOBUTTON "&Â³äïîâ³äíèé âèêëèê íå âèêîíóºòüñÿ", 1501, 9, 36, 252, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Çàâ&æäè ðîáèòè çâîðîòíèé âèêëèê çà âêàçàíèìè íîìåðàìè:", 1502, 9, 48, 252, 10, BS_TOP | BS_MULTILINE, WS_EX_TRANSPARENT CONTROL "", 1503, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00008401, 15, 63, 240, 143 - PUSHBUTTON "&Edit...", 1504, 131, 213, 60, 14 - PUSHBUTTON "&Delete", 1505, 194, 213, 60, 14 + PUSHBUTTON "Ç&ì³íèòè...", 1504, 131, 213, 60, 14 + PUSHBUTTON "Â&èäàëèòè", 1505, 194, 213, 60, 14 CONTROL "", -1, "STATIC", SS_ETCHEDHORZ, 7, 233, 249, 1 DEFPUSHBUTTON "OK", 1, 132, 242, 60, 14 PUSHBUTTON "Ñêàñóâàòè", 2, 196, 242, 60, 14 @@ -977,23 +977,23 @@ 534 DIALOG 0, 0, 230, 215 STYLE DS_SETFONT | WS_CHILD | WS_CAPTION -CAPTION "Options" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Connection type", 1289, 7, 7, 215, 55 - AUTORADIOBUTTON "&Demand dial", 1506, 16, 20, 199, 9, BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP - LTEXT "Idle ti&me before hanging up:", 1299, 27, 33, 99, 8, NOT WS_GROUP +CAPTION "Ïàðàìåòðè" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Òèï ï³äêëþ÷åííÿ", 1289, 7, 7, 215, 55 + AUTORADIOBUTTON "Â&èêëèê íà âèìîãó", 1506, 16, 20, 199, 9, BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP + LTEXT "&×àñ ïðîñòîþ äî ðîç'ºäíàííÿ:", 1299, 27, 33, 99, 8, NOT WS_GROUP COMBOBOX 1291, 144, 30, 70, 108, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - AUTORADIOBUTTON "&Persistent connection", 1507, 16, 47, 197, 9, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP - GROUPBOX "Dialing policy", 1290, 7, 66, 215, 48 - LTEXT "&Redial attempts:", 1300, 14, 79, 123, 8 + AUTORADIOBUTTON "&Ïîñò³éíå ï³äêëþ÷åííÿ", 1507, 16, 47, 197, 9, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP + GROUPBOX "Ïîë³òèêà íàáîðó íîìåðà", 1290, 7, 66, 215, 48 + LTEXT "&Ê³ëüê³ñòü ñïðîá ïîâòîðíîãî íàáîðó:", 1300, 14, 79, 123, 8 EDITTEXT 1287, 143, 76, 70, 14, ES_AUTOHSCROLL | ES_NUMBER - LTEXT "A&verage redial intervals:", 1301, 14, 96, 123, 8 + LTEXT "&Ñåðåäí³é ³íòåðâàë ì³æ ñïðîáàìè:", 1301, 14, 96, 123, 8 COMBOBOX 1292, 143, 94, 70, 123, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - GROUPBOX "Multiple devices", 1288, 7, 116, 215, 35 + GROUPBOX "Âèêîðèñòàííÿ äåê³ëüêîõ ïðèñòðî¿â", 1288, 7, 116, 215, 35 COMBOBOX 1551, 16, 130, 128, 41, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - PUSHBUTTON "C&onfigure...", 1293, 150, 129, 65, 14 - PUSHBUTTON "Call&back", 1302, 8, 195, 60, 14 + PUSHBUTTON "&Íàëàøòóâàòè...", 1293, 150, 129, 65, 14 + PUSHBUTTON "&Â³äïîâ³äíèé âèêëèê", 1302, 8, 195, 60, 14 PUSHBUTTON "&X.25", 1295, 73, 195, 50, 14 END @@ -1053,22 +1053,22 @@ 544 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "New Connection Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Internet Connection Sharing allows other computers on your local network to access external resources through this connection.", -1, 10, 5, 300, 22 - AUTOCHECKBOX "&Enable Internet Connection Sharing for this connection", 1512, 21, 31, 272, 10 - LTEXT "To dial this connection automatically when a computer on your local network attempts to access external resources, select the following check box.", 1514, 10, 56, 294, 22 - AUTOCHECKBOX "Enab&le on-demand dialing", 1513, 21, 86, 260, 10 +CAPTION "Ìàéñòåð íîâèõ ï³äêëþ÷åíü" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ñï³ëüíèé äîñòóï äî ï³äêëþ÷åííÿ äî ²íòåðíåòó äàº çìîãó ³íøèì êîìï'þòåðàì ó âàø³é ëîêàëüí³é ìåðåæ³ îòðèìóâàòè äîñòóï äî çîâí³øí³õ ðåñóðñ³â ÷åðåç öå ï³äêëþ÷åííÿ.", -1, 10, 5, 300, 22 + AUTOCHECKBOX "&Äîçâîëèòè ñï³ëüíèé äîñòóï äëÿ öüîãî ï³äêëþ÷åííÿ", 1512, 21, 31, 272, 10 + LTEXT "Ùîá óñòàíîâëþâàòè öå ï³äêëþ÷åííÿ àâòîìàòè÷íî, êîëè áóäü-ÿêèé êîìï'þòåð ó âàø³é ëîêàëüí³é ìåðåæ³ íàìàãàòèìåòüñÿ îòðèìàòè äîñòóï äî çîâí³øí³õ ðåñóðñ³â, óñòàíîâ³òü öåé ïðàïîðåöü.", 1514, 10, 56, 294, 22 + AUTOCHECKBOX "Äî&çâîëèòè âèêëèê íà âèìîãó", 1513, 21, 86, 260, 10 END 545 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "New Connection Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Shared access allows other computers on your local network to access external resources through this dial-up connection. You can enable shared access for one connection and one local network at a time.", -1, 10, 5, 300, 25 - LTEXT "&Select the local network that will access resources through this connection:", -1, 21, 35, 285, 8 +CAPTION "Ìàéñòåð íîâèõ ï³äêëþ÷åíü" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ñï³ëüíèé äîñòóï äàº çìîãó ³íøèì êîìï'þòåðàì ó âàø³é ëîêàëüí³é ìåðåæ³ îòðèìóâàòè äîñòóï äî çîâí³øí³õ ðåñóðñ³â ÷åðåç öå ï³äêëþ÷åííÿ â³ääàëåíîãî äîñòóïó. Îäíî÷àñíî ìîæíà äîçâîëÿòè ñï³ëüíèé äîñòóï ëèøå äëÿ îäíîãî ï³äêëþ÷åííÿ é îäíî¿ ëîêàëüíî¿ ìåðåæ³.", -1, 10, 5, 300, 25 + LTEXT "&Âèáåð³òü ëîêàëüíó ìåðåæó, ÿêà îòðèìàº äîñòóï äî ðåñóðñ³â ÷åðåç öå ï³äêëþ÷åííÿ:", -1, 21, 35, 285, 8 COMBOBOX 1522, 21, 48, 231, 56, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP END @@ -1076,36 +1076,36 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "You can configure this connection to use your smart card to log you into the remote network. Select whether to use your smart card with this connection.", -1, 10, 5, 303, 22 - AUTORADIOBUTTON "&Use my smart card ", 1524, 26, 29, 264, 12, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP - AUTORADIOBUTTON "&Do not use my smart card ", 1525, 26, 44, 261, 16, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP + LTEXT "Ìîæíà íàëàøòóâàòè öå ï³äêëþ÷åííÿ äëÿ âèêîðèñòàííÿ ñìàðò-êàðòêè äëÿ âõîäó äî â³ääàëåíî¿ ìåðåæ³. Âèêîðèñòîâóâàòè ñìàðò-êàðòêó äëÿ öüîãî ï³äêëþ÷åííÿ?", -1, 10, 5, 303, 22 + AUTORADIOBUTTON "&Âèêîðèñòîâóâàòè ìîþ ñìàðò-êàðòêó ", 1524, 26, 29, 264, 12, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "&Íå âèêîðèñòîâóâàòè ìîþ ñìàðò-êàðòêó ", 1525, 26, 44, 261, 16, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP END 547 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "Demand Dial Interface Wizard" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Welcome to the Demand Dial Interface Wizard.", 1530, 122, 8, 192, 32 - LTEXT "Using this wizard you can create a demand dial interface to connect this router to other routers.", 1531, 122, 43, 192, 37 - LTEXT "Press Next to continue.", 1532, 122, 85, 191, 29 +CAPTION "Ìàéñòåð ³íòåðôåéñó âèêëèêó íà âèìîãó" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìàéñòåð ³íòåðôåéñó âèêëèêó íà âèìîãó.", 1530, 122, 8, 192, 32 + LTEXT "Çà äîïîìîãîþ öüîãî ìàéñòðà ìîæíà ñòâîðèòè ³íòåðôåéñ âèêëèêó íà âèìîãó äëÿ ï³äêëþ÷åííÿ öüîãî ìàðøðóòèçàòîðà äî ³íøèõ ìàðøðóòèçàòîð³â.", 1531, 122, 43, 192, 37 + LTEXT "Ùîá ïðîäîâæèòè, íàòèñí³òü êíîïêó ""Äàë³"".", 1532, 122, 85, 191, 29 END 548 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - AUTORADIOBUTTON "Connect using a &modem, ISDN adapter, or other physical device.", 1531, 21, 17, 290, 15, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP - AUTORADIOBUTTON "Connect using &virtual private networking (VPN)", 1532, 21, 38, 291, 15, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP - AUTORADIOBUTTON "Connect using PPP over Ethernet (PPPoE)", 1688, 21, 58, 290, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "Ï³äêëþ÷àòèñÿ çà äîïî&ìîãîþ ìîäåìà, àäàïòåðà ISDN àáî ³íøîãî ô³çè÷íîãî ïðèñòðîþ.", 1531, 21, 17, 290, 15, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "Ï³äêëþ÷àòèñÿ çà äîïîìîãîþ &â³ðòóàëüíî¿ ïðèâàòíî¿ ìåðåæ³ (VPN)", 1532, 21, 38, 291, 15, BS_LEFT | BS_TOP | BS_MULTILINE | NOT WS_TABSTOP + AUTORADIOBUTTON "Ï³äêëþ÷àòèñÿ çà äîïîìîãîþ PPP ÷åðåç Ethernet (PPPoE)", 1688, 21, 58, 290, 12, NOT WS_TABSTOP END 550 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Enter the name or IP address of the router to which you are connecting.", 1535, 10, 8, 289, 18 - LTEXT "&Host name or IP address (such as reactos.org or 145.52.0.1):", 1537, 21, 35, 285, 8 + LTEXT "Ââåä³òü ³ì'ÿ àáî IP-àäðåñó ìàðøðóòèçàòîðà, äî ÿêîãî âè ï³äêëþ÷àºòåñÿ.", 1535, 10, 8, 289, 18 + LTEXT "²ì'ÿ êîìï'þòåðà àáî IP-àäðåñà (íàïð&èêëàä, reactos.org àáî 145.52.0.1):", 1537, 21, 35, 285, 8 EDITTEXT 1536, 21, 47, 285, 14, ES_AUTOHSCROLL END @@ -1174,16 +1174,16 @@ CAPTION "Çàãàëüí³" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Connec&t using:", 1124, 7, 4, 193, 8 + LTEXT "Ï³äêë&þ÷åííÿ ÷åðåç:", 1124, 7, 4, 193, 8 CONTROL "", 1128, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00004C0D, 7, 17, 195, 44, WS_EX_CLIENTEDGE - PUSHBUTTON "&Up", 1132, 208, 18, 16, 14, BS_ICON - PUSHBUTTON "&Down", 1131, 208, 36, 16, 14, BS_ICON - AUTOCHECKBOX "A&ll devices call the same numbers", 1119, 7, 65, 131, 21, BS_TOP | BS_MULTILINE - PUSHBUTTON "C&onfigure...", 1130, 140, 66, 60, 14 - GROUPBOX "Sample type", 1125, 7, 87, 213, 56, WS_GROUP - LTEXT "&Phone number:", 1135, 19, 102, 191, 8 + PUSHBUTTON "Â&ãîðó", 1132, 208, 18, 16, 14, BS_ICON + PUSHBUTTON "Â&íèç", 1131, 208, 36, 16, 14, BS_ICON + AUTOCHECKBOX "Íà&áèðàòè îäíàêîâ³ íîìåðè äëÿ ï³äêëþ÷åííÿ âñ³õ ïðèñòðî¿â", 1119, 7, 65, 131, 21, BS_TOP | BS_MULTILINE + PUSHBUTTON "Íàëà&øòóâàòè...", 1130, 140, 66, 60, 14 + GROUPBOX "Çðàçîê", 1125, 7, 87, 213, 56, WS_GROUP + LTEXT "Íîìåð &òåëåôîíó:", 1135, 19, 102, 191, 8 EDITTEXT 1123, 17, 112, 138, 14, ES_AUTOHSCROLL - PUSHBUTTON "Alter&nates", 1129, 161, 112, 50, 14 + PUSHBUTTON "&²íø³", 1129, 161, 112, 50, 14 AUTOCHECKBOX "&Ï³ñëÿ ï³äêëþ÷åííÿ ïîêàçàòè çíà÷îê â îáëàñò³ ñïîâ³ùåíü", 1120, 11, 194, 212, 20, BS_TOP | BS_MULTILINE END @@ -1659,12 +1659,12 @@ 7005 DIALOG 0, 0, 230, 215 STYLE DS_SETFONT | DS_CONTEXTHELP | WS_CHILD | WS_CAPTION -CAPTION "Callback" -FONT 8, "MS Shell Dlg" -BEGIN - AUTORADIOBUTTON "&Do not allow callback", 7009, 9, 7, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "All&ow the caller to set the callback number", 7006, 9, 20, 218, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP - AUTORADIOBUTTON "Al&ways use the following callback number:", 7007, 9, 34, 217, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP +CAPTION "Â³äïîâ³äíèé âèêëèê" +FONT 8, "MS Shell Dlg" +BEGIN + AUTORADIOBUTTON "&Çàáîðîíèòè çâîðîòíèé âèêëèê", 7009, 9, 7, 219, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Äîç&âîëèòè àáîíåíòîâ³ âèçíà÷àòè íîìåð çâîðîòíîãî âèêëèêó", 7006, 9, 20, 218, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP + AUTORADIOBUTTON "Çàâæäè âèêîðèñ&òîâóâàòè äëÿ çâîðîòíîãî âèêëèêó öåé íîìåð:", 7007, 9, 34, 217, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP EDITTEXT 7008, 19, 49, 204, 14, ES_AUTOHSCROLL | WS_GROUP END @@ -1673,149 +1673,149 @@ CAPTION "Çàãàëüí³" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Incoming connections", -1, 7, 4, 214, 110, WS_GROUP - LTEXT "Allow incoming connections on these devices.", -1, 17, 17, 195, 8 - LTEXT "&Devices:", -1, 17, 29, 29, 8 + GROUPBOX "Âõ³äí³ ï³äêëþ÷åííÿ", -1, 7, 4, 214, 110, WS_GROUP + LTEXT "Äîçâîëèòè âõ³äí³ ï³äêëþ÷åííÿ äëÿ òàêèõ ïðèñòðî¿â:", -1, 17, 17, 195, 8 + LTEXT "&Ïðèñòðî¿:", -1, 17, 29, 29, 8 CONTROL "", 7011, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x00004405, 17, 41, 193, 47, WS_EX_CLIENTEDGE - AUTOCHECKBOX "&Enable multilink", 7012, 17, 96, 121, 10, BS_TOP | BS_MULTILINE | WS_GROUP - PUSHBUTTON "P&roperties", 7013, 145, 94, 65, 14, WS_GROUP - GROUPBOX "Virtual private network", -1, 6, 122, 214, 49, WS_GROUP - AUTOCHECKBOX "Allo&w others to make private connections to my computer by tunneling through the Internet or other network", 7014, 17, 137, 195, 27, BS_TOP | BS_MULTILINE | WS_GROUP - AUTOCHECKBOX "&Show icon in notification area when connected", 7015, 12, 184, 209, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&Áàãàòîêàíàëüíå ï³äêëþ÷åííÿ", 7012, 17, 96, 121, 10, BS_TOP | BS_MULTILINE | WS_GROUP + PUSHBUTTON "Âëàñ&òèâîñò³", 7013, 145, 94, 65, 14, WS_GROUP + GROUPBOX "Â³ðòóàëüíà ïðèâàòíà ìåðåæà (VPN)", -1, 6, 122, 214, 49, WS_GROUP + AUTOCHECKBOX "Äîçâîëèòè ³íøèì êî&ðèñòóâà÷àì ðîáèòè ïðèâàòí³ ï³äêëþ÷åííÿ äî ìîãî êîìï'þòåðà ÷åðåç òóíåëü â ²íòåðíåò³ àáî ³íø³é ìåðåæ³", 7014, 17, 137, 195, 27, BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "Ï³ñëÿ ï³äêëþ÷åííÿ ïîêàçàòè çíà÷îê &â îáëàñò³ ñïîâ³ùåíü", 7015, 12, 184, 209, 10, BS_TOP | BS_MULTILINE | WS_GROUP END 7016 DIALOGEX 0, 0, 265, 190 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Incoming TCP/IP Properties" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Network access", -1, 6, 5, 252, 32 - AUTOCHECKBOX "Allow &callers to access my local area network", 7017, 20, 20, 228, 9, BS_LEFT | BS_TOP | BS_MULTILINE - GROUPBOX "TCP/IP address assignment", -1, 6, 42, 250, 122 - AUTORADIOBUTTON "&Assign TCP/IP addresses automatically using DHCP", 7019, 20, 54, 231, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "S&pecify TCP/IP addresses", 7020, 20, 71, 231, 10, BS_TOP | BS_MULTILINE - LTEXT "&From:", -1, 29, 88, 53, 8 +CAPTION "Âëàñòèâîñò³ âõ³äíèõ âèêëèê³â TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Äîñòóï äî ìåðåæ³", -1, 6, 5, 252, 32 + AUTOCHECKBOX "Äîçâîëèòè àáîíåíòàì äîñòóï äî ëîêàëüíî¿ ìå&ðåæ³", 7017, 20, 20, 228, 9, BS_LEFT | BS_TOP | BS_MULTILINE + GROUPBOX "Ïðèçíà÷åííÿ àäðåñ TCP/IP", -1, 6, 42, 250, 122 + AUTORADIOBUTTON "Ïðèç&íà÷èòè àäðåñè TCP/IP àâòîìàòè÷íî çà äîïîìîãîþ DHCP", 7019, 20, 54, 231, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "&Óêàçàòè àäðåñè TCP/IP", 7020, 20, 71, 231, 10, BS_TOP | BS_MULTILINE + LTEXT "&Ç:", -1, 29, 88, 53, 8 CONTROL "", 7018, "RASIPADDRESS", WS_GROUP | WS_TABSTOP, 90, 85, 103, 13 - LTEXT "&To:", -1, 29, 105, 53, 8 + LTEXT "&Ïî:", -1, 29, 105, 53, 8 CONTROL "", 7021, "RASIPADDRESS", WS_GROUP | WS_TABSTOP, 90, 102, 103, 13 - LTEXT "Total:", -1, 29, 124, 53, 10 + LTEXT "Óñüîãî:", -1, 29, 124, 53, 10 LTEXT "", 7024, 90, 121, 150, 14, 0, WS_EX_STATICEDGE - AUTOCHECKBOX "Allo&w calling computer to specify its own IP address", 7022, 20, 144, 231, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&Äîçâîëèòè àáîíåíòó âêàçàòè ñâîþ IP-àäðåñó", 7022, 20, 144, 231, 10, BS_TOP | BS_MULTILINE | WS_GROUP DEFPUSHBUTTON "OK", 1, 133, 169, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 197, 169, 60, 14 END 7025 DIALOG 0, 0, 250, 157 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Incoming IPX Properties" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Network access", -1, 8, 6, 234, 32 - AUTOCHECKBOX "Allow &callers to access my local area network", 7032, 18, 19, 194, 12, BS_LEFT | BS_TOP | BS_MULTILINE - GROUPBOX "Network number assignment", -1, 8, 43, 234, 87 - AUTOCHECKBOX "&Assign same network number to all computers", 7028, 17, 56, 203, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "Assi&gn network numbers automatically", 7026, 28, 68, 191, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "&Specify network numbers:", 7027, 28, 81, 189, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP +CAPTION "Âëàñòèâîñò³ âõ³äíèõ âèêëèê³â IPX" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Äîñòóï äî ìåðåæ³", -1, 8, 6, 234, 32 + AUTOCHECKBOX "Äîçâîëèòè àáîíåíòàì äîñòóï äî ëîêàëüíî¿ ìå&ðåæ³", 7032, 18, 19, 194, 12, BS_LEFT | BS_TOP | BS_MULTILINE + GROUPBOX "Ïðèçíà÷åííÿ íîìåðà ìåðåæ³", -1, 8, 43, 234, 87 + AUTOCHECKBOX "&Ïðèçíà÷èòè îäèí íîìåð ìåðåæ³ âñ³ì êîìï'þòåðàì", 7028, 17, 56, 203, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Ïðèç&íà÷àòè íîìåðè ìåðåæ àâòîìàòè÷íî", 7026, 28, 68, 191, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "&Óêàçàòè íîìåðè ìåðåæ:", 7027, 28, 81, 189, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP EDITTEXT 7029, 40, 92, 154, 14, ES_UPPERCASE | WS_GROUP - AUTOCHECKBOX "Allo&w callers to specify their own node numbers", 7031, 17, 113, 208, 11, BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "Äîçâîëèòè &àáîíåíòàì óêàçóâàòè ñâî¿ íîìåðè âóçë³â", 7031, 17, 113, 208, 11, BS_TOP | BS_MULTILINE | WS_GROUP DEFPUSHBUTTON "OK", 1, 116, 136, 60, 14, WS_GROUP PUSHBUTTON "Ñêàñóâàòè", 2, 181, 136, 60, 14 END 7033 DIALOG 0, 0, 220, 50 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Incoming Protocol Properties" -FONT 8, "MS Shell Dlg" -BEGIN - AUTOCHECKBOX "Allow &callers to access my local area network", 7034, 7, 7, 208, 18, BS_LEFT | BS_TOP | BS_MULTILINE +CAPTION "Âëàñòèâîñò³ ïðîòîêîë³â" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Äîçâîëèòè àáîíåíòàì äîñòóï äî ëîêàëüíî¿ ìåðåæ³", 7034, 7, 7, 208, 18, BS_LEFT | BS_TOP | BS_MULTILINE DEFPUSHBUTTON "OK", 1, 86, 30, 60, 14 PUSHBUTTON "Ñêàñóâàòè", 2, 151, 30, 60, 14 END 7035 DIALOGEX 0, 0, 230, 215 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Networking" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Network components:", -1, 7, 7, 217, 9 +CAPTION "Ìåðåæà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ìåðåæí³ êîìïîíåíòè:", -1, 7, 7, 217, 9 CONTROL "", 7036, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000440D, 7, 17, 215, 89, WS_EX_CLIENTEDGE - PUSHBUTTON "&Install...", 7037, 9, 110, 67, 14, WS_GROUP - PUSHBUTTON "&Uninstall", 7038, 80, 110, 67, 14, WS_GROUP - PUSHBUTTON "P&roperties", 7039, 153, 110, 67, 14, WS_GROUP - GROUPBOX "Description", -1, 7, 138, 213, 69 + PUSHBUTTON "&Óñòàíîâèòè...", 7037, 9, 110, 67, 14, WS_GROUP + PUSHBUTTON "&Âèäàëèòè", 7038, 80, 110, 67, 14, WS_GROUP + PUSHBUTTON "Âëàñ&òèâîñò³", 7039, 153, 110, 67, 14, WS_GROUP + GROUPBOX "Îïèñ", -1, 7, 138, 213, 69 LTEXT "<protocol description>", 7040, 17, 150, 193, 48 END 7042 DIALOGEX 0, 0, 230, 215 STYLE DS_SETFONT | DS_CONTEXTHELP | WS_CHILD | WS_CAPTION -CAPTION "Users" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Users allowed to connect:", -1, 7, 5, 213, 8 +CAPTION "Êîðèñòóâà÷³" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Êîðèñòóâà÷³, ÿêèì äîçâîëåíî &ï³äêëþ÷àòèñÿ:", -1, 7, 5, 213, 8 CONTROL "", 7043, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 7, 19, 214, 83, WS_EX_CLIENTEDGE - PUSHBUTTON "&New...", 7044, 7, 107, 67, 14, WS_GROUP - PUSHBUTTON "&Delete", 7045, 80, 107, 67, 14, WS_GROUP - PUSHBUTTON "P&roperties", 7046, 153, 107, 67, 14, WS_GROUP - AUTOCHECKBOX "Re&quire all users to secure their passwords and data.", 7048, 8, 151, 217, 12, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Al&ways allow directly connected devices such as palmtop computers to connect without providing a password.", 7049, 8, 169, 217, 23, BS_TOP | BS_MULTILINE - LTEXT "Note that other factors, such as a disabled user account, may affect a user's ability to connect.", -1, 9, 126, 212, 23 + PUSHBUTTON "&Íîâèé...", 7044, 7, 107, 67, 14, WS_GROUP + PUSHBUTTON "Â&èäàëèòè", 7045, 80, 107, 67, 14, WS_GROUP + PUSHBUTTON "Âëàñ&òèâîñò³", 7046, 153, 107, 67, 14, WS_GROUP + AUTOCHECKBOX "&Óñ³ êîðèñòóâà÷³ ïîâèíí³ òðèìàòè â ñåêðåò³ ñâî¿ ïàðîë³ é äàí³.", 7048, 8, 151, 217, 12, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Çàâæäè äîçâîëÿòè ïðèñòðîÿì ³ç ïðÿìèì ç'ºäíàííÿì, íàïðèêëàä, êèøåíüêîâèì êîìï'þòåðàì, ï³äêëþ÷åííÿ áåç ïàðîëÿ.", 7049, 8, 169, 217, 23, BS_TOP | BS_MULTILINE + LTEXT "²íø³ ôàêòîðè, òàê³ ÿê âèìêíåííÿ îáë³êîâîãî çàïèñó, ìîæóòü ïåðåøêîäèòè ï³äêëþ÷åííþ êîðèñòóâà÷à.", -1, 9, 126, 212, 23 END 7049 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the check box next to each user who should be allowed a connection to this computer. Note that other factors, such as a disabled user account, may affect a user's ability to connect.", -1, 10, 1, 275, 27 - LTEXT "&Users allowed to connect:", -1, 10, 28, 275, 8 + LTEXT "Óñòàíîâ³òü ïðàïîðö³ ïîðó÷ ³ç êîðèñòóâà÷àìè, ÿêèì ñë³ä äîçâîëèòè ï³äêëþ÷àòèñÿ äî öüîãî êîìï'þòåðà. ²íø³ ôàêòîðè, òàê³ ÿê âèìêíåííÿ îáë³êîâîãî çàïèñó, ìîæóòü ïåðåøêîäèòè ï³äêëþ÷åííþ êîðèñòóâà÷à.", -1, 10, 1, 275, 27 + LTEXT "Êîðèñòóâà÷³, ÿêèì äîçâîëåíî &ï³äêëþ÷àòèñÿ:", -1, 10, 28, 275, 8 CONTROL "", 7043, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 42, 275, 73 - PUSHBUTTON "&Add...", 7044, 10, 122, 65, 14, WS_GROUP - PUSHBUTTON "&Remove", 7045, 79, 122, 65, 14, WS_GROUP - PUSHBUTTON "&Properties", 7046, 147, 122, 65, 14, WS_GROUP + PUSHBUTTON "&Äîäàòè...", 7044, 10, 122, 65, 14, WS_GROUP + PUSHBUTTON "Â&èäàëèòè", 7045, 79, 122, 65, 14, WS_GROUP + PUSHBUTTON "Âëàñ&òèâîñò³", 7046, 147, 122, 65, 14, WS_GROUP END 7050 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the check box next to each device you want to use for incoming connections.", -1, 10, 4, 299, 10 - LTEXT "&Connection devices:", -1, 10, 16, 275, 8 + LTEXT "Óñòàíîâ³òü ïðàïîðö³ ïîðó÷ ³ç ïðèñòðîÿìè, ÿê³ ïîòð³áíî âèêîðèñòîâóâàòè äëÿ âõ³äíèõ ï³äêëþ÷åíü.", -1, 10, 4, 299, 10 + LTEXT "&Ïðèñòðî¿ äëÿ ï³äêëþ÷åííÿ:", -1, 10, 16, 275, 8 CONTROL "", 7011, "SYSLISTVIEW32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000440D, 10, 26, 297, 87 - PUSHBUTTON "P&roperties", 7013, 243, 120, 65, 14, WS_GROUP + PUSHBUTTON "Âëàñ&òèâîñò³", 7013, 243, 120, 65, 14, WS_GROUP END 7051 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the check box next to each type of networking software that should be enabled for incoming connections.", -1, 10, 1, 288, 20 - LTEXT "Networking &software:", -1, 10, 24, 274, 8 + LTEXT "Óñòàíîâ³òü ïðàïîðö³ ïîðó÷ ³ç íàçâàìè ìåðåæíèõ ïðîãðàì, ÿê³ ñë³ä äîçâîëèòè äëÿ âõ³äíèõ ï³äêëþ÷åíü.", -1, 10, 1, 288, 20 + LTEXT "&Ìåðåæíå ïðîãðàìíå çàáåçïå÷åííÿ:", -1, 10, 24, 274, 8 CONTROL "", 7036, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000440D, 10, 34, 286, 33 - PUSHBUTTON "&Install...", 7037, 108, 71, 60, 14, WS_GROUP - PUSHBUTTON "&Uninstall", 7038, 172, 71, 60, 14, WS_GROUP - PUSHBUTTON "&Properties", 7039, 236, 71, 60, 14, WS_GROUP + PUSHBUTTON "&Óñòàíîâèòè...", 7037, 108, 71, 60, 14, WS_GROUP + PUSHBUTTON "Â&èäàëèòè", 7038, 172, 71, 60, 14, WS_GROUP + PUSHBUTTON "Âëàñ&òèâîñò³", 7039, 236, 71, 60, 14, WS_GROUP LTEXT "<protocol description>", 7040, 21, 105, 273, 38 - LTEXT "Description:", -1, 21, 95, 275, 8 + LTEXT "Îïèñ:", -1, 21, 95, 275, 8 END 7052 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Virtual private connections to your computer through the Internet are possible only if your computer has a known name or IP address on the Internet.", -1, 10, 4, 290, 20 - AUTORADIOBUTTON "&Allow virtual private connections", 7053, 29, 63, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "&Do not allow virtual private connections", 7054, 29, 78, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP - LTEXT "Do you want to allow virtual private connections to this computer?", -1, 17, 49, 275, 8 - LTEXT " If you allow VPN connections, ReactOS will modify the Internet Connection Firewall to allow your computer to send and receive VPN packets.", -1, 10, 25, 293, 25 + LTEXT "Â³ðòóàëüí³ ïðèâàòí³ ï³äêëþ÷åííÿ ÷åðåç ²íòåðíåò ìîæëèâ³, ëèøå ÿêùî âàø êîìï'þòåð ìàº â³äîìå ³ì'ÿ àáî IP-àäðåñó â ²íòåðíåò³.", -1, 10, 4, 290, 20 + AUTORADIOBUTTON "Äîçâîë&èòè â³ðòóàëüí³ ïðèâàòí³ ï³äêëþ÷åííÿ", 7053, 29, 63, 265, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "&Çàáîðîíèòè â³ðòóàëüí³ ïðèâàòí³ ï³äêëþ÷åííÿ", 7054, 29, 78, 265, 10, BS_TOP | BS_MULTILINE | NOT WS_TABSTOP + LTEXT "Äîçâîëèòè â³ðòóàëüí³ ïðèâàòí³ ï³äêëþ÷åííÿ äî öüîãî êîìï'þòåðà?", -1, 17, 49, 275, 8 + LTEXT " ßêùî äîçâîëèòè VPN-ï³äêëþ÷åííÿ, Windows çì³íèòü áðàíäìàóåð ï³äêëþ÷åííÿ äî ²íòåðíåòó òàêèì ÷èíîì, ùî âàøîìó êîìï'þòåðó áóäå äîçâîëåíî íàäñèëàòè é îòðèìóâàòè VPN-ïàêåòè.", -1, 10, 25, 293, 25 END 7055 DIALOG 0, 0, 317, 143 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Device for this connection:", -1, 23, 24, 275, 8 + LTEXT "&Ïðèñòð³é äëÿ öüîãî ï³äêëþ÷åííÿ:", -1, 23, 24, 275, 8 COMBOBOX 7056, 22, 36, 275, 125, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Devices other than the one you select will not be affected and may be used for other purposes.", -1, 10, 4, 275, 17 - PUSHBUTTON "&Properties", 7061, 232, 53, 65, 14, WS_GROUP + LTEXT "Óñ³ ïðèñòðî¿, îêð³ì âèáðàíèõ, íå áóäóòü çàä³ÿí³ é ìîæóòü âèêîðèñòîâóâàòèñÿ äëÿ ³íøèõ ïîòðåá.", -1, 10, 4, 275, 17 + PUSHBUTTON "Âëàñ&òèâîñò³", 7061, 232, 53, 65, 14, WS_GROUP END 7379 DIALOG 0, 0, 317, 143 Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc Tue Jan 8 11:06:08 2008 @@ -362,7 +362,7 @@ GROUPBOX "Çàâäàííÿ", -1, 7, 10, 249, 45 //ICON AUTORADIOBUTTON "&Ïîêàçóâàòè ñïèñîê òèïîâèõ çàâäàíü ó ïàïêàõ", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Âèêîðèñòîâóâàòè çâè&÷àéí³ ïàïêè Windows", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Âèêîðèñòîâóâàòè çâè&÷àéí³ ïàïêè ReactOS", 14002, 40, 37, 120, 10, WS_TABSTOP GROUPBOX "Îãëÿä ïàïîê", -1, 7, 60, 249, 45, WS_TABSTOP //ICON AUTORADIOBUTTON "Â³äêðèâàòè ïàïêè â òî&ìó ñàìîìó â³êí³", 14004, 40, 70, 140, 10, WS_TABSTOP

1 0

[hpoussin] 31663: Add debug trace
by hpoussin＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: hpoussin Date: Tue Jan 8 10:28:45 2008 New Revision: 31663 URL: http://svn.reactos.org/svn/reactos?rev=31663&view=rev Log: Add debug trace Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c Tue Jan 8 10:28:45 2008 @@ -131,6 +131,10 @@ case IOCTL_KEYBOARD_SET_INDICATORS: { TRACE_(I8042PRT, "IOCTL_KEYBOARD_SET_INDICATORS\n"); + INFO_(I8042PRT, "Leds: {%s%s%s }", + DeviceExtension->KeyboardIndicators.LedFlags & KEYBOARD_CAPS_LOCK_ON ? " CAPSLOCK" : "", + DeviceExtension->KeyboardIndicators.LedFlags & KEYBOARD_NUM_LOCK_ON ? " NUMLOCK" : "", + DeviceExtension->KeyboardIndicators.LedFlags & KEYBOARD_SCROLL_LOCK_ON ? " SCROLLLOCK" : ""); PortDeviceExtension->PacketBuffer[0] = KBD_CMD_SET_LEDS; PortDeviceExtension->PacketBuffer[1] = 0;

1 0

[jimtabor] 31662: Add layout support for CreateCompatibleDC.
by jimtabor＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: jimtabor Date: Tue Jan 8 08:29:13 2008 New Revision: 31662 URL: http://svn.reactos.org/svn/reactos?rev=31662&view=rev Log: Add layout support for CreateCompatibleDC. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Jan 8 08:29:13 2008 @@ -62,6 +62,7 @@ HDC hNewDC, DisplayDC; HRGN hVisRgn; UNICODE_STRING DriverName; + DWORD Layout = 0; DisplayDC = NULL; if (hDC == NULL) @@ -142,6 +143,8 @@ nDc_Attr->crBackgroundClr = oDc_Attr->crBackgroundClr; nDc_Attr->jBkMode = oDc_Attr->jBkMode; nDc_Attr->jROP2 = oDc_Attr->jROP2; + nDc_Attr->dwLayout = oDc_Attr->dwLayout; + if (oDc_Attr->dwLayout & LAYOUT_ORIENTATIONMASK) Layout = oDc_Attr->dwLayout; DC_UnlockDc(NewDC); DC_UnlockDc(OrigDC); @@ -153,6 +156,7 @@ hVisRgn = NtGdiCreateRectRgn(0, 0, 1, 1); IntGdiSelectVisRgn(hNewDC, hVisRgn); NtGdiDeleteObject(hVisRgn); + if (Layout) NtGdiSetLayout( hNewDC, -1, Layout); DC_InitDC(hNewDC); return hNewDC;

1 0

[tkreuzer] 31661: change gdi object deleting mechanism to a windows compatible one.
by tkreuzer＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: tkreuzer Date: Tue Jan 8 08:04:52 2008 New Revision: 31661 URL: http://svn.reactos.org/svn/reactos?rev=31661&view=rev Log: change gdi object deleting mechanism to a windows compatible one. Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Tue Jan 8 08:04:52 2008 @@ -24,9 +24,9 @@ ////////////////////////////////////////////////////////////////////////////// PPAGED_LOOKASIDE_LIST LookasideLists; - SLIST_HEADER FreeEntriesHead; - SLIST_ENTRY FreeEntries[((GDI_HANDLE_COUNT * sizeof(GDI_TABLE_ENTRY)) << 3) / - (sizeof(SLIST_ENTRY) << 3)]; + ULONG FirstFree; + ULONG FirstUnused; + } GDI_HANDLE_TABLE, *PGDI_HANDLE_TABLE; extern PGDI_HANDLE_TABLE GdiHandleTable; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Tue Jan 8 08:04:52 2008 @@ -124,9 +124,7 @@ PGDI_HANDLE_TABLE HandleTable = NULL; LARGE_INTEGER htSize; UINT ObjType; - UINT i; ULONG ViewSize = 0; - PGDI_TABLE_ENTRY Entry; NTSTATUS Status; ASSERT(SectionObject != NULL); @@ -157,16 +155,6 @@ RtlZeroMemory(HandleTable, sizeof(GDI_HANDLE_TABLE)); - /* - * initialize the free entry cache - */ - InitializeSListHead(&HandleTable->FreeEntriesHead); - Entry = &HandleTable->Entries[RESERVE_ENTRIES_COUNT]; - for(i = GDI_HANDLE_COUNT - 1; i >= RESERVE_ENTRIES_COUNT; i--) - { - InterlockedPushEntrySList(&HandleTable->FreeEntriesHead, &HandleTable->FreeEntries[i]); - } - HandleTable->LookasideLists = ExAllocatePoolWithTag(NonPagedPool, BASE_OBJTYPE_COUNT * sizeof(PAGED_LOOKASIDE_LIST), TAG_GDIHNDTBLE); @@ -188,6 +176,9 @@ } ShortDelay.QuadPart = -5000LL; /* FIXME - 0.5 ms? */ + + HandleTable->FirstFree = 0; + HandleTable->FirstUnused = RESERVE_ENTRIES_COUNT; return HandleTable; } @@ -329,6 +320,69 @@ KeRosDumpStackFrames(NULL, 20); } +ULONG +FASTCALL +InterlockedPopFreeEntry(PGDI_HANDLE_TABLE HandleTable) +{ + ULONG idxFirstFree, idxNextFree, idxPrev; + PGDI_TABLE_ENTRY pFreeEntry; + + DPRINT("Enter InterLockedPopFreeEntry\n"); + + do + { + idxFirstFree = HandleTable->FirstFree; + if (idxFirstFree) + { + pFreeEntry = HandleTable->Entries + idxFirstFree; + ASSERT(((ULONG)pFreeEntry->KernelData & ~GDI_HANDLE_INDEX_MASK) == 0); + idxNextFree = (ULONG)pFreeEntry->KernelData; + idxPrev = (ULONG)_InterlockedCompareExchange((LONG*)&HandleTable->FirstFree, idxNextFree, idxFirstFree); + } + else + { + idxFirstFree = HandleTable->FirstUnused; + idxNextFree = idxFirstFree + 1; + if (idxNextFree >= GDI_HANDLE_COUNT) + { + DPRINT1("No more gdi handles left!\n"); + return 0; + } + idxPrev = (ULONG)_InterlockedCompareExchange((LONG*)&HandleTable->FirstUnused, idxNextFree, idxFirstFree); + } + } + while (idxPrev != idxFirstFree); + + return idxFirstFree; +} + +/* Pushes an entry of the handle table to the free list, + The entry must be unlocked and the base type field must be 0 */ +VOID +FASTCALL +InterlockedPushFreeEntry(PGDI_HANDLE_TABLE HandleTable, ULONG idxToFree) +{ + ULONG idxFirstFree, idxPrev; + PGDI_TABLE_ENTRY pFreeEntry; + + DPRINT("Enter InterlockedPushFreeEntry\n"); + + pFreeEntry = HandleTable->Entries + idxToFree; + ASSERT((pFreeEntry->Type & GDI_ENTRY_BASETYPE_MASK) == 0); + ASSERT(pFreeEntry->ProcessId == 0); + pFreeEntry->UserData = NULL; + + do + { + idxFirstFree = HandleTable->FirstFree; + pFreeEntry->KernelData = (PVOID)idxFirstFree; + + idxPrev = (ULONG)_InterlockedCompareExchange((LONG*)&HandleTable->FirstFree, idxToFree, idxFirstFree); + } + while (idxPrev != idxFirstFree); +} + + /*! * Allocate memory for GDI object and return handle to it. * @@ -380,7 +434,7 @@ } if(newObject != NULL) { - PSLIST_ENTRY FreeEntry; + UINT Index; PGDI_TABLE_ENTRY Entry; PGDIOBJ ObjectBody; LONG TypeInfo; @@ -407,15 +461,11 @@ (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ TypeInfo = (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); - FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); - if(FreeEntry != NULL) + Index = InterlockedPopFreeEntry(HandleTable); + if (Index != 0) { HANDLE PrevProcId; - UINT Index; - - /* calculate the entry from the address of the entry in the free slot array */ - Index = ((ULONG_PTR)FreeEntry - (ULONG_PTR)&HandleTable->FreeEntries[0]) / - sizeof(HandleTable->FreeEntries[0]); + Entry = &HandleTable->Entries[Index]; LockHandle: @@ -423,8 +473,6 @@ if(PrevProcId == NULL) { HGDIOBJ Handle; - - ASSERT(Entry->KernelData == NULL); Entry->KernelData = ObjectBody; @@ -554,7 +602,8 @@ if(PrevProcId == ProcessId) { if( (Entry->KernelData != NULL) && - ((Entry->Type << GDI_ENTRY_UPPER_SHIFT) == HandleUpper) ) + ((Entry->Type << GDI_ENTRY_UPPER_SHIFT) == HandleUpper) && + ((Entry->Type & GDI_ENTRY_BASETYPE_MASK) == (HandleUpper & GDI_ENTRY_BASETYPE_MASK)) ) { PGDIOBJHDR GdiHdr; @@ -565,16 +614,14 @@ BOOL Ret; PW32PROCESS W32Process = PsGetCurrentProcessWin32Process(); - /* Clear the type field so when unlocking the handle it gets finally deleted and increment reuse counter */ - Entry->Type = (Entry->Type + GDI_ENTRY_REUSE_INC) & GDI_ENTRY_REUSE_MASK; - Entry->KernelData = NULL; + /* Clear the basetype field so when unlocking the handle it gets finally deleted and increment reuse counter */ + Entry->Type = (Entry->Type + GDI_ENTRY_REUSE_INC) & ~GDI_ENTRY_BASETYPE_MASK; /* unlock the handle slot */ (void)InterlockedExchangePointer(&Entry->ProcessId, NULL); /* push this entry to the free list */ - InterlockedPushEntrySList(&HandleTable->FreeEntriesHead, - &HandleTable->FreeEntries[GDI_ENTRY_TO_INDEX(HandleTable, Entry)]); + InterlockedPushFreeEntry(HandleTable, GDI_ENTRY_TO_INDEX(HandleTable, Entry)); if(W32Process != NULL) { @@ -646,7 +693,7 @@ else { DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & ~0x1); - KeRosDumpStackFrames(NULL, 20); + KeRosDumpStackFrames(NULL, 20); } #ifdef GDI_DEBUG DPRINT1("-> called from %s:%i\n", file, line);

1 0

[jimtabor] 31660: Remove unused flags and start using new dc type ids.
by jimtabor＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: jimtabor Date: Tue Jan 8 06:48:08 2008 New Revision: 31660 URL: http://svn.reactos.org/svn/reactos?rev=31660&view=rev Log: Remove unused flags and start using new dc type ids. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/print.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Tue Jan 8 06:48:08 2008 @@ -394,7 +394,6 @@ INT saveLevel; // DCLEVEL lSaveDepth HDC hSelf; // DCLEVEL hdcSave Used only for MemoryDC & SaveDC. - BOOL IsIC; // Use DC_Type HPALETTE PalIndexed; Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Jan 8 06:48:08 2008 @@ -5,12 +5,8 @@ #include "driver.h" /* DC flags */ -#define DC_MEMORY 0x0001 /* It is a memory DC */ #define DC_SAVED 0x0002 /* It is a saved DC */ #define DC_DIRTY 0x0004 /* hVisRgn has to be updated */ -#define DC_THUNKHOOK 0x0008 /* DC hook is in the 16-bit code */ - -#define GDI_DC_TYPE (1) // GDIDEVICE flags #define PDEV_DISPLAY 0x00000001 // Display device Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c Tue Jan 8 06:48:08 2008 @@ -90,7 +90,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Tue Jan 8 06:48:08 2008 @@ -58,7 +58,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (DCDest->IsIC) + if (DCDest->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ @@ -75,7 +75,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (DCSrc->IsIC) + if (DCSrc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); @@ -204,7 +204,7 @@ DPRINT("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest); return FALSE; } - if (DCDest->IsIC) + if (DCDest->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ @@ -222,7 +222,7 @@ DPRINT("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc); return FALSE; } - if (DCSrc->IsIC) + if (DCSrc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); @@ -424,7 +424,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (DCDest->IsIC) + if (DCDest->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ @@ -442,7 +442,7 @@ { DCSrc = DCDest; } - if (DCSrc->IsIC) + if (DCSrc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCSrc); if(hdcDst != hdcSrc) @@ -814,7 +814,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (DCDest->IsIC) + if (DCDest->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCDest); /* Yes, Windows really returns TRUE in this case */ @@ -833,7 +833,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (DCSrc->IsIC) + if (DCSrc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(DCSrc); DC_UnlockDc(DCDest); @@ -1103,7 +1103,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -1155,7 +1155,7 @@ } Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Tue Jan 8 06:48:08 2008 @@ -257,7 +257,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return Result; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); return Result; Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c Tue Jan 8 06:48:08 2008 @@ -548,7 +548,7 @@ // The RealizePalette function modifies the palette for the device associated with the specified device context. If the // device context is a memory DC, the color table for the bitmap selected into the DC is modified. If the device // context is a display DC, the physical palette for that device is modified. - if(dc->w.flags == DC_MEMORY) + if(dc->DC_Type == DC_TYPE_MEMORY) { // Memory managed DC ASSERT(sysGDI->NumColors <= 256); @@ -571,7 +571,7 @@ PALETTE_UnlockPalette(palGDI); // Step 3: Create the XLATEOBJ for device managed DCs - if(dc->w.flags != DC_MEMORY) + if(dc->DC_Type != DC_TYPE_MEMORY) { // Device managed DC palGDI->logicalToSystem = IntEngCreateXlate(sysMode, palMode, systemPalette, dc->w.hPalette); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Jan 8 06:48:08 2008 @@ -62,7 +62,6 @@ HDC hNewDC, DisplayDC; HRGN hVisRgn; UNICODE_STRING DriverName; - INT DC_Type = DC_TYPE_DIRECT; DisplayDC = NULL; if (hDC == NULL) @@ -74,7 +73,6 @@ return NULL; } hDC = DisplayDC; - DC_Type = DC_TYPE_MEMORY; // Null hDC == Memory DC. } /* Allocate a new DC based on the original DC's device */ @@ -106,8 +104,6 @@ /* Copy information from original DC to new DC */ NewDC->hSelf = hNewDC; - NewDC->IsIC = FALSE; - NewDC->DC_Type = DC_Type; NewDC->PDev = OrigDC->PDev; @@ -131,7 +127,7 @@ } return NULL; } - NewDC->w.flags = DC_MEMORY; + NewDC->DC_Type = DC_TYPE_MEMORY; // Always! NewDC->w.hBitmap = hBitmap; NewDC->w.hFirstBitmap = hBitmap; NewDC->pPDev = OrigDC->pPDev; @@ -802,7 +798,6 @@ if(!nDc_Attr) nDc_Attr = &NewDC->Dc_Attr; NewDC->DC_Type = DC_TYPE_DIRECT; - NewDC->IsIC = CreateAsIC; NewDC->PDev = PrimarySurface.hPDev; if(pUMdhpdev) pUMdhpdev = NewDC->PDev; // set DHPDEV for device. @@ -974,7 +969,7 @@ NtGdiSelectBrush (DCHandle, STOCK_WHITE_BRUSH); NtGdiSelectFont (DCHandle, STOCK_SYSTEM_FONT); DC_LockDC (DCHandle); NtGdiSelectXxx does not recognize stock objects yet */ - if (DCToDelete->w.flags & DC_MEMORY) + if (DCToDelete->DC_Type == DC_TYPE_MEMORY) { NtGdiDeleteObject (DCToDelete->w.hFirstBitmap); } @@ -1256,7 +1251,7 @@ nDc_Attr->szlViewportExt = Dc_Attr->szlViewportExt; newdc->saveLevel = 0; - newdc->IsIC = dc->IsIC; + newdc->DC_Type = dc->DC_Type; #if 0 PATH_InitGdiPath( &newdc->w.path ); @@ -1330,7 +1325,7 @@ Dc_Attr->szlViewportExt = sDc_Attr->szlViewportExt; dc->PalIndexed = dcs->PalIndexed; - if (!(dc->w.flags & DC_MEMORY)) + if (dc->DC_Type != DC_TYPE_MEMORY) { dc->w.bitsPerPixel = dcs->w.bitsPerPixel; } @@ -1928,7 +1923,7 @@ if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; /* must be memory dc to select bitmap */ - if (!(pDC->w.flags & DC_MEMORY)) + if (pDC->DC_Type != DC_TYPE_MEMORY) { DC_UnlockDc(pDC); return NULL; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Tue Jan 8 06:48:08 2008 @@ -33,7 +33,7 @@ UINT Index; if (!(dc = DC_LockDc(hDC))) return 0; - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); return 0; @@ -91,7 +91,7 @@ UINT Index; if (!(dc = DC_LockDc(hDC))) return 0; - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); return 0; @@ -297,7 +297,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } - if (Dc->IsIC) + if (Dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(Dc); return 0; @@ -351,7 +351,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } - if (pDC->IsIC) + if (pDC->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(pDC); return 0; @@ -466,7 +466,7 @@ /* Get handle for the palette in DC. */ Dc = DC_LockDc(hDC); if (Dc == NULL) return 0; - if (Dc->IsIC) + if (Dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(Dc); return 0; Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Tue Jan 8 06:48:08 2008 @@ -226,7 +226,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -665,7 +665,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -861,7 +861,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -1155,7 +1155,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -1461,7 +1461,7 @@ DPRINT1("NtGdiRoundRect() - hDC is invalid\n"); SetLastWin32Error(ERROR_INVALID_HANDLE); } - else if (dc->IsIC) + else if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ @@ -1599,7 +1599,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Tue Jan 8 06:48:08 2008 @@ -393,7 +393,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */ Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c Tue Jan 8 06:48:08 2008 @@ -173,7 +173,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return -1; } - if ( pDC->IsIC ) + if ( pDC->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(pDC); return 0; 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Tue Jan 8 06:48:08 2008 @@ -1567,7 +1567,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->IsIC) + if (dc->DC_Type == DC_TYPE_INFO) { DC_UnlockDc(dc); /* Yes, Windows really returns TRUE in this case */

1 0

[tkreuzer] 31659: fix 2 names
by tkreuzer＠svn.reactos.org 08 Jan '08

08 Jan '08

Author: tkreuzer Date: Tue Jan 8 05:49:09 2008 New Revision: 31659 URL: http://svn.reactos.org/svn/reactos?rev=31659&view=rev Log: fix 2 names Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S Tue Jan 8 05:49:09 2008 @@ -4649,15 +4649,15 @@ call *(%ecx) ret $0xc -.global _UMPDDrvQuerySpoolType@8 -_UMPDDrvQuerySpoolType@8: +.global _NtGdiMakeObjectXferable@8 +_NtGdiMakeObjectXferable@8: movl $0x1297, %eax movl $KUSER_SHARED_SYSCALL, %ecx call *(%ecx) ret $0x8 -.global _DefaultHTCallBack@4 -_DefaultHTCallBack@4: +.global _NtGdiMakeObjectUnXferable@4 +_NtGdiMakeObjectUnXferable@4: movl $0x1298, %eax movl $KUSER_SHARED_SYSCALL, %ecx call *(%ecx) Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def Tue Jan 8 05:49:09 2008 @@ -670,5 +670,5 @@ NtGdiBRUSHOBJ_DeleteRbrush@8 NtGdiUMPDEngFreeUserMem@4 NtGdiDrawStream@12 -UMPDDrvQuerySpoolType@8 -DefaultHTCallBack@4 +NtGdiMakeObjectXferable@8 +NtGdiMakeObjectUnXferable@4

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008