Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[cfinck] 31648: Fix the indentation mess in "settings.c" as well
by cfinck＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: cfinck Date: Mon Jan 7 20:22:05 2008 New Revision: 31648 URL: http://svn.reactos.org/svn/reactos?rev=31648&view=rev Log: Fix the indentation mess in "settings.c" as well Modified: trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c (original) +++ trunk/reactos/base/setup/usetup/settings.c Mon Jan 7 20:22:05 2008 @@ -36,818 +36,828 @@ GetComputerIdentifier(PWSTR Identifier, ULONG IdentifierLength) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - LPCWSTR ComputerIdentifier; - HANDLE ProcessorsKey; - PKEY_FULL_INFORMATION pFullInfo; - ULONG Size, SizeNeeded; - NTSTATUS Status; - - DPRINT("GetComputerIdentifier() called\n"); - - Size = sizeof(KEY_FULL_INFORMATION); - pFullInfo = (PKEY_FULL_INFORMATION)RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); - if (!pFullInfo) - { - DPRINT("RtlAllocateHeap() failed\n"); - return FALSE; - } - - /* Open the processors key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&ProcessorsKey, - KEY_QUERY_VALUE , - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status 0x%lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - /* Get number of subkeys */ - Status = NtQueryKey( - ProcessorsKey, - KeyFullInformation, - pFullInfo, - Size, - &Size); - NtClose(ProcessorsKey); - if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) - { - DPRINT("NtQueryKey() failed (Status 0x%lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - /* Find computer identifier */ - if (pFullInfo->SubKeys == 0) - { - /* Something strange happened. No processor detected */ - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - return FALSE; - } - - if (pFullInfo->SubKeys == 1) - { - /* Computer is mono-CPU */ - ComputerIdentifier = L"PC UP"; - } - else - { - /* Computer is multi-CPUs */ - ComputerIdentifier = L"PC MP"; - } - RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); - - /* Copy computer identifier to return buffer */ - SizeNeeded = (wcslen(ComputerIdentifier) + 1) * sizeof(WCHAR); - if (SizeNeeded > IdentifierLength) - return FALSE; - RtlCopyMemory(Identifier, ComputerIdentifier, SizeNeeded); - return TRUE; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + LPCWSTR ComputerIdentifier; + HANDLE ProcessorsKey; + PKEY_FULL_INFORMATION pFullInfo; + ULONG Size, SizeNeeded; + NTSTATUS Status; + + DPRINT("GetComputerIdentifier() called\n"); + + Size = sizeof(KEY_FULL_INFORMATION); + pFullInfo = (PKEY_FULL_INFORMATION)RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); + if (!pFullInfo) + { + DPRINT("RtlAllocateHeap() failed\n"); + return FALSE; + } + + /* Open the processors key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&ProcessorsKey, + KEY_QUERY_VALUE , + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed (Status 0x%lx)\n", Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + return FALSE; + } + + /* Get number of subkeys */ + Status = NtQueryKey( + ProcessorsKey, + KeyFullInformation, + pFullInfo, + Size, + &Size); + NtClose(ProcessorsKey); + + if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) + { + DPRINT("NtQueryKey() failed (Status 0x%lx)\n", Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + return FALSE; + } + + /* Find computer identifier */ + if (pFullInfo->SubKeys == 0) + { + /* Something strange happened. No processor detected */ + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + return FALSE; + } + + if (pFullInfo->SubKeys == 1) + { + /* Computer is mono-CPU */ + ComputerIdentifier = L"PC UP"; + } + else + { + /* Computer is multi-CPUs */ + ComputerIdentifier = L"PC MP"; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, pFullInfo); + + /* Copy computer identifier to return buffer */ + SizeNeeded = (wcslen(ComputerIdentifier) + 1) * sizeof(WCHAR); + if (SizeNeeded > IdentifierLength) + return FALSE; + + RtlCopyMemory(Identifier, ComputerIdentifier, SizeNeeded); + + return TRUE; } PGENERIC_LIST CreateComputerTypeList(HINF InfFile) { - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - WCHAR ComputerIdentifier[128]; - WCHAR ComputerKey[32]; - - /* Get the computer identification */ - if (!GetComputerIdentifier(ComputerIdentifier, 128)) - { - ComputerIdentifier[0] = 0; - } - - DPRINT("Computer identifier: '%S'\n", ComputerIdentifier); - - /* Search for matching device identifier */ - if (!SetupFindFirstLineW(InfFile, L"Map.Computer", NULL, &Context)) - { - /* FIXME: error message */ - return NULL; - } - - do - { - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("KeyValue: %S\n", KeyValue); - if (wcsstr(ComputerIdentifier, KeyValue)) - { - if (!INF_GetDataField(&Context, 0, &KeyName)) + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + WCHAR ComputerIdentifier[128]; + WCHAR ComputerKey[32]; + + /* Get the computer identification */ + if (!GetComputerIdentifier(ComputerIdentifier, 128)) + { + ComputerIdentifier[0] = 0; + } + + DPRINT("Computer identifier: '%S'\n", ComputerIdentifier); + + /* Search for matching device identifier */ + if (!SetupFindFirstLineW(InfFile, L"Map.Computer", NULL, &Context)) + { + /* FIXME: error message */ + return NULL; + } + + do + { + if (!INF_GetDataField(&Context, 1, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; + } + + DPRINT("KeyValue: %S\n", KeyValue); + if (wcsstr(ComputerIdentifier, KeyValue)) + { + if (!INF_GetDataField(&Context, 0, &KeyName)) { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; } - DPRINT("Computer key: %S\n", KeyName); - wcscpy(ComputerKey, KeyName); - } - } - while (SetupFindNextLine(&Context, &Context)); - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"Computer", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, Buffer, UserData, - _wcsicmp(KeyName, ComputerKey) ? FALSE : TRUE); - } - while (SetupFindNextLine(&Context, &Context)); - - return List; + DPRINT("Computer key: %S\n", KeyName); + wcscpy(ComputerKey, KeyName); + } + } while (SetupFindNextLine(&Context, &Context)); + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"Computer", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, Buffer, UserData, + _wcsicmp(KeyName, ComputerKey) ? FALSE : TRUE); + } while (SetupFindNextLine(&Context, &Context)); + + return List; } static BOOLEAN GetDisplayIdentifier(PWSTR Identifier, - ULONG IdentifierLength) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - WCHAR Buffer[32]; - HANDLE BusKey; - HANDLE BusInstanceKey; - HANDLE ControllerKey; - HANDLE ControllerInstanceKey; - ULONG BusInstance; - ULONG ControllerInstance; - ULONG BufferLength; - ULONG ReturnedLength; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - NTSTATUS Status; - - DPRINT("GetDisplayIdentifier() called\n"); - - /* Open the bus key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\HARDWARE\\Description\\System\\MultifunctionAdapter"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&BusKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - BusInstance = 0; - while (TRUE) - { - swprintf(Buffer, L"%lu", BusInstance); - RtlInitUnicodeString(&KeyName, - Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - BusKey, - NULL); - Status = NtOpenKey(&BusInstanceKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(BusKey); - return FALSE; - } - - /* Open the controller type key */ - RtlInitUnicodeString(&KeyName, - L"DisplayController"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - BusInstanceKey, - NULL); - Status = NtOpenKey(&ControllerKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - ControllerInstance = 0; - while (TRUE) - { - /* Open the pointer controller instance key */ - swprintf(Buffer, L"%lu", ControllerInstance); - RtlInitUnicodeString(&KeyName, - Buffer); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ControllerKey, - NULL); - Status = NtOpenKey(&ControllerInstanceKey, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtOpenKey() failed (Status %lx)\n", Status); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return FALSE; - } - - /* Get controller identifier */ - RtlInitUnicodeString(&KeyName, - L"Identifier"); - - BufferLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + - 256 * sizeof(WCHAR); - ValueInfo = (KEY_VALUE_PARTIAL_INFORMATION*) RtlAllocateHeap(RtlGetProcessHeap(), - 0, - BufferLength); - if (ValueInfo == NULL) - { - DPRINT("RtlAllocateHeap() failed\n"); - NtClose(ControllerInstanceKey); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return FALSE; - } - - Status = NtQueryValueKey(ControllerInstanceKey, - &KeyName, - KeyValuePartialInformation, - ValueInfo, - BufferLength, - &ReturnedLength); - if (NT_SUCCESS(Status)) - { - DPRINT("Identifier: %S\n", (PWSTR)ValueInfo->Data); - - BufferLength = min(ValueInfo->DataLength / sizeof(WCHAR), IdentifierLength); - RtlCopyMemory (Identifier, - ValueInfo->Data, - BufferLength * sizeof(WCHAR)); - Identifier[BufferLength] = 0; - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - ValueInfo); - NtClose(ControllerInstanceKey); - NtClose(ControllerKey); - NtClose(BusInstanceKey); - NtClose(BusKey); - return TRUE; - } - - NtClose(ControllerInstanceKey); - - ControllerInstance++; - } - - NtClose(ControllerKey); - } - - NtClose(BusInstanceKey); - - BusInstance++; - } - - NtClose(BusKey); - - return FALSE; + ULONG IdentifierLength) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + WCHAR Buffer[32]; + HANDLE BusKey; + HANDLE BusInstanceKey; + HANDLE ControllerKey; + HANDLE ControllerInstanceKey; + ULONG BusInstance; + ULONG ControllerInstance; + ULONG BufferLength; + ULONG ReturnedLength; + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + NTSTATUS Status; + + DPRINT("GetDisplayIdentifier() called\n"); + + /* Open the bus key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\HARDWARE\\Description\\System\\MultifunctionAdapter"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&BusKey, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed (Status %lx)\n", Status); + return FALSE; + } + + BusInstance = 0; + while (TRUE) + { + swprintf(Buffer, L"%lu", BusInstance); + RtlInitUnicodeString(&KeyName, + Buffer); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + BusKey, + NULL); + + Status = NtOpenKey(&BusInstanceKey, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed (Status %lx)\n", Status); + NtClose(BusKey); + return FALSE; + } + + /* Open the controller type key */ + RtlInitUnicodeString(&KeyName, + L"DisplayController"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + BusInstanceKey, + NULL); + + Status = NtOpenKey(&ControllerKey, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + ControllerInstance = 0; + + while (TRUE) + { + /* Open the pointer controller instance key */ + swprintf(Buffer, L"%lu", ControllerInstance); + RtlInitUnicodeString(&KeyName, + Buffer); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ControllerKey, + NULL); + + Status = NtOpenKey(&ControllerInstanceKey, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenKey() failed (Status %lx)\n", Status); + NtClose(ControllerKey); + NtClose(BusInstanceKey); + NtClose(BusKey); + return FALSE; + } + + /* Get controller identifier */ + RtlInitUnicodeString(&KeyName, + L"Identifier"); + + BufferLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + + 256 * sizeof(WCHAR); + ValueInfo = (KEY_VALUE_PARTIAL_INFORMATION*) RtlAllocateHeap(RtlGetProcessHeap(), + 0, + BufferLength); + if (ValueInfo == NULL) + { + DPRINT("RtlAllocateHeap() failed\n"); + NtClose(ControllerInstanceKey); + NtClose(ControllerKey); + NtClose(BusInstanceKey); + NtClose(BusKey); + return FALSE; + } + + Status = NtQueryValueKey(ControllerInstanceKey, + &KeyName, + KeyValuePartialInformation, + ValueInfo, + BufferLength, + &ReturnedLength); + if (NT_SUCCESS(Status)) + { + DPRINT("Identifier: %S\n", (PWSTR)ValueInfo->Data); + + BufferLength = min(ValueInfo->DataLength / sizeof(WCHAR), IdentifierLength); + RtlCopyMemory (Identifier, + ValueInfo->Data, + BufferLength * sizeof(WCHAR)); + Identifier[BufferLength] = 0; + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + ValueInfo); + + NtClose(ControllerInstanceKey); + NtClose(ControllerKey); + NtClose(BusInstanceKey); + NtClose(BusKey); + return TRUE; + } + + NtClose(ControllerInstanceKey); + + ControllerInstance++; + } + + NtClose(ControllerKey); + } + + NtClose(BusInstanceKey); + + BusInstance++; + } + + NtClose(BusKey); + + return FALSE; } PGENERIC_LIST CreateDisplayDriverList(HINF InfFile) { - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - WCHAR DisplayIdentifier[128]; - WCHAR DisplayKey[32]; - - /* Get the display identification */ - if (!GetDisplayIdentifier(DisplayIdentifier, 128)) - { - DisplayIdentifier[0] = 0; - } - - DPRINT("Display identifier: '%S'\n", DisplayIdentifier); - - /* Search for matching device identifier */ - if (!SetupFindFirstLineW(InfFile, L"Map.Display", NULL, &Context)) - { - /* FIXME: error message */ - return NULL; - } - - do - { - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("KeyValue: %S\n", KeyValue); - if (wcsstr(DisplayIdentifier, KeyValue)) - { - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetDataField() failed\n"); - return NULL; - } - - DPRINT("Display key: %S\n", KeyName); - wcscpy(DisplayKey, KeyName); - } - } - while (SetupFindNextLine(&Context, &Context)); - - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"Display", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetDataField(&Context, 0, &KeyName)) - { - DPRINT1("INF_GetDataField() failed\n"); - break; - } - - if (!INF_GetDataField(&Context, 1, &KeyValue)) - { - DPRINT1("INF_GetDataField() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - DPRINT1("RtlAllocateHeap() failed\n"); - DestroyGenericList(List, TRUE); - return NULL; - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DisplayKey) ? FALSE : TRUE); - } - while (SetupFindNextLine(&Context, &Context)); + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + WCHAR DisplayIdentifier[128]; + WCHAR DisplayKey[32]; + + /* Get the display identification */ + if (!GetDisplayIdentifier(DisplayIdentifier, 128)) + { + DisplayIdentifier[0] = 0; + } + + DPRINT("Display identifier: '%S'\n", DisplayIdentifier); + + /* Search for matching device identifier */ + if (!SetupFindFirstLineW(InfFile, L"Map.Display", NULL, &Context)) + { + /* FIXME: error message */ + return NULL; + } + + do + { + if (!INF_GetDataField(&Context, 1, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; + } + + DPRINT("KeyValue: %S\n", KeyValue); + if (wcsstr(DisplayIdentifier, KeyValue)) + { + if (!INF_GetDataField(&Context, 0, &KeyName)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetDataField() failed\n"); + return NULL; + } + + DPRINT("Display key: %S\n", KeyName); + wcscpy(DisplayKey, KeyName); + } + } while (SetupFindNextLine(&Context, &Context)); + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"Display", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetDataField(&Context, 0, &KeyName)) + { + DPRINT1("INF_GetDataField() failed\n"); + break; + } + + if (!INF_GetDataField(&Context, 1, &KeyValue)) + { + DPRINT1("INF_GetDataField() failed\n"); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (UserData == NULL) + { + DPRINT1("RtlAllocateHeap() failed\n"); + DestroyGenericList(List, TRUE); + return NULL; + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, + Buffer, + UserData, + _wcsicmp(KeyName, DisplayKey) ? FALSE : TRUE); + } while (SetupFindNextLine(&Context, &Context)); #if 0 - AppendGenericListEntry(List, "Other display driver", NULL, TRUE); + AppendGenericListEntry(List, "Other display driver", NULL, TRUE); #endif - return List; + return List; } BOOLEAN ProcessComputerFiles(HINF InfFile, PGENERIC_LIST List, PWCHAR* AdditionalSectionName) { - PGENERIC_LIST_ENTRY Entry; - static WCHAR SectionName[128]; - - DPRINT("ProcessComputerFiles() called\n"); - - Entry = GetGenericListEntry(List); - if (Entry == NULL) - { - DPRINT("GetGenericListEntry() failed\n"); - return FALSE; - } - - wcscpy(SectionName, L"Files."); - wcscat(SectionName, (const wchar_t*) Entry->UserData); - *AdditionalSectionName = SectionName; - - return TRUE; + PGENERIC_LIST_ENTRY Entry; + static WCHAR SectionName[128]; + + DPRINT("ProcessComputerFiles() called\n"); + + Entry = GetGenericListEntry(List); + if (Entry == NULL) + { + DPRINT("GetGenericListEntry() failed\n"); + return FALSE; + } + + wcscpy(SectionName, L"Files."); + wcscat(SectionName, (const wchar_t*) Entry->UserData); + *AdditionalSectionName = SectionName; + + return TRUE; } BOOLEAN ProcessDisplayRegistry(HINF InfFile, PGENERIC_LIST List) { - PGENERIC_LIST_ENTRY Entry; - INFCONTEXT Context; - PWCHAR ServiceName; - ULONG StartValue; - NTSTATUS Status; - WCHAR RegPath [255]; - PWCHAR Buffer; - ULONG Width, Hight, Bpp; - - DPRINT("ProcessDisplayRegistry() called\n"); - - Entry = GetGenericListEntry(List); - if (Entry == NULL) - { - DPRINT("GetGenericListEntry() failed\n"); - return FALSE; - } - - if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*) Entry->UserData, &Context)) - { - DPRINT("SetupFindFirstLineW() failed\n"); - return FALSE; - } - - /* Enable the right driver */ - if (!INF_GetDataField(&Context, 3, &ServiceName)) - { - DPRINT("INF_GetDataField() failed\n"); - return FALSE; - } - - ASSERT(wcslen(ServiceName) < 10); - DPRINT("Service name: %S\n", ServiceName); - - StartValue = 1; - Status = RtlWriteRegistryValue(RTL_REGISTRY_SERVICES, - ServiceName, - L"Start", - REG_DWORD, - &StartValue, - sizeof(ULONG)); - - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Set the resolution */ - swprintf(RegPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", ServiceName); - - if (!INF_GetDataField(&Context, 4, &Buffer)) - { - DPRINT("INF_GetDataField() failed\n"); - return FALSE; - } - Width = wcstoul(Buffer, NULL, 10); - Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, - RegPath, - L"DefaultSettings.XResolution", - REG_DWORD, - &Width, - sizeof(ULONG)); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - return FALSE; - } - - - if (!INF_GetDataField(&Context, 5, &Buffer)) - { - DPRINT("INF_GetDataField() failed\n"); - return FALSE; - } - Hight = wcstoul(Buffer, 0, 0); - Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, - RegPath, - L"DefaultSettings.YResolution", - REG_DWORD, - &Hight, - sizeof(ULONG)); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - return FALSE; - } - - if (!INF_GetDataField(&Context, 6, &Buffer)) - { - DPRINT("INF_GetDataField() failed\n"); - return FALSE; - } - Bpp = wcstoul(Buffer, 0, 0); - Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, - RegPath, - L"DefaultSettings.BitsPerPel", - REG_DWORD, - &Bpp, - sizeof(ULONG)); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); - return FALSE; - } - - DPRINT("ProcessDisplayRegistry() done\n"); - - return TRUE; + PGENERIC_LIST_ENTRY Entry; + INFCONTEXT Context; + PWCHAR ServiceName; + ULONG StartValue; + NTSTATUS Status; + WCHAR RegPath [255]; + PWCHAR Buffer; + ULONG Width, Height, Bpp; + + DPRINT("ProcessDisplayRegistry() called\n"); + + Entry = GetGenericListEntry(List); + if (Entry == NULL) + { + DPRINT("GetGenericListEntry() failed\n"); + return FALSE; + } + + if (!SetupFindFirstLineW(InfFile, L"Display", (WCHAR*) Entry->UserData, &Context)) + { + DPRINT("SetupFindFirstLineW() failed\n"); + return FALSE; + } + + /* Enable the right driver */ + if (!INF_GetDataField(&Context, 3, &ServiceName)) + { + DPRINT("INF_GetDataField() failed\n"); + return FALSE; + } + + ASSERT(wcslen(ServiceName) < 10); + DPRINT("Service name: %S\n", ServiceName); + + StartValue = 1; + Status = RtlWriteRegistryValue(RTL_REGISTRY_SERVICES, + ServiceName, + L"Start", + REG_DWORD, + &StartValue, + sizeof(ULONG)); + + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } + + /* Set the resolution */ + swprintf(RegPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", ServiceName); + + if (!INF_GetDataField(&Context, 4, &Buffer)) + { + DPRINT("INF_GetDataField() failed\n"); + return FALSE; + } + + Width = wcstoul(Buffer, NULL, 10); + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + RegPath, + L"DefaultSettings.XResolution", + REG_DWORD, + &Width, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } + + if (!INF_GetDataField(&Context, 5, &Buffer)) + { + DPRINT("INF_GetDataField() failed\n"); + return FALSE; + } + + Height = wcstoul(Buffer, 0, 0); + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + RegPath, + L"DefaultSettings.YResolution", + REG_DWORD, + &Height, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } + + if (!INF_GetDataField(&Context, 6, &Buffer)) + { + DPRINT("INF_GetDataField() failed\n"); + return FALSE; + } + + Bpp = wcstoul(Buffer, 0, 0); + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + RegPath, + L"DefaultSettings.BitsPerPel", + REG_DWORD, + &Bpp, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } + + DPRINT("ProcessDisplayRegistry() done\n"); + + return TRUE; } PGENERIC_LIST CreateKeyboardDriverList(HINF InfFile) { - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"Keyboard", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, Buffer, UserData, FALSE); - } - while (SetupFindNextLine(&Context, &Context)); - - return List; + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"Keyboard", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, Buffer, UserData, FALSE); + } while (SetupFindNextLine(&Context, &Context)); + + return List; } PGENERIC_LIST CreateLanguageList(HINF InfFile, WCHAR * DefaultLanguage) -{ - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - - /* Get default language id */ - if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLanguage", &Context)) - return NULL; - - if (!INF_GetData (&Context, NULL, &KeyValue)) - return NULL; - - wcscpy(DefaultLanguage, KeyValue); - +{ + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + + /* Get default language id */ + if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLanguage", &Context)) + return NULL; + + if (!INF_GetData (&Context, NULL, &KeyValue)) + return NULL; + + wcscpy(DefaultLanguage, KeyValue); + SelectedLanguageId = KeyValue; - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DefaultLanguage) ? FALSE : TRUE); - } - while (SetupFindNextLine(&Context, &Context)); - - return List; + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"Language", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, + Buffer, + UserData, + _wcsicmp(KeyName, DefaultLanguage) ? FALSE : TRUE); + } while (SetupFindNextLine(&Context, &Context)); + + return List; } PGENERIC_LIST CreateKeyboardLayoutList(HINF InfFile, WCHAR * DefaultKBLayout) { - CHAR Buffer[128]; - PGENERIC_LIST List; - INFCONTEXT Context; - PWCHAR KeyName; - PWCHAR KeyValue; - PWCHAR UserData; - - /* Get default layout id */ - if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) - return NULL; - - if (!INF_GetData (&Context, NULL, &KeyValue)) - return NULL; - - wcscpy(DefaultKBLayout, KeyValue); - - List = CreateGenericList(); - if (List == NULL) - return NULL; - - if (!SetupFindFirstLineW (InfFile, L"KeyboardLayout", NULL, &Context)) - { - DestroyGenericList(List, FALSE); - return NULL; - } - - do - { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) - { - /* FIXME: Handle error! */ - DPRINT("INF_GetData() failed\n"); - DestroyGenericList(List, FALSE); - break; - } - - UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, - 0, - (wcslen(KeyName) + 1) * sizeof(WCHAR)); - if (UserData == NULL) - { - /* FIXME: Handle error! */ - } - - wcscpy(UserData, KeyName); - - sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); - } - while (SetupFindNextLine(&Context, &Context)); - - return List; + CHAR Buffer[128]; + PGENERIC_LIST List; + INFCONTEXT Context; + PWCHAR KeyName; + PWCHAR KeyValue; + PWCHAR UserData; + + /* Get default layout id */ + if (!SetupFindFirstLineW (InfFile, L"NLS", L"DefaultLayout", &Context)) + return NULL; + + if (!INF_GetData (&Context, NULL, &KeyValue)) + return NULL; + + wcscpy(DefaultKBLayout, KeyValue); + + List = CreateGenericList(); + if (List == NULL) + return NULL; + + if (!SetupFindFirstLineW (InfFile, L"KeyboardLayout", NULL, &Context)) + { + DestroyGenericList(List, FALSE); + return NULL; + } + + do + { + if (!INF_GetData (&Context, &KeyName, &KeyValue)) + { + /* FIXME: Handle error! */ + DPRINT("INF_GetData() failed\n"); + DestroyGenericList(List, FALSE); + break; + } + + UserData = (WCHAR*) RtlAllocateHeap(ProcessHeap, + 0, + (wcslen(KeyName) + 1) * sizeof(WCHAR)); + + if (UserData == NULL) + { + /* FIXME: Handle error! */ + } + + wcscpy(UserData, KeyName); + + sprintf(Buffer, "%S", KeyValue); + AppendGenericListEntry(List, + Buffer, + UserData, + _wcsicmp(KeyName, DefaultKBLayout) ? FALSE : TRUE); + } while (SetupFindNextLine(&Context, &Context)); + + return List; } BOOLEAN ProcessKeyboardLayoutRegistry(PGENERIC_LIST List) { - PGENERIC_LIST_ENTRY Entry; - PWCHAR LanguageId; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - NTSTATUS Status; - - Entry = GetGenericListEntry(List); - if (Entry == NULL) - return FALSE; - - LanguageId = (PWCHAR)Entry->UserData; - if (LanguageId == NULL) - return FALSE; - - /* Open the nls language key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); - return FALSE; - } - - /* Set default language */ - RtlInitUnicodeString(&ValueName, - L"Default"); - Status = NtSetValueKey (KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)(LanguageId + 4), - 8 * sizeof(PWCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - /* Set install language */ - RtlInitUnicodeString(&ValueName, - L"InstallLanguage"); - Status = NtSetValueKey (KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)(LanguageId + 4), - 8 * sizeof(PWCHAR)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); - NtClose(KeyHandle); - return FALSE; - } - - NtClose(KeyHandle); - - return TRUE; + PGENERIC_LIST_ENTRY Entry; + PWCHAR LanguageId; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + NTSTATUS Status; + + Entry = GetGenericListEntry(List); + if (Entry == NULL) + return FALSE; + + LanguageId = (PWCHAR)Entry->UserData; + if (LanguageId == NULL) + return FALSE; + + /* Open the nls language key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); + return FALSE; + } + + /* Set default language */ + RtlInitUnicodeString(&ValueName, + L"Default"); + + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)(LanguageId + 4), + 8 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + /* Set install language */ + RtlInitUnicodeString(&ValueName, + L"InstallLanguage"); + Status = NtSetValueKey (KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)(LanguageId + 4), + 8 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + NtClose(KeyHandle); + + return TRUE; } @@ -855,7 +865,7 @@ BOOLEAN ProcessKeyboardLayoutFiles(PGENERIC_LIST List) { - return TRUE; + return TRUE; } #endif

