Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[rharabien] 54160: [WIN32K] - Formating... No code changes.

by rharabien＠svn.reactos.org

Author: rharabien Date: Sun Oct 16 12:26:22 2011 New Revision: 54160 URL: http://svn.reactos.org/svn/reactos?rev=54160&view=rev Log: [WIN32K] - Formating... No code changes. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Oct 16 12:26:22 2011 @@ -142,13 +142,6 @@ ByteOffset.QuadPart = (LONGLONG)0; WaitTimeout.QuadPart = (LONGLONG)(-10000000); - - /*do - { - KEVENT Event; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &WaitTimeout); - } while (!NT_SUCCESS(Status));*/ ptiRawInput = PsGetCurrentThreadWin32Thread(); ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Sun Oct 16 12:26:22 2011 @@ -29,700 +29,700 @@ */ static NTSTATUS APIENTRY ReadRegistryValue( PUNICODE_STRING KeyName, - PUNICODE_STRING ValueName, - PUNICODE_STRING ReturnedValue ) -{ - NTSTATUS Status; - HANDLE KeyHandle; - OBJECT_ATTRIBUTES KeyAttributes; - PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; - ULONG Length = 0; - ULONG ResLength = 0; - PWCHAR ReturnBuffer; - - InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, - NULL, NULL); - Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); - if( !NT_SUCCESS(Status) ) - { - return Status; - } - - Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, - 0, - 0, - &ResLength); - - if( Status != STATUS_BUFFER_TOO_SMALL ) - { - NtClose(KeyHandle); - return Status; - } - - ResLength += sizeof( *KeyValuePartialInfo ); - KeyValuePartialInfo = - ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); - Length = ResLength; - - if( !KeyValuePartialInfo ) - { - NtClose(KeyHandle); - return STATUS_NO_MEMORY; - } - - Status = ZwQueryValueKey(KeyHandle, - ValueName, - KeyValuePartialInformation, - (PVOID)KeyValuePartialInfo, - Length, - &ResLength); - - if( !NT_SUCCESS(Status) ) - { - NtClose(KeyHandle); - ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); - return Status; - } - - /* At this point, KeyValuePartialInfo->Data contains the key data */ - ReturnBuffer = ExAllocatePoolWithTag(PagedPool, - KeyValuePartialInfo->DataLength, - TAG_STRING); - - if(!ReturnBuffer) - { - NtClose(KeyHandle); - ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); - return STATUS_NO_MEMORY; - } - - RtlCopyMemory(ReturnBuffer, - KeyValuePartialInfo->Data, - KeyValuePartialInfo->DataLength); - RtlInitUnicodeString(ReturnedValue, ReturnBuffer); - - ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); - NtClose(KeyHandle); - - return Status; + PUNICODE_STRING ValueName, + PUNICODE_STRING ReturnedValue ) +{ + NTSTATUS Status; + HANDLE KeyHandle; + OBJECT_ATTRIBUTES KeyAttributes; + PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; + ULONG Length = 0; + ULONG ResLength = 0; + PWCHAR ReturnBuffer; + + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, + NULL, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, + 0, + 0, + &ResLength); + + if (Status != STATUS_BUFFER_TOO_SMALL) + { + NtClose(KeyHandle); + return Status; + } + + ResLength += sizeof(*KeyValuePartialInfo); + KeyValuePartialInfo = + ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); + Length = ResLength; + + if (!KeyValuePartialInfo) + { + NtClose(KeyHandle); + return STATUS_NO_MEMORY; + } + + Status = ZwQueryValueKey(KeyHandle, + ValueName, + KeyValuePartialInformation, + (PVOID)KeyValuePartialInfo, + Length, + &ResLength); + + if (!NT_SUCCESS(Status)) + { + NtClose(KeyHandle); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); + return Status; + } + + /* At this point, KeyValuePartialInfo->Data contains the key data */ + ReturnBuffer = ExAllocatePoolWithTag(PagedPool, + KeyValuePartialInfo->DataLength, + TAG_STRING); + + if (!ReturnBuffer) + { + NtClose(KeyHandle); + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); + return STATUS_NO_MEMORY; + } + + RtlCopyMemory(ReturnBuffer, + KeyValuePartialInfo->Data, + KeyValuePartialInfo->DataLength); + RtlInitUnicodeString(ReturnedValue, ReturnBuffer); + + ExFreePoolWithTag(KeyValuePartialInfo, TAG_STRING); + NtClose(KeyHandle); + + return Status; } static BOOL UserLoadKbdDll(WCHAR *wsKLID, - HANDLE *phModule, - PKBDTABLES *pKbdTables) -{ - NTSTATUS Status; - KbdLayerDescriptor layerDescGetFn; - ANSI_STRING kbdProcedureName; - UNICODE_STRING LayoutKeyName; - UNICODE_STRING LayoutValueName; - UNICODE_STRING LayoutFile; - UNICODE_STRING FullLayoutPath; - UNICODE_STRING klid; - WCHAR LayoutPathBuffer[MAX_PATH] = L"\\SystemRoot\\System32\\"; - WCHAR KeyNameBuffer[MAX_PATH] = L"\\REGISTRY\\Machine\\SYSTEM\\" - L"CurrentControlSet\\Control\\Keyboard Layouts\\"; - - RtlInitUnicodeString(&klid, wsKLID); - RtlInitUnicodeString(&LayoutValueName,L"Layout File"); - RtlInitUnicodeString(&LayoutKeyName, KeyNameBuffer); - LayoutKeyName.MaximumLength = sizeof(KeyNameBuffer); - - RtlAppendUnicodeStringToString(&LayoutKeyName, &klid); - Status = ReadRegistryValue(&LayoutKeyName, &LayoutValueName, &LayoutFile); - - if(!NT_SUCCESS(Status)) - { - TRACE("Can't get layout filename for %wZ. (%08lx)\n", klid, Status); - return FALSE; - } - - TRACE("Read registry and got %wZ\n", &LayoutFile); - RtlInitUnicodeString(&FullLayoutPath, LayoutPathBuffer); - FullLayoutPath.MaximumLength = sizeof(LayoutPathBuffer); - RtlAppendUnicodeStringToString(&FullLayoutPath, &LayoutFile); - TRACE("Loading Keyboard DLL %wZ\n", &FullLayoutPath); - ExFreePoolWithTag(LayoutFile.Buffer, TAG_STRING); - - *phModule = EngLoadImage(FullLayoutPath.Buffer); - - if(*phModule) - { - TRACE("Loaded %wZ\n", &FullLayoutPath); - - RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); - layerDescGetFn = EngFindImageProcAddress(*phModule, "KbdLayerDescriptor"); - - if(layerDescGetFn) - { - *pKbdTables = layerDescGetFn(); - } - else - { - ERR("Error: %wZ has no KbdLayerDescriptor()\n", &FullLayoutPath); - } - - if(!layerDescGetFn || !*pKbdTables) - { - ERR("Failed to load the keyboard layout.\n"); - EngUnloadImage(*phModule); - return FALSE; - } + HANDLE *phModule, + PKBDTABLES *pKbdTables) +{ + NTSTATUS Status; + KbdLayerDescriptor layerDescGetFn; + ANSI_STRING kbdProcedureName; + UNICODE_STRING LayoutKeyName; + UNICODE_STRING LayoutValueName; + UNICODE_STRING LayoutFile; + UNICODE_STRING FullLayoutPath; + UNICODE_STRING klid; + WCHAR LayoutPathBuffer[MAX_PATH] = L"\\SystemRoot\\System32\\"; + WCHAR KeyNameBuffer[MAX_PATH] = L"\\REGISTRY\\Machine\\SYSTEM\\" + L"CurrentControlSet\\Control\\Keyboard Layouts\\"; + + RtlInitUnicodeString(&klid, wsKLID); + RtlInitUnicodeString(&LayoutValueName, L"Layout File"); + RtlInitUnicodeString(&LayoutKeyName, KeyNameBuffer); + LayoutKeyName.MaximumLength = sizeof(KeyNameBuffer); + + RtlAppendUnicodeStringToString(&LayoutKeyName, &klid); + Status = ReadRegistryValue(&LayoutKeyName, &LayoutValueName, &LayoutFile); + + if (!NT_SUCCESS(Status)) + { + TRACE("Can't get layout filename for %wZ. (%08lx)\n", klid, Status); + return FALSE; + } + + TRACE("Read registry and got %wZ\n", &LayoutFile); + RtlInitUnicodeString(&FullLayoutPath, LayoutPathBuffer); + FullLayoutPath.MaximumLength = sizeof(LayoutPathBuffer); + RtlAppendUnicodeStringToString(&FullLayoutPath, &LayoutFile); + TRACE("Loading Keyboard DLL %wZ\n", &FullLayoutPath); + ExFreePoolWithTag(LayoutFile.Buffer, TAG_STRING); + + *phModule = EngLoadImage(FullLayoutPath.Buffer); + + if (*phModule) + { + TRACE("Loaded %wZ\n", &FullLayoutPath); + + RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); + layerDescGetFn = EngFindImageProcAddress(*phModule, "KbdLayerDescriptor"); + + if (layerDescGetFn) + { + *pKbdTables = layerDescGetFn(); + } + else + { + ERR("Error: %wZ has no KbdLayerDescriptor()\n", &FullLayoutPath); + } + + if (!layerDescGetFn || !*pKbdTables) + { + ERR("Failed to load the keyboard layout.\n"); + EngUnloadImage(*phModule); + return FALSE; + } #if 0 // Dump keyboard layout - { - unsigned i; - PVK_TO_BIT pVkToBit = (*pKbdTables)->pCharModifiers->pVkToBit; - PVK_TO_WCHAR_TABLE pVkToWchTbl = (*pKbdTables)->pVkToWcharTable; - PVSC_VK pVscVk = (*pKbdTables)->pVSCtoVK_E0; - DbgPrint("Kbd layout: fLocaleFlags %x bMaxVSCtoVK %x\n", (*pKbdTables)->fLocaleFlags, (*pKbdTables)->bMaxVSCtoVK); - DbgPrint("wMaxModBits %x\n", (*pKbdTables)->pCharModifiers->wMaxModBits); - while(pVkToBit->Vk) - { - DbgPrint("VkToBit %x -> %x\n", pVkToBit->Vk, pVkToBit->ModBits); - ++pVkToBit; - } - for(i = 0; i <= (*pKbdTables)->pCharModifiers->wMaxModBits; ++i) - DbgPrint("ModNumber %x -> %x\n", i, (*pKbdTables)->pCharModifiers->ModNumber[i]); - while(pVkToWchTbl->pVkToWchars) - { - PVK_TO_WCHARS1 pVkToWch = pVkToWchTbl->pVkToWchars; - DbgPrint("pVkToWchTbl nModifications %x cbSize %x\n", pVkToWchTbl->nModifications, pVkToWchTbl->cbSize); - while(pVkToWch->VirtualKey) - { - DbgPrint("pVkToWch VirtualKey %x Attributes %x wc { ", pVkToWch->VirtualKey, pVkToWch->Attributes); - for(i = 0; i < pVkToWchTbl->nModifications; ++i) - DbgPrint("%x ", pVkToWch->wch[i]); - DbgPrint("}\n"); - pVkToWch = (PVK_TO_WCHARS1)(((PBYTE)pVkToWch) + pVkToWchTbl->cbSize); - } - ++pVkToWchTbl; - } - DbgPrint("pusVSCtoVK: { "); - for(i = 0; i < (*pKbdTables)->bMaxVSCtoVK; ++i) - DbgPrint("%x -> %x, ", i, (*pKbdTables)->pusVSCtoVK[i]); - DbgPrint("}\n"); - DbgPrint("pVSCtoVK_E0: { "); - while(pVscVk->Vsc) - { - DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); - ++pVscVk; - } - DbgPrint("}\n"); - pVscVk = (*pKbdTables)->pVSCtoVK_E1; - DbgPrint("pVSCtoVK_E1: { "); - while(pVscVk->Vsc) - { - DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); - ++pVscVk; - } - DbgPrint("}\n"); - } - DbgBreakPoint(); + { + unsigned i; + PVK_TO_BIT pVkToBit = (*pKbdTables)->pCharModifiers->pVkToBit; + PVK_TO_WCHAR_TABLE pVkToWchTbl = (*pKbdTables)->pVkToWcharTable; + PVSC_VK pVscVk = (*pKbdTables)->pVSCtoVK_E0; + DbgPrint("Kbd layout: fLocaleFlags %x bMaxVSCtoVK %x\n", (*pKbdTables)->fLocaleFlags, (*pKbdTables)->bMaxVSCtoVK); + DbgPrint("wMaxModBits %x\n", (*pKbdTables)->pCharModifiers->wMaxModBits); + while (pVkToBit->Vk) + { + DbgPrint("VkToBit %x -> %x\n", pVkToBit->Vk, pVkToBit->ModBits); + ++pVkToBit; + } + for (i = 0; i <= (*pKbdTables)->pCharModifiers->wMaxModBits; ++i) + DbgPrint("ModNumber %x -> %x\n", i, (*pKbdTables)->pCharModifiers->ModNumber[i]); + while (pVkToWchTbl->pVkToWchars) + { + PVK_TO_WCHARS1 pVkToWch = pVkToWchTbl->pVkToWchars; + DbgPrint("pVkToWchTbl nModifications %x cbSize %x\n", pVkToWchTbl->nModifications, pVkToWchTbl->cbSize); + while (pVkToWch->VirtualKey) + { + DbgPrint("pVkToWch VirtualKey %x Attributes %x wc { ", pVkToWch->VirtualKey, pVkToWch->Attributes); + for (i = 0; i < pVkToWchTbl->nModifications; ++i) + DbgPrint("%x ", pVkToWch->wch[i]); + DbgPrint("}\n"); + pVkToWch = (PVK_TO_WCHARS1)(((PBYTE)pVkToWch) + pVkToWchTbl->cbSize); + } + ++pVkToWchTbl; + } + DbgPrint("pusVSCtoVK: { "); + for (i = 0; i < (*pKbdTables)->bMaxVSCtoVK; ++i) + DbgPrint("%x -> %x, ", i, (*pKbdTables)->pusVSCtoVK[i]); + DbgPrint("}\n"); + DbgPrint("pVSCtoVK_E0: { "); + while (pVscVk->Vsc) + { + DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); + ++pVscVk; + } + DbgPrint("}\n"); + pVscVk = (*pKbdTables)->pVSCtoVK_E1; + DbgPrint("pVSCtoVK_E1: { "); + while (pVscVk->Vsc) + { + DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); + ++pVscVk; + } + DbgPrint("}\n"); + } + DbgBreakPoint(); #endif - } - else - { - ERR("Failed to load dll %wZ\n", &FullLayoutPath); - return FALSE; - } - - return TRUE; + } + else + { + ERR("Failed to load dll %wZ\n", &FullLayoutPath); + return FALSE; + } + + return TRUE; } static PKBL UserLoadDllAndCreateKbl(DWORD LocaleId) { - PKBL NewKbl; - ULONG hKl; - LANGID langid; - - NewKbl = ExAllocatePoolWithTag(PagedPool, sizeof(KBL), USERTAG_KBDLAYOUT); - - if(!NewKbl) - { - ERR("%s: Can't allocate memory!\n", __FUNCTION__); - return NULL; - } - - swprintf(NewKbl->Name, L"%08lx", LocaleId); - - if(!UserLoadKbdDll(NewKbl->Name, &NewKbl->hModule, &NewKbl->KBTables)) - { - TRACE("%s: failed to load %x dll!\n", __FUNCTION__, LocaleId); - ExFreePoolWithTag(NewKbl, USERTAG_KBDLAYOUT); - return NULL; - } - - /* Microsoft Office expects this value to be something specific - * for Japanese and Korean Windows with an IME the value is 0xe001 - * We should probably check to see if an IME exists and if so then - * set this word properly. - */ - langid = PRIMARYLANGID(LANGIDFROMLCID(LocaleId)); - hKl = LocaleId; - - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - hKl |= 0xe001 << 16; /* FIXME */ - else hKl |= hKl << 16; - - NewKbl->hkl = (HKL)(ULONG_PTR) hKl; - NewKbl->klid = LocaleId; - NewKbl->Flags = 0; - NewKbl->RefCount = 0; - - return NewKbl; + PKBL NewKbl; + ULONG hKl; + LANGID langid; + + NewKbl = ExAllocatePoolWithTag(PagedPool, sizeof(KBL), USERTAG_KBDLAYOUT); + + if (!NewKbl) + { + ERR("%s: Can't allocate memory!\n", __FUNCTION__); + return NULL; + } + + swprintf(NewKbl->Name, L"%08lx", LocaleId); + + if (!UserLoadKbdDll(NewKbl->Name, &NewKbl->hModule, &NewKbl->KBTables)) + { + TRACE("%s: failed to load %x dll!\n", __FUNCTION__, LocaleId); + ExFreePoolWithTag(NewKbl, USERTAG_KBDLAYOUT); + return NULL; + } + + /* Microsoft Office expects this value to be something specific + * for Japanese and Korean Windows with an IME the value is 0xe001 + * We should probably check to see if an IME exists and if so then + * set this word properly. + */ + langid = PRIMARYLANGID(LANGIDFROMLCID(LocaleId)); + hKl = LocaleId; + + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + hKl |= 0xe001 << 16; /* FIXME */ + else hKl |= hKl << 16; + + NewKbl->hkl = (HKL)(ULONG_PTR) hKl; + NewKbl->klid = LocaleId; + NewKbl->Flags = 0; + NewKbl->RefCount = 0; + + return NewKbl; } BOOL UserInitDefaultKeyboardLayout() { - LCID LocaleId; - NTSTATUS Status; - - Status = ZwQueryDefaultLocale(FALSE, &LocaleId); - if (!NT_SUCCESS(Status)) - { - ERR("Could not get default locale (%08lx).\n", Status); - } - else - { - TRACE("DefaultLocale = %08lx\n", LocaleId); - } - - if(!NT_SUCCESS(Status) || !(KBLList = UserLoadDllAndCreateKbl(LocaleId))) - { - ERR("Trying to load US Keyboard Layout.\n"); - LocaleId = 0x409; - - if(!(KBLList = UserLoadDllAndCreateKbl(LocaleId))) - { - ERR("Failed to load any Keyboard Layout\n"); - return FALSE; - } - } - - KBLList->Flags |= KBL_PRELOAD; - - InitializeListHead(&KBLList->List); - return TRUE; + LCID LocaleId; + NTSTATUS Status; + + Status = ZwQueryDefaultLocale(FALSE, &LocaleId); + if (!NT_SUCCESS(Status)) + { + ERR("Could not get default locale (%08lx).\n", Status); + } + else + { + TRACE("DefaultLocale = %08lx\n", LocaleId); + } + + if (!NT_SUCCESS(Status) || !(KBLList = UserLoadDllAndCreateKbl(LocaleId))) + { + ERR("Trying to load US Keyboard Layout.\n"); + LocaleId = 0x409; + + if (!(KBLList = UserLoadDllAndCreateKbl(LocaleId))) + { + ERR("Failed to load any Keyboard Layout\n"); + return FALSE; + } + } + + KBLList->Flags |= KBL_PRELOAD; + + InitializeListHead(&KBLList->List); + return TRUE; } PKBL W32kGetDefaultKeyLayout(VOID) { - const WCHAR szKeyboardLayoutPath[] = L"\\Keyboard Layout\\Preload"; - const WCHAR szDefaultUserPath[] = L"\\REGISTRY\\USER\\.DEFAULT"; - - HANDLE KeyHandle; - LCID LayoutLocaleId = 0; - NTSTATUS Status; - OBJECT_ATTRIBUTES KeyAttributes; - PKBL pKbl; - UNICODE_STRING CurrentUserPath; - UNICODE_STRING FullKeyboardLayoutPath; - UNICODE_STRING LayoutValueName; - UNICODE_STRING LayoutLocaleIdString; - WCHAR wszBuffer[MAX_PATH]; - - // Get the path to HKEY_CURRENT_USER - Status = RtlFormatCurrentUserKeyPath(&CurrentUserPath); - - if( NT_SUCCESS(Status) ) - { - FullKeyboardLayoutPath.Buffer = wszBuffer; - FullKeyboardLayoutPath.MaximumLength = sizeof(wszBuffer); - - // FIXME: Is this 100% correct? - // We're called very early, so HKEY_CURRENT_USER might not be available yet. Check this first. - InitializeObjectAttributes(&KeyAttributes, &CurrentUserPath, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); - - if(Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - // It is not available, so read it from HKEY_USERS\.DEFAULT - FullKeyboardLayoutPath.Length = sizeof(szDefaultUserPath) - sizeof(UNICODE_NULL); - RtlCopyMemory(wszBuffer, szDefaultUserPath, sizeof(szDefaultUserPath)); - } - else - { - // The path is available - ZwClose(KeyHandle); - RtlCopyUnicodeString(&FullKeyboardLayoutPath, &CurrentUserPath); - } - - // Free CurrentUserPath - we dont need it anymore - RtlFreeUnicodeString(&CurrentUserPath); - - Status = RtlAppendUnicodeToString(&FullKeyboardLayoutPath, szKeyboardLayoutPath); - - if( NT_SUCCESS(Status) ) - { - // Return the first keyboard layout listed there - RtlInitUnicodeString(&LayoutValueName, L"1"); - - Status = ReadRegistryValue(&FullKeyboardLayoutPath, &LayoutValueName, &LayoutLocaleIdString); - - if( NT_SUCCESS(Status) ) - { - RtlUnicodeStringToInteger(&LayoutLocaleIdString, 16, &LayoutLocaleId); - ExFreePoolWithTag(LayoutLocaleIdString.Buffer, TAG_STRING); - } - else - ERR("ReadRegistryValue failed! (%08lx).\n", Status); - } - else - ERR("RtlAppendUnicodeToString failed! (%08lx)\n", Status); - } - else - ERR("RtlFormatCurrentUserKeyPath failed! (%08lx)\n", Status); - - if(!LayoutLocaleId) - { - ERR("Assuming default locale for the keyboard layout (0x409 - US)\n"); - LayoutLocaleId = 0x409; - } - - pKbl = KBLList; - do - { - if(pKbl->klid == LayoutLocaleId) - { - return pKbl; - } - - pKbl = (PKBL) pKbl->List.Flink; - } while(pKbl != KBLList); - - TRACE("Loading new default keyboard layout.\n"); - pKbl = UserLoadDllAndCreateKbl(LayoutLocaleId); - - if(!pKbl) - { - TRACE("Failed to load %x!!! Returning any availableKL.\n", LayoutLocaleId); - return KBLList; - } - - InsertTailList(&KBLList->List, &pKbl->List); - return pKbl; + const WCHAR szKeyboardLayoutPath[] = L"\\Keyboard Layout\\Preload"; + const WCHAR szDefaultUserPath[] = L"\\REGISTRY\\USER\\.DEFAULT"; + + HANDLE KeyHandle; + LCID LayoutLocaleId = 0; + NTSTATUS Status; + OBJECT_ATTRIBUTES KeyAttributes; + PKBL pKbl; + UNICODE_STRING CurrentUserPath; + UNICODE_STRING FullKeyboardLayoutPath; + UNICODE_STRING LayoutValueName; + UNICODE_STRING LayoutLocaleIdString; + WCHAR wszBuffer[MAX_PATH]; + + // Get the path to HKEY_CURRENT_USER + Status = RtlFormatCurrentUserKeyPath(&CurrentUserPath); + + if (NT_SUCCESS(Status)) + { + FullKeyboardLayoutPath.Buffer = wszBuffer; + FullKeyboardLayoutPath.MaximumLength = sizeof(wszBuffer); + + // FIXME: Is this 100% correct? + // We're called very early, so HKEY_CURRENT_USER might not be available yet. Check this first. + InitializeObjectAttributes(&KeyAttributes, &CurrentUserPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); + + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + // It is not available, so read it from HKEY_USERS\.DEFAULT + FullKeyboardLayoutPath.Length = sizeof(szDefaultUserPath) - sizeof(UNICODE_NULL); + RtlCopyMemory(wszBuffer, szDefaultUserPath, sizeof(szDefaultUserPath)); + } + else + { + // The path is available + ZwClose(KeyHandle); + RtlCopyUnicodeString(&FullKeyboardLayoutPath, &CurrentUserPath); + } + + // Free CurrentUserPath - we dont need it anymore + RtlFreeUnicodeString(&CurrentUserPath); + + Status = RtlAppendUnicodeToString(&FullKeyboardLayoutPath, szKeyboardLayoutPath); + + if (NT_SUCCESS(Status)) + { + // Return the first keyboard layout listed there + RtlInitUnicodeString(&LayoutValueName, L"1"); + + Status = ReadRegistryValue(&FullKeyboardLayoutPath, &LayoutValueName, &LayoutLocaleIdString); + + if (NT_SUCCESS(Status)) + { + RtlUnicodeStringToInteger(&LayoutLocaleIdString, 16, &LayoutLocaleId); + ExFreePoolWithTag(LayoutLocaleIdString.Buffer, TAG_STRING); + } + else + ERR("ReadRegistryValue failed! (%08lx).\n", Status); + } + else + ERR("RtlAppendUnicodeToString failed! (%08lx)\n", Status); + } + else + ERR("RtlFormatCurrentUserKeyPath failed! (%08lx)\n", Status); + + if (!LayoutLocaleId) + { + ERR("Assuming default locale for the keyboard layout (0x409 - US)\n"); + LayoutLocaleId = 0x409; + } + + pKbl = KBLList; + do + { + if (pKbl->klid == LayoutLocaleId) + { + return pKbl; + } + + pKbl = (PKBL) pKbl->List.Flink; + } while (pKbl != KBLList); + + TRACE("Loading new default keyboard layout.\n"); + pKbl = UserLoadDllAndCreateKbl(LayoutLocaleId); + + if (!pKbl) + { + TRACE("Failed to load %x!!! Returning any availableKL.\n", LayoutLocaleId); + return KBLList; + } + + InsertTailList(&KBLList->List, &pKbl->List); + return pKbl; } PKBL UserHklToKbl(HKL hKl) { - PKBL pKbl = KBLList; - do - { - if(pKbl->hkl == hKl) return pKbl; - pKbl = (PKBL) pKbl->List.Flink; - } while(pKbl != KBLList); - - return NULL; + PKBL pKbl = KBLList; + do + { + if (pKbl->hkl == hKl) return pKbl; + pKbl = (PKBL) pKbl->List.Flink; + } while (pKbl != KBLList); + + return NULL; } BOOL UserUnloadKbl(PKBL pKbl) { - /* According to msdn, UnloadKeyboardLayout can fail - if the keyboard layout identifier was preloaded. */ - - if(pKbl->Flags & KBL_PRELOAD) - { - ERR("Attempted to unload preloaded keyboard layout.\n"); - return FALSE; - } - - if(pKbl->RefCount > 0) - { - /* Layout is used by other threads. - Mark it as unloaded and don't do anything else. */ - pKbl->Flags |= KBL_UNLOAD; - } - else - { - //Unload the layout - EngUnloadImage(pKbl->hModule); - RemoveEntryList(&pKbl->List); - ExFreePoolWithTag(pKbl, USERTAG_KBDLAYOUT); - } - - return TRUE; + /* According to msdn, UnloadKeyboardLayout can fail + if the keyboard layout identifier was preloaded. */ + + if (pKbl->Flags & KBL_PRELOAD) + { + ERR("Attempted to unload preloaded keyboard layout.\n"); + return FALSE; + } + + if (pKbl->RefCount > 0) + { + /* Layout is used by other threads. + Mark it as unloaded and don't do anything else. */ + pKbl->Flags |= KBL_UNLOAD; + } + else + { + //Unload the layout + EngUnloadImage(pKbl->hModule); + RemoveEntryList(&pKbl->List); + ExFreePoolWithTag(pKbl, USERTAG_KBDLAYOUT); + } + + return TRUE; } static PKBL co_UserActivateKbl(PTHREADINFO w32Thread, PKBL pKbl, UINT Flags) { - PKBL Prev; - - Prev = w32Thread->KeyboardLayout; - Prev->RefCount--; - w32Thread->KeyboardLayout = pKbl; - pKbl->RefCount++; - - if(Flags & KLF_SETFORPROCESS) - { - //FIXME - - } - - if(Prev->Flags & KBL_UNLOAD && Prev->RefCount == 0) - { - UserUnloadKbl(Prev); - } - - // Send WM_INPUTLANGCHANGE to thread's focus window - co_IntSendMessage(w32Thread->MessageQueue->FocusWindow, - WM_INPUTLANGCHANGE, - 0, // FIXME: put charset here (what is this?) - (LPARAM)pKbl->hkl); //klid - - return Prev; + PKBL Prev; + + Prev = w32Thread->KeyboardLayout; + Prev->RefCount--; + w32Thread->KeyboardLayout = pKbl; + pKbl->RefCount++; + + if (Flags & KLF_SETFORPROCESS) + { + //FIXME + + } + + if (Prev->Flags & KBL_UNLOAD && Prev->RefCount == 0) + { + UserUnloadKbl(Prev); + } + + // Send WM_INPUTLANGCHANGE to thread's focus window + co_IntSendMessage(w32Thread->MessageQueue->FocusWindow, + WM_INPUTLANGCHANGE, + 0, // FIXME: put charset here (what is this?) + (LPARAM)pKbl->hkl); //klid + + return Prev; } /* EXPORTS *******************************************************************/ HKL FASTCALL UserGetKeyboardLayout( - DWORD dwThreadId) -{ - NTSTATUS Status; - PETHREAD Thread; - PTHREADINFO W32Thread; - HKL Ret; - - if(!dwThreadId) - { - W32Thread = PsGetCurrentThreadWin32Thread(); - return W32Thread->KeyboardLayout->hkl; - } - - Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)dwThreadId, &Thread); - if(!NT_SUCCESS(Status)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - W32Thread = PsGetThreadWin32Thread(Thread); - Ret = W32Thread->KeyboardLayout->hkl; - ObDereferenceObject(Thread); - return Ret; + DWORD dwThreadId) +{ + NTSTATUS Status; + PETHREAD Thread; + PTHREADINFO W32Thread; + HKL Ret; + + if (!dwThreadId) + { + W32Thread = PsGetCurrentThreadWin32Thread(); + return W32Thread->KeyboardLayout->hkl; + } + + Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)dwThreadId, &Thread); + if (!NT_SUCCESS(Status)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + W32Thread = PsGetThreadWin32Thread(Thread); + Ret = W32Thread->KeyboardLayout->hkl; + ObDereferenceObject(Thread); + return Ret; } UINT APIENTRY NtUserGetKeyboardLayoutList( - INT nItems, - HKL* pHklBuff) -{ - UINT Ret = 0; - PKBL pKbl; - - UserEnterShared(); - pKbl = KBLList; - - if(nItems == 0) - { - do - { - Ret++; - pKbl = (PKBL) pKbl->List.Flink; - } while(pKbl != KBLList); - } - else - { - _SEH2_TRY - { - ProbeForWrite(pHklBuff, nItems*sizeof(HKL), 4); - - while(Ret < nItems) - { - if(!(pKbl->Flags & KBL_UNLOAD)) + INT nItems, + HKL* pHklBuff) +{ + UINT Ret = 0; + PKBL pKbl; + + UserEnterShared(); + pKbl = KBLList; + + if (nItems == 0) + { + do + { + Ret++; + pKbl = (PKBL) pKbl->List.Flink; + } while (pKbl != KBLList); + } + else + { + _SEH2_TRY + { + ProbeForWrite(pHklBuff, nItems*sizeof(HKL), 4); + + while (Ret < nItems) { - pHklBuff[Ret] = pKbl->hkl; - Ret++; - pKbl = (PKBL) pKbl->List.Flink; - if(pKbl == KBLList) break; + if (!(pKbl->Flags & KBL_UNLOAD)) + { + pHklBuff[Ret] = pKbl->hkl; + Ret++; + pKbl = (PKBL) pKbl->List.Flink; + if (pKbl == KBLList) break; + } } - } - - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Ret = 0; - } - _SEH2_END; - } - - UserLeave(); - return Ret; + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Ret = 0; + } + _SEH2_END; + } + + UserLeave(); + return Ret; } BOOL APIENTRY NtUserGetKeyboardLayoutName( - LPWSTR lpszName) -{ - BOOL ret = FALSE; - PKBL pKbl; - PTHREADINFO pti; - - UserEnterShared(); - - _SEH2_TRY - { - ProbeForWrite(lpszName, KL_NAMELENGTH*sizeof(WCHAR), 1); - pti = PsGetCurrentThreadWin32Thread(); - pKbl = pti->KeyboardLayout; - RtlCopyMemory(lpszName, pKbl->Name, KL_NAMELENGTH*sizeof(WCHAR)); - ret = TRUE; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - ret = FALSE; - } - _SEH2_END; - - UserLeave(); - return ret; + LPWSTR lpszName) +{ + BOOL ret = FALSE; + PKBL pKbl; + PTHREADINFO pti; + + UserEnterShared(); + + _SEH2_TRY + { + ProbeForWrite(lpszName, KL_NAMELENGTH*sizeof(WCHAR), 1); + pti = PsGetCurrentThreadWin32Thread(); + pKbl = pti->KeyboardLayout; + RtlCopyMemory(lpszName, pKbl->Name, KL_NAMELENGTH*sizeof(WCHAR)); + ret = TRUE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + ret = FALSE; + } + _SEH2_END; + + UserLeave(); + return ret; } HKL APIENTRY NtUserLoadKeyboardLayoutEx( - IN HANDLE Handle, - IN DWORD offTable, - IN PUNICODE_STRING puszKeyboardName, - IN HKL hKL, - IN PUNICODE_STRING puszKLID, - IN DWORD dwKLID, - IN UINT Flags) -{ - HKL Ret = NULL; - PKBL pKbl = NULL, Cur; - - UserEnterExclusive(); - - //Let's see if layout was already loaded. - Cur = KBLList; - do - { - if(Cur->klid == dwKLID) - { - pKbl = Cur; - pKbl->Flags &= ~KBL_UNLOAD; - break; - } - - Cur = (PKBL) Cur->List.Flink; - } while(Cur != KBLList); - - //It wasn't, so load it. - if(!pKbl) - { - pKbl = UserLoadDllAndCreateKbl(dwKLID); - - if(!pKbl) - { - goto the_end; - } - - InsertTailList(&KBLList->List, &pKbl->List); - } - - if(Flags & KLF_REORDER) KBLList = pKbl; - - if(Flags & KLF_ACTIVATE) - { - co_UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl, Flags); - } - - Ret = pKbl->hkl; - - //FIXME: KLF_NOTELLSHELL - // KLF_REPLACELANG - // KLF_SUBSTITUTE_OK + IN HANDLE Handle, + IN DWORD offTable, + IN PUNICODE_STRING puszKeyboardName, + IN HKL hKL, + IN PUNICODE_STRING puszKLID, + IN DWORD dwKLID, + IN UINT Flags) +{ + HKL Ret = NULL; + PKBL pKbl = NULL, Cur; + + UserEnterExclusive(); + + //Let's see if layout was already loaded. + Cur = KBLList; + do + { + if (Cur->klid == dwKLID) + { + pKbl = Cur; + pKbl->Flags &= ~KBL_UNLOAD; + break; + } + + Cur = (PKBL) Cur->List.Flink; + } while (Cur != KBLList); + + //It wasn't, so load it. + if (!pKbl) + { + pKbl = UserLoadDllAndCreateKbl(dwKLID); + + if (!pKbl) + { + goto the_end; + } + + InsertTailList(&KBLList->List, &pKbl->List); + } + + if (Flags & KLF_REORDER) KBLList = pKbl; + + if (Flags & KLF_ACTIVATE) + { + co_UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl, Flags); + } + + Ret = pKbl->hkl; + + //FIXME: KLF_NOTELLSHELL + // KLF_REPLACELANG + // KLF_SUBSTITUTE_OK the_end: - UserLeave(); - return Ret; + UserLeave(); + return Ret; } HKL APIENTRY NtUserActivateKeyboardLayout( - HKL hKl, - ULONG Flags) -{ - PKBL pKbl; - HKL Ret = NULL; - PTHREADINFO pWThread; - - UserEnterExclusive(); - - pWThread = PsGetCurrentThreadWin32Thread(); - - if(pWThread->KeyboardLayout->hkl == hKl) - { - Ret = hKl; - goto the_end; - } - - if(hKl == (HKL)HKL_NEXT) - { - pKbl = (PKBL)pWThread->KeyboardLayout->List.Flink; - } - else if(hKl == (HKL)HKL_PREV) - { - pKbl = (PKBL)pWThread->KeyboardLayout->List.Blink; - } - else pKbl = UserHklToKbl(hKl); - - //FIXME: KLF_RESET, KLF_SHIFTLOCK - - if(pKbl) - { - if(Flags & KLF_REORDER) - KBLList = pKbl; - - if(pKbl == pWThread->KeyboardLayout) - { - Ret = pKbl->hkl; - } - else - { - pKbl = co_UserActivateKbl(pWThread, pKbl, Flags); - Ret = pKbl->hkl; - } - } - else - { - ERR("%s: Invalid HKL %x!\n", __FUNCTION__, hKl); - } + HKL hKl, + ULONG Flags) +{ + PKBL pKbl; + HKL Ret = NULL; + PTHREADINFO pWThread; + + UserEnterExclusive(); + + pWThread = PsGetCurrentThreadWin32Thread(); + + if (pWThread->KeyboardLayout->hkl == hKl) + { + Ret = hKl; + goto the_end; + } + + if (hKl == (HKL)HKL_NEXT) + { + pKbl = (PKBL)pWThread->KeyboardLayout->List.Flink; + } + else if (hKl == (HKL)HKL_PREV) + { + pKbl = (PKBL)pWThread->KeyboardLayout->List.Blink; + } + else pKbl = UserHklToKbl(hKl); + + //FIXME: KLF_RESET, KLF_SHIFTLOCK + + if (pKbl) + { + if (Flags & KLF_REORDER) + KBLList = pKbl; + + if (pKbl == pWThread->KeyboardLayout) + { + Ret = pKbl->hkl; + } + else + { + pKbl = co_UserActivateKbl(pWThread, pKbl, Flags); + Ret = pKbl->hkl; + } + } + else + { + ERR("Invalid HKL %x!\n", hKl); + } the_end: - UserLeave(); - return Ret; + UserLeave(); + return Ret; } BOOL APIENTRY NtUserUnloadKeyboardLayout( - HKL hKl) -{ - PKBL pKbl; - BOOL Ret = FALSE; - - UserEnterExclusive(); - - if((pKbl = UserHklToKbl(hKl))) - { - Ret = UserUnloadKbl(pKbl); - } - else - { - ERR("%s: Invalid HKL %x!\n", __FUNCTION__, hKl); - } - - UserLeave(); - return Ret; + HKL hKl) +{ + PKBL pKbl; + BOOL Ret = FALSE; + + UserEnterExclusive(); + + if ((pKbl = UserHklToKbl(hKl))) + { + Ret = UserUnloadKbl(pKbl); + } + else + { + ERR("Invalid HKL %x!\n", hKl); + } + + UserLeave(); + return Ret; } /* EOF */