1 0

[cfinck] 31647: Fix the indentation mess in "usetup.c"
by cfinck＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: cfinck Date: Mon Jan 7 19:50:40 2008 New Revision: 31647 URL: http://svn.reactos.org/svn/reactos?rev=31647&view=rev Log: Fix the indentation mess in "usetup.c" Modified: trunk/reactos/base/setup/usetup/interface/usetup.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…

1 0

[akorotaev] 31646: - Merge procsup.c - Fix bugcheck by replacing MmCreateVirtualMapping with MmCreateVirtualMappingUnsafe (which is used it trunk). Now you can pass 1st stage setup with this branch.
by akorotaev＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: akorotaev Date: Mon Jan 7 19:45:24 2008 New Revision: 31646 URL: http://svn.reactos.org/svn/reactos?rev=31646&view=rev Log: - Merge procsup.c - Fix bugcheck by replacing MmCreateVirtualMapping with MmCreateVirtualMappingUnsafe (which is used it trunk). Now you can pass 1st stage setup with this branch. Modified: branches/cache_manager_rewrite/mm/procsup.c branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/procsu… ============================================================================== --- branches/cache_manager_rewrite/mm/procsup.c (original) +++ branches/cache_manager_rewrite/mm/procsup.c Mon Jan 7 19:45:24 2008 @@ -15,8 +15,8 @@ extern ULONG NtMajorVersion; extern ULONG NtMinorVersion; -extern ULONG NtOSCSDVersion; -extern ULONG NtGlobalFlag; +extern ULONG CmNtCSDVersion; +extern ULONG NtBuildNumber; extern MM_SYSTEMSIZE MmSystemSize; #define MM_HIGHEST_VAD_ADDRESS \ @@ -40,7 +40,7 @@ } /* Save the old priority and update it */ - OldPriority = Process->Vm.Flags.MemoryPriority; + OldPriority = (UCHAR)Process->Vm.Flags.MemoryPriority; Process->Vm.Flags.MemoryPriority = MemoryPriority; /* Return the old priority */ @@ -166,7 +166,7 @@ /* Lock the Address Space */ MmLockAddressSpace(ProcessAddressSpace); - + MemoryArea = MmLocateMemoryAreaByAddress(ProcessAddressSpace, (PVOID)Teb); if (MemoryArea) { @@ -180,7 +180,8 @@ PVOID STDCALL -MmCreateKernelStack(BOOLEAN GuiStack) +MmCreateKernelStack(BOOLEAN GuiStack, + UCHAR Node) { PMEMORY_AREA StackArea; ULONG i; @@ -241,8 +242,9 @@ KEBUGCHECK(0); } - /* Return the stack */ - return KernelStack; + /* Return the stack base */ + return (PVOID)((ULONG_PTR)KernelStack + + (GuiStack ? KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE)); } /* @@ -258,7 +260,7 @@ ASSERT(((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) <= (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)); - /* + /* * We'll give you three more pages. * NOTE: See note in MmCreateKernelStack. These pages are already being reserved. * It would be more efficient to only grow them (commit them) here. @@ -329,9 +331,9 @@ /* Default Version Data (could get changed below) */ Peb->OSMajorVersion = NtMajorVersion; Peb->OSMinorVersion = NtMinorVersion; - Peb->OSBuildNumber = 2195; + Peb->OSBuildNumber = (USHORT)(NtBuildNumber & 0x3FFF); Peb->OSPlatformId = 2; /* VER_PLATFORM_WIN32_NT */ - Peb->OSCSDVersion = NtOSCSDVersion; + Peb->OSCSDVersion = (USHORT)CmNtCSDVersion; /* Heap and Debug Data */ Peb->NumberOfProcessors = KeNumberProcessors; @@ -463,6 +465,11 @@ Teb->DeallocationStack = InitialTeb->AllocatedStackBase; } + /* Initialize the static unicode string */ + Teb->StaticUnicodeString.Length = 0; + Teb->StaticUnicodeString.MaximumLength = sizeof(Teb->StaticUnicodeBuffer); + Teb->StaticUnicodeString.Buffer = Teb->StaticUnicodeBuffer; + /* Return TEB Address */ DPRINT("Allocated: %x\n", Teb); if (Attached) KeDetachProcess(); @@ -470,10 +477,37 @@ } NTSTATUS -STDCALL -MmCreateProcessAddressSpace(IN PEPROCESS Process, - IN PROS_SECTION_OBJECT Section OPTIONAL, - IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) +NTAPI +MmInitializeHandBuiltProcess2(IN PEPROCESS Process) +{ + PVOID BaseAddress; + PMEMORY_AREA MemoryArea; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + NTSTATUS Status; + PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; + BoundaryAddressMultiple.QuadPart = 0; + + /* Create the shared data page */ + BaseAddress = (PVOID)USER_SHARED_DATA; + Status = MmCreateMemoryArea(ProcessAddressSpace, + MEMORY_AREA_SHARED_DATA, + &BaseAddress, + PAGE_SIZE, + PAGE_EXECUTE_READ, + &MemoryArea, + FALSE, + 0, + BoundaryAddressMultiple); + return Status; +} + +NTSTATUS +NTAPI +MmInitializeProcessAddressSpace(IN PEPROCESS Process, + IN PEPROCESS ProcessClone OPTIONAL, + IN PVOID Section OPTIONAL, + IN OUT PULONG Flags, + IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) { NTSTATUS Status; PMADDRESS_SPACE ProcessAddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; @@ -482,6 +516,7 @@ PHYSICAL_ADDRESS BoundaryAddressMultiple; SIZE_T ViewSize = 0; PVOID ImageBase = 0; + PROS_SECTION_OBJECT SectionObject = Section; BoundaryAddressMultiple.QuadPart = 0; /* Initialize the Addresss Space */ @@ -545,7 +580,7 @@ Process->HasAddressSpace = TRUE; /* Check if there's a Section Object */ - if (Section) + if (SectionObject) { UNICODE_STRING FileName; PWCHAR szSrc; @@ -557,7 +592,7 @@ MmUnlockAddressSpace(ProcessAddressSpace); DPRINT("Mapping process image. Section: %p, Process: %p, ImageBase: %p\n", - Section, Process, &ImageBase); + SectionObject, Process, &ImageBase); Status = MmMapViewOfSection(Section, (PEPROCESS)Process, (PVOID*)&ImageBase, @@ -579,7 +614,7 @@ /* Determine the image file name and save it to EPROCESS */ DPRINT("Getting Image name\n"); - FileName = Section->FileObject->FileName; + FileName = SectionObject->FileObject->FileName; szSrc = (PWCHAR)(FileName.Buffer + FileName.Length); while (szSrc >= FileName.Buffer) { @@ -607,7 +642,7 @@ if (AuditName) { /* Setup the audit name */ - SeInitializeProcessAuditName(Section->FileObject, + SeInitializeProcessAuditName(SectionObject->FileObject, FALSE, AuditName); } @@ -632,7 +667,7 @@ /* FIXME: Add part of MmDeleteProcessAddressSpace here */ } -NTSTATUS +NTSTATUS NTAPI MmDeleteProcessAddressSpace(PEPROCESS Process) { Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Mon Jan 7 19:45:24 2008 @@ -994,11 +994,11 @@ * Just map the desired physical page */ Pfn = (Offset + MemoryArea->Data.SectionData.ViewOffset) >> PAGE_SHIFT; - Status = MmCreateVirtualMapping(AddressSpace->Process, - Address, - Region->Protect, - &Pfn, - 1); + Status = MmCreateVirtualMappingUnsafe(AddressSpace->Process, + Address, + Region->Protect, + &Pfn, + 1); if (!NT_SUCCESS(Status)) { DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); @@ -5597,7 +5597,6 @@ CHECKPOINT1; return STATUS_INVALID_PAGE_PROTECTION; } - Section = (PROS_SECTION_OBJECT)SectionObject; AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot;

1 0

[fireball] 31645: - Add declaration for KdChangeOption exported native API.
by fireball＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: fireball Date: Mon Jan 7 19:12:48 2008 New Revision: 31645 URL: http://svn.reactos.org/svn/reactos?rev=31645&view=rev Log: - Add declaration for KdChangeOption exported native API. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Mon Jan 7 19:12:48 2008 @@ -10998,6 +10998,19 @@ KdEnableDebugger( VOID); +#if (NTDDI_VERSION >= NTDDI_WS03SP1) +NTKERNELAPI +NTSTATUS +NTAPI +KdChangeOption( + IN KD_OPTION Option, + IN ULONG InBufferBytes OPTIONAL, + IN PVOID InBuffer, + IN ULONG OutBufferBytes OPTIONAL, + OUT PVOID OutBuffer, + OUT PULONG OutBufferNeeded OPTIONAL); +#endif + VOID NTAPI DbgBreakPoint(

1 0

[hpoussin] 31644: Update irot.idl Misc cleanup
by hpoussin＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: hpoussin Date: Mon Jan 7 18:17:48 2008 New Revision: 31644 URL: http://svn.reactos.org/svn/reactos?rev=31644&view=rev Log: Update irot.idl Misc cleanup Modified: trunk/reactos/include/reactos/idl/idl.rbuild trunk/reactos/include/reactos/idl/wtypes.idl trunk/reactos/include/reactos/wine/irot.idl trunk/reactos/include/reactos/wine/wineheaders.rbuild Modified: trunk/reactos/include/reactos/idl/idl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rb… ============================================================================== --- trunk/reactos/include/reactos/idl/idl.rbuild (original) +++ trunk/reactos/include/reactos/idl/idl.rbuild Mon Jan 7 18:17:48 2008 @@ -2,43 +2,27 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="pnp_server" type="rpcserver" allowwarnings="true"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file>pnp.idl</file> </module> <module name="pnp_client" type="rpcclient"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file>pnp.idl</file> </module> <module name="scm_server" type="rpcserver"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">svcctl.idl</file> </module> <module name="scm_client" type="rpcclient"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">svcctl.idl</file> </module> <module name="eventlog_server" type="rpcserver" allowwarnings="true"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">eventlogrpc.idl</file> </module> <module name="eventlog_client" type="rpcclient" > - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">eventlogrpc.idl</file> </module> <module name="lsa_server" type="rpcserver"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">lsa.idl</file> </module> <module name="lsa_client" type="rpcclient"> - <include base="ReactOS">.</include> - <include base="ReactOS">w32api/include</include> <file switches="--oldnames">lsa.idl</file> </module> </group> Modified: trunk/reactos/include/reactos/idl/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wtypes… ============================================================================== --- trunk/reactos/include/reactos/idl/wtypes.idl (original) +++ trunk/reactos/include/reactos/idl/wtypes.idl Mon Jan 7 18:17:48 2008 @@ -11,4 +11,4 @@ #define LPDWORD unsigned long* #define PBOOL unsigned long* -#define NTSTATUS long +#define NTSTATUS long Modified: trunk/reactos/include/reactos/wine/irot.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/irot.… ============================================================================== --- trunk/reactos/include/reactos/wine/irot.idl (original) +++ trunk/reactos/include/reactos/wine/irot.idl Mon Jan 7 18:17:48 2008 @@ -18,8 +18,8 @@ import "wtypes.idl"; -cpp_quote("#define IROT_PROTSEQ {'n','c','a','l','r','p','c',0}"); -cpp_quote("#define IROT_ENDPOINT {'i','r','o','t',0}"); +cpp_quote("#define IROT_PROTSEQ {'n','c','a','l','r','p','c',0}") +cpp_quote("#define IROT_ENDPOINT {'i','r','o','t',0}") typedef struct tagMonikerComparisonData { ULONG ulCntData; @@ -51,6 +51,7 @@ typedef DWORD IrotCookie; typedef handle_t IrotHandle; + typedef [context_handle] void *IrotContextHandle; HRESULT IrotRegister( [in] IrotHandle h, @@ -59,11 +60,13 @@ [in] const InterfaceData *moniker, [in] const FILETIME *time, [in] DWORD grfFlags, - [out] IrotCookie *cookie); + [out] IrotCookie *cookie, + [out] IrotContextHandle *ctxt_handle); HRESULT IrotRevoke( [in] IrotHandle h, [in] IrotCookie cookie, + [in, out] IrotContextHandle *ctxt_handle, [out] PInterfaceData *object, [out] PInterfaceData *moniker); Modified: trunk/reactos/include/reactos/wine/wineheaders.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wineh… ============================================================================== --- trunk/reactos/include/reactos/wine/wineheaders.rbuild (original) +++ trunk/reactos/include/reactos/wine/wineheaders.rbuild Mon Jan 7 18:17:48 2008 @@ -1,6 +1,5 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="wineheaders" type="idlheader"> - <file>irot.idl</file> <file>itss.idl</file> </module>

1 0