12 years, 11 months

[rharabien] 54159: [WIN32K] - Merge KeyboardInput thread and MouseInputThread into Raw Input Thread (RIT)

by rharabien＠svn.reactos.org

Author: rharabien Date: Sun Oct 16 11:39:47 2011 New Revision: 54159 URL: http://svn.reactos.org/svn/reactos?rev=54159&view=rev Log: [WIN32K] - Merge KeyboardInput thread and MouseInputThread into Raw Input Thread (RIT) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun Oct 16 11:39:47 2011 @@ -182,7 +182,7 @@ WINAPI CreateSystemThreads(PVOID pParam) { - NtUserCallOneParam((DWORD_PTR)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); + NtUserCallOneParam((DWORD)pParam, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); DPRINT1("This thread should not terminate!\n"); return 0; } @@ -196,7 +196,6 @@ HANDLE ServerThread; CLIENT_ID ClientId; NTSTATUS Status; - UINT i; CsrExports = *Exports; Win32CsrApiHeap = CsrssApiHeap; @@ -215,18 +214,15 @@ RtlInitializeCriticalSection(&Win32CsrDefineDosDeviceCritSec); InitializeListHead(&DosDeviceHistory); - /* Start Keyboard, Mouse and Raw Input Threads */ - for (i = 0; i < 3; ++i) - { - Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)i, &ServerThread, &ClientId); - if (NT_SUCCESS(Status)) - { - NtResumeThread(ServerThread, NULL); - NtClose(ServerThread); - } - else - DPRINT1("Cannot start system thread: %u!\n", i); - } + /* Start Raw Input Threads */ + Status = RtlCreateUserThread(NtCurrentProcess(), NULL, TRUE, 0, 0, 0, (PTHREAD_START_ROUTINE)CreateSystemThreads, (PVOID)0, &ServerThread, &ClientId); + if (NT_SUCCESS(Status)) + { + NtResumeThread(ServerThread, NULL); + NtClose(ServerThread); + } + else + DPRINT1("Cannot start Raw Input Thread!\n"); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Oct 16 11:39:47 2011 @@ -23,12 +23,15 @@ HANDLE ghKeyboardDevice; static DWORD LastInputTick = 0; -static HANDLE MouseDeviceHandle; -static KEVENT InputThreadsStart; -static BOOLEAN InputThreadsRunning = FALSE; +static HANDLE ghMouseDevice; /* FUNCTIONS *****************************************************************/ +/* + * IntLastInputTick + * + * Updates or gets last input tick count + */ static DWORD FASTCALL IntLastInputTick(BOOL bUpdate) { @@ -42,6 +45,11 @@ return LastInputTick; } +/* + * DoTheScreenSaver + * + * Check if scrensaver should be started and sends message to SAS window + */ VOID FASTCALL DoTheScreenSaver(VOID) { @@ -78,210 +86,201 @@ } } -static VOID APIENTRY -MouseThreadMain(PVOID StartContext) -{ - UNICODE_STRING MouseDeviceName = RTL_CONSTANT_STRING(L"\\Device\\PointerClass0"); - OBJECT_ATTRIBUTES MouseObjectAttributes; +/* + * OpenInputDevice + * + * Opens input device for asynchronous access + */ +static +NTAPI NTSTATUS +OpenInputDevice(PHANDLE pHandle, PFILE_OBJECT *ppObject, CONST WCHAR *pszDeviceName) +{ + UNICODE_STRING DeviceName; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - MOUSE_ATTRIBUTES MouseAttr; - - KeSetPriorityThread(&PsGetCurrentThread()->Tcb, - LOW_REALTIME_PRIORITY + 3); - - InitializeObjectAttributes(&MouseObjectAttributes, - &MouseDeviceName, + + RtlInitUnicodeString(&DeviceName, pszDeviceName); + + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, 0, NULL, NULL); - do - { - LARGE_INTEGER DueTime; + + Status = ZwOpenFile(pHandle, + FILE_ALL_ACCESS, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (NT_SUCCESS(Status) && ppObject) + { + Status = ObReferenceObjectByHandle(*pHandle, SYNCHRONIZE, NULL, KernelMode, (PVOID*)ppObject, NULL); + ASSERT(NT_SUCCESS(Status)); + } + + return Status; +} + +/* + * RawInputThreadMain + * + * Reads data from input devices and supports win32 timers + */ +VOID NTAPI +RawInputThreadMain() +{ + NTSTATUS MouStatus = STATUS_UNSUCCESSFUL, KbdStatus = STATUS_UNSUCCESSFUL, Status; + IO_STATUS_BLOCK MouIosb, KbdIosb; + PFILE_OBJECT pKbdDevice, pMouDevice; + LARGE_INTEGER WaitTimeout, ByteOffset; + PVOID WaitObjects[3], pSignaledObject = NULL; + ULONG cWaitObjects = 0, cMaxWaitObjects = 1; + MOUSE_INPUT_DATA MouseInput; + KEYBOARD_INPUT_DATA KeyInput; + + ByteOffset.QuadPart = (LONGLONG)0; + WaitTimeout.QuadPart = (LONGLONG)(-10000000); + + /*do + { KEVENT Event; - DueTime.QuadPart = (LONGLONG)(-10000000); KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); - Status = ZwOpenFile(&MouseDeviceHandle, - FILE_ALL_ACCESS, - &MouseObjectAttributes, - &Iosb, - 0, - FILE_SYNCHRONOUS_IO_ALERT); - } while (!NT_SUCCESS(Status)); - - ptiMouse = PsGetCurrentThreadWin32Thread(); - ptiMouse->TIF_flags |= TIF_SYSTEMTHREAD; - TRACE("Mouse Thread 0x%x \n", ptiMouse); + Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &WaitTimeout); + } while (!NT_SUCCESS(Status));*/ + + ptiRawInput = PsGetCurrentThreadWin32Thread(); + ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD; + TRACE("Raw Input Thread 0x%x\n", ptiRawInput); KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); + UserEnterExclusive(); + StartTheTimers(); + UserLeave(); + for(;;) { - /* - * Wait to start input. - */ - TRACE("Mouse Input Thread Waiting for start event\n"); - Status = KeWaitForSingleObject(&InputThreadsStart, - 0, - KernelMode, - TRUE, - NULL); - TRACE("Mouse Input Thread Starting...\n"); - - /*FIXME: Does mouse attributes need to be used for anything */ - Status = ZwDeviceIoControlFile(MouseDeviceHandle, + if (!ghMouseDevice) + { + /* Check if mouse device already exists */ + Status = OpenInputDevice(&ghMouseDevice, &pMouDevice, L"\\Device\\PointerClass0" ); + if (NT_SUCCESS(Status)) + { + ++cMaxWaitObjects; + TRACE("Mouse connected!\n"); + } + } + if (!ghKeyboardDevice) + { + /* Check if keyboard device already exists */ + Status = OpenInputDevice(&ghKeyboardDevice, &pKbdDevice, L"\\Device\\KeyboardClass0"); + if (NT_SUCCESS(Status)) + { + ++cMaxWaitObjects; + TRACE("Keyboard connected!\n"); + } + } + + /* Reset WaitHandles array */ + cWaitObjects = 0; + WaitObjects[cWaitObjects++] = MasterTimer; + + if (ghMouseDevice) + { + /* Try to read from mouse if previous reading is not pending */ + if (MouStatus != STATUS_PENDING) + { + MouStatus = ZwReadFile(ghMouseDevice, NULL, NULL, NULL, - &Iosb, - IOCTL_MOUSE_QUERY_ATTRIBUTES, - &MouseAttr, sizeof(MOUSE_ATTRIBUTES), - NULL, 0); - if(!NT_SUCCESS(Status)) - { - TRACE("Failed to get mouse attributes\n"); - } - - /* - * Receive and process mouse input. - */ - while(InputThreadsRunning) - { - MOUSE_INPUT_DATA MouseInput; - Status = ZwReadFile(MouseDeviceHandle, - NULL, - NULL, - NULL, - &Iosb, - &MouseInput, - sizeof(MOUSE_INPUT_DATA), - NULL, - NULL); - if(Status == STATUS_ALERTED && !InputThreadsRunning) - { - break; - } - if(Status == STATUS_PENDING) - { - NtWaitForSingleObject(MouseDeviceHandle, FALSE, NULL); - Status = Iosb.Status; - } - if(!NT_SUCCESS(Status)) - { - ERR("Win32K: Failed to read from mouse.\n"); - return; //(Status); - } + &MouIosb, + &MouseInput, + sizeof(MOUSE_INPUT_DATA), + &ByteOffset, + NULL); + } + + if (MouStatus == STATUS_PENDING) + WaitObjects[cWaitObjects++] = &pMouDevice->Event; + } + + if (ghKeyboardDevice) + { + /* Try to read from keyboard if previous reading is not pending */ + if (KbdStatus != STATUS_PENDING) + { + KbdStatus = ZwReadFile(ghKeyboardDevice, + NULL, + NULL, + NULL, + &KbdIosb, + &KeyInput, + sizeof(KEYBOARD_INPUT_DATA), + &ByteOffset, + NULL); + + } + if (KbdStatus == STATUS_PENDING) + WaitObjects[cWaitObjects++] = &pKbdDevice->Event; + } + + /* If all objects are pending, wait for them */ + if (cWaitObjects == cMaxWaitObjects) + { + Status = KeWaitForMultipleObjects(cWaitObjects, + WaitObjects, + WaitAny, + UserRequest, + KernelMode, + TRUE, + NULL,//&WaitTimeout, + NULL); + + if (Status >= STATUS_WAIT_0 && Status < STATUS_WAIT_0 + cWaitObjects) + { + /* Some device has finished reading */ + pSignaledObject = WaitObjects[Status - STATUS_WAIT_0]; + + /* Check if it is mouse or keyboard and update status */ + if (pSignaledObject == &pMouDevice->Event) + MouStatus = MouIosb.Status; + else if (pSignaledObject == &pKbdDevice->Event) + KbdStatus = KbdIosb.Status; + else if (pSignaledObject == MasterTimer) + { + /* FIXME: where it should go? */ + ProcessTimers(); + } + else ASSERT(FALSE); + } + } + + /* Have we successed reading from mouse? */ + if (NT_SUCCESS(MouStatus) && MouStatus != STATUS_PENDING) + { TRACE("MouseEvent\n"); + + /* Set LastInputTick */ IntLastInputTick(TRUE); + /* Process data */ UserEnterExclusive(); - - UserProcessMouseInput(&MouseInput, Iosb.Information / sizeof(MOUSE_INPUT_DATA)); - + UserProcessMouseInput(&MouseInput, MouIosb.Information / sizeof(MOUSE_INPUT_DATA)); UserLeave(); } - TRACE("Mouse Input Thread Stopped...\n"); - } -} - -VOID NTAPI -KeyboardThreadMain(PVOID StartContext) -{ - UNICODE_STRING KeyboardDeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0"); - OBJECT_ATTRIBUTES KeyboardObjectAttributes; - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - - InitializeObjectAttributes(&KeyboardObjectAttributes, - &KeyboardDeviceName, - 0, - NULL, - NULL); - do - { - LARGE_INTEGER DueTime; - KEVENT Event; - DueTime.QuadPart = (LONGLONG)(-100000000); - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); - Status = ZwOpenFile(&ghKeyboardDevice, - FILE_READ_ACCESS,//FILE_ALL_ACCESS, - &KeyboardObjectAttributes, - &Iosb, - 0, - FILE_SYNCHRONOUS_IO_ALERT); - } while (!NT_SUCCESS(Status)); - - UserInitKeyboard(ghKeyboardDevice); - - ptiKeyboard = PsGetCurrentThreadWin32Thread(); - ptiKeyboard->TIF_flags |= TIF_SYSTEMTHREAD; - TRACE("Keyboard Thread 0x%x \n", ptiKeyboard); - - KeSetPriorityThread(&PsGetCurrentThread()->Tcb, - LOW_REALTIME_PRIORITY + 3); - - for (;;) - { - /* - * Wait to start input. - */ - TRACE("Keyboard Input Thread Waiting for start event\n"); - Status = KeWaitForSingleObject(&InputThreadsStart, - 0, - KernelMode, - TRUE, - NULL); - - TRACE("Keyboard Input Thread Starting...\n"); - /* - * Receive and process keyboard input. - */ - while (InputThreadsRunning) - { - KEYBOARD_INPUT_DATA KeyInput; - - TRACE("KeyInput @ %08x\n", &KeyInput); - - Status = ZwReadFile (ghKeyboardDevice, - NULL, - NULL, - NULL, - &Iosb, - &KeyInput, - sizeof(KEYBOARD_INPUT_DATA), - NULL, - NULL); - - if (Status == STATUS_ALERTED && !InputThreadsRunning) - { - break; - } - if (Status == STATUS_PENDING) - { - NtWaitForSingleObject(ghKeyboardDevice, FALSE, NULL); - Status = Iosb.Status; - } - if (!NT_SUCCESS(Status)) - { - ERR("Win32K: Failed to read from keyboard.\n"); - return; //(Status); - } - - TRACE("KeyRaw: %s %04x\n", + else if (MouStatus != STATUS_PENDING) + ERR("Failed to read from mouse: %x.\n", MouStatus); + + /* Have we successed reading from keyboard? */ + if (NT_SUCCESS(KbdStatus) && KbdStatus != STATUS_PENDING) + { + TRACE("KeyboardEvent: %s %04x\n", (KeyInput.Flags & KEY_BREAK) ? "up" : "down", - KeyInput.MakeCode ); - - if (Status == STATUS_ALERTED && !InputThreadsRunning) - break; - - if (!NT_SUCCESS(Status)) - { - ERR("Win32K: Failed to read from keyboard.\n"); - return; //(Status); - } + KeyInput.MakeCode); /* Set LastInputTick */ IntLastInputTick(TRUE); @@ -291,68 +290,18 @@ UserProcessKeyboardInput(&KeyInput); UserLeave(); } - - TRACE("KeyboardInput Thread Stopped...\n"); - } -} - - -static PVOID Objects[2]; -/* - Raw Input Thread. - Since this relies on InputThreadsStart, just fake it. - */ -static VOID APIENTRY -RawInputThreadMain(PVOID StartContext) -{ - NTSTATUS Status; - LARGE_INTEGER DueTime; - - DueTime.QuadPart = (LONGLONG)(-10000000); - - do - { - KEVENT Event; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &DueTime); - } while (!NT_SUCCESS(Status)); - - Objects[0] = &InputThreadsStart; - Objects[1] = MasterTimer; - - ptiRawInput = PsGetCurrentThreadWin32Thread(); - ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD; - TRACE("Raw Input Thread 0x%x \n", ptiRawInput); - - KeSetPriorityThread(&PsGetCurrentThread()->Tcb, - LOW_REALTIME_PRIORITY + 3); - - UserEnterExclusive(); - StartTheTimers(); - UserLeave(); - - // - // ATM, we just have one job to handle, merge the other two later. - // - for(;;) - { - TRACE("Raw Input Thread Waiting for start event\n"); - - Status = KeWaitForMultipleObjects( 2, - Objects, - WaitAll, //WaitAny, - WrUserRequest, - KernelMode, - TRUE, - NULL, - NULL); - TRACE("Raw Input Thread Starting...\n"); - - ProcessTimers(); + else if (KbdStatus != STATUS_PENDING) + ERR("Failed to read from keyboard: %x.\n", KbdStatus); } ERR("Raw Input Thread Exit!\n"); } +/* + * CreateSystemThreads + * + * Called form dedicated thread in CSRSS. RIT is started in context of this + * thread because it needs valid Win32 process with TEB initialized + */ DWORD NTAPI CreateSystemThreads(UINT Type) { @@ -360,9 +309,7 @@ switch (Type) { - case 0: KeyboardThreadMain(NULL); break; - case 1: MouseThreadMain(NULL); break; - case 2: RawInputThreadMain(NULL); break; + case 0: RawInputThreadMain(); break; default: ERR("Wrong type: %x\n", Type); } @@ -371,38 +318,43 @@ return 0; } +/* + * InitInputImpl + * + * Inits input implementation + */ INIT_FUNCTION NTSTATUS NTAPI InitInputImpl(VOID) { - KeInitializeEvent(&InputThreadsStart, NotificationEvent, FALSE); - MasterTimer = ExAllocatePoolWithTag(NonPagedPool, sizeof(KTIMER), USERTAG_SYSTEM); if (!MasterTimer) { - ERR("Win32K: Failed making Raw Input thread a win32 thread.\n"); + ERR("Failed to allocate memory\n"); ASSERT(FALSE); return STATUS_UNSUCCESSFUL; } KeInitializeTimer(MasterTimer); /* Initialize the default keyboard layout */ - if(!UserInitDefaultKeyboardLayout()) + if (!UserInitDefaultKeyboardLayout()) { ERR("Failed to initialize default keyboard layout!\n"); } - InputThreadsRunning = TRUE; - KeSetEvent(&InputThreadsStart, IO_NO_INCREMENT, FALSE); - return STATUS_SUCCESS; } +/* + * CleanupInputImp + * + * Cleans input implementation + */ NTSTATUS FASTCALL CleanupInputImp(VOID) { - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } BOOL FASTCALL @@ -517,6 +469,11 @@ return TRUE; } +/* + * NtUserSendInput + * + * Generates input events from software + */ UINT APIENTRY NtUserSendInput(

12 years, 11 months

[tfaber] 54158: [NTDLL_WINETEST] - Fix MSVC build. Already sent upstream(TM)

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 16 11:26:06 2011 New Revision: 54158 URL: http://svn.reactos.org/svn/reactos?rev=54158&view=rev Log: [NTDLL_WINETEST] - Fix MSVC build. Already sent upstream(TM) Modified: trunk/rostests/winetests/ntdll/string.c Modified: trunk/rostests/winetests/ntdll/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/string.c?… ============================================================================== --- trunk/rostests/winetests/ntdll/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/string.c [iso-8859-1] Sun Oct 16 11:26:06 2011 @@ -1165,7 +1165,7 @@ ok(p_wcsupr((LPWSTR)constemptyW) == constemptyW, "p_wcsupr returned different string\n"); } -static __cdecl int intcomparefunc(const void *a, const void *b) +static int __cdecl intcomparefunc(const void *a, const void *b) { const int *p = a, *q = b; @@ -1174,7 +1174,7 @@ return *p - *q; } -static __cdecl int charcomparefunc(const void *a, const void *b) +static int __cdecl charcomparefunc(const void *a, const void *b) { const char *p = a, *q = b; @@ -1183,7 +1183,7 @@ return *p - *q; } -static __cdecl int strcomparefunc(const void *a, const void *b) +static int __cdecl strcomparefunc(const void *a, const void *b) { const char * const *p = a; const char * const *q = b;