[dchapyshev] 31643: - Add Russian translation
by dchapyshev＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: dchapyshev Date: Mon Jan 7 18:08:18 2008 New Revision: 31643 URL: http://svn.reactos.org/svn/reactos?rev=31643&view=rev Log: - Add Russian translation Added: trunk/reactos/dll/win32/modemui/lang/ru-RU.rc (with props) Modified: trunk/reactos/dll/win32/modemui/modemui.rc Added: trunk/reactos/dll/win32/modemui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/modemui/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/modemui/lang/ru-RU.rc Mon Jan 7 18:08:18 2008 @@ -1,0 +1,613 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDM_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Äóáëèðîâàòü...", 0 + MENUITEM "&Óäàëèòü", 1 + MENUITEM "&Ïðîñìîòð æóðíàëà", 2 + MENUITEM SEPARATOR + MENUITEM "Ñâî&éñòâà", 3 + MENUITEM "&Êîïèðîâàòü ñâîéñòâà", 4 + MENUITEM "Ïðè&ìåíèòü ñâîéñòâà", 5 + END +END + +IDD_ADVANCED DIALOG 17, 12, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîïîëíèòåëüíî" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Äîïîëíèòåëüíûå ïàðàìåòðû", 1018, 6, 6, 225, 70 + LTEXT "Ä&îïîëíèòåëüíûå êîìàíäû èíèöèàëèçàöèè:", 1011, 16, 20, 143, 8 + EDITTEXT 1016, 16, 31, 205, 13, ES_AUTOHSCROLL + LTEXT "&Æäàòü ñèãíàëà äëÿ òåëåôîííîé êàðòî÷êè:", 1007, 16, 55, 109, 8, NOT WS_VISIBLE + EDITTEXT 1008, 133, 52, 26, 12, ES_RIGHT | NOT WS_VISIBLE | WS_GROUP + CONTROL "", 1009, "MSCTLS_UPDOWN32", NOT WS_VISIBLE | WS_BORDER | WS_GROUP | 0x00000036, 159, 52, 12, 12 + LTEXT "ñåê.", 1010, 173, 54, 40, 8, NOT WS_VISIBLE + GROUPBOX "&Âûáîð ñòðàíû èëè ðåãèîíà", 1012, 6, 80, 225, 75 + COMBOBOX 1013, 18, 99, 203, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP + PUSHBUTTON "&Äîïîëíèòåëüíûå ïàðàìåòðû...", 1100, 107, 170, 125, 14 + DEFPUSHBUTTON "&Èçìåíèòü óìîë÷àíèÿ...", 3, 107, 188, 125, 14 +END + +IDD_GENERAL DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ïîðò:", 1018, 9, 8, 32, 10 + LTEXT "Ïîñëåäîâàòåëüíûé ïîðò", 1095, 48, 8, 181, 10 + GROUPBOX "&Ãðîìêîñòü äèíàìèêà", 1029, 10, 21, 218, 48 + CONTROL "", 1032, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000001, 84, 40, 66, 20 + RTEXT "Âûêë.", 1045, 56, 40, 22, 8 + LTEXT "Âûøå", 1001, 155, 40, 25, 11 + GROUPBOX "&Ñêîðîñòü ïîðòà äëÿ ìîäåìà", 1031, 10, 78, 218, 46 + COMBOBOX 1036, 18, 100, 202, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Óïðàâëåíèå íàáîðîì íîìåðà", 1060, 10, 133, 218, 51 + AUTOCHECKBOX "&Äîæäàòüñÿ ñèãíàëà ""Ëèíèÿ ñâîáîäíà""", 1003, 27, 157, 174, 10 +END + +IDD_DISTINCTIVE_RING DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ðàçëè÷åíèå çâîíêîâ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 145 + AUTOCHECKBOX "&Èñïîëüçîâàòü ñëóæáû ðàçëè÷åíèÿ çâîíêîâ", 1069, 20, 7, 184, 10 + CTEXT "Âèä çâîíêà", -1, 84, 21, 70, 8 + CTEXT "Òèï âûçîâà", -1, 159, 21, 63, 8 + LTEXT "&Îñíîâíîé àäðåñ:", 1070, 20, 41, 62, 8 + COMBOBOX 1073, 84, 37, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1082, 160, 37, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Àäðåñ &1:", 1071, 20, 59, 62, 8 + COMBOBOX 1074, 84, 55, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1083, 160, 55, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Àäðåñ &2:", 1072, 20, 77, 62, 8 + COMBOBOX 1075, 84, 73, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1084, 160, 73, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Àäðåñ &3:", 1076, 20, 95, 62, 8 + COMBOBOX 1077, 84, 91, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1085, 160, 91, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "&Ïðèîðèòåòíûå âûçîâû:", 1078, 20, 112, 62, 8 + COMBOBOX 1079, 84, 109, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1086, 160, 109, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "Î&òâåòíûé âûçîâ:", 1080, 20, 131, 62, 8 + COMBOBOX 1081, 84, 127, 71, 61, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | NOT WS_TABSTOP + COMBOBOX 1087, 160, 127, 62, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DISTINCTIVE_RING_2 DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ðàçëè÷åíèå çâîíêîâ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", 1068, 10, 7, 218, 87 + AUTOCHECKBOX "&Èñïîëüçîâàòü ñëóæáû ðàçëè÷åíèÿ çâîíêîâ", 1069, 19, 7, 177, 10 + CTEXT "Âèä çâîíêà", -1, 20, 21, 74, 8 + CTEXT "Òèï âûçîâà", -1, 96, 21, 65, 8 + LTEXT "&Îäèíî÷íûé çâîíîê:", 1088, 20, 37, 53, 8 + COMBOBOX 1091, 96, 37, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "&Äâîéíîé çâîíîê:", 1089, 20, 57, 53, 8 + COMBOBOX 1092, 96, 55, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + LTEXT "&Òðîéíîé çâîíîê:", 1090, 20, 76, 53, 8 + COMBOBOX 1093, 96, 73, 65, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP +END + +IDD_DIAGNOSTICS DIALOG 0, 0, 238, 215 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äèàãíîñòèêà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", 1042, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 18, 200, 58 + CONTROL "", 1041, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000084D, 19, 84, 200, 58 + PUSHBUTTON "Îïðî&ñèòü ìîäåì", 1096, 138, 149, 75, 14 + AUTOCHECKBOX "Âåñòè &æóðíàë", 1020, 18, 187, 98, 10 + PUSHBUTTON "&Ïðîñìîòð æóðíàëà", 1094, 138, 184, 75, 14, WS_DISABLED + GROUPBOX "Ñâåäåíèÿ î ìîäåìå", 1047, 10, 6, 217, 164 + GROUPBOX "Âåäåíèå æóðíàëà", -1, 10, 173, 217, 32 +END + +IDD_PLEASE_WAIT DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Ïîæàëóéñòà, ïîäîæäèòå..." +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Èäåò îáìåí äàííûìè ñ ìîäåìîì. Ýòî ìîæåò çàíÿòü íåñêîëüêî ñåêóíä.", -1, 42, 7, 146, 28 + DEFPUSHBUTTON "Îòìåíà", 2, 72, 52, 50, 14 +END + +IDD_GENERAL_2 DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Îáùèå" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "&Ðó÷íîé èëè ïîëóàâòîìàòè÷åñêèé íàáîð íîìåðà", 1002, 19, 22, 180, 10 + AUTOCHECKBOX "Îòêë&þ÷åíèå ïðè ïðîñòîå áîëåå", 1042, 19, 38, 143, 10 + EDITTEXT 1043, 168, 35, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Î&òìåíà âûçîâà ïðè îòñóòñòâèè ñâÿçè", -1, 19, 56, 147, 10 + EDITTEXT 1040, 168, 54, 25, 13, ES_AUTOHSCROLL | ES_NUMBER + RTEXT "&Ñêîðîñòü ïîðòà:", 1034, 16, 102, 93, 8 + COMBOBOX 1036, 114, 100, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Ïðîòîêîë:", 1032, 16, 122, 93, 8 + COMBOBOX 1037, 114, 119, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "Ñ&æàòèå:", 1035, 16, 139, 93, 8 + COMBOBOX 1099, 114, 137, 84, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Óïðàâëåíèå ïîòîêîì:", 1027, 16, 157, 93, 8 + COMBOBOX 1031, 114, 155, 84, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Ïàðàìåòðû âûçîâà", 1060, 11, 7, 217, 66 + LTEXT "ìèí.", 1044, 195, 38, 22, 8 + LTEXT "ñåê.", 1041, 195, 56, 22, 8 + GROUPBOX "Ïàðàìåòðû ïîäêëþ÷åíèÿ ëèíèè äàííûõ", -1, 11, 82, 217, 94 +END + +IDD_ADVANCED_2 DIALOG 17, 12, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîïîëíèòåëüíî" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Îòêðûòü îêíî òåðìèíàëà &äî íàáîðà íîìåðà", 1000, 20, 21, 200, 10 + AUTOCHECKBOX "Îòêðûòü îêíî òåðìèíàëà &ïîñëå íàáîðà íîìåðà", 1001, 20, 38, 200, 10 + RTEXT "&Áèòû äàííûõ:", 1024, 18, 79, 93, 8 + COMBOBOX 1025, 114, 77, 106, 61, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&×åòíîñòü:", 1026, 18, 97, 93, 8 + COMBOBOX 1028, 114, 95, 106, 60, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "Ñ&òîïîâûå áèòû:", 1029, 18, 115, 93, 8 + COMBOBOX 1030, 114, 113, 106, 45, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + RTEXT "&Ìîäóëÿöèÿ:", 1045, 18, 133, 93, 8 + COMBOBOX 1038, 114, 131, 106, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "Îêíî òåðìèíàëà", 1004, 10, 7, 217, 49 + GROUPBOX "Ïàðàìåòðû íàñòðîéêè îáîðóäîâàíèÿ", 1005, 10, 64, 217, 89 +END + +IDD_ISDN DIALOG 0, 0, 238, 210 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "ISDN" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Òèï êîììóòàòîðà", -1, 11, 6, 217, 39 + COMBOBOX 1104, 17, 20, 204, 69, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP + GROUPBOX "&Ïåðâûé íîìåð", -1, 11, 50, 217, 50 + EDITTEXT 1017, 33, 62, 188, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "S&PID/EAZ:", 1027, 34, 83, 67, 8 + EDITTEXT 1107, 104, 79, 117, 13, ES_AUTOHSCROLL | ES_NUMBER + GROUPBOX "&Âòîðîé íîìåð", -1, 11, 105, 217, 49 + EDITTEXT 1018, 33, 114, 189, 13, ES_AUTOHSCROLL | ES_NUMBER + LTEXT "SPI&D/EAZ:", 1028, 35, 135, 68, 8 + EDITTEXT 1108, 105, 132, 117, 13, ES_AUTOHSCROLL | ES_NUMBER +END + +IDD_PLEASE_WAIT_2 DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Ïîæàëóéñòà, ïîäîæäèòå" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Îòïðàâêà íà ìîäåì ñâåäåíèé î ñòðàíå èëè ðåãèîíå.", -1, 42, 7, 146, 28 +END + +IDD_WARNING DIALOG 0, 0, 360, 105 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Ïðåäóïðåæäåíèå" +FONT 8, "MS Shell Dlg" +BEGIN + AUTOCHECKBOX "Íå âûâîäèòü ýòî ñîîáùåíèå â äàëüíåéøåì", 1109, 17, 73, 175, 10 + DEFPUSHBUTTON "OK", 1, 302, 84, 50, 14 + LTEXT "Íåêîòîðûå ìîäåìû íå óìåþò îáðàáàòûâàòü ñòîëü äëèííûå ñòðîêè èíèöèàëèçàöèè.", -1, 50, 27, 304, 8 + LTEXT "Ñâåäåíèÿ îá îãðàíè÷åíèÿõ âàøåãî ìîäåìà ìîæíî ïîëó÷èòü ó èçãîòîâèòåëÿ.", -1, 50, 41, 304, 8 + ICON 5100, -1, 15, 14, 20, 20 + LTEXT "Ââåäåííàÿ ñòðîêà èíèöèàëèçàöèè ìîäåìà äëèííåå 57 çíàêîâ.", -1, 50, 14, 304, 8 +END + +IDD_MODEMS DIALOG 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ìîäåìû" +FONT 8, "MS Shell Dlg" +BEGIN + ICON 5100, 1057, 6, 7, 20, 20 + LTEXT "Íà êîìïüþòåðå óñòàíîâëåíû ñëåäóþùèå ìîä&åìû:", -1, 44, 12, 203, 9 + CONTROL "", 113, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00000849, 7, 32, 238, 158, WS_EX_CLIENTEDGE + PUSHBUTTON "&Äîáàâèòü...", 110, 56, 198, 60, 14 + PUSHBUTTON "&Óäàëèòü", 112, 121, 198, 60, 14 + PUSHBUTTON "Ñâî&éñòâà", 109, 185, 198, 60, 14 +END + +IDD_PLEASE_WAIT_3 DIALOG 0, 0, 195, 72 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Ïîæàëóéñòà, ïîäîæäèòå..." +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Î&ñòàíîâèòü", 2, 74, 53, 50, 14 + ICON 5100, -1, 9, 7, 20, 20 + LTEXT "Óäàëåíèå", -1, 40, 8, 151, 8 + LTEXT "Ìîäåì", 1005, 40, 16, 151, 25 +END + +STRINGTABLE +BEGIN + 180 "Ïîñëåäîâàòåëüíûé ïîðò RS-232" + 181 "Âíåøíèé ìîäåì" + 182 "Âíóòðåííèé ìîäåì" + 183 "Ìîäåì PCMCIA" + 184 "Ïàðàëëåëüíûé ìîäåì" + 185 "Ïàðàëëåëüíûé ïîðò" + 200 "110" + 201 "1200" + 202 "2400" + 203 "4800" + 204 "9600" + 206 "19200" + 207 "38400" + 210 "115200" + 211 "57600" + 216 "300" + 220 "230400" + 221 "460800" + 222 "921600" + 240 "4" + 241 "5" + 242 "6" + 243 "7" + 244 "8" + 250 "×åò" + 251 "Íå÷åò" + 252 "Íå ïðîâåðÿåòñÿ" + 253 "Ìàðêåð (1)" + 254 "Ïðîáåë (0)" + 255 "1" + 256 "1,5" + 257 "2" + 260 "Xon/Xoff" + 261 "Àïïàðàòíîå" + 262 "Îòñóòñòâóåò" + 263 "Âêë." + 264 "Íèæå" + 265 "V.23 (Minitel)" + 266 "Ñòàíäàðòíàÿ" + 267 "Íåñòàíäàðòíàÿ (Bell, HST)" + 270 "Ä&îáàâèòü â æóðíàë" + 300 "Íå îïðåäåëåí" + 301 "Äàííûå" + 302 "Ôàêñ" + 303 "Ðå÷ü" + 304 "Íåò" + 320 "Ïàðàìåòðû ñòðàíû èëè ðåãèîíà îáíîâëåíû" + 340 "Ìîäåì" + 341 "Ïàðàìåòðû ìîäåìà" + 342 "Àäðåñ ìîäåìà" + 400 "Ïàðàìåòðû ñòðàíû èëè ðåãèîíà íå îáíîâëåíû" + 401 "Íåêîòîðûå ìîäåìû íå ïðèíèìàþò êîìàíäû èíèöèàëèçàöèè, åñëè ñòðîêà êîìàíäû äëèííåå 57 ñèìâîëîâ.\n\nÑâåäåíèÿ îá îãðàíè÷åíèÿõ äëÿ âàøåãî ìîäåìà ìîæíî ïîëó÷èòü ó èçãîòîâèòåëÿ." + 402 "Ïðåäóïðåæäåíèå" + 460 "Íåäîñòàòî÷íî ïàìÿòè äëÿ ïðîñìîòðà îáùèõ ñâîéñòâ.\nÇàêðîéòå ÷àñòü ïðîãðàìì è ôàéëîâ è ïîâòîðèòå ïîïûòêó." + 461 "Íåäîñòàòî÷íî ïàìÿòè äëÿ ïðîñìîòðà ïàðàìåòðîâ ìîäåìà.\nÇàêðîéòå ÷àñòü ïðîãðàìì è ôàéëîâ è ïîâòîðèòå ïîïûòêó." + 463 "Êàæäûé àäðåñ âûçîâà äîëæåí áûòü 'Àâòîìàòè÷åñêèì' èëè èìåòü óíèêàëüíûé âèä çâîíêà.\n\nÈçìåíèòå ïîâòîðÿþùèéñÿ âèä çâîíêà íà äðóãîå çíà÷åíèå." + 465 "Ñòàíäàðòíûé EC" + 466 "Ôîðñèðîâàííûé EC" + 467 "Ñîòîâûé" + 468 "Îòêëþ÷åí" + 469 "Âêëþ÷åíî" + 470 "Îòêëþ÷åíî" + 480 "ÀÂÒÎ (1 êàí.)" + 481 "ÀÂÒÎ (2 êàí.)" + 482 "PPP (56K)" + 483 "PPP (64K)" + 484 "PPP (112K)" + 485 "PPP (112K,PAP)" + 486 "PPP (112K,CHAP)" + 487 "PPP (112K,MSCHAP)" + 488 "PPP (128K)" + 489 "PPP (128K,PAP)" + 490 "PPP (128K,CHAP)" + 491 "PPP (128K,MSCHAP)" + 500 "V.120 (64K)" + 501 "V.120 (56K)" + 502 "V.120 (112K)" + 503 "V.120 (128K)" + 504 "X.75 (64K)" + 505 "X.75 (128K)" + 506 "X.75 (T.70)" + 507 "X.75 (BTX)" + 508 "V.110 (1.2K)" + 509 "V.110 (2.4K)" + 510 "V.110 (4.8K)" + 511 "V.110 (9.6K)" + 512 "V.110 (12.0K)" + 513 "V.110 (14.4K)" + 514 "V.110 (19.2K)" + 515 "V.110 (28.8K)" + 516 "V.110 (38.4K)" + 517 "V.110 (57.6K)" + 518 "Àíàëîãîâûé (V.34/V.90)" + 550 "ESS5 (AT&T) (Ñåâåðíàÿ Àìåðèêà)" + 551 "ÀÒÒ ò&î÷êà - ìíîãèå òî÷êè" + 552 "National ISDN 1 (NI-1)" + 553 "Northern Telecom DMS 100 (NT1)" + 554 "NTT INS64 (ßïîíèÿ)" + 555 "European ISDN (DSS1) (Åâðîïà)" + 556 "German National (1TR6) (ðåäêî èñïîëüçóåìûé)" + 557 "French National (VN3) (ðåäêî èñïîëüçóåìûé)" + 558 "Belgium National (ðåäêî èñïîëüçóåìûé)" + 559 "Australian National (ðåäêî èñïîëüçóåìûé)" + 560 "Íåèçâåñòíûé êîììóòàòîð" + 570 "Íàñòðîéêà ISDN äëÿ ýòîãî ìîäåìà\n íå çàâåðøåíà.\n\nÇàïîëíèòå ñâåäåíèÿ íà âêëàäêå\nISDN ïåðåä èñïîëüçîâàíèåì ìîäåìà." + 600 "PPP (56K,GSM)" + 601 "PPP (64K,GSM)" + 602 "V.120 (64K,GSM)" + 604 "V.110 (1.2K,GSM)" + 605 "V.110 (2.4K,GSM)" + 606 "V.110 (4.8K,GSM)" + 607 "V.110 (9.6K,GSM)" + 608 "V.110 (12.0K,GSM)" + 609 "V.110 (14.4K,GSM)" + 610 "V.110 (19.2K,GSM)" + 611 "V.110 (28.8K,GSM)" + 612 "V.110 (38.4K,GSM)" + 613 "V.110 (57.6K,GSM)" + 614 "Àíàëîãîâûé RLP" + 615 "Àíàëîãîâûé NRLP" + 616 "GPRS" + 617 "PIAFS - âõîäÿùèé" + 618 "PIAFS - èñõîäÿùèé" + 700 "Èñïîëüçîâàòü òåêóùåå ìåñòîïîëîæåíèÿ èç TAPI" + 2006 "Ïîäêëþ÷åí ê" + 2007 "Îòñóòñòâóåò" + 2008 "Íå ðàáîòàåò" + 2009 "Òðåáóåòñÿ ïåðåçàãðóçêà" + 2010 "#Äëÿ çàâåðøåíèÿ óñòàíîâêè ìîäåìà òðåáóåòñÿ ïåðåçàãðóçèòü êîìïüþòåð.\n\nÏåðåçàãðóçèòü êîìïüþòåð ïðÿìî ñåé÷àñ?" + 2011 "Ìîäåì óñòàíîâëåí íåïðàâèëüíî" + 2012 "Íåèçâåñòíûé ïîðò" + 3000 "Óñòàíîâêà ìîäåìà" + 3018 "Ìîäåìû" + 3019 "Óñòàíîâêà íîâîãî ìîäåìà è èçìåíåíèå åãî ïàðàìåòðîâ." + 3053 "Îòîáðàæåíèå ñâîéñòâ ìîäåìà íåâîçìîæíî, òàê êàê ìîäåì íåäîñòóïåí.\n\nÏåðåçàãðóçèòå ñèñòåìó è ïîâòîðèòå ïîïûòêó." + 3054 "Ñâîéñòâà: Ìîäåìû" + 3060 "Óäàëèòü âûáðàííûå ìîäåìû èç ñèñòåìû?" + 3061 "Íå óäàëîñü óäàëèòü ìîäåì '%1' èç ñèñòåìû (ïîðò %2)." + 3062 "Ìîäåì" + 3069 "Íåäîñòàòî÷íî ïàìÿòè äëÿ îòêðûòèÿ ïðîãðàììû íàñòðîéêè ìîäåìîâ ïàíåëè óïðàâëåíèÿ.\n\nÇàêðîéòå íåíóæíûå ïðîãðàììû è ïîâòîðèòå ïîïûòêó." + 3073 "Óñòàíîâêà ìîäåìîâ ðàçðåøåíà òîëüêî ñèñòåìíûì àäìèíèñòðàòîðàì." + 3074 "Íè îäíîãî ìîäåìà íå óñòàíîâëåíî. Óñòàíîâêà ìîäåìîâ ðàçðåøåíà òîëüêî ñèñòåìíûì àäìèíèñòðàòîðàì." + 3076 "Âíåñåííûå èçìåíåíèÿ âñòóïÿò â ñèëó òîëüêî ïîñëå ïåðåçàãðóçêè êîìïüþòåðà.\n\nÂûïîëíèòü ïåðåçàãðóçêó ñåé÷àñ?" + 3077 "Èçìåíåíèå ïàðàìåòðîâ ñåòè" + 3200 "300 áîä" + 3201 "1200 áîä" + 3202 "2400 áîä" + 3203 "9600 áîä" + 3204 "19,2K áîä" + 3205 "38,4K áîä" + 3206 "57,6K áîä" + 3207 "Íåò îòâåòà" + 3212 "Êîìàíäà" + 3213 "Îòâåò" + 3214 "Íå óäàëîñü îòêðûòü ïîðò, ê êîòîðîìó ïîäêëþ÷åí ìîäåì. Ýòî ìîæåò áûòü ðåçóëüòàòîì êîíôëèêòà îáîðóäîâàíèÿ. Ïðîâåðüòå ñ ïîìîùüþ äèñïåò÷åðà óñòðîéñòâ, ÷òî âñå óñòðîéñòâà ðàáîòàþò íîðìàëüíî." + 3215 "Ïîðò, èñïîëüçóåìûé ìîäåìîì â äàííûé ìîìåíò îòêðûò äðóãèì ïðèëîæåíèåì. Çàêðîéòå âñå ïðèëîæåíèÿ, êîòîðûå ìîãóò èñïîëüçîâàòü ýòîò ïîðò." + 3218 "OpenComm" + 3221 "115K áîä" + 3222 "Îáíîâëåíèå" + 3223 "Îøèáêà" + 3233 "Óñïåøíî" + 3236 "Ýòîò ìîäåì íå îòâå÷àåò. Ïðîâåðüòå, ÷òî îí ïðàâèëüíî ïîäêëþ÷åí è ïèòàíèå âêëþ÷åíî. Åñëè ýòî âíóòðåííèé ìîäåì, èëè åñëè îí ïîäêëþ÷åí ïðàâèëüíî, ïðîâåðüòå, ÷òî äëÿ ïîðòà âûáðàíî ïðàâèëüíîå ïðåðûâàíèå." + 3237 "ÊÎÌÀÍÄÀ ÍÅ ÏÎÄÄÅÐÆÈÂÀÅÒÑß" + 3238 "Ïîëå" + 3239 "Çíà÷åíèå" + 3240 " Ïðåäïî÷òåíèÿ ïî óìîë÷àíèþ" + 3241 " Ïðåäïî÷òåíèÿ ïîäêëþ÷åíèÿ" + 6144 "ßïîíèÿ" + 6145 "Àëáàíèÿ" + 6146 "Àëæèð" + 6147 "Àìåðèêàíñêèå Ñàìîà" + 6148 "Ãåðìàíèÿ (êîä ñòðàíû èëè ðåãèîíà 04)" + 6149 "Àíãèëüÿ" + 6150 "Àíòèãóà è Áàðáóäà" + 6151 "Àðãåíòèíà" + 6152 "î. Âîçíåñåíèÿ" + 6153 "Àâñòðàëèÿ" + 6154 "Àâñòðèÿ" + 6155 "Áàãàìû" + 6156 "Áàõðåéí" + 6157 "Áàíãëàäåø" + 6158 "Áàðáàäîñ" + 6159 "Áåëüãèÿ" + 6160 "Áåëèç" + 6161 "Áåíèí" + 6162 "Áåðìóäñêèå î-âà" + 6163 "Áóòàí" + 6164 "Áîëèâèÿ" + 6165 "Áîòñâàíà" + 6166 "Áðàçèëèÿ" + 6167 "Êîä ñòðàíû èëè ðåãèîíà (23)" + 6168 "Áðèòàíñêàÿ òåððèòîðèÿ Èíäèéñêîãî îêåàíà" + 6169 "Áðèòàíñêèå Âèðãèíñêèå î-âà" + 6170 "Áðóíåé" + 6171 "Áîëãàðèÿ" + 6172 "Ìüÿíìà" + 6173 "Áóðóíäè" + 6174 "Áåëàðóñü" + 6175 "Êàìåðóí" + 6176 "Êàíàäà" + 6177 "î-âà Çåëåíîãî Ìûñà" + 6178 "Êàéìàíîâû î-âà" + 6179 "Öåíòðàëüíî-Àôðèêàíñêàÿ Ðåñïóáëèêà" + 6180 "×àä" + 6181 "×èëè" + 6182 "Êèòàé" + 6183 "Êîëóìáèÿ" + 6184 "Êîìîðñêèå î-âà" + 6185 "Êîíãî" + 6186 "î-âà Êóêà" + 6187 "Êîñòà-Ðèêà" + 6188 "Êóáà" + 6189 "Êèïð" + 6190 "×åøñêàÿ ðåñïóáëèêà" + 6191 "Êàìáîäæà" + 6192 "Êîðåéñêàÿ íàðîäíî-äåìîêðàòè÷åñêàÿ ðåñïóáëèêà" + 6193 "Äàíèÿ" + 6194 "Äæèáóòè" + 6195 "Äîìèíèêàíñêàÿ Ðåñïóáëèêà" + 6196 "Äîìèíèêà" + 6197 "Ýêâàäîð" + 6198 "Åãèïåò" + 6199 "Ñàëüâàäîð" + 6200 "Ýêâàòîðèàëüíàÿ Ãâèíåÿ" + 6201 "Ýôèîïèÿ" + 6202 "Ôîëêëåíäñêèå (Ìàëüâèíñêèå) î-âà" + 6203 "î-âà Ôèäæè" + 6204 "Ôèíëÿíäèÿ" + 6205 "Ôðàíöèÿ" + 6206 "Ôðàíöóçñêàÿ Ïîëèíåçèÿ" + 6207 "Êîä ñòðàíû èëè ðåãèîíà (63)" + 6208 "Ãàáîí" + 6209 "Ãàìáèÿ" + 6210 "Ãåðìàíèÿ èëè ðåãèîíà (êîä ñòðàíû 66)" + 6211 "Àíãîëà" + 6212 "Ãàíà" + 6213 "Ãèáðàëòàð" + 6214 "Ãðåöèÿ" + 6215 "Ãðåíàäà" + 6216 "î. Ãóàì" + 6217 "Ãâàòåìàëà" + 6218 "Ãåðíñè" + 6219 "Ãâèíåÿ" + 6220 "Ãâèíåÿ-Áèñàó" + 6221 "Ãàéàíà" + 6222 "Ãàèòè" + 6223 "Ãîíäóðàñ" + 6224 "Ãîíêîíã (SAR) " + 6225 "Âåíãðèÿ" + 6226 "Èñëàíäèÿ" + 6227 "Èíäèÿ" + 6228 "Èíäîíåçèÿ" + 6229 "Èðàí" + 6230 "Èðàê" + 6231 "Èðëàíäèÿ" + 6232 "Èçðàèëü" + 6233 "Èòàëèÿ" + 6234 "Êîò ä'Èâóàð (Áåðåã Ñëîíîâîé Êîñòè)" + 6235 "ßìàéêà" + 6236 "Àôãàíèñòàí" + 6237 "Äæåðñè" + 6238 "Èîðäàíèÿ" + 6239 "Êåíèÿ" + 6240 "Êèðèáàòè" + 6241 "Þæíàÿ Êîðåÿ" + 6242 "Êóâåéò" + 6243 "Ëàîñ" + 6244 "Ëèâàí" + 6245 "Ëåñîòî" + 6246 "Ëèáåðèÿ" + 6247 "Ëèâèÿ" + 6248 "Ëèõòåíøòåéí" + 6249 "Ëþêñåìáóðã" + 6250 "Ìàêàî" + 6251 "Ìàäàãàñêàð" + 6252 "Ìàëàéçèÿ" + 6253 "Ìàëàâè" + 6254 "Ìàëüäèâñêèå î-âà" + 6255 "Ìàëè" + 6256 "Ìàëüòà" + 6257 "Ìàâðèòàíèÿ" + 6258 "Ìàâðèêèé" + 6259 "Ìåêñèêà" + 6260 "Ìîíàêî" + 6261 "Ìîíãîëèÿ" + 6262 "Ìîíñåððàò" + 6263 "Ìàðîêêî" + 6264 "Ìîçàìáèê" + 6265 "Íàóðó" + 6266 "Íåïàë" + 6267 "Íèäåðëàíäû" + 6268 "Íèäåðëàíäñêèå Àíòèëüñêèå î-âà" + 6269 "Íîâàÿ Êàëåäîíèÿ" + 6270 "Íîâàÿ Çåëàíäèÿ" + 6271 "Íèêàðàãóà" + 6272 "Íèãåð" + 6273 "Íèãåðèÿ" + 6274 "Íîðâåãèÿ" + 6275 "Îìàí" + 6276 "Ïàêèñòàí" + 6277 "Ïàíàìà" + 6278 "Ïàïóà - Íîâàÿ Ãâèíåÿ" + 6279 "Ïàðàãâàé" + 6280 "Ïåðó" + 6281 "Ôèëèïïèíû" + 6282 "Ïîëüøà" + 6283 "Ïîðòóãàëèÿ" + 6284 "Ïóýðòî-Ðèêî" + 6285 "Êàòàð" + 6286 "Ðóìûíèÿ" + 6287 "Ðóàíäà" + 6288 "Ñåíò-Êèòñ è Íåâèñ" + 6289 "Êîä ñòðàíû èëè ðåãèîíà (145)" + 6290 "î. Ñâÿòîé Åëåíû" + 6291 "Ñàíòà-Ëóñèÿ" + 6292 "Ñàí-Ìàðèíî" + 6293 "Êîä ñòðàíû èëè ðåãèîíà (148)" + 6294 "Ñàí-Òîìå è Ïðèíñèïè" + 6295 "Ñåí-Âèíñåíò è Ãðåíàäèíû" + 6296 "Ñàóäîâñêàÿ Àðàâèÿ" + 6297 "Ñåíåãàë" + 6298 "Ñåéøåëüñêèå î-âà" + 6299 "Ñüåððà-Ëåîíå" + 6300 "Ñèíãàïóð" + 6301 "Ñîëîìîíîâû î-âà" + 6302 "Ñîìàëè" + 6303 "Þæíàÿ Àôðèêà" + 6304 "Èñïàíèÿ" + 6305 "Øðè-Ëàíêà" + 6306 "Ñóäàí" + 6307 "Ñóðèíàì" + 6308 "Ñâàçèëåíä" + 6309 "Øâåöèÿ" + 6310 "Øâåéöàðèÿ" + 6311 "Ñèðèÿ" + 6312 "Òàíçàíèÿ" + 6313 "Òàèëàíä" + 6314 "Òîãî" + 6315 "Òîíãà" + 6316 "Òðèíèäàä è Òîáàãî" + 6317 "Òóíèñ" + 6318 "Òóðöèÿ" + 6319 "î-âà Òóðêñ è Êàéêîñ" + 6320 "Òóâàëó" + 6321 "Óãàíäà" + 6322 "Óêðàèíà" + 6323 "Îáúåäèíåííûå Àðàáñêèå Ýìèðàòû" + 6324 "Âåëèêîáðèòàíèÿ" + 6325 "ÑØÀ" + 6326 "Áóðêèíà-Ôàñî" + 6327 "Óðóãâàé" + 6328 "Êîä ñòðàíû èëè ðåãèîíà (184)" + 6329 "Âàíóàòó" + 6330 "Âàòèêàí" + 6331 "Âåíåñóýëà" + 6332 "Âüåòíàì" + 6333 "Óîëëèñ è Ôóòóíà" + 6334 "Ñàìîà" + 6335 "Éåìåí" + 6336 "Éåìåí" + 6337 "Êîä ñòðàíû èëè ðåãèîíà (193)" + 6338 "Äåìîêðàòè÷åñêàÿ Ðåñïóáëèêà Êîíãî" + 6339 "Çàìáèÿ" + 6340 "Çèìáàáâå" + 6501 "Ìîëäîâà" + 6502 "Ýñòîíèÿ" + 6503 "Ëèòâà" + 6504 "Àðìåíèÿ" + 6505 "Ãðóçèÿ" + 6506 "Àçåðáàéäæàí" + 6507 "Òóðêìåíèñòàí" + 6508 "Óçáåêèñòàí" + 6509 "Êàçàõñòàí" + 6510 "Òàäæèêèñòàí" + 6511 "Êèðãèçñòàí" + 6512 "Ëàòâèÿ" + 6513 "Ðîññèÿ" + 6600 "Õîðâàòèÿ" + 6601 "Ñëîâåíèÿ" + 6602 "Ìàêåäîíèÿ" + 6603 "Áîñíèÿ è Ãåðöåãîâèíà" + 6604 "Þãîñëàâèÿ" + 20013 "ID îáîðóäîâàíèÿ" +END Propchange: trunk/reactos/dll/win32/modemui/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… ============================================================================== --- trunk/reactos/dll/win32/modemui/modemui.rc (original) +++ trunk/reactos/dll/win32/modemui/modemui.rc Mon Jan 7 18:08:18 2008 @@ -20,3 +20,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/uk-UA.rc" +#include "lang/ru-RU.rc"