12 years, 11 months

[tfaber] 54157: [CMAKE] - Do not exclude itss, msxml3 and qmgr from MSVC build, as they build just fine

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 16 09:33:22 2011 New Revision: 54157 URL: http://svn.reactos.org/svn/reactos?rev=54157&view=rev Log: [CMAKE] - Do not exclude itss, msxml3 and qmgr from MSVC build, as they build just fine Modified: trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sun Oct 16 09:33:22 2011 @@ -60,9 +60,7 @@ add_subdirectory(iphlpapi) #add_subdirectory(iprtprio) # not built in trunk add_subdirectory(itircl) -if(NOT MSVC) - add_subdirectory(itss) # FIXME: msvc build. -endif() +add_subdirectory(itss) add_subdirectory(jscript) add_subdirectory(kernel32) add_subdirectory(loadperf) @@ -115,9 +113,7 @@ add_subdirectory(msvfw32) add_subdirectory(msvidc32) add_subdirectory(mswsock) -if(NOT MSVC) - add_subdirectory(msxml3) # FIXME: msvc build. -endif() +add_subdirectory(msxml3) add_subdirectory(nddeapi) add_subdirectory(netapi32) add_subdirectory(netcfgx) @@ -147,9 +143,7 @@ add_subdirectory(printui) add_subdirectory(psapi) add_subdirectory(pstorec) -if(NOT MSVC) - add_subdirectory(qmgr) # FIXME: msvc build. -endif() +add_subdirectory(qmgr) add_subdirectory(qmgrprxy) add_subdirectory(query) add_subdirectory(rasadhlp)

12 years, 11 months

[tkreuzer] 54156: [WIN32K] - Fix insertion of the GRAPHICS_DEVICE into the global list. Fixes mode enumeration when the 2nd adapter is used. - Remove a hack.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 16 09:15:19 2011 New Revision: 54156 URL: http://svn.reactos.org/svn/reactos?rev=54156&view=rev Log: [WIN32K] - Fix insertion of the GRAPHICS_DEVICE into the global list. Fixes mode enumeration when the 2nd adapter is used. - Remove a hack. Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Sun Oct 16 09:15:19 2011 @@ -220,7 +220,9 @@ EngAcquireSemaphore(ghsemGraphicsDeviceList); /* Insert the device into the global list */ - pGraphicsDevice->pNextGraphicsDevice = gpGraphicsDeviceLast; + pGraphicsDevice->pNextGraphicsDevice = NULL; + if (gpGraphicsDeviceLast) + gpGraphicsDeviceLast->pNextGraphicsDevice = pGraphicsDevice; gpGraphicsDeviceLast = pGraphicsDevice; if (!gpGraphicsDeviceFirst) gpGraphicsDeviceFirst = pGraphicsDevice; @@ -246,11 +248,13 @@ UNICODE_STRING ustrCurrent; PGRAPHICS_DEVICE pGraphicsDevice; ULONG i; + DPRINT("EngpFindGraphicsDevice('%wZ', %ld, 0x%lx)\n", + pustrDevice, iDevNum, dwFlags); /* Lock list */ EngAcquireSemaphore(ghsemGraphicsDeviceList); - if (pustrDevice) + if (pustrDevice && pustrDevice->Buffer) { /* Loop through the list of devices */ for (pGraphicsDevice = gpGraphicsDeviceFirst; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Sun Oct 16 09:15:19 2011 @@ -307,7 +307,7 @@ return STATUS_UNSUCCESSFUL; } - /* Open thhe device map registry key */ + /* Open the device map registry key */ Status = RegOpenKey(KEY_VIDEO, &hkey); if (!NT_SUCCESS(Status)) { @@ -354,10 +354,6 @@ TRACE("Enter NtUserEnumDisplayDevices(%wZ, %ld)\n", pustrDevice, iDevNum); - // FIXME: HACK, desk.cpl passes broken crap - if (pustrDevice && iDevNum != 0) - return FALSE; - dispdev.cb = sizeof(dispdev); if (pustrDevice) @@ -423,7 +419,7 @@ _SEH2_END } - ERR("Leave NtUserEnumDisplayDevices, Status = 0x%lx\n", Status); + TRACE("Leave NtUserEnumDisplayDevices, Status = 0x%lx\n", Status); /* Return the result */ // return Status; return NT_SUCCESS(Status); // FIXME @@ -464,8 +460,8 @@ PDEVMODEENTRY pdmentry; ULONG i, iFoundMode; - TRACE("Enter UserEnumDisplaySettings('%ls', %ld)\n", - pustrDevice ? pustrDevice->Buffer : NULL, iModeNum); + TRACE("Enter UserEnumDisplaySettings('%wZ', %ld)\n", + pustrDevice, iModeNum); /* Ask gdi for the GRAPHICS_DEVICE */ pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0); @@ -570,8 +566,8 @@ ULONG cbSize, cbExtra; DEVMODEW dmReg, *pdm; - TRACE("Enter NtUserEnumDisplaySettings(%ls, %ld)\n", - pustrDevice ? pustrDevice->Buffer : 0, iModeNum); + TRACE("Enter NtUserEnumDisplaySettings(%wZ, %ld, %p, 0x%lx)\n", + pustrDevice, iModeNum, lpDevMode, dwFlags); if (pustrDevice) {