1 0

[dchapyshev] 31642: - Added ACP, OEMCP and MACCP keys to registry - Added ERROR_ADDING_CODEPAGE to all languages - Update Russian translation
by dchapyshev＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: dchapyshev Date: Mon Jan 7 17:51:42 2008 New Revision: 31642 URL: http://svn.reactos.org/svn/reactos?rev=31642&view=rev Log: - Added ACP, OEMCP and MACCP keys to registry - Added ERROR_ADDING_CODEPAGE to all languages - Update Russian translation Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h (original) +++ trunk/reactos/base/setup/usetup/errorcode.h Mon Jan 7 17:51:42 2008 @@ -62,6 +62,7 @@ ERROR_CREATE_INSTALL_DIR, ERROR_FIND_SETUPDATA, ERROR_WRITE_PTABLE, + ERROR_ADDING_CODEPAGE, ERROR_LAST_ERROR_CODE }ERROR_NUMBER; Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Mon Jan 7 17:51:42 2008 @@ -3093,6 +3093,14 @@ return QUIT_PAGE; } + /* Add codepage information to registry */ + CONSOLE_SetStatusText(" Adding codepage information to registry..."); + if (!AddCodePage()) + { + MUIDisplayError(ERROR_ADDING_CODEPAGE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + /* Update the mounted devices list */ SetMountedDeviceValues(PartitionList); Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Mon Jan 7 17:51:42 2008 @@ -1458,6 +1458,11 @@ "ENTER = Computer neustarten" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Åðáíåêêßíçóç õðïëïãéóôÞ" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Mon Jan 7 17:51:42 2008 @@ -1275,7 +1275,7 @@ "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NO_HDD @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Mon Jan 7 17:51:42 2008 @@ -1464,6 +1464,11 @@ "ENTER = Redemarrer l'ordinateur" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Mon Jan 7 17:51:42 2008 @@ -1458,6 +1458,11 @@ "INVIO = Riavviare il computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Mon Jan 7 17:51:42 2008 @@ -1460,6 +1460,11 @@ "ENTER = Restart komputera" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Mon Jan 7 17:51:42 2008 @@ -6,37 +6,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Language Selection.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Please choose the language used for the installation process.", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âûáîð ÿçûêà", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Ïîæàëóéñòà âûáåðèòå ÿçûê èñïîëüçóåìûé ïðè óñòàíîâêå.", TEXT_NORMAL }, { 8, 11, - " Then press ENTER.", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 This Language will be the default language for the final system.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + "\x07 Ýòîò ÿçûê áóäåò óñòàíîâëåí ïî óìîë÷àíèþ â óñòàíîâëåííîé ñèñòåìå.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü F3 = Âûõîä", TEXT_STATUS }, { @@ -52,55 +52,55 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "®¡à® ¯®¦ «®¢ âì ¢ ãáâ ®¢ªã ReactOS", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Äîáðî ïîæàëîâàòü â óñòàíîâêó ReactOS", TEXT_HIGHLIGHT }, { 6, 11, - " íâ®© áâ ¤¨¨ ãáâ ®¢ª¨ ¡ã¤ãâ áª®¯¨à®¢ ë ä ©«ë ®¯¥à æ¨®®© á¨áâ¥¬ë ReactOS", + "Íà ýòîé ñòàäèè óñòàíîâêè áóäóò ñêîïèðîâàíû ôàéëû îïåðàöèîííîé ñèñòåìû ReactOS", TEXT_NORMAL }, { 6, 12, - " ¢ è ª®¬¯ìîâ¥à ¨ ¯®¤£®â®¢«¥ ¢â®à ï áâ ¤¨ï ãáâ ®¢ª¨.", + "íà âàø êîìïüþòåð è ïîäãîòîâëåíà âòîðàÿ ñòàäèÿ óñòàíîâêè.", TEXT_NORMAL }, { 8, 15, - "\x07 ¦¬¨â¥ ¤«ï ãáâ ®¢ª¨ ReactOS.", + "\x07 Íàæìèòå ENTER äëÿ óñòàíîâêè ReactOS.", TEXT_NORMAL }, { 8, 17, - "\x07 ¦¬¨â¥ R ¤«ï ¢®áâ ®¢«¥¨ï ReactOS.", + "\x07 Íàæìèòå R äëÿ âîñòàíîâëåíèÿ ReactOS.", TEXT_NORMAL }, { 8, 19, - "\x07 ¦¬¨â¥ L ¤«ï ¯à®á¬®âà «¨æ¥§¨®®£® á®£« è¥¨ï ReactOS", + "\x07 Íàæìèòå L äëÿ ïðîñìîòðà ëèöåíçèîííîãî ñîãëàøåíèÿ ReactOS", TEXT_NORMAL }, { 8, 21, - "\x07 ¦¬¨â¥ F3 ¤«ï ¢ëå®¤ ¨§ ãáâ ®¢ª¨ ReactOS.", + "\x07 Íàæìèòå F3 äëÿ âûõîäà èç óñòàíîâêè ReactOS.", TEXT_NORMAL }, { 6, 23, - "«ï ¤®¯®«¨â¥«ì®© ¨ä®à¬ æ¨¨ ® ReactOS ¯®á¥â¨â¥:", + "Äëÿ äîïîëíèòåëüíîé èíôîðìàöèè î ReactOS ïîñåòèòå:", TEXT_NORMAL }, { @@ -112,7 +112,7 @@ { 0, 0, - " = à®¤®«¦¥¨¥ R = ®áâ ®¢«¥¨¥ F3 = ëå®¤", + " ENTER = Ïðîäîëæåíèå R = Âîñòàíîâëåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -128,85 +128,85 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ReactOS å®¤¨âáï ¢ à ¥© áâ ¤¨¨ à §à ¡®âª¨ ¨ ¥ ¯®¤¤¥à¦¨¢ ¥â ¢á¥", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS íàõîäèòñÿ â ðàííåé ñòàäèè ðàçðàáîòêè è íå ïîääåðæèâàåò âñå", TEXT_NORMAL }, { 6, 9, - "äãªæ¨¨ ¤«ï ¯®«®© á®¢¬¥áâ¨¬®áâ¨ á ãâ ¢«¨¢ ¥¬ë¬¨ ¯à¨«®¦¥¨ï¬¨.", + "ôóíêöèè äëÿ ïîëíîé ñîâìåñòèìîñòè ñ óòàíàâëèâàåìûìè ïðèëîæåíèÿìè.", TEXT_NORMAL }, { 6, 12, - "¬¥îâáï á«¥¤ãîé¨¥ ®£à ¨ç¥¨ï:", + "Èìåþòñÿ ñëåäóþùèå îãðàíè÷åíèÿ:", TEXT_NORMAL }, { 8, 13, - "- áâ ®¢ª ¢®§¬®¦ â®«ìª® ¯¥à¢¨çë© à §¤¥« ¤¨áª ", + "- Óñòàíîâêà âîçìîæíà òîëüêî íà ïåðâè÷íûé ðàçäåë äèñêà", TEXT_NORMAL }, { 8, 14, - "- à¨ ãáâ ®¢ª¥ ¥«ì§ï ã¤ «¨âì ¯¥à¢¨çë© à §¤¥« ¤¨áª ", + "- Ïðè óñòàíîâêå íåëüçÿ óäàëèòü ïåðâè÷íûé ðàçäåë äèñêà", TEXT_NORMAL }, { 8, 15, - " ¯®ª ¨¬¥¥âáï à áè¨à¥ë© à §¤¥«.", + " ïîêà èìååòñÿ ðàñøèðåííûé ðàçäåë.", TEXT_NORMAL }, { 8, 16, - "- à¨ ãáâ ®¢ª¥ ¥«ì§ï ã¤ «¨âì ¯¥à¢ë© à áè¨à¥ë© à §¤¥« á ¤¨áª ", + "- Ïðè óñòàíîâêå íåëüçÿ óäàëèòü ïåðâûé ðàñøèðåííûé ðàçäåë ñ äèñêà", TEXT_NORMAL }, { 8, 17, - " ¯®ª áãé¥áâ¢ãîâ ¤àã£¨¥ à áè¨à¥ë¥ à §¤¥«ë.", + " ïîêà ñóùåñòâóþò äðóãèå ðàñøèðåííûå ðàçäåëû.", TEXT_NORMAL }, { 8, 18, - "- à¨ ãáâ ®¢ª¥ ¯®¤¤¥à¦¨¢ ¥âáï â®«ìª® ä ©«®¢ ï á¨áâ¥¬ FAT.", + "- Ïðè óñòàíîâêå ïîääåðæèâàåòñÿ òîëüêî ôàéëîâàÿ ñèñòåìà FAT.", TEXT_NORMAL }, { 8, 19, - "- à®¢¥àª ä ©«®¢®© á¨áâ¥¬ë ¥ ®áãé¥áâ¢«ï¥âáï.", + "- Ïðîâåðêà ôàéëîâîé ñèñòåìû íå îñóùåñòâëÿåòñÿ.", TEXT_NORMAL }, { 8, 23, - "\x07 ¦¬¨â¥ ¢¢®¤ ¤«ï ãáâ ®¢ª¨ ReactOS.", + "\x07 Íàæìèòå ENTER äëÿ óñòàíîâêè ReactOS.", TEXT_NORMAL }, { 8, 25, - "\x07 ¦¬¨â¥ F3 ¤«ï ¢ëå®¤ ¨§ ãáâ ®¢ª¨ ReactOS.", - TEXT_NORMAL - }, - { - 0, - 0, - " = à®¤®«¦¥¨¥ F3 = ëå®¤", + "\x07 Íàæìèòå F3 äëÿ âûõîäà èç óñòàíîâêè ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -222,79 +222,79 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 6, - "¨æ¥§¨ï:", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 6, + "Ëèöåíçèÿ:", TEXT_HIGHLIGHT }, { 8, 8, - "ReactOS «¨æ¥§¨à®¢ ¢ á®®â¢¥âáâ¢¨¨ á âªàëâë¬ «¨æ¥§¨®ë¬", + "ReactOS ëèöåíçèðîâàíà â ñîîòâåòñòâèè ñ Îòêðûòûì ëèöåíçèîííûì", TEXT_NORMAL }, { 8, 9, - "á®£« è¥¨¥¬ GNU GPL ¨ á®¤¥à¦¨â ª®¬¯®¥âë à á¯à®áâà ï¥¬ë¥", - TEXT_NORMAL - }, - { - 8, - 10, - "á á®¢¬¥áâ¨¬ë¬¨ «¨æ¥§¨ï¬¨: X11, BSD ¨ GNU LGPL.", + "ñîãëàøåíèåì GNU GPL è ñîäåðæèò êîìïîíåíòû ðàñïðîñòðàíÿåìûå", + TEXT_NORMAL + }, + { + 8, + 10, + "ñ ñîâìåñòèìûìè ëèöåíçèÿìè: X11, BSD è GNU LGPL.", TEXT_NORMAL }, { 8, 11, - "á¥ ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥ ¢å®¤ïé¥¥ ¢ á¨áâ¥¬ã ReactOS ¢ë¯ãé¥®", + "Âñå ïðîãðàììíîå îáåñïå÷åíèå âõîäÿùåå â ñèñòåìó ReactOS âûïóùåíî", TEXT_NORMAL }, { 8, 12, - "¯®¤ âªàëâë¬ «¨æ¥§¨®ë¬ á®£« è¥¨¥¬ GNU GPL á á®åà ¥¨¥¬", + "ïîä Îòêðûòûì ëèöåíçèîííûì ñîãëàøåíèåì GNU GPL ñ ñîõðàíåíèåì", TEXT_NORMAL }, { 8, 13, - "¯¥à¢® ç «ì®© «¨æ¥§¨¨.", + "ïåðâîíà÷àëüíîé ëèöåíçèè.", TEXT_NORMAL }, { 8, 15, - " ®¥ ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥ ¯®áâ ¢«ï¥âáï ¨ ¡¥§ ®£à ¨ç¥¨©", + "Äàííîå ïðîãðàììíîå îáåñïå÷åíèå ïîñòàâëÿåòñÿ ÁÅÇ ÃÀÐÀÍÒÈÈ è áåç îãðàíè÷åíèé", TEXT_NORMAL }, { 8, 16, - "¢ ¨á¯®«ì§®¢ ¨¨, ª ª ¢ ¬¥áâ®¬, â ª ¨ ¬¥¦¤ã à®¤®¬ ¯à ¢¥.", + "â èñïîëüçîâàíèè, êàê â ìåñòíîì, òàê è ìåæäóíàðîäíîì ïðàâå.", TEXT_NORMAL }, { 8, 17, - "¨æ¥§¨ï ReactOS à §à¥è ¥â ¯¥à¥¤ çã ¯à®¤ãªâ âà¥âì¨¬ «¨æ ¬.", + "Ëèöåíçèÿ ReactOS ðàçðåøàåò ïåðåäà÷ó ïðîäóêòà òðåòüèì ëèöàì.", TEXT_NORMAL }, { 8, 18, - "á«¨ ¯® ª ª®¬-«¨¡® ¯à¨ç¨ ¬ ¢ë ¥ ¯®«ãç¨«¨ ª®¯¨î âªàëâ®£®", + "Åñëè ïî êàêîì-ëèáî ïðè÷èíàì âû íå ïîëó÷èëè êîïèþ Îòêðûòîãî", TEXT_NORMAL }, { 8, 19, - "«¨æ¥§¨®®£® á®£« è¥¨ï GNU ¢¬¥áâ¥ á ReactOS, ¯®á¥â¨â¥", + "ëèöåíçèîííîãî ñîãëàøåíèÿ GNU âìåñòå ñ ReactOS, ïîñåòèòå", TEXT_NORMAL }, { @@ -306,31 +306,31 @@ { 8, 22, - " à â¨¨:", + "Ãàðàíòèè:", TEXT_HIGHLIGHT }, { 8, 24, - "â® á¢®¡®¤®¥ ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥; á¬. ¨áâ®ç¨ª ¤«ï ¯à®á¬®âà ¯à ¢.", + "Ýòî ñâîáîäíîå ïðîãðàììíîå îáåñïå÷åíèå; ñì. èñòî÷íèê äëÿ ïðîñìîòðà ïðàâ.", TEXT_NORMAL }, { 8, 25, - " ; ¥â £ à â¨¨ ¨«¨", + "ÍÅÒ ÍÈÊÀÊÈÕ ÃÀÐÀÍÒÈÉ; íåò ãàðàíòèè ÒÎÂÀÐÍÎÃÎ ÑÎÑÒÎßÍÈß èëè", TEXT_NORMAL }, { 8, 26, - " ", - TEXT_NORMAL - }, - { - 0, - 0, - " = ®§¢à â", + "ÏÐÈÃÎÄÍÎÑÒÈ ÄËß ÊÎÍÊÐÅÒÍÛÕ ÖÅËÅÉ", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Âîçâðàò", TEXT_STATUS }, { @@ -346,84 +346,84 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - " á¯¨áª¥ ¨¦¥ ¯à¨¢¥¤¥ë ãáâà®©áâ¢ ¨ ¨å ¯ à ¬¥âàë.", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Â ñïèñêå íèæå ïðèâåäåíû óñòðîéñòâà è èõ ïàðàìåòðû.", TEXT_NORMAL }, { 8, 11, - " ®¬¯ìîâ¥à:", + " Êîìïüþòåð:", TEXT_NORMAL }, { 8, 12, - " ªà :", + " Ýêðàí:", TEXT_NORMAL, }, { 8, 13, - " « ¢¨ âãà :", + " Êëàâèàòóðà:", TEXT_NORMAL }, { 8, 14, - " áª« ¤ª ª« ¢¨ âãàë:", + "Ðàñêëàäêà êëàâèàòóðû:", TEXT_NORMAL }, { 8, 16, - " à¨¬¥¨âì:", + " Ïðèìåíèòü:", TEXT_NORMAL }, { 25, - 16, "à¨¬¥¨âì ¤ ë¥ ¯ à ¬¥âàë ãáâà®©áâ¢", + 16, "Ïðèìåíèòü äàííûå ïàðàìåòðû óñòðîéñòâ", TEXT_NORMAL }, { 6, 19, - "ë ¬®¦¥â¥ ¨§¬¥¨âì ¯ à ¬¥âàë ãáâà®©áâ¢ ¦¨¬ ï ª« ¢¨è¨ ¨ ", + "Âû ìîæåòå èçìåíèòü ïàðàìåòðû óñòðîéñòâ íàæèìàÿ êëàâèøè ÂÂÅÐÕ è ÂÍÈÇ", TEXT_NORMAL }, { 6, 20, - "¤«ï ¢ë¤¥«¥¨ï í«¥¬¥â ¨ ª« ¢¨èã ¤«ï ¢ë¡®à ¤àã£¨å ¢ à¨ â®¢", + "äëÿ âûäåëåíèÿ ýëåìåíòà è êëàâèøó ENTER äëÿ âûáîðà äðóãèõ âàðèàíòîâ", TEXT_NORMAL }, { 6, 21, - "¯ à ¬¥âà®¢.", + "ïàðàìåòðîâ.", TEXT_NORMAL }, { 6, 23, - "®£¤ ¢á¥ ¯ à ¬¥âàë ®¯à¥¤¥«¥ë, ¢ë¡¥à¨â¥ \"à¨¬¥¨âì ¤ ë¥ ¯ à ¬¥âàë ãáâà®©áâ¢\"", + "Êîãäà âñå ïàðàìåòðû îïðåäåëåíû, âûáåðèòå \"Ïðèìåíèòü äàííûå ïàðàìåòðû óñòðîéñòâ\"", TEXT_NORMAL }, { 6, 24, - "¨ ¦¬¨â¥ .", - TEXT_NORMAL - }, - { - 0, - 0, - " = à®¤®«¦¥¨¥ F3 = ëå®¤", + "è íàæìèòå ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -439,55 +439,55 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ReactOS å®¤¨âáï ¢ à ¥© áâ ¤¨¨ à §à ¡®âª¨ ¨ ¥ ¯®¤¤¥à¦¨¢ ¥â ¢á¥", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS íàõîäèòñÿ â ðàííåé ñòàäèè ðàçðàáîòêè è íå ïîääåðæèâàåò âñå", TEXT_NORMAL }, { 6, 9, - "äãªæ¨¨ ¤«ï ¯®«®© á®¢¬¥áâ¨¬®áâ¨ á ãâ ¢«¨¢ ¥¬ë¬¨ ¯à¨«®¦¥¨ï¬¨.", + "ôóíêöèè äëÿ ïîëíîé ñîâìåñòèìîñòè ñ óòàíàâëèâàåìûìè ïðèëîæåíèÿìè.", TEXT_NORMAL }, { 6, 12, - "ãªæ¨ï ¢®áâ ®¢«¥¨ï ¢ ¤ ë¬ ¬®¬¥â ®âáãâáâ¢ã¥â.", + "Ôóíêöèÿ âîñòàíîâëåíèÿ â äàííûì ìîìåíò îòñóòñòâóåò.", TEXT_NORMAL }, { 8, 15, - "\x07 ¦¬¨â¥ U ¤«ï ®¡®¢«¥¨ï .", + "\x07 Íàæìèòå U äëÿ îáíîâëåíèÿ ÎÑ.", TEXT_NORMAL }, { 8, 17, - "\x07 ¦¬¨â¥ R ¤«ï § ¯ãáª ª®á®«¨ ¢®áâ ®¢«¥¨ï.", + "\x07 Íàæìèòå R äëÿ çàïóñêà êîíñîëè âîñòàíîâëåíèÿ.", TEXT_NORMAL }, { 8, 19, - "\x07 ¦¬¨â¥ ESC ¤«ï ¢®§¢à â £« ¢ãî áâà ¨æã.", + "\x07 Íàæìèòå ESC äëÿ âîçâðàòà íà ãëàâíóþ ñòðàíèöó.", TEXT_NORMAL }, { 8, 21, - "\x07 ¦¬¨â¥ ¤«ï ¯¥à¥§ £àã§ª¨ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " ESC = « ¢ ï áâà ¨æ = ¥à¥§ £àã§ª ", + "\x07 Íàæìèòå ENTER äëÿ ïåðåçàãðóçêè êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Ãëàâíàÿ ñòðàíèöà ENTER = Ïåðåçàãðóçêà", TEXT_STATUS }, { @@ -502,43 +502,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ë å®â¨â¥ ¨§¬¥¨âì ãáâ ¢«¨¢ ¥¬ë© â¨¯ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 ¦¬¨â¥ ª« ¢¨èã ¨«¨ ¤«ï ¢ë¡®à ¯à¥¤¯®çâ¨â¥«ì®£® â¨¯ ª®¬¯ìîâ¥à .", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âû õîòèòå èçìåíèòü óñòàíàâëèâàåìûé òèï êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Íàæìèòå êëàâèøó ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà ïðåäïî÷òèòåëüíîãî òèïà êîìïüþòåðà.", TEXT_NORMAL }, { 8, 11, - " â¥¬ ¦¬¨â¥ .", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 ¦¬¨â¥ ª« ¢¨èã ESC ¤«ï ¢®§¢à â ª ¯à¥¤ë¤ãé¥© áâà ¨æ¥ ¡¥§ ¨§¬¥¥¨ï", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç èçìåíåíèÿ", TEXT_NORMAL }, { 8, 14, - " â¨¯ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " = à®¤®«¦¥¨¥ ESC = â¬¥ F3 = ëå®¤", + " òèïà êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -554,31 +554,31 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 10, - 6, - "¨áâ¥¬ ¯à®¢¥àï¥â ¢á¥ «¨ ¤ ë¥ § ¯¨á ë ¤¨áª", - TEXT_NORMAL - }, - { - 10, - 8, - "â® ¬®¦¥â § ïâì ¬¨ãâã", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "Ñèñòåìà ïðîâåðÿåò âñå ëè äàííûå çàïèñàíû íà äèñê", + TEXT_NORMAL + }, + { + 10, + 8, + "Ýòî ìîæåò çàíÿòü ìèíóòó", TEXT_NORMAL }, { 10, 9, - "®á«¥ § ¢¥àè¥¨ï ª®¬¯ìîâ¥à ¡ã¤¥â ¢â®¬ â¨ç¥áª¨ ¯¥à¥§ £àã¦¥", - TEXT_NORMAL - }, - { - 0, - 0, - " ç¨áâª ª¥è ", + "Ïîñëå çàâåðøåíèÿ êîìïüþòåð áóäåò àâòîìàòè÷åñêè ïåðåçàãðóæåí", + TEXT_NORMAL + }, + { + 0, + 0, + " Î÷èñòêà êåøà", TEXT_STATUS }, { @@ -594,37 +594,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 10, - 6, - "ReactOS ãáâ ®¢«¥ ¥ ¯®«®áâìî", - TEXT_NORMAL - }, - { - 10, - 8, - "§¢«¥ª¨â¥ £¨¡ª¨© ¤¨áª ¨§ ¤¨áª®¢®¤ A: ¨", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "ReactOS óñòàíîâëåí íå ïîëíîñòüþ", + TEXT_NORMAL + }, + { + 10, + 8, + "Èçâëåêèòå ãèáêèé äèñê èç äèñêîâîäà A: è", TEXT_NORMAL }, { 10, 9, - "¢á¥ CD-ROM ¨§ CD-¤¨áª®¢®¤®¢.", + "âñå CD-ROM èç CD-äèñêîâîäîâ.", TEXT_NORMAL }, { 10, 11, - " ¦¬¨â¥ ¤«ï ¯¥à¥§ £àã§ª¨ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " ®¦ «ã©áâ ¯®¤®¦¤¨â¥ ...", + "Íàæìèòå ENTER äëÿ ïåðåçàãðóçêè êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " Ïîæàëóéñòà ïîäîæäèòå ...", TEXT_STATUS, }, { @@ -640,42 +640,42 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ë å®â¨â¥ ¨§¬¥¨âì ãáâ ¢«¨¢ ¥¬ë© â¨¯ íªà .", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âû õîòèòå èçìåíèòü óñòàíàâëèâàåìûé òèï ýêðàíà.", TEXT_NORMAL }, { 8, 10, - "\x07 ¦¬¨â¥ ª« ¢¨è¨ ¨«¨ ¤«ï ¢ë¡®à â¨¯ íªà .", + "\x07 Íàæìèòå êëàâèøè ÂÂÎÐÕ èëè ÂÍÈÇ äëÿ âûáîðà òèïà ýêðàíà.", TEXT_NORMAL }, { 8, 11, - " â¥¬ ¦¬¨â¥ .", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 ¦¬¨â¥ ª« ¢¨èã ESC ¤«ï ¢®§¢à â ª ¯à¥¤ë¤ãé¥© áâà ¨æ¥ ¡¥§ ¨§¬¥¥¨ï", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç èçìåíåíèÿ", TEXT_NORMAL }, { 8, 14, - " â¨¯ íªà .", - TEXT_NORMAL - }, - { - 0, - 0, - " = à®¤®«¦¥¨¥ ESC = â¬¥ F3 = ëå®¤", + " òèïà ýêðàíà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -691,37 +691,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 10, - 6, - "á®¢ë¥ ª®¬¯®¥âë ReactOS ¡ë«¨ ãá¯¥è® ãáâ ®¢«¥ë.", - TEXT_NORMAL - }, - { - 10, - 8, - "§¢«¥ª¨â¥ £¨¡ª¨© ¤¨áª ¨§ ¤¨áª®¢®¤ A: ¨", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "Îñíîâíûå êîìïîíåíòû ReactOS áûëè óñïåøíî óñòàíîâëåíû.", + TEXT_NORMAL + }, + { + 10, + 8, + "Èçâëåêèòå ãèáêèé äèñê èç äèñêîâîäà A: è", TEXT_NORMAL }, { 10, 9, - "¢á¥ CD-ROM ¨§ CD-¤¨áª®¢®¤®¢.", + "âñå CD-ROM èç CD-äèñêîâîäîâ.", TEXT_NORMAL }, { 10, 11, - " ¦¬¨â¥ ¤«ï ¯¥à¥§ £àã§ª¨ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " = ¥à¥§ £àã§¨âì ª®¬¯ìîâ¥à", + "Íàæìèòå ENTER äëÿ ïåðåçàãðóçêè êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïåðåçàãðóçèòü êîìïüþòåð", TEXT_STATUS }, { @@ -737,37 +737,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "à®£à ¬¬ ãáâ ®¢ª¨ ¥ á¬®£« ãáâ ®¢¨âì § £àã§ç¨ª ", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ïðîãðàììà óñòàíîâêè íå ñìîãëà óñòàíîâèòü çàãðóç÷èê íà", TEXT_NORMAL }, { 6, 9, - "¦¥áâª¨© ¤¨áª ¢ è¥£® ª®¬¯ìîâ¥à .", + "æåñòêèé äèñê âàøåãî êîìïüþòåðà.", TEXT_NORMAL }, { 6, 13, - "®¦ «ã©áâ ¢áâ ¢â¥ ®âä®à¬ â¨à®¢ ë© £¨¡ª¨© ¤¨áª ¢ ¤¨áª®¢®¤ A: ¨", + "Ïîæàëóéñòà âñòàâòå îòôîðìàòèðîâàííûé ãèáêèé äèñê â äèñêîâîä A: è", TEXT_NORMAL }, { 6, 14, - " ¦¬¨â¥ .", + "íàæìèòå ENTER.", TEXT_NORMAL, }, { 0, 0, - " = à®¤®«¦¥¨¥ F3 = ëå®¤", + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -784,49 +784,49 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "The list below shows existing partitions and unused disk", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Â ñïèñêå íèæå ïîêàçàíû ñóùåñòâóþùèå ðàçäåëû è íåèñïîëüçóåìîå ïðîñòðàíñòâî", TEXT_NORMAL }, { 6, 9, - "space for new partitions.", + "äëÿ íîâîãî ðàçäåëà.", TEXT_NORMAL }, { 8, 11, - "\x07 Press UP or DOWN to select a list entry.", + "\x07 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà ýëåìåíòà.", TEXT_NORMAL }, { 8, 13, - "\x07 Press ENTER to install ReactOS onto the selected partition.", + "\x07 Íàæìèòå ENTER äëÿ óñòàíîâêè ReactOS íà âûäåëåííûé ðàçäåë.", TEXT_NORMAL }, { 8, 15, - "\x07 Press C to create a new partition.", + "\x07 Íàæìèòå C äëÿ ñîçäàíèÿ íîâîãî ðàçäåëà.", TEXT_NORMAL }, { 8, 17, - "\x07 Press D to delete an existing partition.", - TEXT_NORMAL - }, - { - 0, - 0, - " Please wait...", + "\x07 Íàæìèòå D äëÿ óäàëåíèÿ ñóùåñòâóþùåãî ðàçäåëà.", + TEXT_NORMAL + }, + { + 0, + 0, + " Ïîæàëóéñòà ïîäîæäèòå...", TEXT_STATUS }, { @@ -842,25 +842,25 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Format partition", - TEXT_NORMAL - }, - { - 6, - 10, - "Setup will now format the partition. Press ENTER to continue.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ôîðìàòèðîâàíèå ðàçäåëà", + TEXT_NORMAL + }, + { + 6, + 10, + "Äëÿ óñòàíîâêè ðàçäåë áóäåò îòôîðìàòèðîâàí. Íàæìèòå ENTER äëÿ ïðîäîëæåíèÿ.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -876,43 +876,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup installs ReactOS files onto the selected partition. Choose a", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Óñòàíîâêà ôàéëîâ ReactOS íà âûáðàííûé ðàçäåë. Âûáåðèòå äèðåêòîðèþ", TEXT_NORMAL }, { 6, 9, - "directory where you want ReactOS to be installed:", + "â êîòîðóþ áóäåò óñòàíîâëåíà ñèñòåìà:", TEXT_NORMAL }, { 6, 14, - "To change the suggested directory, press BACKSPACE to delete", + "×òîáû èçìåíèòü âûáðàííóþ äèðåêòîðèþ íàæìèòå BACKSPACE è óäàëèòå ñèìâîëû,", TEXT_NORMAL }, { 6, 15, - "characters and then type the directory where you want ReactOS to", + "à çà òåì íàáåðèòå íîâîå èìÿ äèðåêòîðèè äëÿ óñòàíîâêè ReactOS", TEXT_NORMAL }, { 6, 16, - "be installed.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + " ", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü F3 = Âûõîä", TEXT_STATUS }, { @@ -928,31 +928,31 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { 11, 12, - "Please wait while ReactOS Setup copies files to your ReactOS", + "Ïîæàëóéñòà ïîäîæäèòå ïîêà ïðîãðàììà óñòàíîâêè ñêîïèðóåò ôàéëû ReactOS", TEXT_NORMAL }, { 30, 13, - "installation folder.", + "â óñòàíîâî÷íóþ äèðåêòîðèþ.", TEXT_NORMAL }, { 20, 14, - "This may take several minutes to complete.", - TEXT_NORMAL - }, - { - 0, - 0, - " \xB3 Please wait... ", + "Ýòî ìîæåò çàíÿòü íåñêîëüêî ìèíóò.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Ïîæàëóéñòà ïîäîæäèòå... ", TEXT_STATUS }, { @@ -968,37 +968,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup is installing the boot loader", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Óñòàíîâêà çàãðóç÷èêà ReactOS", TEXT_NORMAL }, { 8, 12, - "Install bootloader on the harddisk (MBR).", + "Óñòàíîâêà íà æåñòêèé äèñê (MBR).", TEXT_NORMAL }, { 8, 13, - "Install bootloader on a floppy disk.", + "Óñòàíîâêà íà ãèáêèé äèñê.", TEXT_NORMAL }, { 8, 14, - "Skip install bootloader.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + "Íå óñòàíàâëèâàòü çàãðóç÷èê.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü F3 = Âûõîä", TEXT_STATUS }, { @@ -1014,43 +1014,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "You want to change the type of keyboard to be installed.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Press the UP or DOWN key to select the desired keyboard type.", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Èçìåíåíèå òèïà êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà íóæíîãî òèïà êëàâèàòóðû.", TEXT_NORMAL }, { 8, 11, - " Then press ENTER.", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç èçìåíåíèÿ", TEXT_NORMAL }, { 8, 14, - " the keyboard type.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue ESC = Cancel F3 = Quit", + " òèïà êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -1066,43 +1066,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "You want to change the keyboard layout to be installed.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Press the UP or DOWN key to select the desired keyboard", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âûáîð óñòàíàâëèâàåìîé ðàñêëàäêè êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà íóæíîé ðàñêëàäêè", TEXT_NORMAL }, { 8, 11, - " layout. Then press ENTER.", + " êëàâèàòóðû. Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç", TEXT_NORMAL }, { 8, 14, - " the keyboard layout.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue ESC = Cancel F3 = Quit", + " èçìåíåíèÿ ðàñêëàäêè êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -1119,19 +1119,19 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup prepares your computer for copying the ReactOS files. ", - TEXT_NORMAL - }, - { - 0, - 0, - " Building the file copy list...", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ïîäãîòîâêà âàøåãî êîìïüþòåðà ê êîïèðîâàíèþ ôàéëîâ ReactOS. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Ïîäãîòîâêà ñïèñêà êîïèðóåìûõ ôàéëîâ...", TEXT_STATUS }, { @@ -1148,37 +1148,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { 6, 17, - "Select a file system from the list below.", + "Âûáåðèòå ôàéëîâóþ ñèñòåìó èç ñïèñêà íèæå.", 0 }, { 8, 19, - "\x07 Press UP or DOWN to select a file system.", + "\x07 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà ôàéëîâîé ñèñòåìû.", 0 }, { 8, 21, - "\x07 Press ENTER to format the partition.", + "\x07 Íàæìèòå ENTER äëÿ ôîðìàòèðîâàíèÿ ðàçäåëà.", 0 }, { 8, 23, - "\x07 Press ESC to select another partition.", - 0 - }, - { - 0, - 0, - " ENTER = Continue ESC = Cancel F3 = Quit", + "\x07 Íàæìèòå ESC äëÿ âûáîðà äðóãîãî ðàçäåëà.", + 0 + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, @@ -1195,37 +1195,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "You have chosen to delete the partition", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âû âûáðàëè óäàëåíèå ðàçäåëà.", TEXT_NORMAL }, { 8, 18, - "\x07 Press D to delete the partition.", + "\x07 Íàæìèòå D äëÿ óäàëåíèÿ ðàçäåëà.", TEXT_NORMAL }, { 11, 19, - "WARNING: All data on this partition will be lost!", + "ÂÍÈÌÀÍÈÅ: Âñå äàííûå ñ ýòîãî ðàçäåëà áóäóò ïîòåðÿíû!", TEXT_NORMAL }, { 8, 21, - "\x07 Press ESC to cancel.", - TEXT_NORMAL - }, - { - 0, - 0, - " D = Delete Partition ESC = Cancel F3 = Quit", + "\x07 Íàæìèòå ESC äëÿ îòìåíû.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Óäàëèòü ðàçäåë ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -1241,19 +1241,19 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup is updating the system configuration. ", - TEXT_NORMAL - }, - { - 0, - 0, - " Creating registry hives...", + "Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ïðîãðàììà óñòàíîâêè îáíîâëÿåò êîíôèãóðàöèþ ñèñòåìû. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Ñîçäàíèå êóñòîâ ñèñòåìíîãî ðååñòðà...", TEXT_STATUS }, { @@ -1269,68 +1269,68 @@ { { //ERROR_NOT_INSTALLED - "ReactOS is not completely installed on your\n" - "computer. If you quit Setup now, you will need to\n" - "run Setup again to install ReactOS.\n" - "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "ReactOS íå áûë ïîëíîñòüþ óñòàíîâëåí íà âàø\n" + "êîìïüþòåð. Åñëè âû âûéäèòå èç óñòàíîâêè ñåé÷àñ,\n" + "òî âàì íóæíî çàïóñòèòü ïðîãðàììó óñòàíîâêè ñíîâà,\n" + "åñëè âû õîòèòå óñòàíîâèòü ReactOS\n" + " \x07 Íàæìèòå ENTER äëÿ ïðîäîëæåíèÿ óñòàíîâêè.\n" + " \x07 Íàæìèòå F3 âûõîäà èç óñòàíîâêè.", + "F3 = Âûõîä ENTER = Ïðîäîëæèòü" }, { //ERROR_NO_HDD - "Setup could not find a harddisk.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü íàéòè æåñòêèé äèñê.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_NO_SOURCE_DRIVE - "Setup could not find its source drive.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü íàéòè óñòàíîâî÷íûé äèñê.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_LOAD_TXTSETUPSIF - "Setup failed to load the file TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü çàãðóçèòü ôàéë TXTSETUP.SIF.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_CORRUPT_TXTSETUPSIF "Setup found a corrupt TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_LOAD_COMPUTER, - "Setup failed to load the computer type list.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü çàãðóçèòü ñïèñîê òèïîâ êîìïüþòåðà.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_LOAD_DISPLAY, - "Setup failed to load the display settings list.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü çàãðóçèòü ñïèñîê ðåæèìîâ ýêðàíà.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_LOAD_KEYBOARD, - "Setup failed to load the keyboard type list.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü çàãðóçèòü ñïèñîê òèïîâ êëàâèàòóðû.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_LOAD_KBLAYOUT, - "Setup failed to load the keyboard layout list.\n", - "ENTER = Reboot computer" + "Íå óäàëîñü çàãðóçèòü ñïèñîê ðàñêëàäîê êëàâèàòóðû.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_WARN_PARTITION, @@ -1339,123 +1339,129 @@ "\n" "Creating or deleting partitions can destroy the partiton table.\n" "\n" - " \x07 Press F3 to quit Setup." - " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + " \x07 Íàæìèòå F3 äëÿ âûõîäà èç óñòàíîâêè." + " \x07 Íàæìèòå ENTER äëÿ ïðîäîëæåíèÿ.", + "F3 = Âûõîä ENTER = Ïðîäîëæèòü" }, { //ERROR_NEW_PARTITION, "You can not create a new Partition inside\n" "of an already existing Partition!\n" "\n" - " * Press any key to continue.", + " * Íàæìèòå ëþáóþ êëàâèøó äëÿ ïðîäîëæåíèÿ.", NULL }, { //ERROR_DELETE_SPACE, "You can not delete unpartitioned disk space!\n" "\n" - " * Press any key to continue.", + " * Íàæìèòå ëþáóþ êëàâèøó äëÿ ïðîäîëæåíèÿ.", NULL }, { //ERROR_INSTALL_BOOTCODE, "Setup failed to install the FAT bootcode on the system partition.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_NO_FLOPPY, - "No disk in drive A:.", - "ENTER = Continue" + "Íåò äèñêà â äèñêîâîäå A:.", + "ENTER = Ïðîäîëæèòü" }, { //ERROR_UPDATE_KBSETTINGS, "Setup failed to update keyboard layout settings.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_UPDATE_DISPLAY_SETTINGS, "Setup failed to update display registry settings.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_IMPORT_HIVE, "Setup failed to import a hive file.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_FIND_REGISTRY "Setup failed to find the registry data files.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_CREATE_HIVE, "Setup failed to create the registry hives.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_INITIALIZE_REGISTRY, "Setup failed to set the initialize the registry.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_CABINET_MISSING, - "Cabinet not found.\n", - "ENTER = Reboot computer" + "Cabinet íå íàéäåí.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_CABINET_SCRIPT, - "Cabinet has no setup script.\n", - "ENTER = Reboot computer" + "Cabinet íå ñìîã íàéòè óñòàíîâî÷íûé ñêðèïò.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_CREATE_DIR, + "Íå óäàëîñü ñîçäàòü óñòàíîâî÷íûå äèðåêòîðèè.", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_TXTSETUP_SECTION, + "Íå óäàëîñü íàéòè ñåêöèþ 'Directories'\n" + "â ôàéëå TXTSETUP.SIF.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_CABINET_SECTION, + "Íå óäàëîñü íàéòè ñåêöèþ 'Directories'\n" + "â cabinet.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Íå óäàëîñü ñîçäàòü äèðåêòîðèþ äëÿ óñòàíîâêè.", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_FIND_SETUPDATA, + "Íå óäàëîñü íàéòè ñåêöèþ 'SetupData'\n" + "â ôàéëå TXTSETUP.SIF.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_WRITE_PTABLE, + "Íå óäàëîñü çàïèñàòü òàáëèöó ðàçäåëîâ.\n" + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_CREATE_DIR, - "Setup could not create install directories.", - "ENTER = Reboot computer" - }, - { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_CREATE_INSTALL_DIR - "Setup could not create the install directory.", - "ENTER = Reboot computer" - }, - { - //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_WRITE_PTABLE, - "Setup failed to write partition tables.\n" - "ENTER = Reboot computer" - }, - { NULL, NULL } }; + MUI_PAGE ruRUPages[] = { @@ -1464,8 +1470,8 @@ ruRULanguagePageEntries }, { - START_PAGE, - ruRUWelcomePageEntries + START_PAGE, + ruRUWelcomePageEntries }, { INSTALL_INTRO_PAGE, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Mon Jan 7 17:51:42 2008 @@ -28,6 +28,9 @@ #include "errorcode.h" #include "mui.h" +#define NDEBUG +#include <debug.h> + #include "lang/en-US.h" #include "lang/de-DE.h" #include "lang/el-GR.h" @@ -308,4 +311,99 @@ WaitEvent); } +static BOOLEAN +AddCodepageToRegistry(PWCHAR ACPage, PWCHAR OEMCPage, PWCHAR MACCPage) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + NTSTATUS Status; + + // Open the nls codepage key + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); + return FALSE; + } + + // Set ANSI codepage + RtlInitUnicodeString(&ValueName, L"ACP"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)ACPage, + 4 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + // Set OEM codepage + RtlInitUnicodeString(&ValueName, L"OEMCP"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)OEMCPage, + 3 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + // Set MAC codepage + RtlInitUnicodeString(&ValueName, L"MACCP"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)MACCPage, + 5 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + NtClose(KeyHandle); + + return TRUE; +} + +BOOLEAN +AddCodePage(VOID) +{ + ULONG lngIndex = 0; + do + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + return AddCodepageToRegistry(LanguageList[lngIndex].ACPage, + LanguageList[lngIndex].OEMCPage, + LanguageList[lngIndex].MACCPage); + } + + lngIndex++; + } + while (LanguageList[lngIndex].MuiPages != NULL); + return FALSE; +} + /* EOF */ Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Mon Jan 7 17:51:42 2008 @@ -53,5 +53,8 @@ VOID MUIDefaultKeyboardLayout(WCHAR * KeyboardLayout); +BOOLEAN +AddCodePage(VOID); + #endif Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c (original) +++ trunk/reactos/base/setup/usetup/settings.c Mon Jan 7 17:51:42 2008 @@ -821,7 +821,7 @@ 0, REG_SZ, (PVOID)(LanguageId + 4), - 8); + 8 * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -837,7 +837,7 @@ 0, REG_SZ, (PVOID)(LanguageId + 4), - 8); + 8 * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);