12 years, 11 months

[tfaber] 54155: [TRANSLATION] - Fix some German formal addressing

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 16 07:57:59 2011 New Revision: 54155 URL: http://svn.reactos.org/svn/reactos?rev=54155&view=rev Log: [TRANSLATION] - Fix some German formal addressing Modified: trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/joy/lang/de-DE.rc trunk/reactos/dll/cpl/liccpa/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/win32/comdlg32/cdlg_De.rc trunk/reactos/dll/win32/devmgr/lang/de-DE.rc trunk/reactos/dll/win32/netid/lang/de-DE.rc trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/tapiui/lang/de-DE.rc trunk/reactos/dll/win32/winmm/winmm_De.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -231,7 +231,7 @@ CAPTION "Auswahl des Explorerfenster-Modus" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Bitte wählen Sie ihr bevorzugtes Explorer Userinterface:", + LTEXT "Bitte wählen Sie Ihr bevorzugtes Explorer Userinterface:", IDC_STATIC,7,7,160,8 CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -142,7 +142,7 @@ AUTORADIOBUTTON "Sch&nelle Anschläge ignorieren und Wiederholrate verlangsamen",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHEETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE PUSHBUTTON "&Einstellungen",IDC_FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PROPSHEETPADDING(15),14,WS_GROUP PUSHBUTTON "E&instellungen",IDC_FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,PROPSHEETPADDING(15),14,WS_GROUP - LTEXT "&Klicken Sie hier und geben sie zum Test der Einstellungen etwas ein:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "&Klicken Sie hier und geben Sie zum Test der Einstellungen etwas ein:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) EDITTEXT IDC_FILTER_TEST_EDIT,PROPSHEETPADDING(2),LABELLINE(15)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),14,WS_GROUP|ES_AUTOHSCROLL GROUPBOX "Benachrichtigung",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+3 @@ -295,7 +295,7 @@ STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Bedienbarkeit" - IDS_CPLSYSTEMDESCRIPTION "Stellen sie die Bedienbarkeitsfunktionen für ihren Computer ein." + IDS_CPLSYSTEMDESCRIPTION "Stellen Sie die Bedienbarkeitsfunktionen für Ihren Computer ein." IDS_SENTRY_NONE "[Keine]" IDS_SENTRY_TITLE "Aktive Titelleiste blinkt" Modified: trunk/reactos/dll/cpl/joy/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/de-DE.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/joy/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -25,7 +25,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 - LTEXT "Wählen Sie einen Spielcontroller aus der Liste und klicken Sie auf OK. Wenn ihr Spielcontroller nicht in der Liste erscheint, klicken Sie auf Benutzerdefiniert.", -1, 35, 7, 210, 33 + LTEXT "Wählen Sie einen Spielcontroller aus der Liste und klicken Sie auf OK. Wenn Ihr Spielcontroller nicht in der Liste erscheint, klicken Sie auf Benutzerdefiniert.", -1, 35, 7, 210, 33 LTEXT "&Spielcontroller:", -1, 8, 45, 126, 8 LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP AUTOCHECKBOX "&Ruder und Pedale aktivieren", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 105, 10, WS_GROUP Modified: trunk/reactos/dll/cpl/liccpa/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/liccpa/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -4,7 +4,7 @@ IDD_PROPPAGE1 DIALOGEX DISCARDABLE 20, 40, 315, 104 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_OVERLAPPED | WS_CAPTION | WS_VISIBLE | WS_SYSMENU -CAPTION "Wählen sie den Lizenzmodus aus" +CAPTION "Wählen Sie den Lizenzmodus aus" FONT 8, "Helv" BEGIN CONTROL "Client-Lizenzierungsmodus", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -273,7 +273,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CPLSYSTEMNAME "System" - IDS_CPLSYSTEMDESCRIPTION "Zeigt Informationen über ihren Computer an und ändert verschiedene Computer- und Hardware-Einstellungen" + IDS_CPLSYSTEMDESCRIPTION "Zeigt Informationen über Ihren Computer an und ändert verschiedene Computer- und Hardware-Einstellungen" IDS_MEGABYTE "MB RAM" IDS_GIGABYTE "GB RAM" IDS_TERABYTE "TB RAM" Modified: trunk/reactos/dll/win32/comdlg32/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_De… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_De.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -369,7 +369,7 @@ IDS_SYSTEMFOLDERS "System Ordner" IDS_LOCALHARDRIVES "Lokale Festplatten" IDS_FILENOTFOUND "Datei nicht gefunden" - IDS_VERIFYFILE "Bitte Ã¼berprÃ¼fen sie, ob der korrekte Dateiname angegeben wurde" + IDS_VERIFYFILE "Bitte Ã¼berprÃ¼fen Sie, ob der korrekte Dateiname angegeben wurde" IDS_CREATEFILE "Die Datei existiert nicht.\nWollen Sie sie neu anlegen?" IDS_OVERWRITEFILE "Die Datei existiert bereits.\nWollen Sie sie Ã¼berschreiben?" IDS_INVALID_FILENAME_TITLE "UnzulÃ¤ssige Zeichen im Pfad" @@ -393,7 +393,7 @@ PD32_VALUE_UREADABLE "Unlesbarer Eintrag" PD32_INVALID_PAGE_RANGE "Dieser Wert liegt nicht auf der Seite.\n\ -Bitte geben sie einen Wert zwischen %d und %d an." +Bitte geben Sie einen Wert zwischen %d und %d an." PD32_FROM_NOT_ABOVE_TO "Der 'von' Eintrag kann nicht grÃ¶Ãer sein als der 'bis' Eintrag." PD32_MARGINS_OVERLAP "Die RÃ¤nder Ã¼berlappen oder sind auÃerhalb des Papiers.\nBitte die RÃ¤nder neu eingeben." PD32_NR_OF_COPIES_EMPTY "Es muss ein Wert bei der Anzahl der Kopien angegeben werden." Modified: trunk/reactos/dll/win32/devmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -37,7 +37,7 @@ IDS_DEV_NOT_CONFIGURED "Dieses Gerät ist nicht richtig konfiguriert." IDS_DEV_DEVLOADER_FAILED "ReactOS konnte den Treiber für dieses Gerät nicht laden, weil der Computer zwei $1 Bustypen meldet." IDS_DEV_DEVLOADER_FAILED2 "Der/die $1 Gerätelader für dieses Gerät konnte den Gerätetreiber nicht laden." - IDS_DEV_OUT_OF_MEMORY "Der Treiber für dieses Gerät könnte beschädigt sein, oder ihr System verfügt über zu wenig Speicher oder andere Ressourcen." + IDS_DEV_OUT_OF_MEMORY "Der Treiber für dieses Gerät könnte beschädigt sein, oder Ihr System verfügt über zu wenig Speicher oder andere Ressourcen." IDS_DEV_ENTRY_IS_WRONG_TYPE "Dieses Gerät arbeitet nicht korrekt, weil einer seiner Treiber oder die Registry beschädigt ist." IDS_DEV_LACKED_ARBITRATOR "Der Treiber dieses Gerätes hat eine Ressource angefragt, die ReactOS nicht behandeln kann." IDS_DEV_BOOT_CONFIG_CONFLICT "Ein anderes Gerät benutzt bereits die Ressourcen, die dieses Gerät benötigt." @@ -73,7 +73,7 @@ IDS_DEV_FAILED_ADD "Dieses Gerät arbeitet nicht korrekt, weil $1 nicht korrekt funktioniert." IDS_DEV_DISABLED_SERVICE "ReactOS kann die Treiber für dieses Gerät nicht installieren, weil auf das (Netz-)Laufwerk, auf dem die Installationsdateien abgelegt sind, nicht zugegriffen werden kann." IDS_DEV_TRANSLATION_FAILED "Dieses Gerät reagiert nicht auf seinen Treiber." - IDS_DEV_NO_SOFTCONFIG "ReactOS kann die Einstellungen für dieses Gerät nicht feststellen. Lesen sie die Dokumentation, die mit diesem Gerät kam und benutzen sie den Reiter ""Ressourcen"" umd die Konfiguration vorzunehmen." + IDS_DEV_NO_SOFTCONFIG "ReactOS kann die Einstellungen für dieses Gerät nicht feststellen. Lesen Sie die Dokumentation, die mit diesem Gerät kam und benutzen Sie den Reiter ""Ressourcen"" umd die Konfiguration vorzunehmen." IDS_DEV_BIOS_TABLE "Die System-Firmware ihres Computers beinhaltet nicht genug Information um dieses Gerät korrekt konfigurieren und benutzen zu können. Um dieses Gerät benutzen zu können, kontaktieren Sie bitte Ihren Computerhersteller um ein Firmware- oder BIOS-Update zu erhalten." IDS_DEV_IRQ_TRANSLATION_FAILED "Dieses Gerät beantragt einen PCI-Interrupt, ist aber für einen ISA-Interrupt konfiguriert (oder andersherum). Bitte benutzen Sie das System-Setup Programm dieses Computers, um den Interrupt für dieses Gerät neu zu konfigurieren." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS kann den Gerätetreiber für dieses Gerät nicht initialisieren." Modified: trunk/reactos/dll/win32/netid/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/de-DE… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -14,7 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON - LTEXT "ReactOS benutzt folgende Informationen, um ihren Computer im Netzwerk zu identifizieren.", IDC_STATIC, 40, 5, 204, 20 + LTEXT "ReactOS benutzt folgende Informationen, um Ihren Computer im Netzwerk zu identifizieren.", IDC_STATIC, 40, 5, 204, 20 LTEXT "Computerbeschreibung:", IDC_STATIC, 6, 40, 80, 9 EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Computername:", IDC_STATIC, 6, 68, 64, 9 Modified: trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -439,7 +439,7 @@ CAPTION "X.25-Anmeldeeinstellungen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Wählen Sie ihren X.25 Netzwerkanbieter and und geben Sie ihre X.121 Adresse des Remoteservers ein:", 1408, 7, 4, 220, 27 + LTEXT "Wählen Sie Ihren X.25 Netzwerkanbieter and und geben Sie Ihre X.121 Adresse des Remoteservers ein:", 1408, 7, 4, 220, 27 LTEXT "&Netzwerk:", 1410, 9, 35, 213, 8, NOT WS_GROUP COMBOBOX 1406, 9, 46, 215, 125, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP LTEXT "X.121 &Adresse:", 1407, 9, 66, 213, 8, NOT WS_GROUP Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -464,7 +464,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Sind Sie sicher, dass sie sich abmelden wollen?", -1, 43, 11, 140, 22 + LTEXT "Sind Sie sicher, dass Sie sich abmelden wollen?", -1, 43, 11, 140, 22 DEFPUSHBUTTON "&Abmelden", IDOK, 57, 40, 60, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 122, 40, 60, 14 END Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -69,7 +69,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 - LTEXT "Bitte geben sie einen Computernamen ein (maximal 15 Zeichen). Wenn Sie im Netzwerk sind, muss dieser Name einmalig sein.", + LTEXT "Bitte geben Sie einen Computernamen ein (maximal 15 Zeichen). Wenn Sie im Netzwerk sind, muss dieser Name einmalig sein.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Computername:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE @@ -171,14 +171,14 @@ BEGIN IDS_ACKTITLE "Anerkennungen" IDS_ACKSUBTITLE "Das Fundament, auf dem ReactOS gebaut ist, und Lizenzinformationen" - IDS_OWNERTITLE "Personalisieren Sie ihre Software" + IDS_OWNERTITLE "Personalisieren Sie Ihre Software" IDS_OWNERSUBTITLE "Das Setup nutzt diese Informationen über Sie, um ReactOS zu personalisieren." IDS_COMPUTERTITLE "Computername und Administratorpasswort" - IDS_COMPUTERSUBTITLE "Sie müssen einen Namen und ein Adminstratorpasswort für ihren Computer festlegen." + IDS_COMPUTERSUBTITLE "Sie müssen einen Namen und ein Adminstratorpasswort für Ihren Computer festlegen." IDS_LOCALETITLE "Regionale Einstellungen" IDS_LOCALESUBTITLE "Sie können ReactOS auf unterschiedliche Regionen und Sprachen einstellen." IDS_DATETIMETITLE "Datum und Uhrzeit" - IDS_DATETIMESUBTITLE "Setzen Sie das korrekte Datum und Uhrzeit für ihren Computer." + IDS_DATETIMESUBTITLE "Setzen Sie das korrekte Datum und Uhrzeit für Ihren Computer." IDS_PROCESSTITLE "Registriere Komponenten" IDS_PROCESSSUBTITLE "Bitte warten..." END Modified: trunk/reactos/dll/win32/tapiui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/tapiui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapiui/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -236,7 +236,7 @@ CAPTION "Zielnummer" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Dieser Schritt wird die Zielrufummer in die Callingcard-Wählfolge einfügen. Welche Teile der Zielrufnummer sollen gewählt werden, wenn sie die Zielnummer anwählen?", 2000, 7, 7, 238, 24 + LTEXT "Dieser Schritt wird die Zielrufummer in die Callingcard-Wählfolge einfügen. Welche Teile der Zielrufnummer sollen gewählt werden, wenn Sie die Zielnummer anwählen?", 2000, 7, 7, 238, 24 AUTOCHECKBOX "&Landes-/Regionalkennzahl wählen", 1027, 7, 39, 238, 10 AUTOCHECKBOX "&Vorwahl wählen", 1034, 7, 55, 238, 10 AUTOCHECKBOX "&Rufnummer wählen", 1008, 7, 71, 238, 10, WS_DISABLED Modified: trunk/reactos/dll/win32/winmm/winmm_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm_De.r… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm_De.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -45,7 +45,7 @@ MIDIERR_NOMAP, "Es wurde keine MIDI - Map gefunden. Es könnte ein Problem mit dem Treiber geben oder die Datei MIDIMAP.CFG fehlt oder ist beschädigt." MIDIERR_NOTREADY, "Der Anschluss ist mit der Datenausgabe belegt. Warten Sie, bis die Daten übertragen wurden und versuchen Sie es erneut." MIDIERR_NODEVICE, "Das gegenwärtige MIDI - Mapper Setup benutzt ein MIDI - Gerät, das nicht installiert ist. Benutzen Sie den MIDI - Mapper, um das Setup zu ändern." -MIDIERR_INVALIDSETUP, "Das aktuelle MIDI Setup ist beschädigt. Kopieren sie die ursprüngliche Datei MIDIMAP.CFG in das ReactOS - Systemverzeichnis und versuchen Sie es erneut." +MIDIERR_INVALIDSETUP, "Das aktuelle MIDI Setup ist beschädigt. Kopieren Sie die ursprüngliche Datei MIDIMAP.CFG in das ReactOS - Systemverzeichnis und versuchen Sie es erneut." /* MCI errors */ MCIERR_INVALID_DEVICE_ID, "Ungültige MCI - Gerätekennung. Benutzen Sie die zurückgegebene ID, wenn Sie das MCI - Gerät öffnen." Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:57:59 2011 @@ -8,7 +8,7 @@ LTEXT "Programm wird beendet...",IDC_STATIC,7,7,186,11 CONTROL "Fortschritt",IDC_PROGRESS,"msctls_progress32",WS_BORDER, 7,20,186,13 - LTEXT "Wenn Sie das Programm sofort beenden, werden sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", + LTEXT "Wenn Sie das Programm sofort beenden, werden Sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", IDC_STATIC,7,40,186,26 DEFPUSHBUTTON "J&etzt beenden",IDC_END_NOW,150,71,43,17 END @@ -23,7 +23,7 @@ LTEXT "Das Programm reagiert nicht",IDC_STATIC,7,7,178,8 LTEXT "Um zu ReactOS zurückzukehren und den Status der Anwendung zu überprüfen, wählen Sie Abbrechen.", IDC_STATIC,7,26,178,16 - LTEXT "Wenn Sie das Programm sofort beenden, werden sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", + LTEXT "Wenn Sie das Programm sofort beenden, werden Sie eventuell ungespeicherte Daten verlieren. Um das Programm zu beenden, wählen Sie Jetzt beenden.", IDC_STATIC,7,53,178,26 END

12 years, 11 months

[tfaber] 54154: [SYSDM] - Increase size of the homepage link control to correctly show the complete focus rectangle. Patch by Elton Chung (elton328 at gmail dot com) See issue #5038 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 16 07:27:33 2011 New Revision: 54154 URL: http://svn.reactos.org/svn/reactos?rev=54154&view=rev Log: [SYSDM] - Increase size of the homepage link control to correctly show the complete focus rectangle. Patch by Elton Chung (elton328 at gmail dot com) See issue #5038 for more details. Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -19,7 +19,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Ïîñåòåòå <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 8 + CONTROL "Ïîñåòåòå <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 10 PUSHBUTTON "&Ðàçðåøèòåëíîòî", IDC_LICENCE, 170, 199, 78, 13 END Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -22,7 +22,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Navtívit <A HREF=""http://www.reactos.org/"">stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 8 + CONTROL "Navtívit <A HREF=""http://www.reactos.org/"">stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 PUSHBUTTON "Zobrazit &licenci...", IDC_LICENCE, 170, 199, 78, 13 END Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -26,7 +26,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "<A HREF=""http://www.reactos.de/"">ReactOS-Homepage</A> besuchen", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 100, 8 + CONTROL "<A HREF=""http://www.reactos.de/"">ReactOS-Homepage</A> besuchen", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 100, 10 PUSHBUTTON "&Lizenz anzeigen...", IDC_LICENCE, 170, 199, 78, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -17,7 +17,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Åðéóêåõôåßôå ôçí <A HREF=""http://www.reactos.org/"">Éóôïóåëßäá ôïõ ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 180, 93, 8 + CONTROL "Åðéóêåõôåßôå ôçí <A HREF=""http://www.reactos.org/"">Éóôïóåëßäá ôïõ ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 180, 93, 10 PUSHBUTTON "&ÐñïâïëÞ Üäåéáò...", IDC_LICENCE, 170, 199, 78, 13 END Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -17,7 +17,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Visit the <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 8 + CONTROL "Visit the <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 199, 78, 13 END Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -22,7 +22,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Visite <A HREF=""http://www.reactos.org/"">Página Web de ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 110, 8 + CONTROL "Visite <A HREF=""http://www.reactos.org/"">Página Web de ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 110, 10 PUSHBUTTON "Ver &licencia...", IDC_LICENCE, 170, 199, 78, 13 END Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -21,7 +21,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Visiter la <A HREF=""http://www.reactos.org/"">page d'accueil ReactOS </A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 8 + CONTROL "Visiter la <A HREF=""http://www.reactos.org/"">page d'accueil ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 10 PUSHBUTTON "Voir la &licence...", IDC_LICENCE, 170, 199, 78, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -17,7 +17,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Kunjungi <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 8 + CONTROL "Kunjungi <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 10 PUSHBUTTON "Lihat &lisensi...", IDC_LICENCE, 170, 199, 78, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -17,7 +17,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - LTEXT "Visita ReactOS su internet", IDC_ROSHOMEPAGE_LINK, 20, 200, 93, 8 + CONTROL "Visita <A HREF=""http://www.reactos.org/"">ReactOS su internet</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 10 PUSHBUTTON "Vedi la licenza...", IDC_LICENCE, 170, 199, 78, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -17,7 +17,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS z[y[W</A>Ös", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 8 + CONTROL "<A HREF=""http://www.reactos.org/"">ReactOS z[y[W</A>Ös", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 PUSHBUTTON "CZXð\\¦(&L)...", IDC_LICENCE, 170, 199, 78, 13 END Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -18,7 +18,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Besøk <A HREF=""http://www.reactos.org/no/index.html"">ReactOS Hjemmesiden</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 8 + CONTROL "Besøk <A HREF=""http://www.reactos.org/no/index.html"">ReactOS Hjemmesiden</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 PUSHBUTTON "Vis &lisensen...", IDC_LICENCE, 170, 199, 78, 13 END Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -26,7 +26,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "OdwiedÅº <A HREF=""http://www.reactos.org/"">StronÄ domowÄ ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 123, 8 + CONTROL "OdwiedÅº <A HREF=""http://www.reactos.org/"">StronÄ domowÄ ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 123, 10 PUSHBUTTON "WyÅwietl &licencjÄ...", IDC_LICENCE, 170, 199, 78, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -17,7 +17,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "VedeÈi <A HREF=""http://www.reactos.org/"">pagina de web ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 8 + CONTROL "VedeÈi <A HREF=""http://www.reactos.org/"">pagina de web ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 PUSHBUTTON "&LicenÈÄ...", IDC_LICENCE, 170, 199, 78, 13 END Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -17,7 +17,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "ÐÐ¾ÑÐµÑÐ¸ÑÐµ <A HREF=""http://www.reactos.org/"">Ð´Ð¾Ð¼Ð°ÑÐ½ÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ ReactOS</A>.", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 204, 220, 8 + CONTROL "ÐÐ¾ÑÐµÑÐ¸ÑÐµ <A HREF=""http://www.reactos.org/"">Ð´Ð¾Ð¼Ð°ÑÐ½ÑÑ ÑÑÑÐ°Ð½Ð¸ÑÑ ReactOS</A>.", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 204, 220, 10 PUSHBUTTON "&ÐÐ¸ÑÐµÐ½Ð·Ð¸Ñ...", IDC_LICENCE, 170, 200, 78, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -25,7 +25,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Navtívte <A HREF=""http://www.reactos.org/"">domovskú stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 165, 8 + CONTROL "Navtívte <A HREF=""http://www.reactos.org/"">domovskú stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 165, 10 PUSHBUTTON "Zobrazi &licenciu...", IDC_LICENCE, 170, 199, 78, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -19,7 +19,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Besök <A HREF=""http://www.reactos.org/"">ReactOS hemsida</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 8 + CONTROL "Besök <A HREF=""http://www.reactos.org/"">ReactOS hemsida</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 PUSHBUTTON "Visa &licens...", IDC_LICENCE, 170, 199, 78, 13 END Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -25,7 +25,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "ÐÑÐ´Ð²ÑÐ´Ð°ÑÑÐµ <A HREF=""http://www.reactos.org/"">Ð´Ð¾Ð¼Ð°ÑÐ½Ñ ÑÑÐ¾ÑÑÐ½ÐºÑ ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 150, 8 + CONTROL "ÐÑÐ´Ð²ÑÐ´Ð°ÑÑÐµ <A HREF=""http://www.reactos.org/"">Ð´Ð¾Ð¼Ð°ÑÐ½Ñ ÑÑÐ¾ÑÑÐ½ÐºÑ ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 150, 10 PUSHBUTTON "&ÐÑÑÐµÐ½Ð·ÑÑ...", IDC_LICENCE, 170, 199, 78, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Sun Oct 16 07:27:33 2011 @@ -22,7 +22,7 @@ LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "Çë·ÃÎÊ<A HREF=""http://www.reactos.org/"">ReactOS Ö÷Ò³</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 8 + CONTROL "Çë·ÃÎÊ<A HREF=""http://www.reactos.org/"">ReactOS Ö÷Ò³</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 PUSHBUTTON "²é¿´°æÈ¨ÐÅÏ¢(&L)...", IDC_LICENCE, 170, 199, 78, 13 END