1 0

[fireball] 31641: - WIDL Wine vs. ReactOS differences.
by fireball＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: fireball Date: Mon Jan 7 17:23:35 2008 New Revision: 31641 URL: http://svn.reactos.org/svn/reactos?rev=31641&view=rev Log: - WIDL Wine vs. ReactOS differences. Added: trunk/reactos/tools/widl_20080105/widl_ros.diff (with props) Added: trunk/reactos/tools/widl_20080105/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl_20080105/widl_r… ============================================================================== --- trunk/reactos/tools/widl_20080105/widl_ros.diff (added) +++ trunk/reactos/tools/widl_20080105/widl_ros.diff Mon Jan 7 17:23:35 2008 @@ -1,0 +1,59 @@ +--- hash.c Fri Sep 29 17:48:44 2006 ++++ hash.c Sat Jan 05 21:25:37 2008 +@@ -533,17 +533,24 @@ + case LANG_ROMANIAN: case LANG_SANSKRIT: case LANG_SERBIAN: + case LANG_SINDHI: case LANG_SLOVENIAN: case LANG_SWAHILI: + case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL: + case LANG_TATAR: case LANG_TELUGU: case LANG_THAI: + case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK: ++#ifndef __REACTOS__ + case LANG_VIETNAMESE: case LANG_GAELIC: case LANG_MALTESE: + case LANG_TAJIK: case LANG_ROMANSH: case LANG_IRISH: + case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_SUTU: + case LANG_TSONGA: case LANG_TSWANA: case LANG_VENDA: + case LANG_XHOSA: case LANG_ZULU: case LANG_ESPERANTO: + case LANG_WALON: case LANG_CORNISH: case LANG_WELSH: + case LANG_BRETON: ++#else ++ case LANG_VIETNAMESE: case LANG_MALTESE: case LANG_IRISH: ++ case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_TSWANA: ++ case LANG_XHOSA: case LANG_ZULU: case LANG_WELSH: ++ case LANG_BRETON: ++#endif + nOffset = 16; + pnLookup = Lookup_16; + break; + case LANG_CZECH: case LANG_HUNGARIAN: case LANG_POLISH: + case LANG_SLOVAK: case LANG_SPANISH: +--- server.c Sat Jan 05 20:48:36 2008 ++++ server.c Sat Jan 05 22:44:57 2008 +@@ -388,10 +388,11 @@ + error("Could not open %s for output\n", server_name); + + print_server("/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n", PACKAGE_VERSION, input_name); + print_server("#include <string.h>\n"); + fprintf(server, "\n"); ++ print_server("#define _SEH_NO_NATIVE_NLG\n"); + print_server("#include \"%s\"\n", header_name); + fprintf(server, "\n"); + } + + +--- widl.c Sat Jan 05 20:48:36 2008 ++++ widl.c Sat Jan 05 23:44:29 2008 +@@ -547,10 +547,15 @@ + return 1; + } + } + + if(do_header) { ++ if (strrchr(header_name, '\\')) ++ header_token = make_token(strrchr(header_name, '\\') + 1); ++ else if (strrchr(header_name, '/')) ++ header_token = make_token(strrchr(header_name, '/') + 1); ++ else + header_token = make_token(header_name); + + if(!(header = fopen(header_name, "w"))) { + fprintf(stderr, "Could not open %s for output\n", header_name); + return 1; Propchange: trunk/reactos/tools/widl_20080105/widl_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 31640: - Change incorrect rpcrt4's synchronous operation back to asynchronous (which was in Wine back in 0.9.5). - Update corresponding patch file, increasing context to 5 lines for better merging.
by fireball＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: fireball Date: Mon Jan 7 17:16:27 2008 New Revision: 31640 URL: http://svn.reactos.org/svn/reactos?rev=31640&view=rev Log: - Change incorrect rpcrt4's synchronous operation back to asynchronous (which was in Wine back in 0.9.5). - Update corresponding patch file, increasing context to 5 lines for better merging. Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpc_t… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpc_transport.c Mon Jan 7 17:16:27 2008 @@ -90,7 +90,7 @@ { RpcConnection common; HANDLE pipe; - OVERLAPPED ovl; + OVERLAPPED ovl[2]; BOOL listening; } RpcConnection_np; @@ -112,11 +112,11 @@ return RPC_S_OK; npc->listening = TRUE; - if (ConnectNamedPipe(npc->pipe, &npc->ovl)) + if (ConnectNamedPipe(npc->pipe, &npc->ovl[0])) return RPC_S_OK; if (GetLastError() == ERROR_PIPE_CONNECTED) { - SetEvent(npc->ovl.hEvent); + SetEvent(npc->ovl[0].hEvent); return RPC_S_OK; } if (GetLastError() == ERROR_IO_PENDING) { @@ -146,7 +146,8 @@ } memset(&npc->ovl, 0, sizeof(npc->ovl)); - npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); /* Note: we don't call ConnectNamedPipe here because it must be done in the * server thread as the thread must be alertable */ @@ -209,7 +210,9 @@ /* pipe is connected; change to message-read mode. */ dwMode = PIPE_READMODE_MESSAGE; SetNamedPipeHandleState(pipe, &dwMode, NULL, NULL); - npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->pipe = pipe; return RPC_S_OK; @@ -315,7 +318,8 @@ * to the child, then reopen the server binding to continue listening */ new_npc->pipe = old_npc->pipe; - new_npc->ovl = old_npc->ovl; + new_npc->ovl[0] = old_npc->ovl[0]; + new_npc->ovl[1] = old_npc->ovl[1]; old_npc->pipe = 0; memset(&old_npc->ovl, 0, sizeof(old_npc->ovl)); old_npc->listening = FALSE; @@ -366,9 +370,14 @@ while (bytes_left) { DWORD bytes_read; - ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); - if (!ret || !bytes_read) + ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &npc->ovl[0]); + if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING)) break; + + ret = GetOverlappedResult(npc->pipe, &npc->ovl[0], &bytes_read, TRUE); + if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) + break; + bytes_left -= bytes_read; buf += bytes_read; } @@ -386,9 +395,14 @@ while (bytes_left) { DWORD bytes_written; - ret = WriteFile(npc->pipe, buf, count, &bytes_written, NULL); - if (!ret || !bytes_written) + ret = WriteFile(npc->pipe, buf, count, &bytes_written, &npc->ovl[1]); + if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING)) break; + + ret = GetOverlappedResult(npc->pipe, &npc->ovl[1], &bytes_written, TRUE); + if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) + break; + bytes_left -= bytes_written; buf += bytes_written; } @@ -403,10 +417,15 @@ CloseHandle(npc->pipe); npc->pipe = 0; } - if (npc->ovl.hEvent) { - CloseHandle(npc->ovl.hEvent); - npc->ovl.hEvent = 0; - } + if (npc->ovl[0].hEvent) { + CloseHandle(npc->ovl[0].hEvent); + npc->ovl[0].hEvent = 0; + } + if (npc->ovl[1].hEvent) { + CloseHandle(npc->ovl[1].hEvent); + npc->ovl[1].hEvent = 0; + } + return 0; } @@ -554,7 +573,7 @@ conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { rpcrt4_conn_listen_pipe(conn); - if (conn->ovl.hEvent) + if (conn->ovl[0].hEvent) (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } @@ -575,7 +594,7 @@ *count = 1; conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if ((objs[*count] = conn->ovl.hEvent)) + if ((objs[*count] = conn->ovl[0].hEvent)) (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } @@ -622,7 +641,7 @@ EnterCriticalSection(&protseq->cs); conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { - if (b_handle == conn->ovl.hEvent) break; + if (b_handle == conn->ovl[0].hEvent) break; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } cconn = NULL; Modified: trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4_new/rpcrt… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff (original) +++ trunk/reactos/dll/win32/rpcrt4_new/rpcrt4_ros.diff Mon Jan 7 17:16:27 2008 @@ -1,6 +1,8 @@ --- H:\Working Copies\wine\dlls\rpcrt4\rpc_transport.c Sun Jan 06 19:27:38 2008 -+++ H:\Working Copies\ReactOS\trunk\reactos\dll\win32\rpcrt4\rpc_transport.c Sun Jan 06 19:28:07 2008 -@@ -56,6 +56,9 @@ ++++ H:\Working Copies\ReactOS\trunk\reactos\dll\win32\rpcrt4\rpc_transport.c Mon Jan 07 16:02:15 2008 +@@ -54,10 +54,13 @@ + #endif + #ifdef HAVE_SYS_POLL_H #include <sys/poll.h> #endif @@ -10,7 +12,11 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -@@ -73,6 +76,8 @@ + #include "winerror.h" + #include "winternl.h" +@@ -71,10 +74,12 @@ + #include "rpc_binding.h" + #include "rpc_message.h" #include "rpc_server.h" #include "epm_towers.h" @@ -19,7 +25,42 @@ #ifndef SOL_TCP # define SOL_TCP IPPROTO_TCP #endif -@@ -128,7 +133,7 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(rpc); +@@ -83,11 +88,11 @@ + + typedef struct _RpcConnection_np + { + RpcConnection common; + HANDLE pipe; +- OVERLAPPED ovl; ++ OVERLAPPED ovl[2]; + BOOL listening; + } RpcConnection_np; + + static RpcConnection *rpcrt4_conn_np_alloc(void) + { +@@ -105,15 +110,15 @@ + { + if (npc->listening) + return RPC_S_OK; + + npc->listening = TRUE; +- if (ConnectNamedPipe(npc->pipe, &npc->ovl)) ++ if (ConnectNamedPipe(npc->pipe, &npc->ovl[0])) + return RPC_S_OK; + + if (GetLastError() == ERROR_PIPE_CONNECTED) { +- SetEvent(npc->ovl.hEvent); ++ SetEvent(npc->ovl[0].hEvent); + return RPC_S_OK; + } + if (GetLastError() == ERROR_IO_PENDING) { + /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ + return RPC_S_OK; +@@ -126,11 +131,11 @@ + static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) + { RpcConnection_np *npc = (RpcConnection_np *) Connection; TRACE("listening on %s\n", pname); @@ -28,7 +69,158 @@ PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); -@@ -715,12 +720,14 @@ + if (npc->pipe == INVALID_HANDLE_VALUE) { + WARN("CreateNamedPipe failed with error %d\n", GetLastError()); +@@ -139,11 +144,12 @@ + else + return RPC_S_CANT_CREATE_ENDPOINT; + } + + memset(&npc->ovl, 0, sizeof(npc->ovl)); +- npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ++ npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ++ npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + /* Note: we don't call ConnectNamedPipe here because it must be done in the + * server thread as the thread must be alertable */ + return RPC_S_OK; + } +@@ -202,11 +208,13 @@ + /* success */ + memset(&npc->ovl, 0, sizeof(npc->ovl)); + /* pipe is connected; change to message-read mode. */ + dwMode = PIPE_READMODE_MESSAGE; + SetNamedPipeHandleState(pipe, &dwMode, NULL, NULL); +- npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ++ npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ++ npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ++ + npc->pipe = pipe; + + return RPC_S_OK; + } + +@@ -308,11 +316,12 @@ + { + /* because of the way named pipes work, we'll transfer the connected pipe + * to the child, then reopen the server binding to continue listening */ + + new_npc->pipe = old_npc->pipe; +- new_npc->ovl = old_npc->ovl; ++ new_npc->ovl[0] = old_npc->ovl[0]; ++ new_npc->ovl[1] = old_npc->ovl[1]; + old_npc->pipe = 0; + memset(&old_npc->ovl, 0, sizeof(old_npc->ovl)); + old_npc->listening = FALSE; + } + +@@ -359,13 +368,18 @@ + unsigned int bytes_left = count; + + while (bytes_left) + { + DWORD bytes_read; +- ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); +- if (!ret || !bytes_read) ++ ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &npc->ovl[0]); ++ if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING)) + break; ++ ++ ret = GetOverlappedResult(npc->pipe, &npc->ovl[0], &bytes_read, TRUE); ++ if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) ++ break; ++ + bytes_left -= bytes_read; + buf += bytes_read; + } + return ret ? count : -1; + } +@@ -379,13 +393,18 @@ + unsigned int bytes_left = count; + + while (bytes_left) + { + DWORD bytes_written; +- ret = WriteFile(npc->pipe, buf, count, &bytes_written, NULL); +- if (!ret || !bytes_written) ++ ret = WriteFile(npc->pipe, buf, count, &bytes_written, &npc->ovl[1]); ++ if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING)) + break; ++ ++ ret = GetOverlappedResult(npc->pipe, &npc->ovl[1], &bytes_written, TRUE); ++ if (!ret /*&& GetLastError() != ERROR_MORE_DATA*/) ++ break; ++ + bytes_left -= bytes_written; + buf += bytes_written; + } + return ret ? count : -1; + } +@@ -396,14 +415,19 @@ + if (npc->pipe) { + FlushFileBuffers(npc->pipe); + CloseHandle(npc->pipe); + npc->pipe = 0; + } +- if (npc->ovl.hEvent) { +- CloseHandle(npc->ovl.hEvent); +- npc->ovl.hEvent = 0; ++ if (npc->ovl[0].hEvent) { ++ CloseHandle(npc->ovl[0].hEvent); ++ npc->ovl[0].hEvent = 0; ++ } ++ if (npc->ovl[1].hEvent) { ++ CloseHandle(npc->ovl[1].hEvent); ++ npc->ovl[1].hEvent = 0; + } ++ + return 0; + } + + static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) + { +@@ -547,11 +571,11 @@ + /* open and count connections */ + *count = 1; + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); + while (conn) { + rpcrt4_conn_listen_pipe(conn); +- if (conn->ovl.hEvent) ++ if (conn->ovl[0].hEvent) + (*count)++; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); + } + + /* make array of connections */ +@@ -568,11 +592,11 @@ + + objs[0] = npps->mgr_event; + *count = 1; + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); + while (conn) { +- if ((objs[*count] = conn->ovl.hEvent)) ++ if ((objs[*count] = conn->ovl[0].hEvent)) + (*count)++; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); + } + LeaveCriticalSection(&protseq->cs); + return objs; +@@ -615,11 +639,11 @@ + b_handle = objs[res - WAIT_OBJECT_0]; + /* find which connection got a RPC */ + EnterCriticalSection(&protseq->cs); + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); + while (conn) { +- if (b_handle == conn->ovl.hEvent) break; ++ if (b_handle == conn->ovl[0].hEvent) break; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); + } + cconn = NULL; + if (conn) + RPCRT4_SpawnConnection(&cconn, &conn->common); +@@ -713,16 +737,18 @@ + RpcConnection_tcp *tcpc; + tcpc = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcConnection_tcp)); if (tcpc == NULL) return NULL; tcpc->sock = -1; @@ -43,7 +235,11 @@ return &tcpc->common; } -@@ -785,8 +792,7 @@ + static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) + { +@@ -783,12 +809,11 @@ + continue; + } /* RPC depends on having minimal latency so disable the Nagle algorithm */ val = 1; @@ -53,7 +249,11 @@ tcpc->sock = sock; -@@ -808,6 +814,7 @@ + freeaddrinfo(ai); + TRACE("connected\n"); +@@ -806,10 +831,11 @@ + int sock; + int ret; struct addrinfo *ai; struct addrinfo *ai_cur; struct addrinfo hints; @@ -61,7 +261,11 @@ RpcConnection *first_connection = NULL; TRACE("(%p, %s)\n", protseq, endpoint); -@@ -859,7 +866,7 @@ + + hints.ai_flags = AI_PASSIVE /* for non-localhost addresses */; +@@ -857,11 +883,11 @@ + ret = bind(sock, ai_cur->ai_addr, ai_cur->ai_addrlen); + if (ret < 0) { WARN("bind failed: %s\n", strerror(errno)); close(sock); @@ -70,7 +274,11 @@ status = RPC_S_DUPLICATE_ENDPOINT; else status = RPC_S_CANT_CREATE_ENDPOINT; -@@ -888,7 +895,8 @@ + continue; + } +@@ -886,11 +912,12 @@ + } + /* need a non-blocking socket, otherwise accept() has a potential * race-condition (poll() says it is readable, connection drops, * and accept() blocks until the next connection comes...) */ @@ -80,7 +288,11 @@ if (ret < 0) { WARN("couldn't make socket non-blocking, error %d\n", ret); -@@ -931,6 +939,7 @@ + RPCRT4_DestroyConnection(&tcpc->common); + status = RPC_S_OUT_OF_RESOURCES; +@@ -929,10 +956,11 @@ + static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection *new_conn) + { int ret; struct sockaddr_in address; socklen_t addrsize; @@ -88,7 +300,11 @@ RpcConnection_tcp *server = (RpcConnection_tcp*) old_conn; RpcConnection_tcp *client = (RpcConnection_tcp*) new_conn; -@@ -942,7 +951,8 @@ + addrsize = sizeof(address); + ret = accept(server->sock, (struct sockaddr*) &address, &addrsize); +@@ -940,11 +968,12 @@ + { + ERR("Failed to accept a TCP connection: error %d\n", ret); return RPC_S_OUT_OF_RESOURCES; } /* reset to blocking behaviour */ @@ -98,7 +314,11 @@ client->sock = ret; TRACE("Accepted a new TCP connection\n"); return RPC_S_OK; -@@ -1189,10 +1199,12 @@ + } + +@@ -1187,14 +1216,16 @@ + { + RpcServerProtseq_sock *ps = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps)); if (ps) { int fds[2]; @@ -113,3 +333,5 @@ ps->mgr_event_rcv = fds[0]; ps->mgr_event_snd = fds[1]; } + else + {