12 years, 11 months

[jimtabor] 54153: [Win32k] - Fix timer resolution to match what windows uses. Now pass wine test_timers_no_wnd.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Oct 15 21:35:40 2011 New Revision: 54153 URL: http://svn.reactos.org/svn/reactos?rev=54153&view=rev Log: [Win32k] - Fix timer resolution to match what windows uses. Now pass wine test_timers_no_wnd. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sat Oct 15 21:35:40 2011 @@ -187,7 +187,7 @@ PTIMER pTmr; UINT Ret = IDEvent; LARGE_INTEGER DueTime; - DueTime.QuadPart = (LONGLONG)(-9000); // 1024hz .9765625 ms + DueTime.QuadPart = (LONGLONG)(-10000); // 1024hz .9765625 ms set to 1.1 ms #if 0 /* Windows NT/2k/XP behaviour */ @@ -448,7 +448,7 @@ KeQueryTickCount(&TickCount); Time = MsqCalculateMessageTime(&TickCount); - DueTime.QuadPart = (LONGLONG)(-9000); // 1024hz .9765625 ms + DueTime.QuadPart = (LONGLONG)(-10000); // 1024hz .9765625 ms set to 1.1 ms while(pLE != &TimersListHead) {

12 years, 11 months

[tkreuzer] 54152: [registry] Mark the VBE driver as VgaCompatible. This is an outrageous lie, but it lets us use 3rd party drivers, like VBoxVideo, while VBE is installed. Consider this a hack, whi...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 15 21:29:11 2011 New Revision: 54152 URL: http://svn.reactos.org/svn/reactos?rev=54152&view=rev Log: [registry] Mark the VBE driver as VgaCompatible. This is an outrageous lie, but it lets us use 3rd party drivers, like VBoxVideo, while VBE is installed. Consider this a hack, which is to be fixed bei either making vbemp really vga compatible or by fixing whatever keeps the VBoxVideo from replacing vbemp. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Oct 15 21:29:11 2011 @@ -1104,7 +1104,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI","Timeout",0x00010001,0x00000007 HKLM,"SYSTEM\CurrentControlSet\Control\GraphicsDrivers\UseNewKey",,0x00000012 -; Group order, the first DWORD is the count of entries, +; Group order, the first DWORD is the count of entries, ; the following dwords are the tag entries for the load order. HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Video Save", 0x00000001, \ 0x02, 0x00, 0x00, 0x00, \ @@ -1715,6 +1715,9 @@ HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,480 +; This is not true but it allows to use 3rd party drivers while having the VBE driver installed +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","VgaCompatible",0x00010001,1 + ; VGA miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save"

12 years, 11 months

[tkreuzer] 54151: [WIN32K] - Fix a bug when iterating through the DEVMODE list - Handle VgaCompatible flag differently, by reading this value from the registry for every installed driver. - Prioriz...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 15 21:22:19 2011 New Revision: 54151 URL: http://svn.reactos.org/svn/reactos?rev=54151&view=rev Log: [WIN32K] - Fix a bug when iterating through the DEVMODE list - Handle VgaCompatible flag differently, by reading this value from the registry for every installed driver. - Priorize non-vga compatible devices over vga compatible, unless /BASEVIDEO is requested - Fall back to vga compatible driver when no other is present Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c trunk/reactos/subsystems/win32/win32k/include/pdevobj.h trunk/reactos/subsystems/win32/win32k/ntuser/display.c Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Sat Oct 15 21:22:19 2011 @@ -151,7 +151,7 @@ /* Loop all DEVMODEs */ pdmEnd = (DEVMODEW*)((PCHAR)pdminfo->adevmode + pdminfo->cbdevmode); for (pdm = pdminfo->adevmode; - pdm + 1 <= pdmEnd; + (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0); pdm = (DEVMODEW*)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra)) { /* Count this DEVMODE */ @@ -195,7 +195,7 @@ /* Loop through the DEVMODEs */ for (pdm = pdminfo->adevmode; - pdm + 1 <= pdmEnd; + (pdm + 1 <= pdmEnd) && (pdm->dmSize != 0); pdm = (PDEVMODEW)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra)) { /* Compare with the default entry */ Modified: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Sat Oct 15 21:22:19 2011 @@ -44,7 +44,7 @@ DEVMODEW adevmode[1]; } DEVMODEINFO, *PDEVMODEINFO; -typedef struct +typedef struct _DEVMODEENTRY { DWORD dwFlags; PDEVMODEW pdm; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Sat Oct 15 21:22:19 2011 @@ -74,6 +74,7 @@ ULONG cbSize; HKEY hkey; DEVMODEW dmDefault; + DWORD dwVga; ERR("InitDisplayDriver(%S, %S);\n", pwszDeviceName, pwszRegKey); @@ -128,6 +129,11 @@ /* Query the default settings */ RegReadDisplaySettings(hkey, &dmDefault); + /* Query if this is a VGA compatible driver */ + cbSize = sizeof(DWORD); + Status = RegQueryValue(hkey, L"VgaCompatible", REG_DWORD, &dwVga, &cbSize); + if (!NT_SUCCESS(Status)) dwVga = 0; + /* Close the registry key */ ZwClose(hkey); @@ -137,6 +143,10 @@ &ustrDisplayDrivers, &ustrDescription, &dmDefault); + if (pGraphicsDevice && dwVga) + { + pGraphicsDevice->StateFlags |= DISPLAY_DEVICE_VGA_COMPATIBLE; + } return pGraphicsDevice; } @@ -197,7 +207,7 @@ ERR("Could not read MaxObjectNumber, defaulting to 0.\n"); } - TRACE("Found %ld devices\n", ulMaxObjectNumber); + TRACE("Found %ld devices\n", ulMaxObjectNumber + 1); /* Loop through all adapters */ for (iDevNum = 0; iDevNum <= ulMaxObjectNumber; iDevNum++) @@ -218,31 +228,30 @@ pGraphicsDevice = InitDisplayDriver(awcDeviceName, awcBuffer); if (!pGraphicsDevice) continue; - /* Check if this is the VGA adapter */ - if (iDevNum == iVGACompatible) - { - /* Set the VGA device as primary */ - gpVgaGraphicsDevice = pGraphicsDevice; - ERR("gpVgaGraphicsDevice = %p\n", gpVgaGraphicsDevice); - } - - /* Set the first one as primary device */ - if (!gpPrimaryGraphicsDevice) - gpPrimaryGraphicsDevice = pGraphicsDevice; + /* Check if this is a VGA compatible adapter */ + if (pGraphicsDevice->StateFlags & DISPLAY_DEVICE_VGA_COMPATIBLE) + { + /* Save this as the VGA adapter */ + if (!gpVgaGraphicsDevice) + gpVgaGraphicsDevice = pGraphicsDevice; + TRACE("gpVgaGraphicsDevice = %p\n", gpVgaGraphicsDevice); + } + else + { + /* Set the first one as primary device */ + if (!gpPrimaryGraphicsDevice) + gpPrimaryGraphicsDevice = pGraphicsDevice; + TRACE("gpPrimaryGraphicsDevice = %p\n", gpPrimaryGraphicsDevice); + } } /* Close the device map registry key */ ZwClose(hkey); - /* Check if we had any success */ - if (!gpPrimaryGraphicsDevice) - { - ERR("No usable display driver was found.\n"); - return STATUS_UNSUCCESSFUL; - } - + /* Was VGA mode requested? */ if (gbBaseVideo) { + /* Check if we found a VGA compatible device */ if (gpVgaGraphicsDevice) { /* Set the VgaAdapter as primary */ @@ -252,6 +261,22 @@ else { ERR("Could not find VGA compatible driver. Trying normal.\n"); + } + } + + /* Check if we had any success */ + if (!gpPrimaryGraphicsDevice) + { + /* Check if there is a VGA device we skipped */ + if (gpVgaGraphicsDevice) + { + /* There is, use the VGA device */ + gpPrimaryGraphicsDevice = gpVgaGraphicsDevice; + } + else + { + ERR("No usable display driver was found.\n"); + return STATUS_UNSUCCESSFUL; } }

12 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2011