1 0

[hpoussin] 31639: Use kernel facilities to change debug level at runtime
by hpoussin＠svn.reactos.org 07 Jan '08

07 Jan '08

Author: hpoussin Date: Mon Jan 7 15:57:32 2008 New Revision: 31639 URL: http://svn.reactos.org/svn/reactos?rev=31639&view=rev Log: Use kernel facilities to change debug level at runtime Modified: trunk/reactos/drivers/input/sermouse/detect.c trunk/reactos/drivers/input/sermouse/readmouse.c trunk/reactos/drivers/serial/serenum/detect.c trunk/reactos/drivers/serial/serial/create.c trunk/reactos/drivers/serial/serial/rw.c Modified: trunk/reactos/drivers/input/sermouse/detect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/det… ============================================================================== --- trunk/reactos/drivers/input/sermouse/detect.c (original) +++ trunk/reactos/drivers/input/sermouse/detect.c Mon Jan 7 15:57:32 2008 @@ -141,14 +141,14 @@ if (!NT_SUCCESS(Status)) return mtNone; /* Reset UART */ - CHECKPOINT; + TRACE_(SERMOUSE, "Reset UART\n"); Mcr = 0; /* MCR: DTR/RTS/OUT2 off */ Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, &Mcr, sizeof(Mcr), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; /* Set communications parameters */ - CHECKPOINT; + TRACE_(SERMOUSE, "Set communications parameters\n"); /* DLAB off */ Fcr = 0; Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL, @@ -168,7 +168,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Flush receive buffer */ - CHECKPOINT; + TRACE_(SERMOUSE, "Flush receive buffer\n"); Command = SERIAL_PURGE_RXCLEAR; Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, &Command, sizeof(Command), NULL, NULL); @@ -177,7 +177,7 @@ Wait(100); /* Enable DTR/RTS */ - CHECKPOINT; + TRACE_(SERMOUSE, "Enable DTR/RTS\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -186,7 +186,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Set timeout to 500 microseconds */ - CHECKPOINT; + TRACE_(SERMOUSE, "Set timeout to 500 microseconds\n"); Timeouts.ReadIntervalTimeout = 100; Timeouts.ReadTotalTimeoutMultiplier = 0; Timeouts.ReadTotalTimeoutConstant = 500; @@ -196,7 +196,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Fill the read buffer */ - CHECKPOINT; + TRACE_(SERMOUSE, "Fill the read buffer\n"); Status = ReadBytes(LowerDevice, Buffer, sizeof(Buffer)/sizeof(Buffer[0]), &Count); if (!NT_SUCCESS(Status)) goto ByeBye; Modified: trunk/reactos/drivers/input/sermouse/readmouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/rea… ============================================================================== --- trunk/reactos/drivers/input/sermouse/readmouse.c (original) +++ trunk/reactos/drivers/input/sermouse/readmouse.c Mon Jan 7 15:57:32 2008 @@ -149,8 +149,8 @@ &ioStatus); if (!Irp) { - /* no memory actually, try later */ - CHECKPOINT; + /* No memory actually, try later */ + INFO_(SERMOUSE, "No memory actually, trying again\n"); KeStallExecutionProcessor(10); continue; } Modified: trunk/reactos/drivers/serial/serenum/detect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/det… ============================================================================== --- trunk/reactos/drivers/serial/serenum/detect.c (original) +++ trunk/reactos/drivers/serial/serenum/detect.c Mon Jan 7 15:57:32 2008 @@ -248,7 +248,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* 1. COM port initialization, check for device enumerate */ - CHECKPOINT; + TRACE_(SERENUM, "COM port initialization, check for device enumerate\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -263,7 +263,7 @@ if ((Msr & SERIAL_DSR_STATE) == 0) goto DisconnectIdle; /* 2. COM port setup, 1st phase */ - CHECKPOINT; + TRACE_(SERENUM, "COM port setup, 1st phase\n"); BaudRate = 1200; Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE, &BaudRate, sizeof(BaudRate), NULL, 0); @@ -287,7 +287,7 @@ Wait(200); /* 3. Wait for response, 1st phase */ - CHECKPOINT; + TRACE_(SERENUM, "Wait for response, 1st phase\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_RTS, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -303,7 +303,7 @@ if (Size != 0) goto CollectPnpComDeviceId; /* 4. COM port setup, 2nd phase */ - CHECKPOINT; + TRACE_(SERENUM, "COM port setup, 2nd phase\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_CLR_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -317,7 +317,7 @@ Wait(200); /* 5. Wait for response, 2nd phase */ - CHECKPOINT; + TRACE_(SERENUM, "Wait for response, 2nd phase\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -335,7 +335,7 @@ /* 6. Collect PnP COM device ID */ CollectPnpComDeviceId: - CHECKPOINT; + TRACE_(SERENUM, "Collect PnP COM device ID\n"); Timeouts.ReadIntervalTimeout = 200; Timeouts.ReadTotalTimeoutMultiplier = 0; Timeouts.ReadTotalTimeoutConstant = 2200; @@ -374,7 +374,7 @@ /* 7. Verify disconnect */ VerifyDisconnect: - CHECKPOINT; + TRACE_(SERENUM, "Verify disconnect\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -386,7 +386,7 @@ /* 8. Connect idle */ ConnectIdle: - CHECKPOINT; + TRACE_(SERENUM, "Connect idle\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -411,7 +411,7 @@ /* 9. Disconnect idle */ DisconnectIdle: - CHECKPOINT; + TRACE_(SERENUM, "Disconnect idle\n"); /* FIXME: report to OS device removal, if it was present */ Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); @@ -476,14 +476,14 @@ if (!NT_SUCCESS(Status)) return Status; /* Reset UART */ - CHECKPOINT; + TRACE_(SERENUM, "Reset UART\n"); Mcr = 0; /* MCR: DTR/RTS/OUT2 off */ Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, &Mcr, sizeof(Mcr), NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; /* Set communications parameters */ - CHECKPOINT; + TRACE_(SERENUM, "Set communications parameters\n"); /* DLAB off */ Fcr = 0; Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_FIFO_CONTROL, @@ -503,7 +503,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Flush receive buffer */ - CHECKPOINT; + TRACE_(SERENUM, "Flush receive buffer\n"); Command = SERIAL_PURGE_RXCLEAR; Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_MODEM_CONTROL, &Command, sizeof(Command), NULL, NULL); @@ -512,7 +512,7 @@ Wait(100); /* Enable DTR/RTS */ - CHECKPOINT; + TRACE_(SERENUM, "Enable DTR/RTS\n"); Status = DeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_DTR, NULL, 0, NULL, NULL); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -521,7 +521,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Set timeout to 500 microseconds */ - CHECKPOINT; + TRACE_(SERENUM, "Set timeout to 500 microseconds\n"); Timeouts.ReadIntervalTimeout = 100; Timeouts.ReadTotalTimeoutMultiplier = 0; Timeouts.ReadTotalTimeoutConstant = 500; @@ -531,7 +531,7 @@ if (!NT_SUCCESS(Status)) goto ByeBye; /* Fill the read buffer */ - CHECKPOINT; + TRACE_(SERENUM, "Fill the read buffer\n"); Status = ReadBytes(LowerDevice, Buffer, sizeof(Buffer)/sizeof(Buffer[0]), &Count); if (!NT_SUCCESS(Status)) goto ByeBye; Modified: trunk/reactos/drivers/serial/serial/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/crea… ============================================================================== --- trunk/reactos/drivers/serial/serial/create.c (original) +++ trunk/reactos/drivers/serial/serial/create.c Mon Jan 7 15:57:32 2008 @@ -24,7 +24,7 @@ if (Stack->Parameters.Create.Options & FILE_DIRECTORY_FILE) { - CHECKPOINT; + INFO_(SERIAL, "Not a directory\n"); Status = STATUS_NOT_A_DIRECTORY; goto ByeBye; } Modified: trunk/reactos/drivers/serial/serial/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/rw.c… ============================================================================== --- trunk/reactos/drivers/serial/serial/rw.c (original) +++ trunk/reactos/drivers/serial/serial/rw.c Mon Jan 7 15:57:32 2008 @@ -227,8 +227,8 @@ return STATUS_PENDING; } - /* insufficient resources, we can't pend the Irp */ - CHECKPOINT; + /* Insufficient resources, we can't pend the Irp */ + INFO_(SERIAL, "Insufficient resources\n"); Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); if (!NT_SUCCESS(Status)) {

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
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