Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[ion] 25872: - Rename ModuleListHead to PsLoadedModulesList. - Start implementing some routines of the Mm SysLdr. Implemented MiSnapThunk and most of MiResolveImageReferences. The SysLdr has a lot of restrictions that the typical Ldr in user-mode doesn't, as well as manages imports and reference counts them, so the code can't be shared with ntdll's Ldr (this is also why real NT doesn't have an Ldr component, and this is in Mm). - Fix some PE Header types that were wrong in our PSDK.

by ion＠svn.reactos.org

Author: ion Date: Thu Feb 22 03:01:52 2007 New Revision: 25872 URL: http://svn.reactos.org/svn/reactos?rev=25872&view=rev Log: - Rename ModuleListHead to PsLoadedModulesList. - Start implementing some routines of the Mm SysLdr. Implemented MiSnapThunk and most of MiResolveImageReferences. The SysLdr has a lot of restrictions that the typical Ldr in user-mode doesn't, as well as manages imports and reference counts them, so the code can't be shared with ntdll's Ldr (this is also why real NT doesn't have an Ldr component, and this is in Mm). - Fix some PE Header types that were wrong in our PSDK. Added: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/ldrtypes.h trunk/reactos/include/psdk/winnt.h trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ldr/loader.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/verifier.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=25… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Thu Feb 22 03:01:52 2007 @@ -3814,6 +3814,14 @@ ); NTSYSAPI +NTSTATUS +NTAPI +RtlAppendStringToString( + PSTRING Destination, + const STRING *Source +); + +NTSYSAPI USHORT NTAPI RtlCaptureStackBackTrace ( Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Feb 22 03:01:52 2007 @@ -247,6 +247,8 @@ #define MAXIMUM_PRIORITY 32 #define MAXIMUM_SUSPEND_COUNT MAXCHAR + +#define MAXIMUM_FILENAME_LENGTH 256 #define FILE_SUPERSEDED 0x00000000 #define FILE_OPENED 0x00000001 Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h (original) +++ trunk/reactos/include/ndk/ldrtypes.h Thu Feb 22 03:01:52 2007 @@ -119,6 +119,15 @@ } LDR_DATA_TABLE_ENTRY, *PLDR_DATA_TABLE_ENTRY; // +// Loaded Imports Reference Counting in Kernel +// +typedef struct _LOAD_IMPORTS +{ + SIZE_T Count; + PLDR_DATA_TABLE_ENTRY Entry[1]; +} LOAD_IMPORTS, *PLOAD_IMPORTS; + +// // Loader Resource Information // typedef struct _LDR_RESOURCE_INFO Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Thu Feb 22 03:01:52 2007 @@ -3119,21 +3119,21 @@ } IMAGE_IMPORT_BY_NAME,*PIMAGE_IMPORT_BY_NAME; typedef struct _IMAGE_THUNK_DATA { union { - PBYTE ForwarderString; - PDWORD Function; + ULONG ForwarderString; + ULONG Function; DWORD Ordinal; - PIMAGE_IMPORT_BY_NAME AddressOfData; + ULONG AddressOfData; } u1; } IMAGE_THUNK_DATA,*PIMAGE_THUNK_DATA; typedef struct _IMAGE_IMPORT_DESCRIPTOR { _ANONYMOUS_UNION union { DWORD Characteristics; - PIMAGE_THUNK_DATA OriginalFirstThunk; + ULONG OriginalFirstThunk; } DUMMYUNIONNAME; DWORD TimeDateStamp; DWORD ForwarderChain; DWORD Name; - PIMAGE_THUNK_DATA FirstThunk; + ULONG FirstThunk; } IMAGE_IMPORT_DESCRIPTOR,*PIMAGE_IMPORT_DESCRIPTOR; typedef struct _IMAGE_BOUND_IMPORT_DESCRIPTOR { DWORD TimeDateStamp; Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Thu Feb 22 03:01:52 2007 @@ -952,8 +952,8 @@ /* Class 11 - Module Information */ QSI_DEF(SystemModuleInformation) { - extern LIST_ENTRY ModuleListHead; - return ExpQueryModuleInformation(&ModuleListHead, + extern LIST_ENTRY PsLoadedModuleList; + return ExpQueryModuleInformation(&PsLoadedModuleList, NULL, (PRTL_PROCESS_MODULES)Buffer, Size, Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Thu Feb 22 03:01:52 2007 @@ -384,7 +384,7 @@ extern POBJECT_TYPE PsJobType; extern LARGE_INTEGER ShortPsLockDelay; extern UNICODE_STRING PsNtDllPathName; -extern LIST_ENTRY PriorityListHead[MAXIMUM_PRIORITY]; +extern LIST_ENTRY PsLoadedModuleList; // // Inlined Functions Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Thu Feb 22 03:01:52 2007 @@ -107,13 +107,12 @@ { PLIST_ENTRY current_entry; PLDR_DATA_TABLE_ENTRY current; - extern LIST_ENTRY ModuleListHead; INT Count = 0; INT Length; - current_entry = ModuleListHead.Flink; - - while (current_entry != &ModuleListHead) + current_entry = PsLoadedModuleList.Flink; + + while (current_entry != &PsLoadedModuleList) { current = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2587… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Thu Feb 22 03:01:52 2007 @@ -37,15 +37,15 @@ { PLIST_ENTRY current_entry; PLDR_DATA_TABLE_ENTRY current; - extern LIST_ENTRY ModuleListHead; + extern LIST_ENTRY PsLoadedModuleList; ULONG_PTR RelativeAddress; ULONG i = 0; do { - current_entry = ModuleListHead.Flink; - - while (current_entry != &ModuleListHead) + current_entry = PsLoadedModuleList.Flink; + + while (current_entry != &PsLoadedModuleList) { current = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, @@ -267,13 +267,13 @@ PVOID ImageBase, EipBase = NULL; PLDR_DATA_TABLE_ENTRY Entry; PLIST_ENTRY ListHead, NextEntry; - extern LIST_ENTRY ModuleListHead; + extern LIST_ENTRY PsLoadedModuleList; /* Assume no */ *InKernel = FALSE; /* Set list pointers and make sure it's valid */ - ListHead = &ModuleListHead; + ListHead = &PsLoadedModuleList; NextEntry = ListHead->Flink; if (NextEntry) { Modified: trunk/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ldr/loader.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ldr/loader.c (original) +++ trunk/reactos/ntoskrnl/ldr/loader.c Thu Feb 22 03:01:52 2007 @@ -20,44 +20,21 @@ /* GLOBALS *******************************************************************/ -LIST_ENTRY ModuleListHead; +LIST_ENTRY PsLoadedModuleList; KSPIN_LOCK ModuleListLock; LDR_DATA_TABLE_ENTRY NtoskrnlModuleObject; LDR_DATA_TABLE_ENTRY HalModuleObject; /* FUNCTIONS *****************************************************************/ -static PVOID -LdrPEGetExportByName ( - PVOID BaseAddress, - PUCHAR SymbolName, - USHORT Hint ); - -static VOID -LdrpBuildModuleBaseName ( - PUNICODE_STRING BaseName, - PUNICODE_STRING FullName ) -{ - PWCHAR p; - - DPRINT("LdrpBuildModuleBaseName()\n"); - DPRINT("FullName %wZ\n", FullName); - - p = wcsrchr(FullName->Buffer, L'\\'); - if (p == NULL) - { - p = FullName->Buffer; - } - else - { - p++; - } - - DPRINT("p %S\n", p); - - RtlInitUnicodeString(BaseName, p); -} - +NTSTATUS +NTAPI +MiResolveImageReferences(IN PVOID ImageBase, + IN PUNICODE_STRING ImageFileDirectory, + IN PUNICODE_STRING NamePrefix OPTIONAL, + OUT PCHAR *MissingApi, + OUT PWCHAR *MissingDriver, + OUT PLOAD_IMPORTS *LoadImports); static LONG LdrpCompareModuleNames ( @@ -128,380 +105,128 @@ return(0); } -#ifndef PATH_MAX -#define PATH_MAX 260 -#endif - -static NTSTATUS -LdrPEGetOrLoadModule ( - PWCHAR ModuleName, - PCHAR ImportedName, - PLDR_DATA_TABLE_ENTRY* ImportedModule) +VOID +INIT_FUNCTION +NTAPI +LdrInit1(VOID) { - UNICODE_STRING DriverName; - UNICODE_STRING NameString; - WCHAR NameBuffer[PATH_MAX]; - NTSTATUS Status = STATUS_SUCCESS; - - RtlCreateUnicodeStringFromAsciiz (&DriverName, ImportedName); - DPRINT("Import module: %wZ\n", &DriverName); - - *ImportedModule = LdrGetModuleObject(&DriverName); - if (*ImportedModule == NULL) - { - PWCHAR PathEnd; - ULONG PathLength; - - PathEnd = wcsrchr(ModuleName, L'\\'); - if (NULL != PathEnd) + PLDR_DATA_TABLE_ENTRY HalModuleObject, NtoskrnlModuleObject, LdrEntry; + + /* Initialize the module list and spinlock */ + InitializeListHead(&PsLoadedModuleList); + KeInitializeSpinLock(&ModuleListLock); + + /* Get the NTOSKRNL Entry from the loader */ + LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + /* Initialize ModuleObject for NTOSKRNL */ + NtoskrnlModuleObject = ExAllocatePoolWithTag(PagedPool, + sizeof(LDR_DATA_TABLE_ENTRY), + TAG('M', 'm', 'L', 'd')); + NtoskrnlModuleObject->DllBase = LdrEntry->DllBase; + RtlInitUnicodeString(&NtoskrnlModuleObject->FullDllName, KERNEL_MODULE_NAME); + NtoskrnlModuleObject->BaseDllName = NtoskrnlModuleObject->FullDllName; + NtoskrnlModuleObject->EntryPoint = LdrEntry->EntryPoint; + NtoskrnlModuleObject->SizeOfImage = LdrEntry->SizeOfImage; + + /* Insert it into the list */ + InsertTailList(&PsLoadedModuleList, &NtoskrnlModuleObject->InLoadOrderLinks); + + /* Get the HAL Entry from the loader */ + LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink->Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + /* Initialize ModuleObject for HAL */ + HalModuleObject = ExAllocatePoolWithTag(PagedPool, + sizeof(LDR_DATA_TABLE_ENTRY), + TAG('M', 'm', 'L', 'd')); + HalModuleObject->DllBase = LdrEntry->DllBase; + RtlInitUnicodeString(&HalModuleObject->FullDllName, HAL_MODULE_NAME); + HalModuleObject->BaseDllName = HalModuleObject->FullDllName; + HalModuleObject->EntryPoint = LdrEntry->EntryPoint; + HalModuleObject->SizeOfImage = LdrEntry->SizeOfImage; + + /* Insert it into the list */ + InsertTailList(&PsLoadedModuleList, &HalModuleObject->InLoadOrderLinks); + + /* Hook for KDB on initialization of the loader. */ + KDB_LOADERINIT_HOOK(NtoskrnlModuleObject, HalModuleObject); +} + +// +// Used for checking if a module is already in the module list. +// Used during loading/unloading drivers. +// +PLDR_DATA_TABLE_ENTRY +NTAPI +LdrGetModuleObject ( PUNICODE_STRING ModuleName ) +{ + PLDR_DATA_TABLE_ENTRY Module; + PLIST_ENTRY Entry; + KIRQL Irql; + + DPRINT("LdrGetModuleObject(%wZ) called\n", ModuleName); + + KeAcquireSpinLock(&ModuleListLock,&Irql); + + Entry = PsLoadedModuleList.Flink; + while (Entry != &PsLoadedModuleList) + { + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + DPRINT("Comparing %wZ and %wZ\n", + &Module->BaseDllName, + ModuleName); + + if (!LdrpCompareModuleNames(&Module->BaseDllName, ModuleName)) { - PathLength = (PathEnd - ModuleName + 1) * sizeof(WCHAR); - RtlCopyMemory(NameBuffer, ModuleName, PathLength); - RtlCopyMemory(NameBuffer + (PathLength / sizeof(WCHAR)), DriverName.Buffer, DriverName.Length); - NameString.Buffer = NameBuffer; - NameString.MaximumLength = NameString.Length = (USHORT)PathLength + DriverName.Length; - - /* NULL-terminate */ - NameString.MaximumLength += sizeof(WCHAR); - NameBuffer[NameString.Length / sizeof(WCHAR)] = 0; - - Status = LdrLoadModule(&NameString, ImportedModule); + DPRINT("Module %wZ\n", &Module->BaseDllName); + KeReleaseSpinLock(&ModuleListLock, Irql); + return(Module); } - else - { - DPRINT("Module '%wZ' not loaded yet\n", &DriverName); - wcscpy(NameBuffer, L"\\SystemRoot\\system32\\drivers\\"); - wcsncat(NameBuffer, DriverName.Buffer, DriverName.Length / sizeof(WCHAR)); - RtlInitUnicodeString(&NameString, NameBuffer); - Status = LdrLoadModule(&NameString, ImportedModule); - } - if (!NT_SUCCESS(Status)) - { - wcscpy(NameBuffer, L"\\SystemRoot\\system32\\"); - wcsncat(NameBuffer, DriverName.Buffer, DriverName.Length / sizeof(WCHAR)); - RtlInitUnicodeString(&NameString, NameBuffer); - Status = LdrLoadModule(&NameString, ImportedModule); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unknown import module: %wZ (Status %lx)\n", &DriverName, Status); - } - } - } - RtlFreeUnicodeString(&DriverName); - return Status; + + Entry = Entry->Flink; + } + + KeReleaseSpinLock(&ModuleListLock, Irql); + + DPRINT("Could not find module '%wZ'\n", ModuleName); + + return(NULL); } -static PVOID -LdrPEFixupForward ( PCHAR ForwardName ) -{ - CHAR NameBuffer[128]; - UNICODE_STRING ModuleName; - PCHAR p; - PLDR_DATA_TABLE_ENTRY ModuleObject; - - DPRINT("LdrPEFixupForward (%s)\n", ForwardName); - - strcpy(NameBuffer, ForwardName); - p = strchr(NameBuffer, '.'); - if (p == NULL) - { - return NULL; - } - - *p = 0; - - DPRINT("Driver: %s Function: %s\n", NameBuffer, p+1); - - RtlCreateUnicodeStringFromAsciiz(&ModuleName, - NameBuffer); - ModuleObject = LdrGetModuleObject(&ModuleName); - RtlFreeUnicodeString(&ModuleName); - - DPRINT("ModuleObject: %p\n", ModuleObject); - - if (ModuleObject == NULL) - { - DPRINT("LdrPEFixupForward: failed to find module %s\n", NameBuffer); - return NULL; - } - return LdrPEGetExportByName(ModuleObject->DllBase, (PUCHAR)(p+1), 0xffff); -} - -static PVOID -LdrPEGetExportByOrdinal ( - PVOID BaseAddress, - ULONG Ordinal ) -{ - PIMAGE_EXPORT_DIRECTORY ExportDir; - ULONG ExportDirSize; - PULONG * ExFunctions; - PVOID Function; - - ExportDir = (PIMAGE_EXPORT_DIRECTORY)RtlImageDirectoryEntryToData ( - BaseAddress, - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &ExportDirSize); - - ExFunctions = (PULONG *)RVA(BaseAddress, - ExportDir->AddressOfFunctions); - DPRINT("LdrPEGetExportByOrdinal(Ordinal %d) = %x\n", - Ordinal, - RVA(BaseAddress, ExFunctions[Ordinal - ExportDir->Base])); - - Function = 0 != ExFunctions[Ordinal - ExportDir->Base] - ? RVA(BaseAddress, ExFunctions[Ordinal - ExportDir->Base] ) - : NULL; - - if (((ULONG_PTR)Function >= (ULONG_PTR)ExportDir) && - ((ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize)) - { - DPRINT("Forward: %s\n", (PCHAR)Function); - Function = LdrPEFixupForward((PCHAR)Function); - } - - return Function; -} - -static PVOID -LdrPEGetExportByName ( - PVOID BaseAddress, - PUCHAR SymbolName, - USHORT Hint ) -{ - PIMAGE_EXPORT_DIRECTORY ExportDir; - PULONG * ExFunctions; - PULONG * ExNames; - USHORT * ExOrdinals; - PVOID ExName; - ULONG Ordinal; - PVOID Function; - LONG minn, maxn, mid, res; - ULONG ExportDirSize; - - DPRINT("LdrPEGetExportByName %x %s %hu\n", BaseAddress, SymbolName, Hint); - - ExportDir = (PIMAGE_EXPORT_DIRECTORY)RtlImageDirectoryEntryToData(BaseAddress, - TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, - &ExportDirSize); - if (ExportDir == NULL) - { - DPRINT1("LdrPEGetExportByName(): no export directory!\n"); - return NULL; - } - - - /* The symbol names may be missing entirely */ - if (ExportDir->AddressOfNames == 0) - { - DPRINT("LdrPEGetExportByName(): symbol names missing entirely\n"); - return NULL; - } - - /* - * Get header pointers - */ - ExNames = (PULONG *)RVA(BaseAddress, ExportDir->AddressOfNames); - ExOrdinals = (USHORT *)RVA(BaseAddress, ExportDir->AddressOfNameOrdinals); - ExFunctions = (PULONG *)RVA(BaseAddress, ExportDir->AddressOfFunctions); - - /* - * Check the hint first - */ - if (Hint < ExportDir->NumberOfNames) - { - ExName = RVA(BaseAddress, ExNames[Hint]); - if (strcmp(ExName, (PCHAR)SymbolName) == 0) - { - Ordinal = ExOrdinals[Hint]; - Function = RVA(BaseAddress, ExFunctions[Ordinal]); - if ((ULONG_PTR)Function >= (ULONG_PTR)ExportDir && - (ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize) - { - DPRINT("Forward: %s\n", (PCHAR)Function); - Function = LdrPEFixupForward((PCHAR)Function); - if (Function == NULL) - { - DPRINT1("LdrPEGetExportByName(): failed to find %s\n",SymbolName); - } - return Function; - } - if (Function != NULL) - { - return Function; - } - } - } - - /* - * Binary search - */ - minn = 0; - maxn = ExportDir->NumberOfNames - 1; - while (minn <= maxn) - { - mid = (minn + maxn) / 2; - - ExName = RVA(BaseAddress, ExNames[mid]); - res = strcmp(ExName, (PCHAR)SymbolName); - if (res == 0) - { - Ordinal = ExOrdinals[mid]; - Function = RVA(BaseAddress, ExFunctions[Ordinal]); - if ((ULONG_PTR)Function >= (ULONG_PTR)ExportDir && - (ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize) - { - DPRINT("Forward: %s\n", (PCHAR)Function); - Function = LdrPEFixupForward((PCHAR)Function); - if (Function == NULL) - { - DPRINT1("LdrPEGetExportByName(): failed to find %s\n",SymbolName); - } - return Function; - } - if (Function != NULL) - { - return Function; - } - } - else if (res > 0) - { - maxn = mid - 1; - } - else - { - minn = mid + 1; - } - } - - ExName = RVA(BaseAddress, ExNames[mid]); - DPRINT1("LdrPEGetExportByName(): failed to find %s\n",SymbolName); - return (PVOID)NULL; -} - -static NTSTATUS -LdrPEProcessImportDirectoryEntry( - PVOID DriverBase, - PLDR_DATA_TABLE_ENTRY ImportedModule, - PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory ) -{ - PVOID* ImportAddressList; - PULONG FunctionNameList; - ULONG Ordinal; - - if (ImportModuleDirectory == NULL || ImportModuleDirectory->Name == 0) - { - return STATUS_UNSUCCESSFUL; - } - - /* Get the import address list. */ - ImportAddressList = (PVOID*)RVA(DriverBase, ImportModuleDirectory->FirstThunk); - - /* Get the list of functions to import. */ - if (ImportModuleDirectory->OriginalFirstThunk != 0) - { - FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->OriginalFirstThunk); - } - else - { - FunctionNameList = (PULONG)RVA(DriverBase, ImportModuleDirectory->FirstThunk); - } - - /* Walk through function list and fixup addresses. */ - while (*FunctionNameList != 0L) - { - if ((*FunctionNameList) & 0x80000000) - { - Ordinal = (*FunctionNameList) & 0x7fffffff; - *ImportAddressList = LdrPEGetExportByOrdinal(ImportedModule->DllBase, Ordinal); - if ((*ImportAddressList) == NULL) - { - DPRINT1("Failed to import #%ld from %wZ\n", Ordinal, &ImportedModule->FullDllName); - return STATUS_UNSUCCESSFUL; - } - } - else - { - IMAGE_IMPORT_BY_NAME *pe_name; - pe_name = RVA(DriverBase, *FunctionNameList); - *ImportAddressList = LdrPEGetExportByName(ImportedModule->DllBase, pe_name->Name, pe_name->Hint); - if ((*ImportAddressList) == NULL) - { - DPRINT1("Failed to import %s from %wZ\n", pe_name->Name, &ImportedModule->FullDllName); - return STATUS_UNSUCCESSFUL; - } - } - ImportAddressList++; - FunctionNameList++; - } - return STATUS_SUCCESS; -} - -typedef struct _LOAD_IMPORTS -{ - SIZE_T Count; - PLDR_DATA_TABLE_ENTRY Entry[1]; -} LOAD_IMPORTS, *PLOAD_IMPORTS; - +// +// Used when unloading drivers +// NTSTATUS NTAPI -MiResolveImageReferences(IN PVOID ImageBase, - IN PUNICODE_STRING ImageFileDirectory, - IN PUNICODE_STRING NamePrefix OPTIONAL, - OUT PCHAR *MissingApi, - OUT PWCHAR *MissingDriver, - OUT PLOAD_IMPORTS *LoadImports) +LdrUnloadModule ( PLDR_DATA_TABLE_ENTRY ModuleObject ) { - /* We don't do anything for now */ - return STATUS_SUCCESS; + KIRQL Irql; + + /* Remove the module from the module list */ + KeAcquireSpinLock(&ModuleListLock,&Irql); + RemoveEntryList(&ModuleObject->InLoadOrderLinks); + KeReleaseSpinLock(&ModuleListLock, Irql); + + /* Hook for KDB on unloading a driver. */ + KDB_UNLOADDRIVER_HOOK(ModuleObject); + + /* Free module section */ + // MmFreeSection(ModuleObject->DllBase); + + ExFreePool(ModuleObject->FullDllName.Buffer); + ExFreePool(ModuleObject); + + return(STATUS_SUCCESS); } -static NTSTATUS -LdrPEFixupImports (IN PVOID DllBase, - IN PWCHAR DllName) -{ - PIMAGE_IMPORT_DESCRIPTOR ImportModuleDirectory; - PCHAR ImportedName; - PLDR_DATA_TABLE_ENTRY ImportedModule; - NTSTATUS Status; - ULONG Size; - - /* Process each import module */ - ImportModuleDirectory = (PIMAGE_IMPORT_DESCRIPTOR) - RtlImageDirectoryEntryToData(DllBase, - TRUE, - IMAGE_DIRECTORY_ENTRY_IMPORT, - &Size); - DPRINT("Processeing import directory at %p\n", ImportModuleDirectory); - while (ImportModuleDirectory->Name) - { - /* Check to make sure that import lib is kernel */ - ImportedName = (PCHAR) DllBase + ImportModuleDirectory->Name; - - Status = LdrPEGetOrLoadModule(DllName, ImportedName, &ImportedModule); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - Status = LdrPEProcessImportDirectoryEntry(DllBase, ImportedModule, ImportModuleDirectory); - if (!NT_SUCCESS(Status)) - { - while (TRUE); - return Status; - } - - ImportModuleDirectory++; - } - return STATUS_SUCCESS; -} - -static NTSTATUS -LdrPEProcessModule( - PVOID ModuleLoadBase, - PUNICODE_STRING FileName, - PLDR_DATA_TABLE_ENTRY *ModuleObject ) +// +// Used for images already loaded (boot drivers) +// +NTSTATUS +LdrProcessModule(PVOID ModuleLoadBase, + PUNICODE_STRING FileName, + PLDR_DATA_TABLE_ENTRY *ModuleObject) { unsigned int DriverSize, Idx; ULONG CurrentSize; @@ -641,7 +366,7 @@ BaseLength *= sizeof(WCHAR); /* Setup the string */ - BaseName.Length = BaseLength; + BaseName.Length = (USHORT)BaseLength; BaseName.Buffer = p; } else @@ -698,7 +423,7 @@ NtHeader->OptionalHeader.AddressOfEntryPoint); LdrEntry->SizeOfImage = DriverSize; LdrEntry->CheckSum = NtHeader->OptionalHeader.CheckSum; - LdrEntry->SectionPointer = NULL; // FIXME + LdrEntry->SectionPointer = LdrEntry; /* Now write the DLL name */ LdrEntry->BaseDllName.Buffer = NameBuffer; @@ -737,7 +462,7 @@ /* Insert the entry */ KeAcquireSpinLock(&ModuleListLock, &Irql); - InsertTailList(&ModuleListHead, &LdrEntry->InLoadOrderLinks); + InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks); KeReleaseSpinLock(&ModuleListLock, Irql); /* Resolve imports */ @@ -748,10 +473,6 @@ &MissingApiName, &MissingDriverName, &LoadedImports); - - /* Resolve imports */ - Status = LdrPEFixupImports(LdrEntry->DllBase, - LdrEntry->FullDllName.Buffer); if (!NT_SUCCESS(Status)) { /* Fail */ @@ -763,145 +484,6 @@ /* Return */ *ModuleObject = LdrEntry; return STATUS_SUCCESS; -} - -VOID -INIT_FUNCTION -NTAPI -LdrInit1(VOID) -{ - PLDR_DATA_TABLE_ENTRY HalModuleObject, NtoskrnlModuleObject, LdrEntry; - - /* Initialize the module list and spinlock */ - InitializeListHead(&ModuleListHead); - KeInitializeSpinLock(&ModuleListLock); - - /* Get the NTOSKRNL Entry from the loader */ - LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - /* Initialize ModuleObject for NTOSKRNL */ - NtoskrnlModuleObject = ExAllocatePoolWithTag(PagedPool, - sizeof(LDR_DATA_TABLE_ENTRY), - TAG('M', 'm', 'L', 'd')); - NtoskrnlModuleObject->DllBase = LdrEntry->DllBase; - RtlInitUnicodeString(&NtoskrnlModuleObject->FullDllName, KERNEL_MODULE_NAME); - LdrpBuildModuleBaseName(&NtoskrnlModuleObject->BaseDllName, &NtoskrnlModuleObject->FullDllName); - NtoskrnlModuleObject->EntryPoint = LdrEntry->EntryPoint; - NtoskrnlModuleObject->SizeOfImage = LdrEntry->SizeOfImage; - - /* Insert it into the list */ - InsertTailList(&ModuleListHead, &NtoskrnlModuleObject->InLoadOrderLinks); - - /* Get the HAL Entry from the loader */ - LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink->Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - /* Initialize ModuleObject for HAL */ - HalModuleObject = ExAllocatePoolWithTag(PagedPool, - sizeof(LDR_DATA_TABLE_ENTRY), - TAG('M', 'm', 'L', 'd')); - HalModuleObject->DllBase = LdrEntry->DllBase; - RtlInitUnicodeString(&HalModuleObject->FullDllName, HAL_MODULE_NAME); - LdrpBuildModuleBaseName(&HalModuleObject->BaseDllName, &HalModuleObject->FullDllName); - HalModuleObject->EntryPoint = LdrEntry->EntryPoint; - HalModuleObject->SizeOfImage = LdrEntry->SizeOfImage; - - /* Insert it into the list */ - InsertTailList(&ModuleListHead, &HalModuleObject->InLoadOrderLinks); - - /* Hook for KDB on initialization of the loader. */ - KDB_LOADERINIT_HOOK(NtoskrnlModuleObject, HalModuleObject); -} - -// -// Used for checking if a module is already in the module list. -// Used during loading/unloading drivers. -// -PLDR_DATA_TABLE_ENTRY -NTAPI -LdrGetModuleObject ( PUNICODE_STRING ModuleName ) -{ - PLDR_DATA_TABLE_ENTRY Module; - PLIST_ENTRY Entry; - KIRQL Irql; - - DPRINT("LdrGetModuleObject(%wZ) called\n", ModuleName); - - KeAcquireSpinLock(&ModuleListLock,&Irql); - - Entry = ModuleListHead.Flink; - while (Entry != &ModuleListHead) - { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - DPRINT("Comparing %wZ and %wZ\n", - &Module->BaseDllName, - ModuleName); - - if (!LdrpCompareModuleNames(&Module->BaseDllName, ModuleName)) - { - DPRINT("Module %wZ\n", &Module->BaseDllName); - KeReleaseSpinLock(&ModuleListLock, Irql); - return(Module); - } - - Entry = Entry->Flink; - } - - KeReleaseSpinLock(&ModuleListLock, Irql); - - DPRINT("Could not find module '%wZ'\n", ModuleName); - - return(NULL); -} - -// -// Used when unloading drivers -// -NTSTATUS -NTAPI -LdrUnloadModule ( PLDR_DATA_TABLE_ENTRY ModuleObject ) -{ - KIRQL Irql; - - /* Remove the module from the module list */ - KeAcquireSpinLock(&ModuleListLock,&Irql); - RemoveEntryList(&ModuleObject->InLoadOrderLinks); - KeReleaseSpinLock(&ModuleListLock, Irql); - - /* Hook for KDB on unloading a driver. */ - KDB_UNLOADDRIVER_HOOK(ModuleObject); - - /* Free module section */ - // MmFreeSection(ModuleObject->DllBase); - - ExFreePool(ModuleObject->FullDllName.Buffer); - ExFreePool(ModuleObject); - - return(STATUS_SUCCESS); -} - -// -// Used for images already loaded (boot drivers) -// -NTSTATUS -LdrProcessModule( - PVOID ModuleLoadBase, - PUNICODE_STRING ModuleName, - PLDR_DATA_TABLE_ENTRY *ModuleObject ) -{ - PIMAGE_DOS_HEADER PEDosHeader; - - /* If MZ header exists */ - PEDosHeader = (PIMAGE_DOS_HEADER) ModuleLoadBase; - if (PEDosHeader->e_magic == IMAGE_DOS_SIGNATURE && PEDosHeader->e_lfanew != 0L) - { - return LdrPEProcessModule(ModuleLoadBase, - ModuleName, - ModuleObject); - } - - DPRINT("Module wasn't PE\n"); - return STATUS_UNSUCCESSFUL; } // Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=25872… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c (original) +++ trunk/reactos/ntoskrnl/mm/mm.c Thu Feb 22 03:01:52 2007 @@ -409,7 +409,7 @@ ANSI_STRING AnsiRoutineName; NTSTATUS Status; PLIST_ENTRY NextEntry; - extern LIST_ENTRY ModuleListHead; + extern LIST_ENTRY PsLoadedModuleList; PLDR_DATA_TABLE_ENTRY LdrEntry; BOOLEAN Found = FALSE; UNICODE_STRING KernelName = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); @@ -422,8 +422,8 @@ if (!NT_SUCCESS(Status)) return NULL; /* Loop the loaded module list */ - NextEntry = ModuleListHead.Flink; - while (NextEntry != &ModuleListHead) + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) { /* Get the entry */ LdrEntry = CONTAINING_RECORD(NextEntry, Added: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (added) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Thu Feb 22 03:01:52 2007 @@ -1,0 +1,586 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/mm/sysldr.c +* PURPOSE: Contains the Kernel Loader (SYSLDR) for loading PE files. +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +MiSnapThunk(IN PVOID DllBase, + IN PVOID ImageBase, + IN PIMAGE_THUNK_DATA Name, + IN PIMAGE_THUNK_DATA Address, + IN PIMAGE_EXPORT_DIRECTORY ExportDirectory, + IN ULONG ExportSize, + IN BOOLEAN SnapForwarder, + OUT PCHAR *MissingApi) +{ + BOOLEAN IsOrdinal; + USHORT Ordinal; + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_IMPORT_BY_NAME NameImport; + USHORT Hint; + ULONG Low = 0, Mid = 0, High; + LONG Ret; + NTSTATUS Status; + PCHAR MissingForwarder; + CHAR NameBuffer[MAXIMUM_FILENAME_LENGTH]; + PULONG ExportTable; + ANSI_STRING DllName; + UNICODE_STRING ForwarderName; + PLIST_ENTRY NextEntry; + PLDR_DATA_TABLE_ENTRY LdrEntry; + ULONG ForwardExportSize; + PIMAGE_EXPORT_DIRECTORY ForwardExportDirectory; + PIMAGE_IMPORT_BY_NAME ForwardName; + ULONG ForwardLength; + IMAGE_THUNK_DATA ForwardThunk; + PAGED_CODE(); + + /* Check if this is an ordinal */ + IsOrdinal = IMAGE_SNAP_BY_ORDINAL(Name->u1.Ordinal); + if ((IsOrdinal) && !(SnapForwarder)) + { + /* Get the ordinal number and set it as missing */ + Ordinal = (USHORT)(IMAGE_ORDINAL(Name->u1.Ordinal) - + ExportDirectory->Base); + *MissingApi = (PCHAR)(ULONG_PTR)Ordinal; + } + else + { + /* Get the VA if we don't have to snap */ + if (!SnapForwarder) Name->u1.AddressOfData += (ULONG_PTR)ImageBase; + NameImport = (PIMAGE_IMPORT_BY_NAME)Name->u1.AddressOfData; + + /* Copy the procedure name */ + strncpy(*MissingApi, + (PCHAR)&NameImport->Name[0], + MAXIMUM_FILENAME_LENGTH - 1); + + /* Setup name tables */ + DPRINT("Import name: %s\n", NameImport->Name); + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Get the hint and check if it's valid */ + Hint = NameImport->Hint; + if ((Hint < ExportDirectory->NumberOfNames) && + !(strcmp(NameImport->Name, (PCHAR)DllBase + NameTable[Hint]))) + { + /* We have a match, get the ordinal number from here */ + Ordinal = OrdinalTable[Hint]; + } + else + { + /* Do a binary search */ + High = ExportDirectory->NumberOfNames - 1; + while (High >= Low) + { + /* Get new middle value */ + Mid = (Low + High) >> 1; + + /* Compare name */ + Ret = strcmp(NameImport->Name, (PCHAR)DllBase + NameTable[Mid]); + if (Ret < 0) + { + /* Update high */ + High = Mid - 1; + } + else if (Ret > 0) + { + /* Update low */ + Low = Mid + 1; + } + else + { + /* We got it */ + break; + } + } + + /* Check if we couldn't find it */ + if (High < Low) return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; + + /* Otherwise, this is the ordinal */ + Ordinal = OrdinalTable[Mid]; + } + } + + /* Check if the ordinal is invalid */ + if (Ordinal >= ExportDirectory->NumberOfFunctions) + { + /* Fail */ + Status = STATUS_DRIVER_ORDINAL_NOT_FOUND; + } + else + { + /* In case the forwarder is missing */ + MissingForwarder = NameBuffer; + + /* Resolve the address and write it */ + ExportTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfFunctions); + Address->u1.Function = (ULONG_PTR)DllBase + ExportTable[Ordinal]; + + /* Assume success from now on */ + Status = STATUS_SUCCESS; + + /* Check if the function is actually a forwarder */ + if ((Address->u1.Function > (ULONG_PTR)ExportDirectory) && + (Address->u1.Function < ((ULONG_PTR)ExportDirectory + ExportSize))) + { + /* Now assume failure in case the forwarder doesn't exist */ + Status = STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; + + /* Build the forwarder name */ + DllName.Buffer = (PCHAR)Address->u1.Function; + DllName.Length = strchr(DllName.Buffer, '.') - + DllName.Buffer + + sizeof(ANSI_NULL); + DllName.MaximumLength = DllName.Length; + + /* Convert it */ + if (!NT_SUCCESS(RtlAnsiStringToUnicodeString(&ForwarderName, + &DllName, + TRUE))) + { + /* We failed, just return an error */ + return Status; + } + + /* Loop the module list */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + /* Get the loader entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Check if it matches */ + if (RtlPrefixString((PSTRING)&ForwarderName, + (PSTRING)&LdrEntry->BaseDllName, + TRUE)) + { + /* Get the forwarder export directory */ + ForwardExportDirectory = + RtlImageDirectoryEntryToData(LdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ForwardExportSize); + if (!ForwardExportDirectory) break; + + /* Allocate a name entry */ + ForwardLength = strlen(DllName.Buffer + DllName.Length) + + sizeof(ANSI_NULL); + ForwardName = ExAllocatePoolWithTag(PagedPool, + sizeof(*ForwardName) + + ForwardLength, + TAG_LDR_WSTR); + if (!ForwardName) break; + + /* Copy the data */ + RtlCopyMemory(&ForwardName->Name[0], + DllName.Buffer + DllName.Length, + ForwardLength); + ForwardName->Hint = 0; + + /* Set the new address */ + *(PULONG)&ForwardThunk.u1.AddressOfData = (ULONG)ForwardName; + + /* Snap the forwarder */ + Status = MiSnapThunk(LdrEntry->DllBase, + ImageBase, + &ForwardThunk, + &ForwardThunk, + ForwardExportDirectory, + ForwardExportSize, + TRUE, + &MissingForwarder); + + /* Free the forwarder name and set the thunk */ + ExFreePool(ForwardName); + Address->u1 = ForwardThunk.u1; + break; + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Free the name */ + RtlFreeUnicodeString(&ForwarderName); + } + } + + /* Return status */ + return Status; +} + +NTSTATUS +NTAPI +MiResolveImageReferences(IN PVOID ImageBase, + IN PUNICODE_STRING ImageFileDirectory, + IN PUNICODE_STRING NamePrefix OPTIONAL, + OUT PCHAR *MissingApi, + OUT PWCHAR *MissingDriver, + OUT PLOAD_IMPORTS *LoadImports) +{ + PCHAR MissingApiBuffer = *MissingApi, ImportName; + PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor, CurrentImport; + ULONG ImportSize, ImportCount = 0, LoadedImportsSize, ExportSize; + PLOAD_IMPORTS LoadedImports; + ULONG GdiLink, NormalLink, i; + BOOLEAN ReferenceNeeded, Loaded; + ANSI_STRING TempString; + UNICODE_STRING NameString, DllName; + PLDR_DATA_TABLE_ENTRY LdrEntry = NULL, DllEntry, ImportEntry = NULL; + PVOID ImportBase, DllBase; + PLIST_ENTRY NextEntry; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + NTSTATUS Status; + PIMAGE_THUNK_DATA OrigThunk, FirstThunk; + PAGED_CODE(); + DPRINT("%s - ImageBase: %p. ImageFileDirectory: %wZ\n", + __FUNCTION__, ImageBase, ImageFileDirectory); + + /* Assume no imports */ + *LoadImports = (PVOID)-2; + + /* Get the import descriptor */ + ImportDescriptor = RtlImageDirectoryEntryToData(ImageBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, + &ImportSize); + if (!ImportDescriptor) return STATUS_SUCCESS; + + /* Loop all imports to count them */ + for (CurrentImport = ImportDescriptor; + (CurrentImport->Name) && (CurrentImport->OriginalFirstThunk); + CurrentImport++) + { + /* One more */ + ImportCount++; + } + + /* Make sure we have non-zero imports */ + if (ImportCount) + { + /* Calculate and allocate the list we'll need */ + LoadedImportsSize = ImportCount * sizeof(PVOID) + sizeof(SIZE_T); + LoadedImports = ExAllocatePoolWithTag(PagedPool, + LoadedImportsSize, + TAG_LDR_WSTR); + if (LoadedImports) + { + /* Zero it and set the count */ + RtlZeroMemory(LoadedImports, LoadedImportsSize); + LoadedImports->Count = ImportCount; + } + } + else + { + /* No table */ + LoadedImports = NULL; + } + + /* Reset the import count and loop descriptors again */ + ImportCount = GdiLink = NormalLink = 0; + while ((ImportDescriptor->Name) && (ImportDescriptor->OriginalFirstThunk)) + { + /* Get the name */ + ImportName = (PCHAR)((ULONG_PTR)ImageBase + ImportDescriptor->Name); + + /* Check if this is a GDI driver */ + GdiLink = GdiLink | + !(_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)); + + /* We can also allow dxapi */ + NormalLink = NormalLink | + ((_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)) && + (_strnicmp(ImportName, "dxapi", sizeof("dxapi") - 1))); + + /* Check if this is a valid GDI driver */ + if ((GdiLink) && (NormalLink)) + { + /* It's not, it's importing stuff it shouldn't be! */ + DPRINT1("Invalid driver!\n"); + //MiDereferenceImports(LoadedImports); + if (LoadedImports) ExFreePool(LoadedImports); + return STATUS_PROCEDURE_NOT_FOUND; + } + + /* Check if this is a "core" import, which doesn't get referenced */ + if (!(_strnicmp(ImportName, "ntoskrnl", sizeof("ntoskrnl") - 1)) || + !(_strnicmp(ImportName, "win32k", sizeof("win32k") - 1)) || + !(_strnicmp(ImportName, "hal", sizeof("hal") - 1))) + { + /* Don't reference this */ + ReferenceNeeded = FALSE; + } + else + { + /* Reference these modules */ + ReferenceNeeded = TRUE; + } + + /* Now setup a unicode string for the import */ + RtlInitAnsiString(&TempString, ImportName); + Status = RtlAnsiStringToUnicodeString(&NameString, &TempString, TRUE); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + //MiDereferenceImports(LoadedImports); + if (LoadedImports) ExFreePool(LoadedImports); + return Status; + } + + /* We don't support name prefixes yet */ + if (NamePrefix) DPRINT1("Name Prefix not yet supported!\n"); + + /* Remember that we haven't loaded the import at this point */ +CheckDllState: + Loaded = FALSE; + ImportBase = NULL; + + /* Loop the driver list */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + /* Get the loader entry and compare the name */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + if (RtlEqualUnicodeString(&NameString, + &LdrEntry->BaseDllName, + TRUE)) + { + /* Get the base address */ + ImportBase = LdrEntry->DllBase; + + /* Check if we haven't loaded yet, and we need references */ + if (!(Loaded) && (ReferenceNeeded)) + { + /* Make sure we're not already loading */ + if (!(LdrEntry->Flags & LDRP_LOAD_IN_PROGRESS)) + { + /* Increase the load count */ + LdrEntry->LoadCount++; + } + } + + /* Done, break out */ + break; + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Check if we haven't loaded the import yet */ + if (!ImportBase) + { + /* Setup the import DLL name */ + DllName.MaximumLength = NameString.Length + + ImageFileDirectory->Length + + sizeof(UNICODE_NULL); + DllName.Buffer = ExAllocatePoolWithTag(NonPagedPool, + DllName.MaximumLength, + TAG_LDR_WSTR); + if (DllName.Buffer) + { + /* Setup the base length and copy it */ + DllName.Length = ImageFileDirectory->Length; + RtlCopyMemory(DllName.Buffer, + ImageFileDirectory->Buffer, + ImageFileDirectory->Length); + + /* Now add the import name and null-terminate it */ + RtlAppendStringToString((PSTRING)&DllName, + (PSTRING)&NameString); + DllName.Buffer[(DllName.MaximumLength - 1) / 2] = UNICODE_NULL; + + /* Load the image */ + Status = LdrLoadModule(&DllName, &DllEntry); + if (NT_SUCCESS(Status)) + { + /* We can free the DLL Name */ + ExFreePool(DllName.Buffer); + } + else + { + /* Fill out the information for the error */ + DPRINT1("Failed to import: %S\n", DllName.Buffer); + *MissingDriver = DllName.Buffer; + *(PULONG)MissingDriver |= 1; + *MissingApi = NULL; + } + } + else + { + /* We're out of resources */ + Status = STATUS_INSUFFICIENT_RESOURCES; + } + + /* Check if we're OK until now */ + if (NT_SUCCESS(Status)) + { + /* We're now loaded */ + Loaded = TRUE; + + /* Get the base address and other information */ + DllBase = DllEntry->DllBase; + ASSERT(DllBase = DllEntry->DllBase); + + /* Call the initialization routines */ +#if 0 + Status = MmCallDllInitialize(DllEntry, &PsLoadedModuleList); + if (!NT_SUCCESS(Status)) + { + /* We failed, unload the image */ + MmUnloadSystemImage(DllEntry); + while (TRUE); + Loaded = FALSE; + } +#endif + } + + /* Check if we failed by here */ + if (!NT_SUCCESS(Status)) + { + /* Cleanup and return */ + DPRINT1("Failed loading import\n"); + RtlFreeUnicodeString(&NameString); + //MiDereferenceImports(LoadedImports); + if (LoadedImports) ExFreePool(LoadedImports); + return Status; + } + + /* Loop again to make sure that everything is OK */ + goto CheckDllState; + } + + /* Check if we're support to reference this import */ + if ((ReferenceNeeded) && (LoadedImports)) + { + /* Make sure we're not already loading */ + if (!(LdrEntry->Flags & LDRP_LOAD_IN_PROGRESS)) + { + /* Add the entry */ + LoadedImports->Entry[ImportCount] = LdrEntry; + ImportCount++; + } + } + + /* Free the import name */ + RtlFreeUnicodeString(&NameString); + + /* Set the missing driver name and get the export directory */ + *MissingDriver = LdrEntry->BaseDllName.Buffer; + ExportDirectory = RtlImageDirectoryEntryToData(ImportBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + if (!ExportDirectory) + { + /* Cleanup and return */ + DPRINT1("Invalid driver: %wZ\n", &LdrEntry->BaseDllName); + //MiDereferenceImports(LoadedImports); + if (LoadedImports) ExFreePool(LoadedImports); + return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; + } + + /* Make sure we have an IAT */ + if (ImportDescriptor->OriginalFirstThunk) + { + /* Get the first thunks */ + OrigThunk = (PVOID)((ULONG_PTR)ImageBase + + ImportDescriptor->OriginalFirstThunk); + FirstThunk = (PVOID)((ULONG_PTR)ImageBase + + ImportDescriptor->FirstThunk); + + /* Loop the IAT */ + while (OrigThunk->u1.AddressOfData) + { + /* Snap thunk */ + Status = MiSnapThunk(ImportBase, + ImageBase, + OrigThunk++, + FirstThunk++, + ExportDirectory, + ExportSize, + FALSE, + MissingApi); + if (!NT_SUCCESS(Status)) + { + /* Cleanup and return */ + //MiDereferenceImports(LoadedImports); + if (LoadedImports) ExFreePool(LoadedImports); + return Status; + } + + /* Reset the buffer */ + *MissingApi = MissingApiBuffer; + } + } + + /* Go to the next import */ + ImportDescriptor++; + } + + /* Check if we have an import list */ + if (LoadedImports) + { + /* Reset the count again, and loop entries*/ + ImportCount = 0; + for (i = 0; i < LoadedImports->Count; i++) + { + if (LoadedImports->Entry[i]) + { + /* Got an entry, OR it with 1 in case it's the single entry */ + ImportEntry = (PVOID)((ULONG_PTR)LoadedImports->Entry[i] | 1); + ImportCount++; + } + } + + /* Check if we had no imports */ + if (!ImportCount) + { + /* Free the list and set it to no imports */ + ExFreePool(LoadedImports); + LoadedImports = (PVOID)-2; + } + else if (ImportCount == 1) + { + /* Just one entry, we can free the table and only use our entry */ + ExFreePool(LoadedImports); + LoadedImports = (PLOAD_IMPORTS)ImportEntry; + } + else if (ImportCount != LoadedImports->Count) + { + /* FIXME: Can this happen? */ + DPRINT1("Unhandled scenario\n"); + while (TRUE); + } + + /* Return the list */ + *LoadImports = LoadedImports; + } + + /* Return success */ + return STATUS_SUCCESS; +} + Modified: trunk/reactos/ntoskrnl/mm/verifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/verifier.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/verifier.c (original) +++ trunk/reactos/ntoskrnl/mm/verifier.c Thu Feb 22 03:01:52 2007 @@ -19,7 +19,7 @@ KMUTANT MmSystemLoadLock; ULONG MiActiveVerifierThunks; -extern LIST_ENTRY ModuleListHead; +extern LIST_ENTRY PsLoadedModuleList; /* PRIVATE FUNCTIONS *********************************************************/ @@ -32,7 +32,7 @@ PAGED_CODE(); /* Loop entries */ - NextEntry = ModuleListHead.Flink; + NextEntry = PsLoadedModuleList.Flink; do { /* Get the loader entry */ @@ -51,7 +51,7 @@ /* Move on */ NextEntry = NextEntry->Flink; - } while(NextEntry != &ModuleListHead); + } while(NextEntry != &PsLoadedModuleList); /* Return the entry */ return FoundEntry; Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu Feb 22 03:01:52 2007 @@ -275,6 +275,7 @@ <file>region.c</file> <file>rmap.c</file> <file>section.c</file> + <file>sysldr.c</file> <file>verifier.c</file> <file>virtual.c</file> <file>wset.c</file>

17 years, 6 months

[greatlrd] 25871: merge r25870 it take care of unexpect crash in NtGdiDdCreateDirectDrawObject for it using seh now

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Feb 22 01:22:30 2007 New Revision: 25871 URL: http://svn.reactos.org/svn/reactos?rev=25871&view=rev Log: merge r25870 it take care of unexpect crash in NtGdiDdCreateDirectDrawObject for it using seh now Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/intddraw.h branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/tags.h branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/stubs.c Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/intddraw.h Thu Feb 22 01:22:30 2007 @@ -100,6 +100,14 @@ /* Notify Callback */ //LPDD_NOTIFYCALLBACK NotifyCallback + /* memory stuff */ + DWORD dwNumHeaps; + PVIDEOMEMORY pvmList; + + DWORD dwNumFourCC; + LPDWORD pdwFourCC; + + } DD_DIRECTDRAW, *PDD_DIRECTDRAW; BOOL INTERNAL_CALL DD_Cleanup(PVOID pDD); Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/tags.h (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/include/tags.h Thu Feb 22 01:22:30 2007 @@ -58,4 +58,10 @@ #define TAG_FNTFILE TAG('F', 'N', 'T', 'F') /* font file */ #define TAG_SSECTPOOL TAG('S', 'S', 'C', 'P') /* shared section pool */ + +/* Dx internal tags rember I do not known if it right namees */ +#define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */ +#define TAG_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */ + + #endif /* _WIN32K_TAGS_H */ Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Thu Feb 22 01:22:30 2007 @@ -48,79 +48,182 @@ return FALSE; } + //if (pDirectDraw->pvmList != NULL) + //{ + // ExFreePool(pDirectDraw->pvmList); + //} + // + //if (pDirectDraw->pdwFourCC != NULL) + //{ + // ExFreePool(pDirectDraw->pdwFourCC); + //} + pDirectDraw->DrvDisableDirectDraw(pDirectDraw->Global.dhpdev); return TRUE; } +/* code for enable and reanble the drv */ +BOOL +intEnableDriver(PDD_DIRECTDRAW pDirectDraw) +{ + BOOL success; + DD_HALINFO HalInfo; + + /*clean up some of the cache entry */ + RtlZeroMemory(&pDirectDraw->DD, sizeof(DD_CALLBACKS)); + RtlZeroMemory(&pDirectDraw->Surf, sizeof(DD_SURFACECALLBACKS)); + RtlZeroMemory(&pDirectDraw->Pal, sizeof(DD_PALETTECALLBACKS)); + RtlZeroMemory(&pDirectDraw->Hal, sizeof(DD_HALINFO)); + RtlZeroMemory(&HalInfo, sizeof(DD_HALINFO)); + pDirectDraw->dwNumHeaps =0; + pDirectDraw->dwNumFourCC = 0; + pDirectDraw->pdwFourCC = NULL; + pDirectDraw->pvmList = NULL; + + /* Get DirectDraw infomations form the driver + * DDK say pvmList, pdwFourCC is always NULL in frist call here + * but we get back how many pvmList it whant we should alloc, same + * with pdwFourCC. + */ + success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, + &HalInfo, + &pDirectDraw->dwNumHeaps, + NULL, + &pDirectDraw->dwNumFourCC, + NULL); + if (!success) + { + DPRINT1("DrvGetDirectDrawInfo frist call fail\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + /* The driver are not respnose to alloc the memory for pvmList + * but it is win32k responsible todo, Windows 9x it is gdi32.dll + */ + if (pDirectDraw->dwNumHeaps != 0) + { + pDirectDraw->pvmList = (PVIDEOMEMORY) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumHeaps * sizeof(VIDEOMEMORY), TAG_DXPVMLIST); + if (pDirectDraw->pvmList == NULL) + { + return FALSE; + } + } + + /* The driver are not respnose to alloc the memory for pdwFourCC + * but it is win32k responsible todo, Windows 9x it is gdi32.dll + */ + + if (pDirectDraw->dwNumFourCC != 0) + { + pDirectDraw->pdwFourCC = (LPDWORD) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumFourCC * sizeof(DWORD), TAG_DXFOURCC); + + if (pDirectDraw->pdwFourCC == NULL) + { + return FALSE; + } + } + + success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, + &HalInfo, + &pDirectDraw->dwNumHeaps, + pDirectDraw->pvmList, + &pDirectDraw->dwNumFourCC, + pDirectDraw->pdwFourCC); + if (!success) + { + DPRINT1("DrvGetDirectDrawInfo second call fail\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + + /* We need now convert the DD_HALINFO we got, it can be NT4 driver we + * loading ReactOS supporting NT4 and higher to be loading.so we make + * the HALInfo compatible here so we can easy pass it to gdi32.dll + * without converting it later + */ + + if ((HalInfo.dwSize != sizeof(DD_HALINFO)) && + (HalInfo.dwSize != sizeof(DD_HALINFO_V4))) + { + DPRINT1(" Fail not vaild driver DD_HALINFO struct found\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + if (HalInfo.dwSize != sizeof(DD_HALINFO)) + { + if (HalInfo.dwSize == sizeof(DD_HALINFO_V4)) + { + /* NT4 Compatible */ + DPRINT1("Got DD_HALINFO_V4 sturct we convert it to DD_HALINFO \n"); + HalInfo.dwSize = sizeof(DD_HALINFO); + HalInfo.lpD3DGlobalDriverData = NULL; + HalInfo.lpD3DHALCallbacks = NULL; + HalInfo.lpD3DBufCallbacks = NULL; + } + else + { + /* Unknown version found */ + DPRINT1(" Fail : did not get DD_HALINFO size \n"); + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + /* Copy it to user mode pointer the data */ + RtlCopyMemory(&pDirectDraw->Hal, &HalInfo, sizeof(DD_HALINFO)); + } + + success = pDirectDraw->EnableDirectDraw( pDirectDraw->Global.dhpdev, + &pDirectDraw->DD, + &pDirectDraw->Surf, + &pDirectDraw->Pal); + + if (!success) + { + DPRINT1("EnableDirectDraw call fail\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + return TRUE; +} + + HANDLE STDCALL NtGdiDdCreateDirectDrawObject(HDC hdc) { - DD_CALLBACKS callbacks; - DD_SURFACECALLBACKS surface_callbacks; - DD_PALETTECALLBACKS palette_callbacks; DC *pDC; - BOOL success; HANDLE hDirectDraw; PDD_DIRECTDRAW pDirectDraw; DPRINT1("NtGdiDdCreateDirectDrawObject\n"); - RtlZeroMemory(&callbacks, sizeof(DD_CALLBACKS)); - callbacks.dwSize = sizeof(DD_CALLBACKS); - RtlZeroMemory(&surface_callbacks, sizeof(DD_SURFACECALLBACKS)); - surface_callbacks.dwSize = sizeof(DD_SURFACECALLBACKS); - RtlZeroMemory(&palette_callbacks, sizeof(DD_PALETTECALLBACKS)); - palette_callbacks.dwSize = sizeof(DD_PALETTECALLBACKS); - /* Create a hdc if we do not have one */ if (hdc == NULL) { - HDC newHdc = IntGdiCreateDC(NULL,NULL,NULL,NULL,FALSE); - hdc = newHdc; - - if (hdc == NULL) - { - DPRINT1("FIXME hdc is NULL \n"); - return NULL; - } + return NULL; } /* Look the hdc to gain the internal struct */ - pDC = DC_LockDc(hdc); if (!pDC) { - /* We did fail look here so return NULL */ return NULL; } - if (pDC->DriverFunctions.EnableDirectDraw == NULL) - { - /* Driver doesn't support DirectDraw */ - - /* - Warring ReactOS complain that pDC are not right owner - when DC_UnlockDc(pDC) hit, why ? - */ + /* test see if drv got a dx interface or not */ + if (( pDC->DriverFunctions.GetDirectDrawInfo == NULL) || + ( pDC->DriverFunctions.DisableDirectDraw == NULL) || + ( pDC->DriverFunctions.EnableDirectDraw == NULL)) + { DC_UnlockDc(pDC); return NULL; } - /* test see if driver support DirectDraw interface */ - success = pDC->DriverFunctions.EnableDirectDraw( - pDC->PDev, &callbacks, &surface_callbacks, &palette_callbacks); - - if (!success) - { - /* DirectDraw creation failed */ - DPRINT1("DirectDraw creation failed\n"); - DC_UnlockDc(pDC); - return NULL; - } - - /* We found a DirectDraw interface - * Alloc a handler for it - */ + /* alloc and lock the stucrt */ hDirectDraw = GDIOBJ_AllocObj(DdHandleTable, GDI_OBJECT_TYPE_DIRECTDRAW); if (!hDirectDraw) { @@ -129,8 +232,6 @@ return NULL; } - /* try look the DirectDraw handler and setup some data later */ - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDraw, GDI_OBJECT_TYPE_DIRECTDRAW); if (!pDirectDraw) { @@ -139,27 +240,7 @@ return NULL; } - /* - * We are caching all callbacks and some data - * reason for it, is we do not trust on the kernel/usermode - * pointer for the callbacks comes back from user mode. - * I perfer more safer way todo it, only safe way is - * to cache the callbacks pointer, and send back the true - * kernel pointer to user mode of the driver api we get back - * Windows is sending back kernel pointer of the driver we - * are doing same, differnt is we also cache it. and only - * use the cached one. - */ - - /* - Getting the PDev bad idea we need the hdc instead - if we are doing a dymatic resultions change the - Pdev will get lost, we should cache the HDC instead - in windows, after a resultions change the HAL interface - need be rebuild from scrach, thanks to this.small problem - maybe we in ReactOS can found a solvtions on this later - */ - + /* setup the internal stuff */ pDirectDraw->Global.dhpdev = pDC->PDev; pDirectDraw->Local.lpGbl = &pDirectDraw->Global; @@ -167,30 +248,28 @@ pDirectDraw->DrvDisableDirectDraw = pDC->DriverFunctions.DisableDirectDraw; pDirectDraw->EnableDirectDraw = pDC->DriverFunctions.EnableDirectDraw; - - /* DD_CALLBACKS setup */ - RtlMoveMemory(&pDirectDraw->DD, &callbacks, sizeof(DD_CALLBACKS)); - - /* DD_SURFACECALLBACKS setup*/ - RtlMoveMemory(&pDirectDraw->Surf, &surface_callbacks, sizeof(DD_SURFACECALLBACKS)); - - /* DD_PALETTECALLBACKS setup*/ - RtlMoveMemory(&pDirectDraw->Pal, &palette_callbacks, sizeof(DD_PALETTECALLBACKS)); + if (intEnableDriver(pDirectDraw) == FALSE) + { + /* FIXME delete the pDirectDraw and the handle */ + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + DC_UnlockDc(pDC); + return NULL; + } GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); DC_UnlockDc(pDC); - DPRINT1("DirectDraw return handler 0x%x\n",hDirectDraw); + return hDirectDraw; } BOOL STDCALL NtGdiDdDeleteDirectDrawObject( HANDLE hDirectDrawLocal) { - DPRINT1("NtGdiDdDeleteDirectDrawObject\n"); return GDIOBJ_FreeObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); } + BOOL STDCALL NtGdiDdQueryDirectDrawObject( @@ -207,139 +286,97 @@ DWORD *puFourCC ) { - DD_HALINFO HalInfo; PDD_DIRECTDRAW pDirectDraw; - BOOL success; - + NTSTATUS Status = FALSE; DPRINT1("NtGdiDdQueryDirectDrawObject\n"); - - /* Check for NULL pointer to prevent any one doing a mistake */ if (hDirectDrawLocal == NULL) { return FALSE; } - if (pHalInfo == NULL) - { - return FALSE; - } - - if ( pCallBackFlags == NULL) - { - return FALSE; - } - - /* Look the DirectDraw interface */ pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); if (!pDirectDraw) { - /* Fail to Lock DirectDraw handle */ return FALSE; } - /* lock susseces - * rest the pHalInfo size we do not known - * if we got a NT4 driver or windows 2000/XP/2003 driver yet - */ - pHalInfo->dwSize = 0; - - /* Getting the request size of all struct at frist call - * Secound call we getting data back - */ - - success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, - &HalInfo, - puNumHeaps, puvmList, - puNumFourCC, puFourCC); - - if (!success) - { - /* fail we did not get any DrvGetDirectDrawInfo - * so we assume it is simple 2d DirectDraw interface - */ - DPRINT1("Driver does not fill the Fail to get DirectDraw driver info \n"); - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + _SEH_TRY + { + ProbeForWrite(pHalInfo, sizeof(DD_HALINFO), 1); + RtlCopyMemory(pHalInfo,&pDirectDraw->Hal, sizeof(DD_HALINFO)); + + ProbeForWrite(pCallBackFlags, sizeof(DWORD)*3, 1); + pCallBackFlags[0]=pDirectDraw->DD.dwFlags; + pCallBackFlags[1]=pDirectDraw->Surf.dwFlags; + pCallBackFlags[2]=pDirectDraw->Pal.dwFlags; + + if (pDirectDraw->Hal.lpD3DHALCallbacks != NULL) + { + DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); + + ProbeForWrite(puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS), 1); + RtlCopyMemory( puD3dCallbacks, pDirectDraw->Hal.lpD3DHALCallbacks, + sizeof( D3DNTHAL_CALLBACKS ) ); + } + + if (pDirectDraw->Hal.lpD3DGlobalDriverData != NULL) + { + DPRINT1("Found DirectDraw Global DriverData \n"); + + ProbeForWrite(puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA), 1); + RtlCopyMemory( puD3dDriverData, pDirectDraw->Hal.lpD3DGlobalDriverData, + sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + } + + if (pDirectDraw->Hal.lpD3DBufCallbacks != NULL) + { + DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); + ProbeForWrite(puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS), 1); + RtlCopyMemory( puD3dBufferCallbacks, pDirectDraw->Hal.lpD3DBufCallbacks, + sizeof(DD_D3DBUFCALLBACKS)); + } + + /* FIXME LPDDSURFACEDESC puD3dTextureFormats */ + + ProbeForWrite(puNumHeaps, sizeof(DWORD), 1); + *puNumHeaps = pDirectDraw->dwNumHeaps; + + if (pDirectDraw->pvmList != NULL) + { + ProbeForWrite(puvmList, sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps, 1); + RtlCopyMemory( puvmList, + pDirectDraw->pvmList, + sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps); + } + + ProbeForWrite(puNumFourCC, sizeof(DWORD), 1); + *puNumFourCC = pDirectDraw->dwNumFourCC; + + if (pDirectDraw->pdwFourCC != NULL) + { + ProbeForWrite(puFourCC, sizeof(DWORD) * pDirectDraw->dwNumFourCC, 1); + RtlCopyMemory( puFourCC, + pDirectDraw->pdwFourCC, + sizeof(DWORD) * pDirectDraw->dwNumFourCC); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); return FALSE; } - if (HalInfo.dwSize == 0) - { - /* some driver does not fill it, they only implement the DrvGetDirectDrawInfo - * so they work on Windows 2000/XP/2003 - */ - - DPRINT1(" Fail for driver does not fill the DD_HALINFO struct \n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - /* check see if DD_HALINFO is NT4 version or not - * if it NT4 version we convert it to NT5 version - */ - if (HalInfo.dwSize != sizeof(DD_HALINFO)) - { - if (HalInfo.dwSize == sizeof(DD_HALINFO_V4)) - { - /* NT4 Compatible */ - DPRINT1("Got DD_HALINFO_V4 sturct we convert it to DD_HALINFO \n"); - HalInfo.dwSize = sizeof(DD_HALINFO); - HalInfo.lpD3DGlobalDriverData = NULL; - HalInfo.lpD3DHALCallbacks = NULL; - HalInfo.lpD3DBufCallbacks = NULL; - } - else - { - /* Unknown version found */ - DPRINT1(" Fail : did not get DD_HALINFO size \n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - } - - /* Copy it to user mode pointer the data */ - RtlMoveMemory(pHalInfo, &HalInfo, sizeof(DD_HALINFO)); - - /* rest the flag so we do not need do it later */ - pCallBackFlags[0]=pDirectDraw->DD.dwFlags; - pCallBackFlags[1]=pDirectDraw->Surf.dwFlags; - pCallBackFlags[2]=pDirectDraw->Pal.dwFlags; - - DPRINT1("Found DirectDraw CallBack for 2D and 3D Hal\n"); - - /* Copy it to the cache */ - RtlMoveMemory(&pDirectDraw->Hal, pHalInfo, sizeof(DD_HALINFO)); - - if (pHalInfo->lpD3DGlobalDriverData) - { - /* - msdn say D3DHAL_GLOBALDRIVERDATA and D3DNTHAL_GLOBALDRIVERDATA - are not same but if u compare these in msdn it is exacly same - */ - DPRINT1("Found DirectDraw Global DriverData \n"); - RtlMoveMemory(puD3dDriverData, pHalInfo->lpD3DGlobalDriverData, - sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - } - - if (pHalInfo->lpD3DHALCallbacks ) - { - DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); - RtlMoveMemory(puD3dCallbacks, pHalInfo->lpD3DHALCallbacks, - sizeof( D3DNTHAL_CALLBACKS ) ); - } - - if (pHalInfo->lpD3DBufCallbacks) - { - DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); - /* msdn DDHAL_D3DBUFCALLBACKS = DD_D3DBUFCALLBACKS */ - RtlMoveMemory(puD3dBufferCallbacks, pHalInfo->lpD3DBufCallbacks, - sizeof(DD_D3DBUFCALLBACKS)); - } - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); return TRUE; } Modified: branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/stubs.c (original) +++ branches/ros-branch-0_3_1/reactos/subsystems/win32/win32k/ntddraw/stubs.c Thu Feb 22 01:22:30 2007 @@ -311,7 +311,7 @@ { UNIMPLEMENTED - return 0; + return FALSE; } BOOL STDCALL NtGdiDdReleaseDC(

17 years, 6 months

[greatlrd] 25870: adding a helper intEnableDriver it will be use for enable the dx driver for the graphice card. rewrote NtGdiDdQueryDirectDrawObject so it only copy the cache data only. This will speed up allot. we only need call on NtGdiDdCreateDirectDrawObject yo setup the whole cache and enable the drv with the helper functions. the NtGdiDdQueryDirectDrawObject will be faster like this. using RtlCopyMemory insted for RtlMemMove and allot other change in it. adding _SEH to NtGdiDdQueryDirectD

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Feb 22 01:19:31 2007 New Revision: 25870 URL: http://svn.reactos.org/svn/reactos?rev=25870&view=rev Log: adding a helper intEnableDriver it will be use for enable the dx driver for the graphice card. rewrote NtGdiDdQueryDirectDrawObject so it only copy the cache data only. This will speed up allot. we only need call on NtGdiDdCreateDirectDrawObject yo setup the whole cache and enable the drv with the helper functions. the NtGdiDdQueryDirectDrawObject will be faster like this. using RtlCopyMemory insted for RtlMemMove and allot other change in it. adding _SEH to NtGdiDdQueryDirectDrawObject so user can not crash it any longer. Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h Thu Feb 22 01:19:31 2007 @@ -100,6 +100,14 @@ /* Notify Callback */ //LPDD_NOTIFYCALLBACK NotifyCallback + /* memory stuff */ + DWORD dwNumHeaps; + PVIDEOMEMORY pvmList; + + DWORD dwNumFourCC; + LPDWORD pdwFourCC; + + } DD_DIRECTDRAW, *PDD_DIRECTDRAW; BOOL INTERNAL_CALL DD_Cleanup(PVOID pDD); Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h Thu Feb 22 01:19:31 2007 @@ -58,4 +58,10 @@ #define TAG_FNTFILE TAG('F', 'N', 'T', 'F') /* font file */ #define TAG_SSECTPOOL TAG('S', 'S', 'C', 'P') /* shared section pool */ + +/* Dx internal tags rember I do not known if it right namees */ +#define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */ +#define TAG_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */ + + #endif /* _WIN32K_TAGS_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Thu Feb 22 01:19:31 2007 @@ -48,91 +48,182 @@ return FALSE; } + //if (pDirectDraw->pvmList != NULL) + //{ + // ExFreePool(pDirectDraw->pvmList); + //} + // + //if (pDirectDraw->pdwFourCC != NULL) + //{ + // ExFreePool(pDirectDraw->pdwFourCC); + //} + pDirectDraw->DrvDisableDirectDraw(pDirectDraw->Global.dhpdev); return TRUE; } - -/* Documations how it works in windows and what we should do -* - * HANDLE NtGdiDdCreateDirectDrawObject(HDC hdc) - * - * Use CreateDCW(LDisplay,NULL,NULL,NULL); or some thing else to create a DC. -.* - * A NULL DC are not accpect it return 0 as error - * - * How the interal works see msdn and ddk that is egunt inforamtions to figour or see reactos - * source code. ReactOS interal working diffent here what windows does. - */ +/* code for enable and reanble the drv */ +BOOL +intEnableDriver(PDD_DIRECTDRAW pDirectDraw) +{ + BOOL success; + DD_HALINFO HalInfo; + + /*clean up some of the cache entry */ + RtlZeroMemory(&pDirectDraw->DD, sizeof(DD_CALLBACKS)); + RtlZeroMemory(&pDirectDraw->Surf, sizeof(DD_SURFACECALLBACKS)); + RtlZeroMemory(&pDirectDraw->Pal, sizeof(DD_PALETTECALLBACKS)); + RtlZeroMemory(&pDirectDraw->Hal, sizeof(DD_HALINFO)); + RtlZeroMemory(&HalInfo, sizeof(DD_HALINFO)); + pDirectDraw->dwNumHeaps =0; + pDirectDraw->dwNumFourCC = 0; + pDirectDraw->pdwFourCC = NULL; + pDirectDraw->pvmList = NULL; + + /* Get DirectDraw infomations form the driver + * DDK say pvmList, pdwFourCC is always NULL in frist call here + * but we get back how many pvmList it whant we should alloc, same + * with pdwFourCC. + */ + success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, + &HalInfo, + &pDirectDraw->dwNumHeaps, + NULL, + &pDirectDraw->dwNumFourCC, + NULL); + if (!success) + { + DPRINT1("DrvGetDirectDrawInfo frist call fail\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + /* The driver are not respnose to alloc the memory for pvmList + * but it is win32k responsible todo, Windows 9x it is gdi32.dll + */ + if (pDirectDraw->dwNumHeaps != 0) + { + pDirectDraw->pvmList = (PVIDEOMEMORY) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumHeaps * sizeof(VIDEOMEMORY), TAG_DXPVMLIST); + if (pDirectDraw->pvmList == NULL) + { + return FALSE; + } + } + + /* The driver are not respnose to alloc the memory for pdwFourCC + * but it is win32k responsible todo, Windows 9x it is gdi32.dll + */ + + if (pDirectDraw->dwNumFourCC != 0) + { + pDirectDraw->pdwFourCC = (LPDWORD) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumFourCC * sizeof(DWORD), TAG_DXFOURCC); + + if (pDirectDraw->pdwFourCC == NULL) + { + return FALSE; + } + } + + success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, + &HalInfo, + &pDirectDraw->dwNumHeaps, + pDirectDraw->pvmList, + &pDirectDraw->dwNumFourCC, + pDirectDraw->pdwFourCC); + if (!success) + { + DPRINT1("DrvGetDirectDrawInfo second call fail\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + + /* We need now convert the DD_HALINFO we got, it can be NT4 driver we + * loading ReactOS supporting NT4 and higher to be loading.so we make + * the HALInfo compatible here so we can easy pass it to gdi32.dll + * without converting it later + */ + + if ((HalInfo.dwSize != sizeof(DD_HALINFO)) && + (HalInfo.dwSize != sizeof(DD_HALINFO_V4))) + { + DPRINT1(" Fail not vaild driver DD_HALINFO struct found\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + if (HalInfo.dwSize != sizeof(DD_HALINFO)) + { + if (HalInfo.dwSize == sizeof(DD_HALINFO_V4)) + { + /* NT4 Compatible */ + DPRINT1("Got DD_HALINFO_V4 sturct we convert it to DD_HALINFO \n"); + HalInfo.dwSize = sizeof(DD_HALINFO); + HalInfo.lpD3DGlobalDriverData = NULL; + HalInfo.lpD3DHALCallbacks = NULL; + HalInfo.lpD3DBufCallbacks = NULL; + } + else + { + /* Unknown version found */ + DPRINT1(" Fail : did not get DD_HALINFO size \n"); + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + /* Copy it to user mode pointer the data */ + RtlCopyMemory(&pDirectDraw->Hal, &HalInfo, sizeof(DD_HALINFO)); + } + + success = pDirectDraw->EnableDirectDraw( pDirectDraw->Global.dhpdev, + &pDirectDraw->DD, + &pDirectDraw->Surf, + &pDirectDraw->Pal); + + if (!success) + { + DPRINT1("EnableDirectDraw call fail\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return FALSE; + } + + return TRUE; +} + HANDLE STDCALL NtGdiDdCreateDirectDrawObject(HDC hdc) { - DD_CALLBACKS callbacks; - DD_SURFACECALLBACKS surface_callbacks; - DD_PALETTECALLBACKS palette_callbacks; DC *pDC; - BOOL success; HANDLE hDirectDraw; PDD_DIRECTDRAW pDirectDraw; DPRINT1("NtGdiDdCreateDirectDrawObject\n"); - RtlZeroMemory(&callbacks, sizeof(DD_CALLBACKS)); - callbacks.dwSize = sizeof(DD_CALLBACKS); - RtlZeroMemory(&surface_callbacks, sizeof(DD_SURFACECALLBACKS)); - surface_callbacks.dwSize = sizeof(DD_SURFACECALLBACKS); - RtlZeroMemory(&palette_callbacks, sizeof(DD_PALETTECALLBACKS)); - palette_callbacks.dwSize = sizeof(DD_PALETTECALLBACKS); - /* Create a hdc if we do not have one */ if (hdc == NULL) { - HDC newHdc = IntGdiCreateDC(NULL,NULL,NULL,NULL,FALSE); - hdc = newHdc; - - if (hdc == NULL) - { - return NULL; - } + return NULL; } /* Look the hdc to gain the internal struct */ - pDC = DC_LockDc(hdc); if (!pDC) { - /* We did fail look here so return NULL */ return NULL; } - if (pDC->DriverFunctions.EnableDirectDraw == NULL) - { - /* Driver doesn't support DirectDraw */ - - /* - Warring ReactOS complain that pDC are not right owner - when DC_UnlockDc(pDC) hit, why ? - */ + /* test see if drv got a dx interface or not */ + if (( pDC->DriverFunctions.GetDirectDrawInfo == NULL) || + ( pDC->DriverFunctions.DisableDirectDraw == NULL) || + ( pDC->DriverFunctions.EnableDirectDraw == NULL)) + { DC_UnlockDc(pDC); return NULL; } - /* test see if driver support DirectDraw interface */ - success = pDC->DriverFunctions.EnableDirectDraw( - pDC->PDev, &callbacks, &surface_callbacks, &palette_callbacks); - - if (!success) - { - /* DirectDraw creation failed */ - DPRINT1("DirectDraw creation failed\n"); - DC_UnlockDc(pDC); - return NULL; - } - - /* We found a DirectDraw interface - * Alloc a handler for it - */ + /* alloc and lock the stucrt */ hDirectDraw = GDIOBJ_AllocObj(DdHandleTable, GDI_OBJECT_TYPE_DIRECTDRAW); if (!hDirectDraw) { @@ -141,8 +232,6 @@ return NULL; } - /* try look the DirectDraw handler and setup some data later */ - pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDraw, GDI_OBJECT_TYPE_DIRECTDRAW); if (!pDirectDraw) { @@ -151,27 +240,7 @@ return NULL; } - /* - * We are caching all callbacks and some data - * reason for it, is we do not trust on the kernel/usermode - * pointer for the callbacks comes back from user mode. - * I perfer more safer way todo it, only safe way is - * to cache the callbacks pointer, and send back the true - * kernel pointer to user mode of the driver api we get back - * Windows is sending back kernel pointer of the driver we - * are doing same, differnt is we also cache it. and only - * use the cached one. - */ - - /* - Getting the PDev bad idea we need the hdc instead - if we are doing a dymatic resultions change the - Pdev will get lost, we should cache the HDC instead - in windows, after a resultions change the HAL interface - need be rebuild from scrach, thanks to this.small problem - maybe we in ReactOS can found a solvtions on this later - */ - + /* setup the internal stuff */ pDirectDraw->Global.dhpdev = pDC->PDev; pDirectDraw->Local.lpGbl = &pDirectDraw->Global; @@ -179,32 +248,28 @@ pDirectDraw->DrvDisableDirectDraw = pDC->DriverFunctions.DisableDirectDraw; pDirectDraw->EnableDirectDraw = pDC->DriverFunctions.EnableDirectDraw; - - /* DD_CALLBACKS setup */ - RtlMoveMemory(&pDirectDraw->DD, &callbacks, sizeof(DD_CALLBACKS)); - - /* DD_SURFACECALLBACKS setup*/ - RtlMoveMemory(&pDirectDraw->Surf, &surface_callbacks, sizeof(DD_SURFACECALLBACKS)); - - /* DD_PALETTECALLBACKS setup*/ - RtlMoveMemory(&pDirectDraw->Pal, &palette_callbacks, sizeof(DD_PALETTECALLBACKS)); + if (intEnableDriver(pDirectDraw) == FALSE) + { + /* FIXME delete the pDirectDraw and the handle */ + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + DC_UnlockDc(pDC); + return NULL; + } GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); DC_UnlockDc(pDC); - DPRINT1("DirectDraw return handler 0x%x\n",hDirectDraw); + return hDirectDraw; } - - BOOL STDCALL NtGdiDdDeleteDirectDrawObject( HANDLE hDirectDrawLocal) { - DPRINT1("NtGdiDdDeleteDirectDrawObject\n"); return GDIOBJ_FreeObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); } + BOOL STDCALL NtGdiDdQueryDirectDrawObject( @@ -221,139 +286,97 @@ DWORD *puFourCC ) { - DD_HALINFO HalInfo; PDD_DIRECTDRAW pDirectDraw; - BOOL success; - + NTSTATUS Status = FALSE; DPRINT1("NtGdiDdQueryDirectDrawObject\n"); - - /* Check for NULL pointer to prevent any one doing a mistake */ if (hDirectDrawLocal == NULL) { return FALSE; } - if (pHalInfo == NULL) - { - return FALSE; - } - - if ( pCallBackFlags == NULL) - { - return FALSE; - } - - /* Look the DirectDraw interface */ pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); if (!pDirectDraw) { - /* Fail to Lock DirectDraw handle */ return FALSE; } - /* lock susseces - * rest the pHalInfo size we do not known - * if we got a NT4 driver or windows 2000/XP/2003 driver yet - */ - pHalInfo->dwSize = 0; - - /* Getting the request size of all struct at frist call - * Secound call we getting data back - */ - - success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, - &HalInfo, - puNumHeaps, puvmList, - puNumFourCC, puFourCC); - - if (!success) - { - /* fail we did not get any DrvGetDirectDrawInfo - * so we assume it is simple 2d DirectDraw interface - */ - DPRINT1("Driver does not fill the Fail to get DirectDraw driver info \n"); - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + _SEH_TRY + { + ProbeForWrite(pHalInfo, sizeof(DD_HALINFO), 1); + RtlCopyMemory(pHalInfo,&pDirectDraw->Hal, sizeof(DD_HALINFO)); + + ProbeForWrite(pCallBackFlags, sizeof(DWORD)*3, 1); + pCallBackFlags[0]=pDirectDraw->DD.dwFlags; + pCallBackFlags[1]=pDirectDraw->Surf.dwFlags; + pCallBackFlags[2]=pDirectDraw->Pal.dwFlags; + + if (pDirectDraw->Hal.lpD3DHALCallbacks != NULL) + { + DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); + + ProbeForWrite(puD3dCallbacks, sizeof(D3DNTHAL_CALLBACKS), 1); + RtlCopyMemory( puD3dCallbacks, pDirectDraw->Hal.lpD3DHALCallbacks, + sizeof( D3DNTHAL_CALLBACKS ) ); + } + + if (pDirectDraw->Hal.lpD3DGlobalDriverData != NULL) + { + DPRINT1("Found DirectDraw Global DriverData \n"); + + ProbeForWrite(puD3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA), 1); + RtlCopyMemory( puD3dDriverData, pDirectDraw->Hal.lpD3DGlobalDriverData, + sizeof(D3DNTHAL_GLOBALDRIVERDATA)); + } + + if (pDirectDraw->Hal.lpD3DBufCallbacks != NULL) + { + DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); + ProbeForWrite(puD3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS), 1); + RtlCopyMemory( puD3dBufferCallbacks, pDirectDraw->Hal.lpD3DBufCallbacks, + sizeof(DD_D3DBUFCALLBACKS)); + } + + /* FIXME LPDDSURFACEDESC puD3dTextureFormats */ + + ProbeForWrite(puNumHeaps, sizeof(DWORD), 1); + *puNumHeaps = pDirectDraw->dwNumHeaps; + + if (pDirectDraw->pvmList != NULL) + { + ProbeForWrite(puvmList, sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps, 1); + RtlCopyMemory( puvmList, + pDirectDraw->pvmList, + sizeof(VIDEOMEMORY) * pDirectDraw->dwNumHeaps); + } + + ProbeForWrite(puNumFourCC, sizeof(DWORD), 1); + *puNumFourCC = pDirectDraw->dwNumFourCC; + + if (pDirectDraw->pdwFourCC != NULL) + { + ProbeForWrite(puFourCC, sizeof(DWORD) * pDirectDraw->dwNumFourCC, 1); + RtlCopyMemory( puFourCC, + pDirectDraw->pdwFourCC, + sizeof(DWORD) * pDirectDraw->dwNumFourCC); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); return FALSE; } - if (HalInfo.dwSize == 0) - { - /* some driver does not fill it, they only implement the DrvGetDirectDrawInfo - * so they work on Windows 2000/XP/2003 - */ - - DPRINT1(" Fail for driver does not fill the DD_HALINFO struct \n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - - /* check see if DD_HALINFO is NT4 version or not - * if it NT4 version we convert it to NT5 version - */ - if (HalInfo.dwSize != sizeof(DD_HALINFO)) - { - if (HalInfo.dwSize == sizeof(DD_HALINFO_V4)) - { - /* NT4 Compatible */ - DPRINT1("Got DD_HALINFO_V4 sturct we convert it to DD_HALINFO \n"); - HalInfo.dwSize = sizeof(DD_HALINFO); - HalInfo.lpD3DGlobalDriverData = NULL; - HalInfo.lpD3DHALCallbacks = NULL; - HalInfo.lpD3DBufCallbacks = NULL; - } - else - { - /* Unknown version found */ - DPRINT1(" Fail : did not get DD_HALINFO size \n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return FALSE; - } - } - - /* Copy it to user mode pointer the data */ - RtlMoveMemory(pHalInfo, &HalInfo, sizeof(DD_HALINFO)); - - /* rest the flag so we do not need do it later */ - pCallBackFlags[0]=pDirectDraw->DD.dwFlags; - pCallBackFlags[1]=pDirectDraw->Surf.dwFlags; - pCallBackFlags[2]=pDirectDraw->Pal.dwFlags; - - DPRINT1("Found DirectDraw CallBack for 2D and 3D Hal\n"); - - /* Copy it to the cache */ - RtlMoveMemory(&pDirectDraw->Hal, pHalInfo, sizeof(DD_HALINFO)); - - if (pHalInfo->lpD3DGlobalDriverData) - { - /* - msdn say D3DHAL_GLOBALDRIVERDATA and D3DNTHAL_GLOBALDRIVERDATA - are not same but if u compare these in msdn it is exacly same - */ - DPRINT1("Found DirectDraw Global DriverData \n"); - RtlMoveMemory(puD3dDriverData, pHalInfo->lpD3DGlobalDriverData, - sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - } - - if (pHalInfo->lpD3DHALCallbacks ) - { - DPRINT1("Found DirectDraw CallBack for 3D Hal\n"); - RtlMoveMemory(puD3dCallbacks, pHalInfo->lpD3DHALCallbacks, - sizeof( D3DNTHAL_CALLBACKS ) ); - } - - if (pHalInfo->lpD3DBufCallbacks) - { - DPRINT1("Found DirectDraw CallBack for 3D Hal Bufffer \n"); - /* msdn DDHAL_D3DBUFCALLBACKS = DD_D3DBUFCALLBACKS */ - RtlMoveMemory(puD3dBufferCallbacks, pHalInfo->lpD3DBufCallbacks, - sizeof(DD_D3DBUFCALLBACKS)); - } - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/stubs.c Thu Feb 22 01:19:31 2007 @@ -311,7 +311,7 @@ { UNIMPLEMENTED - return 0; + return FALSE; } BOOL STDCALL NtGdiDdReleaseDC(

17 years, 6 months

[tkreuzer] 25869: Silence some warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 22 01:04:59 2007 New Revision: 25869 URL: http://svn.reactos.org/svn/reactos?rev=25869&view=rev Log: Silence some warnings Modified: trunk/reactos/dll/win32/shell32/autocomplete.c trunk/reactos/dll/win32/shell32/iconcache.c trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/autocomp… ============================================================================== --- trunk/reactos/dll/win32/shell32/autocomplete.c (original) +++ trunk/reactos/dll/win32/shell32/autocomplete.c Thu Feb 22 01:04:59 2007 @@ -38,6 +38,7 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <stdio.h> #define COBJMACROS Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c Thu Feb 22 01:04:59 2007 @@ -22,6 +22,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <stdio.h> #include <string.h> #include <sys/types.h> #ifdef HAVE_UNISTD_H Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c Thu Feb 22 01:04:59 2007 @@ -2557,7 +2557,7 @@ sei.lpParameters = args; sei.lpVerb = szOpen; - if ( ShellExecuteExW( &sei ) && sei.hInstApp > 32 ) + if ( ShellExecuteExW( &sei ) && (UINT)sei.hInstApp > 32 ) r = S_OK; else r = E_FAIL;

17 years, 6 months

[ion] 25868: - Implement ExpQueryModuleInformation to handle SystemModuleInformation, instead of LdrpQueryModleInformation. This version properly fills out all the data required and also supports (but doesn't yet handle) user-mode modules. - Start work on supporting NT-compatible System Loader that properly fills out LDR_DATA_TABLE_ENTRY and handles imports correctly. Modified LdpPEProcessModule to properly build the data table entry and create the base name and directory name. - Add stub for Mi

by ion＠svn.reactos.org

Author: ion Date: Wed Feb 21 21:43:57 2007 New Revision: 25868 URL: http://svn.reactos.org/svn/reactos?rev=25868&view=rev Log: - Implement ExpQueryModuleInformation to handle SystemModuleInformation, instead of LdrpQueryModleInformation. This version properly fills out all the data required and also supports (but doesn't yet handle) user-mode modules. - Start work on supporting NT-compatible System Loader that properly fills out LDR_DATA_TABLE_ENTRY and handles imports correctly. Modified LdpPEProcessModule to properly build the data table entry and create the base name and directory name. - Add stub for MiResolveImageRefernces. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/ldr/loader.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Wed Feb 21 21:43:57 2007 @@ -24,6 +24,123 @@ FAST_MUTEX ExpEnvironmentLock; ERESOURCE ExpFirmwareTableResource; LIST_ENTRY ExpFirmwareTableProviderListHead; + +NTSTATUS +NTAPI +ExpQueryModuleInformation(IN PLIST_ENTRY KernelModeList, + IN PLIST_ENTRY UserModeList, + OUT PRTL_PROCESS_MODULES Modules, + IN ULONG Length, + OUT PULONG ReturnLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG RequiredLength; + PRTL_PROCESS_MODULE_INFORMATION ModuleInfo; + PLDR_DATA_TABLE_ENTRY LdrEntry; + ANSI_STRING ModuleName; + ULONG ModuleCount = 0; + PLIST_ENTRY NextEntry; + PCHAR p; + + /* Setup defaults */ + RequiredLength = FIELD_OFFSET(RTL_PROCESS_MODULES, Modules); + ModuleInfo = &Modules->Modules[0]; + + /* Loop the kernel list */ + NextEntry = KernelModeList->Flink; + while (NextEntry != KernelModeList) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Update size and check if we can manage one more entry */ + RequiredLength += sizeof(RTL_PROCESS_MODULE_INFORMATION); + if (Length >= RequiredLength) + { + /* Fill it out */ + ModuleInfo->MappedBase = NULL; + ModuleInfo->ImageBase = LdrEntry->DllBase; + ModuleInfo->ImageSize = LdrEntry->SizeOfImage; + ModuleInfo->Flags = LdrEntry->Flags; + ModuleInfo->LoadCount = LdrEntry->LoadCount; + ModuleInfo->LoadOrderIndex = ModuleCount; + ModuleInfo->InitOrderIndex = 0; + + /* Setup name */ + RtlInitEmptyAnsiString(&ModuleName, + ModuleInfo->FullPathName, + sizeof(ModuleInfo->FullPathName)); + + /* Convert it */ + Status = RtlUnicodeStringToAnsiString(&ModuleName, + &LdrEntry->FullDllName, + FALSE); + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + /* Calculate offset to name */ + p = ModuleName.Buffer + ModuleName.Length; + while ((p > ModuleName.Buffer) && (*--p)) + { + /* Check if we found the separator */ + if (*p == OBJ_NAME_PATH_SEPARATOR) + { + /* We did, break out */ + p++; + break; + } + } + + /* Set the offset */ + ModuleInfo->OffsetToFileName = p - ModuleName.Buffer; + } + else + { + /* Return empty name */ + ModuleInfo->FullPathName[0] = ANSI_NULL; + ModuleInfo->OffsetToFileName = 0; + } + + /* Go to the next module */ + ModuleInfo++; + } + else + { + /* Set error code */ + Status = STATUS_INFO_LENGTH_MISMATCH; + } + + /* Update count and move to next entry */ + ModuleCount++; + NextEntry = NextEntry->Flink; + } + + /* Check if caller also wanted user modules */ + if (UserModeList) + { + /* FIXME: TODO */ + DPRINT1("User-mode list not yet supported in ReactOS!\n"); + } + + /* Update return length */ + if (ReturnLength) *ReturnLength = RequiredLength; + + /* Validate the length again */ + if (Length >= FIELD_OFFSET(RTL_PROCESS_MODULES, Modules)) + { + /* Set the final count */ + Modules->NumberOfModules = ModuleCount; + } + else + { + /* Otherwise, we failed */ + Status = STATUS_INFO_LENGTH_MISMATCH; + } + + /* Done */ + return Status; +} /* FUNCTIONS *****************************************************************/ @@ -835,7 +952,12 @@ /* Class 11 - Module Information */ QSI_DEF(SystemModuleInformation) { - return LdrpQueryModuleInformation(Buffer, Size, ReqSize); + extern LIST_ENTRY ModuleListHead; + return ExpQueryModuleInformation(&ModuleListHead, + NULL, + (PRTL_PROCESS_MODULES)Buffer, + Size, + ReqSize); } /* Class 12 - Locks Information */ Modified: trunk/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ldr/loader.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ldr/loader.c (original) +++ trunk/reactos/ntoskrnl/ldr/loader.c Wed Feb 21 21:43:57 2007 @@ -438,6 +438,25 @@ return STATUS_SUCCESS; } +typedef struct _LOAD_IMPORTS +{ + SIZE_T Count; + PLDR_DATA_TABLE_ENTRY Entry[1]; +} LOAD_IMPORTS, *PLOAD_IMPORTS; + +NTSTATUS +NTAPI +MiResolveImageReferences(IN PVOID ImageBase, + IN PUNICODE_STRING ImageFileDirectory, + IN PUNICODE_STRING NamePrefix OPTIONAL, + OUT PCHAR *MissingApi, + OUT PWCHAR *MissingDriver, + OUT PLOAD_IMPORTS *LoadImports) +{ + /* We don't do anything for now */ + return STATUS_SUCCESS; +} + static NTSTATUS LdrPEFixupImports (IN PVOID DllBase, IN PWCHAR DllName) @@ -490,15 +509,23 @@ PIMAGE_DOS_HEADER PEDosHeader; PIMAGE_NT_HEADERS PENtHeaders; PIMAGE_SECTION_HEADER PESectionHeaders; - PLDR_DATA_TABLE_ENTRY CreatedModuleObject; NTSTATUS Status; KIRQL Irql; + PIMAGE_NT_HEADERS NtHeader; + UNICODE_STRING BaseName, BaseDirectory, PrefixName; + PLDR_DATA_TABLE_ENTRY LdrEntry; + ULONG EntrySize; + PLOAD_IMPORTS LoadedImports = (PVOID)-2; + PWSTR NameBuffer; + PCHAR MissingApiName, Buffer; + PWCHAR MissingDriverName; DPRINT("Processing PE Module at module base:%08lx\n", ModuleLoadBase); /* Get header pointers */ PEDosHeader = (PIMAGE_DOS_HEADER) ModuleLoadBase; PENtHeaders = RtlImageNtHeader(ModuleLoadBase); + NtHeader = PENtHeaders; PESectionHeaders = IMAGE_FIRST_SECTION(PENtHeaders); @@ -578,78 +605,165 @@ } } - /* Perform relocation fixups */ - Status = LdrRelocateImageWithBias(DriverBase, 0, "", STATUS_SUCCESS, - STATUS_CONFLICTING_ADDRESSES, STATUS_INVALID_IMAGE_FORMAT); + /* Relocate the driver */ + Status = LdrRelocateImageWithBias(DriverBase, + 0, + "SYSLDR", + STATUS_SUCCESS, + STATUS_CONFLICTING_ADDRESSES, + STATUS_INVALID_IMAGE_FORMAT); if (!NT_SUCCESS(Status)) { - // MmFreeSection(DriverBase); + /* Fail */ return Status; } - /* Create the module */ - CreatedModuleObject = ExAllocatePoolWithTag ( - NonPagedPool, sizeof(LDR_DATA_TABLE_ENTRY), TAG_MODULE_OBJECT ); - if (CreatedModuleObject == NULL) - { - // MmFreeSection(DriverBase); + /* Allocate a buffer we'll use for names */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, MAX_PATH, TAG_LDR_WSTR); + if (!Buffer) + { + /* Fail */ return STATUS_INSUFFICIENT_RESOURCES; } - RtlZeroMemory(CreatedModuleObject, sizeof(LDR_DATA_TABLE_ENTRY)); - - /* Initialize ModuleObject data */ - CreatedModuleObject->DllBase = DriverBase; - - CreatedModuleObject->FullDllName.Length = 0; - CreatedModuleObject->FullDllName.MaximumLength = FileName->Length + sizeof(UNICODE_NULL); - CreatedModuleObject->FullDllName.Buffer = - ExAllocatePoolWithTag(PagedPool, CreatedModuleObject->FullDllName.MaximumLength, TAG_LDR_WSTR); - if (CreatedModuleObject->FullDllName.Buffer == NULL) - { - ExFreePool(CreatedModuleObject); - // MmFreeSection(DriverBase); + /* Check for a separator */ + if (FileName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) + { + PWCHAR p; + ULONG BaseLength; + + /* Loop the path until we get to the base name */ + p = &FileName->Buffer[FileName->Length / sizeof(WCHAR)]; + while (*(p - 1) != OBJ_NAME_PATH_SEPARATOR) p--; + + /* Get the length */ + BaseLength = (ULONG)(&FileName->Buffer[FileName->Length / sizeof(WCHAR)] - p); + BaseLength *= sizeof(WCHAR); + + /* Setup the string */ + BaseName.Length = BaseLength; + BaseName.Buffer = p; + } + else + { + /* Otherwise, we already have a base name */ + BaseName.Length = FileName->Length; + BaseName.Buffer = FileName->Buffer; + } + + /* Setup the maximum length */ + BaseName.MaximumLength = BaseName.Length; + + /* Now compute the base directory */ + BaseDirectory = *FileName; + BaseDirectory.Length -= BaseName.Length; + BaseDirectory.MaximumLength = BaseDirectory.Length; + + /* And the prefix */ + PrefixName = *FileName; + + /* Calculate the size we'll need for the entry and allocate it */ + EntrySize = sizeof(LDR_DATA_TABLE_ENTRY) + + BaseName.Length + + sizeof(UNICODE_NULL); + + /* Allocate the entry */ + LdrEntry = ExAllocatePoolWithTag(NonPagedPool, EntrySize, TAG_MODULE_OBJECT); + if (!LdrEntry) + { + /* Fail */ return STATUS_INSUFFICIENT_RESOURCES; } - RtlCopyUnicodeString(&CreatedModuleObject->FullDllName, FileName); - CreatedModuleObject->FullDllName.Buffer[FileName->Length / sizeof(WCHAR)] = 0; - LdrpBuildModuleBaseName(&CreatedModuleObject->BaseDllName, - &CreatedModuleObject->FullDllName); - - CreatedModuleObject->EntryPoint = - (PVOID)((ULONG_PTR)DriverBase + - PENtHeaders->OptionalHeader.AddressOfEntryPoint); - CreatedModuleObject->SizeOfImage = DriverSize; - DPRINT("EntryPoint at %x\n", CreatedModuleObject->EntryPoint); - - /* Perform import fixups */ - Status = LdrPEFixupImports(CreatedModuleObject->DllBase, - CreatedModuleObject->FullDllName.Buffer); + /* Setup the entry */ + LdrEntry->Flags = LDRP_LOAD_IN_PROGRESS; + LdrEntry->LoadCount = 1; + LdrEntry->LoadedImports = LoadedImports; + LdrEntry->PatchInformation = NULL; + + /* Check the version */ + if ((NtHeader->OptionalHeader.MajorOperatingSystemVersion >= 5) && + (NtHeader->OptionalHeader.MajorImageVersion >= 5)) + { + /* Mark this image as a native image */ + LdrEntry->Flags |= 0x80000000; + } + + /* We'll put the name after the entry */ + NameBuffer = (PVOID)(LdrEntry + 1); + + /* Setup the rest of the entry */ + LdrEntry->DllBase = DriverBase; + LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)DriverBase + + NtHeader->OptionalHeader.AddressOfEntryPoint); + LdrEntry->SizeOfImage = DriverSize; + LdrEntry->CheckSum = NtHeader->OptionalHeader.CheckSum; + LdrEntry->SectionPointer = NULL; // FIXME + + /* Now write the DLL name */ + LdrEntry->BaseDllName.Buffer = NameBuffer; + LdrEntry->BaseDllName.Length = BaseName.Length; + LdrEntry->BaseDllName.MaximumLength = BaseName.Length; + + /* Copy and null-terminate it */ + RtlCopyMemory(LdrEntry->BaseDllName.Buffer, + BaseName.Buffer, + BaseName.Length); + LdrEntry->BaseDllName.Buffer[BaseName.Length / 2] = UNICODE_NULL; + + /* Now allocate the full name */ + LdrEntry->FullDllName.Buffer = ExAllocatePoolWithTag(PagedPool, + PrefixName.Length + + sizeof(UNICODE_NULL), + TAG_LDR_WSTR); + if (!LdrEntry->FullDllName.Buffer) + { + /* Don't fail, just set it to zero */ + LdrEntry->FullDllName.Length = 0; + LdrEntry->FullDllName.MaximumLength = 0; + } + else + { + /* Set it up */ + LdrEntry->FullDllName.Length = PrefixName.Length; + LdrEntry->FullDllName.MaximumLength = PrefixName.Length; + + /* Copy and null-terminate */ + RtlCopyMemory(LdrEntry->FullDllName.Buffer, + PrefixName.Buffer, + PrefixName.Length); + LdrEntry->FullDllName.Buffer[PrefixName.Length / 2] = UNICODE_NULL; + } + + /* Insert the entry */ + KeAcquireSpinLock(&ModuleListLock, &Irql); + InsertTailList(&ModuleListHead, &LdrEntry->InLoadOrderLinks); + KeReleaseSpinLock(&ModuleListLock, Irql); + + /* Resolve imports */ + MissingApiName = Buffer; + Status = MiResolveImageReferences(DriverBase, + &BaseDirectory, + NULL, + &MissingApiName, + &MissingDriverName, + &LoadedImports); + + /* Resolve imports */ + Status = LdrPEFixupImports(LdrEntry->DllBase, + LdrEntry->FullDllName.Buffer); if (!NT_SUCCESS(Status)) { - // MmFreeSection(DriverBase); - ExFreePool(CreatedModuleObject->FullDllName.Buffer); - ExFreePool(CreatedModuleObject); + /* Fail */ + ExFreePool(LdrEntry->FullDllName.Buffer); + ExFreePool(LdrEntry); return Status; } - /* Insert module */ - KeAcquireSpinLock(&ModuleListLock, &Irql); - InsertTailList(&ModuleListHead, - &CreatedModuleObject->InLoadOrderLinks); - KeReleaseSpinLock(&ModuleListLock, Irql); - - *ModuleObject = CreatedModuleObject; - - DPRINT("Loading Module %wZ...\n", FileName); - - DPRINT("Module %wZ loaded at 0x%.08x.\n", - FileName, CreatedModuleObject->DllBase); - + /* Return */ + *ModuleObject = LdrEntry; return STATUS_SUCCESS; } - VOID INIT_FUNCTION @@ -897,114 +1011,4 @@ return(STATUS_SUCCESS); } -// -// Used by NtSetSystemInformation -// -NTSTATUS -NTAPI -LdrpQueryModuleInformation ( - PVOID Buffer, - ULONG Size, - PULONG ReqSize ) -{ - PLIST_ENTRY current_entry; - PLDR_DATA_TABLE_ENTRY current; - ULONG ModuleCount = 0; - PRTL_PROCESS_MODULES Smi; - ANSI_STRING AnsiName; - PCHAR p; - KIRQL Irql; - PUNICODE_STRING UnicodeName; - ULONG tmpBufferSize = 0; - PWCHAR tmpNameBuffer; - - KeAcquireSpinLock(&ModuleListLock,&Irql); - - /* calculate required size */ - current_entry = ModuleListHead.Flink; - while (current_entry != (&ModuleListHead)) - { - ModuleCount++; - current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderLinks); - tmpBufferSize += current->FullDllName.Length + sizeof(WCHAR) + sizeof(UNICODE_STRING); - current_entry = current_entry->Flink; - } - - *ReqSize = sizeof(RTL_PROCESS_MODULES)+ - (ModuleCount - 1) * sizeof(RTL_PROCESS_MODULE_INFORMATION); - - if (Size < *ReqSize) - { - KeReleaseSpinLock(&ModuleListLock, Irql); - return(STATUS_INFO_LENGTH_MISMATCH); - } - - /* allocate a temp buffer to store the module names */ - UnicodeName = ExAllocatePool(NonPagedPool, tmpBufferSize); - if (UnicodeName == NULL) - { - KeReleaseSpinLock(&ModuleListLock, Irql); - return STATUS_INSUFFICIENT_RESOURCES; - } - tmpNameBuffer = (PWCHAR)((ULONG_PTR)UnicodeName + ModuleCount * sizeof(UNICODE_STRING)); - - /* fill the buffer */ - memset(Buffer, '=', Size); - - Smi = (PRTL_PROCESS_MODULES)Buffer; - Smi->NumberOfModules = ModuleCount; - - ModuleCount = 0; - current_entry = ModuleListHead.Flink; - while (current_entry != (&ModuleListHead)) - { - current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderLinks); - - Smi->Modules[ModuleCount].Section = 0; /* Always 0 */ - Smi->Modules[ModuleCount].MappedBase = 0; /* Always 0 */ - Smi->Modules[ModuleCount].ImageBase = current->DllBase; - Smi->Modules[ModuleCount].ImageSize = current->SizeOfImage; - Smi->Modules[ModuleCount].Flags = 0; /* Flags ??? (GN) */ - Smi->Modules[ModuleCount].LoadOrderIndex = (USHORT)ModuleCount; - Smi->Modules[ModuleCount].InitOrderIndex = 0; - Smi->Modules[ModuleCount].LoadCount = 0; /* FIXME */ - UnicodeName[ModuleCount].Buffer = tmpNameBuffer; - UnicodeName[ModuleCount].MaximumLength = current->FullDllName.Length + sizeof(WCHAR); - tmpNameBuffer += UnicodeName[ModuleCount].MaximumLength / sizeof(WCHAR); - RtlCopyUnicodeString(&UnicodeName[ModuleCount], &current->FullDllName); - - ModuleCount++; - current_entry = current_entry->Flink; - } - - KeReleaseSpinLock(&ModuleListLock, Irql); - - for (ModuleCount = 0; ModuleCount < Smi->NumberOfModules; ModuleCount++) - { - AnsiName.Length = 0; - AnsiName.MaximumLength = 255; - AnsiName.Buffer = Smi->Modules[ModuleCount].FullPathName; - RtlUnicodeStringToAnsiString(&AnsiName, &UnicodeName[ModuleCount], FALSE); - AnsiName.Buffer[AnsiName.Length] = 0; - Smi->Modules[ModuleCount].InitOrderIndex = AnsiName.Length; - - p = strrchr(AnsiName.Buffer, '\\'); - if (p == NULL) - { - Smi->Modules[ModuleCount].OffsetToFileName = 0; - } - else - { - p++; - Smi->Modules[ModuleCount].OffsetToFileName = p - AnsiName.Buffer; - } - } - - ExFreePool(UnicodeName); - - return(STATUS_SUCCESS); -} - - - /* EOF */

17 years, 6 months

[dgorbachev] 25867: Thai translation (Sumath Aowsakulsutthi)

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Feb 21 21:23:59 2007 New Revision: 25867 URL: http://svn.reactos.org/svn/reactos?rev=25867&view=rev Log: Thai translation (Sumath Aowsakulsutthi) Added: trunk/reactos/dll/cpl/hdwwiz/th-TH.rc trunk/reactos/dll/cpl/timedate/th-TH.rc trunk/reactos/dll/win32/aclui/aclui_Th.rc trunk/reactos/dll/win32/newdev/lang/th-TH.rc trunk/reactos/dll/win32/setupapi/res/lang/Th.rc Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc trunk/reactos/dll/cpl/timedate/timedate.rc trunk/reactos/dll/win32/aclui/aclui.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/setupapi/setupapi.rc Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Wed Feb 21 21:23:59 2007 @@ -19,12 +19,13 @@ #include "De.rc" #include "En.rc" +#include "Es.rc" #include "Fr.rc" +#include "Gr.rc" +#include "Hu.rc" #include "Ja.rc" -#include "Es.rc" -#include "Hu.rc" #include "Nl.rc" #include "Ru.rc" +#include "th-TH.rc" #include "Uk.rc" -#include "Gr.rc" Added: trunk/reactos/dll/cpl/hdwwiz/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/th-TH.rc?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/th-TH.rc (added) +++ trunk/reactos/dll/cpl/hdwwiz/th-TH.rc Wed Feb 21 21:23:59 2007 @@ -1,0 +1,7 @@ +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CPLNAME "à¾ÔèÁ¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì" + IDS_CPLDESCRIPTION "à¾ÔèÁ¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ìà¢éÒÁÒÂÑ§à¤Ã×èÍ§¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³" +END Added: trunk/reactos/dll/cpl/timedate/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/th-TH.rc?… ============================================================================== --- trunk/reactos/dll/cpl/timedate/th-TH.rc (added) +++ trunk/reactos/dll/cpl/timedate/th-TH.rc Wed Feb 21 21:23:59 2007 @@ -1,0 +1,68 @@ +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÇÑ¹·Õè && àÇÅÒ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "&ÇÑ¹·Õè", -1, 4, 2, 122, 125 + COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_RIGHT | WS_GROUP | ES_READONLY + CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP, 120, 17, 50, 12 + + CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd", + WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 37, 108, 80, WS_EX_CLIENTEDGE + GROUPBOX "&àÇÅÒ", -1, 132, 2, 113, 125 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 144, 105, 90, 12 + LTEXT "", IDC_TIMEZONE, 6, 132, 242, 11 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 +END + + +IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "à¢µàÇÅÒ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE + AUTOCHECKBOX "¡ÓÅÑ§·Ó¡ÒÃ»ÃÑº¹ÒÌÔ¡ÒÍÑµâ¹ÁÑµÔã¹àÇÅÒ &¡ÅÒ§ÇÑ¹", + IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP +END + + +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "àÇÅÒ¢Í§ÍÔ¹à·ÍÃìà¹çµ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "¡ÓÅÑ§»ÃÑºà·ÕÂºàÇÅÒÍÑµâ¹ÁÑµÔ¡Ñºà¤Ã×èÍ§áÁè¢èÒÂÍÔ¹à·ÍÃìà¹çµ", IDC_AUTOSYNC, + 11 ,7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "à¤Ã×èÍ§áÁè¢èÒÂ:", IDC_SERVERTEXT, 34, 22, 28, 13 + PUSHBUTTON "»ÃÑº»ÃØ§ã¹µÍ¹¹Õé", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 12, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "¡ÒÃ»ÃÑºà·ÕÂºàÇÅÒ¨ÐÊÒÁÒÃ¶·Óä´éàÁ×èÍ¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³ä´éàª×èÍÁµèÍ¡ÑºÍÔ¹à·ÍÃìà¹çµ", -1, 12, 114, 225, 25 +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "ÇÑ¹·Õè/àÇÅÒ" + IDS_CPLDESCRIPTION "à»ÅÕèÂ¹¢éÍÁÙÅ¢Í§ÇÑ¹·Õè, àÇÅÒ áÅÐà¢µàÇÅÒ" + IDS_TIMEZONETEXT "à¢µàÇÅÒã¹»Ñ¨¨ØºÑ¹: %s" + IDS_TIMEZONEINVALID "Â¡àÅÔ¡¡ÒÃ»ÃÑºà·ÕÂºàÇÅÒ" + IDS_TIMEZONEUNKNOWN "äÁè·ÃÒº¤èÒ" + IDS_INETTIMESUCSYNC "àÇÅÒä´éÃÑº¡ÒÃ»ÃÑºà·ÕÂºàÇÅÒÊÓàÃç¨áÅéÇÀÒÂã¹ %s ¢Í§ %s ã¹ %s" + IDS_INETTIMENEXTSYNC "¡ÒÃ»ÃÑºà·ÕÂºµèÍä»: %s ã¹ %s" + IDS_INETTIMESYNCING "â»Ã´ÃÍ ReactOS ¡ÓÅÑ§»ÃÑºà·ÕÂºàÇÅÒÀÒÂã¹ %s" + IDS_INETTIMEERROR "à¡Ô´¡ÒÃ¼Ô´¾ÅÒ´ã¹¢³Ð·Õè ReactOS ¡ÓÅÑ§»ÃÑºà·ÕÂºàÇÅÒÀÒÂã¹ %s" +END Modified: trunk/reactos/dll/cpl/timedate/timedate.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rc (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rc Wed Feb 21 21:23:59 2007 @@ -16,18 +16,19 @@ IDC_CPLICON ICON "resources/applet.ico" IDC_WORLD BITMAP "resources/world.bmp" -#include "En.rc" #include "Cz.rc" #include "De.rc" #include "Dk.rc" +#include "En.rc" +#include "Es.rc" #include "Fr.rc" #include "Gr.rc" #include "Hu.rc" +#include "It.rc" #include "Ja.rc" #include "Nl.rc" #include "Pl.rc" #include "Ru.rc" #include "Sv.rc" -#include "Es.rc" -#include "It.rc" +#include "th-TH.rc" #include "Uk.rc" Modified: trunk/reactos/dll/win32/aclui/aclui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rc?r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.rc (original) +++ trunk/reactos/dll/win32/aclui/aclui.rc Wed Feb 21 21:23:59 2007 @@ -9,14 +9,15 @@ #include <reactos/version.rc> IDB_USRGRPIMAGES BITMAP "res/usrgrp.bmp" -#include "aclui_Ja.rc" +#include "aclui_De.rc" #include "aclui_El.rc" #include "aclui_En.rc" -#include "aclui_De.rc" +#include "aclui_Es.rc" #include "aclui_Hu.rc" +#include "aclui_Ja.rc" #include "aclui_Nl.rc" -#include "aclui_Sv.rc" -#include "aclui_Es.rc" #include "aclui_Pl.rc" #include "aclui_Ru.rc" +#include "aclui_Sv.rc" +#include "aclui_Th.rc" #include "aclui_Uk.rc" Added: trunk/reactos/dll/win32/aclui/aclui_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Th.r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_Th.rc (added) +++ trunk/reactos/dll/win32/aclui/aclui_Th.rc Wed Feb 21 21:23:59 2007 @@ -1,0 +1,29 @@ +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "¤ÇÒÁ»ÅÍ´ÀÑÂ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&ª×èÍ¡ÅØèÁËÃ×Íª×èÍ¢Í§¼Ùéãªé:", -1, 7, 7, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + PUSHBUTTON "à&¾ÔèÁ...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "à&¤Å×èÍ¹ÂéÒÂ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "Í¹ØÒµ", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "»¯ÔàÊ¸", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "¡Ã³Õ¡ÒÃ¢ÍÍ¹ØÒµ¾ÔàÈÉËÃ×Íà»ç¹¡ÒÃµÑé§¤èÒ¢Ñé¹¡éÒÇË¹éÒ, ¡´àÅ×Í¡¢Ñé¹¡éÒÇË¹éÒ", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "&¢Ñé¹¡éÒÇË¹éÒ", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "Í¹ØÒµãËé %1" + IDS_UNKNOWN "äÁè·ÃÒº" + IDS_SPECIAL_PERMISSIONS "¡ÒÃ¢ÍÍ¹ØÒµáºº¾ÔàÈÉ" + IDS_PERMISSIONS_FOR "Í¹ØÒµãËé %1" + IDS_PERMISSIONS "Í¹ØÒµ" + IDS_USERDOMAINFORMAT "%1 (%2\\%3)" + IDS_USERFORMAT "%1" +} Added: trunk/reactos/dll/win32/newdev/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/th-T… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/th-TH.rc (added) +++ trunk/reactos/dll/win32/newdev/lang/th-TH.rc Wed Feb 21 21:23:59 2007 @@ -1,0 +1,128 @@ +/* + * New device installer (newdev.dll) + * + * Copyright 2006 Sumath Aowsakulsutthi (Thai translation) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "¡ÒÃµÔ´µÑé§¤èÒÍØ»¡Ã³ì" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÂÔ¹´ÕµéÍ¹ÃÑº",IDC_WELCOMETITLE,120,8,195,24 + LTEXT "¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì¢Ñºà¤Å×èÍ¹ãËÁèÍÑµâ¹ÁÑµÔà¾×èÍ:", + IDC_STATIC,120,21,195,16 + LTEXT "¡´àÅ×Í¡¶Ñ´ä»à¾×èÍ·Ó§Ò¹µèÍ",IDC_STATIC,120,169,195,17 + LTEXT "äÁè·ÃÒº¤èÒÍØ»¡Ã³ì",IDC_DEVICE,134,36,164,11 + LTEXT "ÃÐÇÑ§! ¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ìµÒÁ»¡µÔáÅéÇÍÒ¨·ÓãËéà¤Ã×èÍ§¢Í§¤Ø³ËÂØ´¹Ôè§ËÃ×ÍÁÕ¼ÅãËéà»Ô´à¤Ã×èÍ§ãËÁèäÁèä´é!",IDC_STATIC,120,59,195,16 + CONTROL "·Ó¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ìÍÑµâ¹ÁÑµÔ",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,120,112,178,13 + CONTROL "¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì¨Ò¡µÓáË¹è§·ÕèÃÐºØ",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,120,133,164,14 +END + +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "¡ÒÃµÔ´µÑé§¼Ô´¾ÅÒ´",IDC_FINISHTITLE,120,8,195,24 + LTEXT "äÁèÊÒÁÒÃ¶µÔ´µÑé§ÍØ»¡Ã³ì¹Õéà¾ÃÒÐµÃÇ¨ËÒäÁè¾º", + IDC_STATIC,120,40,195,19 + LTEXT "¡´à¾×èÍÂéÍ¹¡ÅÑº¶éÒÁÕá¼è¹ãËé¢éÍÁÙÅÍØ»¡Ã³ìËÃ×ÍÃÙé¨Ñ¡àÊé¹·Ò§ä»ÂÑ§¢éÍÁÙÅ¢Ñºà¤Å×èÍ¹ÍØ»¡Ã³ì", + IDC_STATIC,120,98,181,24 + CONTROL "ÍÂèÒáÊ´§¢éÍ¤ÇÒÁàËÅèÒ¹ÕéÍÕ¡",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 +END + +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "¡ÒÃµÔ´µÑé§¼Ô´¾ÅÒ´",IDC_FINISHTITLE,120,8,195,24 + LTEXT "ÍØ»¡Ã³ì¹ÕéäÁèÊÒÁÒÃ¶µÔ´µÑé§ä´éà¾ÃÒÐÁÕÊÔè§¼Ô´»¡µÔ·ÕèäÁèÊÒÁÒÃ¶¤Ò´¡ÒÃ³ìä´éà¡Ô´¢Öé¹", + IDC_STATIC,120,40,195,19 + LTEXT "äÁèÃÙé¨Ñ¡ÍØ»¡Ã³ì",IDC_DEVICE,134,55,164,11 +END + +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "¤é¹ËÒµÓáË¹è§µèÒ§æ",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "àÅ×Í¡¤èÒÍØ»¡Ã³ì´éÇÂµ¹àÍ§",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "¤é¹ËÒÊ×èÍà¤Å×èÍ¹·Õè",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "ÃÇÁàÊé¹·Ò§¹Õé",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "Ê×º¤é¹",IDC_BROWSE,248,69,50,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL +END + +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "äÁèÃÙé¨Ñ¡ÍØ»¡Ã³ì",IDC_DEVICE,51,20,169,16 +END + +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "äÁèÃÙé¨Ñ¡ÍØ»¡Ã³ì",IDC_DEVICE,51,20,169,16 +END + +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "¡ÒÃµÔ´µÑé§àÊÃç¨ÊÁºÙÃ³ì",IDC_FINISHTITLE,120,8,195,11 + LTEXT "¤Ø³¨Óà»ç¹µéÍ§àÃÔèÁà»Ô´à¤Ã×èÍ§ãËÁèàÁ×èÍàÊÃç¨ÊÔé¹¡ÒÃµÔ´µÑé§:", + IDC_STATIC,120,32,195,19 + LTEXT "¡´àÅ×Í¡àÊÃç¨ÊÔé¹à¾×èÍ»Ô´¡ÒÃµÔ´µÑé§ÍÑµâ¹ÁÑµÔ",IDC_STATIC,120,174, + 179,11 + LTEXT "äÁèÃÙé¨Ñ¡ÍØ»¡Ã³ì",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "¡ÒÃµÔ´µÑé§ÍØ»¡Ã³ì" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "¡ÒÃµÔ´µÑé§àÊÃç¨ÊÁºÙÃ³ì",IDC_FINISHTITLE,120,8,195,11 + LTEXT "¡ÒÃµÔ´µÑé§ÍÑµâ¹ÁÑµÔàÊÃç¨ÊÓËÃÑºÍØ»¡Ã³ì:", + IDC_STATIC,120,32,195,19 + LTEXT "¡´àÅ×Í¡àÊÃç¨ÊÔé¹à¾×èÍ»Ô´¡ÒÃµÔ´µÑé§ÍÑµâ¹ÁÑµÔ",IDC_STATIC,120,174, + 179,11 + LTEXT "äÁèÃÙé¨Ñ¡ÍØ»¡Ã³ì",IDC_DEVICE,148,53,147,12 +END Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/rsrc.rc (original) +++ trunk/reactos/dll/win32/newdev/rsrc.rc Wed Feb 21 21:23:59 2007 @@ -12,4 +12,5 @@ #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/ru-RU.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/setupapi/res/lang/Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/lan… ============================================================================== --- trunk/reactos/dll/win32/setupapi/res/lang/Th.rc (added) +++ trunk/reactos/dll/win32/setupapi/res/lang/Th.rc Wed Feb 21 21:23:59 2007 @@ -1,0 +1,40 @@ +/* + * Thai resources for SETUPAPI + * + * Copyright 2006 Sumath Aowsakulsutthi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "¡ÒÃ¤Ñ´ÅÍ¡á¿éÁ..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "áËÅè§:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "»ÅÒÂ·Ò§:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUERY_REBOOT_TEXT "àÁ×èÍàÊÃç¨ÊÔé¹¡ÒÃµÔ´µÑé§áÅéÇ ¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³¨Óà»ç¹µéÍ§à»Ô´à¤Ã×èÍ§ãËÁè/n/n ¤Ø³µéÍ§¡ÒÃà»Ô´à¤Ã×èÍ§ãËÁèà´ÕëÂÇ¹ÕéàÅÂËÃ×ÍäÁè?" + IDS_QUERY_REBOOT_CAPTION "à»Ô´à¤Ã×èÍ§ãËÁèÍÑµâ¹ÁÑµÔ" +END Modified: trunk/reactos/dll/win32/setupapi/setupapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rc (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rc Wed Feb 21 21:23:59 2007 @@ -42,5 +42,6 @@ #include "res/lang/Pt.rc" #include "res/lang/Ru.rc" #include "res/lang/Sv.rc" +#include "res/lang/Th.rc" #include "res/lang/Tr.rc" #include "res/lang/Uk.rc"

17 years, 6 months

[dgorbachev] 25866: Thai translation (Sumath Aowsakulsutthi)

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Feb 21 21:22:30 2007 New Revision: 25866 URL: http://svn.reactos.org/svn/reactos?rev=25866&view=rev Log: Thai translation (Sumath Aowsakulsutthi) Added: trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/control/lang/th-TH.rc trunk/reactos/base/applications/devmgmt/lang/th-TH.rc trunk/reactos/base/applications/getfirefox/lang/th-TH.rc trunk/reactos/base/applications/imagesoft/lang/th-TH.rc trunk/reactos/base/applications/reporterror/lang/th-TH.rc trunk/reactos/base/applications/sndvol32/lang/th-TH.rc trunk/reactos/base/setup/reactos/th-TH.rc trunk/reactos/base/setup/welcome/lang/th-TH.rc trunk/reactos/base/system/expand/lang/th-TH.rc trunk/reactos/base/system/rundll32/lang/th-TH.rc trunk/reactos/base/system/userinit/lang/th-TH.rc Modified: trunk/reactos/base/applications/calc/rsrc.rc trunk/reactos/base/applications/control/rsrc.rc trunk/reactos/base/applications/devmgmt/rsrc.rc trunk/reactos/base/applications/getfirefox/rsrc.rc trunk/reactos/base/applications/imagesoft/rsrc.rc trunk/reactos/base/applications/reporterror/rsrc.rc trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/setup/welcome/rsrc.rc trunk/reactos/base/system/expand/rsrc.rc trunk/reactos/base/system/rundll32/rsrc.rc trunk/reactos/base/system/userinit/rsrc.rc Added: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,155 @@ +/* + * WineCalc (th-TH.rc) + * + * Copyright 2006 Sumath Aowsakulsutthi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Ê¶Ò¹ÀÒ¾·ÑèÇä»" + + IDS_COPYRIGHT1, "à¤Ã×èÍ§¤Ô´àÅ¢ 5.0. ÅÔ¢ÊÔ·¸ÔìÀÒÂãµé LGPL 2" + IDS_COPYRIGHT2 "Ê§Ç¹ÅÔ¢ÊÔ·¸Ôì 2003, à¨ÁÊì ºÃÔ¨¨ìÊ" + IDS_COPYRIGHT3 "á«¹ â¨Ê, á¤ÅÔ¿ÍÃìà¹ÕÂ, ÊËÃÑ°ÍàÁÃÔ¡Ò" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "¶ÍÂËÅÑ§" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "ÃÒ¡·ÕèÊÍ§" + IDS_ERR_INVALID_INPUT, "¤èÒ·Õè»éÍ¹ãËéäÁèÊÒÁÒÃ¶ãªéã¹¡Ã³Õ¹Õéä´é" + IDS_ERR_DIVIDE_BY_ZERO, "äÁèÊÒÁÒÃ¶ËÒÃ´éÇÂÈÙ¹Âì" + IDS_ERR_UNDEFINED, "äÁèÊÒÁÒÃ¶áÊ´§¼Åä´é" +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "á¡éä¢" { + MENUITEM "¤Ñ´ÅÍ¡ Ctrl+C", IDM_COPY + MENUITEM "ÇÒ§ Ctrl+V", IDM_PASTE + } + POPUP "&ÁØÁÁÍ§" { + MENUITEM "áººÁÒµÃ°Ò¹", IDM_MODE_STANDARD + MENUITEM "áººÇÔ·ÂÒÈÒÊµÃì", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "áÊ´§ËÅÑ¡µÑÇàÅ¢", IDM_DIGIT_GROUPING + } + POPUP "&ªèÇÂàËÅ×Í" { + MENUITEM "¢éÍÁÙÅªèÇÂàËÅ×Í", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "à¡ÕèÂÇ¡Ñº GNU WineCalc", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "á¡éä¢" { + MENUITEM "¤Ñ´ÅÍ¡ Ctrl+C", IDM_COPY + MENUITEM "ÇÒ§ Ctrl+V", IDM_PASTE + } + POPUP "ÁØÁÁÍ§" { + MENUITEM "áººÁÒµÃ°Ò¹", IDM_MODE_STANDARD + MENUITEM "áººÇÔ·ÂÒÈÒÊµÃì", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "°Ò¹ÊÔºË¡\tF5", ID_CALC_NS_HEX + MENUITEM "°Ò¹ÊÔº\tF6", ID_CALC_NS_DEC + MENUITEM "°Ò¹á»´\tF7", ID_CALC_NS_OCT + MENUITEM "°Ò¹ÊÍ§\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Í§ÈÒ\tF2", ID_CALC_MS_DEGREES + MENUITEM "àÃà´ÕÂ¹\tF3", ID_CALC_MS_RADIANS + MENUITEM "à¡Ãà´ÕÂ¹\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "áÊ´§ËÅÑ¡µÑÇàÅ¢", IDM_DIGIT_GROUPING + } + POPUP "ªèÇÂàËÅ×Í" { + MENUITEM "¢éÍÁÙÅªèÇÂàËÅ×Í", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "à¡ÕèÂÇ¡Ñº GNU WineCalc", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "á¡éä¢" { + MENUITEM "¤Ñ´ÅÍ¡ Ctrl+C", IDM_COPY + MENUITEM "ÇÒ§ Ctrl+V", IDM_PASTE + } + POPUP "ÁØÁÁÍ§" { + MENUITEM "áººÁÒµÃ°Ò¹", IDM_MODE_STANDARD + MENUITEM "áººÇÔ·ÂÒÈÒÊµÃì", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "°Ò¹ÊÔºË¡\tF5", ID_CALC_NS_HEX + MENUITEM "°Ò¹ÊÔº\tF6", ID_CALC_NS_DEC + MENUITEM "°Ò¹á»´\tF7", ID_CALC_NS_OCT + MENUITEM "°Ò¹ÊÍ§\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "áÊ´§ËÅÑ¡µÑÇàÅ¢", IDM_DIGIT_GROUPING + } + POPUP "ªèÇÂàËÅ×Í" { + MENUITEM "¢éÍÁÙÅªèÇÂàËÅ×Í", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "à¡ÕèÂÇ¡Ñº GNU WineCalc", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "à¡ÕèÂÇ¡Ñº GNU WineCalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "µ¡Å§", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "ÊÔè§¹Õé¤×ÍÍÐäÃ ?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "¡ÅèÍ§Ê¶Ò¹Ð" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… ============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Wed Feb 21 21:22:30 2007 @@ -23,20 +23,21 @@ IDI_CALCICON ICON "calculator.ico" -#include "lang/en-US.rc" #include "lang/cz-CZ.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" #include "lang/sv-SE.rc" -#include "lang/hu-HU.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" -#include "lang/el-GR.rc" -#include "lang/nb-NO.rc" LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL Added: trunk/reactos/base/applications/control/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/control/lang/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,34 @@ +/* + * PROJECT: ReactOS Control Application + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/control/lang/th-TH.rc + * PURPOSE: Thai translation + * TRANSLATOR: Sumath Aowsakulsutthi + * + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "á&¿éÁ" + BEGIN + MENUITEM "&»Ô´", IDM_CLOSE + END + POPUP "&ÁØÁÁÍ§" + BEGIN + MENUITEM "ÊÑÃÙ»¢¹Ò´ãËè", IDM_LARGEICONS + MENUITEM "ÊÑÃÙ»¢¹Ò´àÅç¡", IDM_SMALLICONS + MENUITEM "ÃÒÂ¡ÒÃ", IDM_LIST + MENUITEM "ÃÒÂÅÐàÍÕÂ´", IDM_DETAILS + END + POPUP "ªèÇÂàËÅ×Í" + BEGIN + MENUITEM "à¡ÕèÂÇ¡Ñº...", IDM_ABOUT + END +END Modified: trunk/reactos/base/applications/control/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/rsrc.rc (original) +++ trunk/reactos/base/applications/control/rsrc.rc Wed Feb 21 21:22:30 2007 @@ -9,19 +9,20 @@ /* include localised resources */ #include "lang/cz-CZ.rc" +#include "lang/da-DK.rc" #include "lang/de-DE.rc" -#include "lang/da-DK.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fi-FI.rc" #include "lang/fr-FR.rc" -#include "lang/el-GR.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/nb-NO.rc" #include "lang/nl-NL.rc" -#include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sv-SE.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/devmgmt/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/devmgmt/lang/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,91 @@ +/* + * PROJECT: ReactOS Device Management + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/devmgmt/lang/th-TH.rc + * PURPOSE: Thai translation + * COPYRIGHT: Copyright 2007 Sumath Aowsakulsutthi + * + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "á&¿éÁ" + BEGIN + MENUITEM "&ÍÍ¡", IDC_EXIT + END + POPUP "àÃÔèÁ·Ó" + BEGIN + MENUITEM "¾ÔÁ¾ì", IDC_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "¤Ø³ÊÁºÑµÔ", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "ªèÇÂàËÅ×Í", IDC_PROGHELP, GRAYED + END + POPUP "ÁØÁÁÍ§" + BEGIN + MENUITEM "ÍØ»¡Ã³ìáºè§µÒÁ»ÃÐàÀ·", IDC_DEVBYTYPE, CHECKED + MENUITEM "ÍØ»¡Ã³ìáºè§µÒÁ¡ÒÃàª×èÍÁµèÍ", IDC_STATIC, GRAYED + MENUITEM "áËÅè§¢éÍÁÙÅµÒÁ»ÃÐàÀ·", IDC_STATIC, GRAYED + MENUITEM "áËÅè§¢éÍÁÙÅµÒÁ¡ÒÃàª×èÍÁµèÍ", IDC_STATIC, GRAYED + END + POPUP "ªèÇÂàËÅ×Í" + BEGIN + MENUITEM "ªèÇÂàËÅ×Í", IDC_PROGHELP + MENUITEM "à¡ÕèÂÇ¡Ñº", IDC_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "Ë¹éÒµèÒ§»Ñ¨¨ØºÑ¹" + BEGIN + MENUITEM "¤Ø³ÊÁºÑµÔ", IDC_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "ªèÇÂàËÅ×Í", IDC_PROGHELP + END +END + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "à¡ÕèÂÇ¡Ñº¡ÒÃ¨Ñ´¡ÒÃÍØ»¡Ã³ì" +FONT 8,"Tahoma",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 + ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "¤Ø³ÊÁºÑµÔ" + IDS_TOOLTIP_REFRESH "¿×é¹¿Ù" + IDS_TOOLTIP_HELP "ªèÇÂàËÅ×Í" + IDS_TOOLTIP_EXIT "ÍÍ¡¨Ò¡â»Ãá¡ÃÁ" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "¡ÒÃ¨Ñ´¡ÒÃÍØ»¡Ã³ì¢Í§ ReactOS" + IDS_HINT_BLANK " " + IDS_HINT_EXIT " ÍÍ¡¨Ò¡â»Ãá¡ÃÁ" + IDS_HINT_REFRESH " ¿×é¹¿ÙÃÒÂ¡ÒÃºÃÔ¡ÒÃ" + IDS_HINT_PROP " à»Ô´¤Ø³ÊÁºÑµÔ¢Í§á¼è¹§Ò¹µÒÁ¡ÒÃàÅ×Í¡ã¹»Ñ¨¨ØºÑ¹" + IDS_HINT_HELP " áÊ´§Ë¹éÒµèÒ§ªèÇÂàËÅ×Í" + IDS_HINT_ABOUT " à¡ÕèÂÇ¡Ñº¡ÒÃ¨Ñ´¡ÒÃÍØ»¡Ã³ì¢Í§ ReactOS" + + IDS_HINT_SYS_RESTORE " ¤×¹ÊÀÒ¾¢Í§Ë¹éÒµèÒ§¹ÕéÊÙè¢¹Ò´»¡µÔ" + IDS_HINT_SYS_MOVE " ÂéÒÂË¹éÒµèÒ§¹Õé" + IDS_HINT_SYS_SIZE " à»ÅÕèÂ¹¢¹Ò´Ë¹éÒµèÒ§¹Õé" + IDS_HINT_SYS_MINIMIZE " ÂèÍË¹éÒµèÒ§¹ÕéãËéà»ç¹ÊÑÃÙ»" + IDS_HINT_SYS_MAXIMIZE " ¢ÂÒÂË¹éÒµèÒ§¹Õé¨¹àµçÁË¹éÒ¨Í" + IDS_HINT_SYS_CLOSE " »Ô´Ë¹éÒµèÒ§¹Õé" +END Modified: trunk/reactos/base/applications/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/rsrc.rc (original) +++ trunk/reactos/base/applications/devmgmt/rsrc.rc Wed Feb 21 21:22:30 2007 @@ -18,3 +18,4 @@ #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/th-TH.rc" Added: trunk/reactos/base/applications/getfirefox/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… ============================================================================== --- trunk/reactos/base/applications/getfirefox/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/getfirefox/lang/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,28 @@ +/* + * PROJECT: ReactOS utilities + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/getfirefox/lang/th-TH.rc + * PURPOSE: Thai resources + * COPYRIGHT: Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2005 Ge van Geldorp (gvg(a)reactos.org) + * Copyright 2006 Sumath Aowsakulsutthi (Thai translation) + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_GETFIREFOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "´ÒÇ¹ìâËÅ´ Firefox" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + CHECKBOX "à¤Å×èÍ¹ÂéÒÂ""¹Óà¢éÒâ»Ãá¡ÃÁ Firefox"" àÃÔèÁµé¹¨Ò¡ÃÒÂ¡ÒÃËÅÑ¡", IDC_REMOVE, + 10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + IDS_START_MENU_NAME "¹Óà¢éÒâ»Ãá¡ÃÁ Firefox" +END Modified: trunk/reactos/base/applications/getfirefox/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… ============================================================================== --- trunk/reactos/base/applications/getfirefox/rsrc.rc (original) +++ trunk/reactos/base/applications/getfirefox/rsrc.rc Wed Feb 21 21:22:30 2007 @@ -26,4 +26,5 @@ #include "lang/nb-NO.rc" #include "lang/ru-RU.rc" #include "lang/sv-SE.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/imagesoft/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/imagesoft/lang/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,234 @@ +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ImageSoft" + IDS_VERSION "v0.1" +END + +IDR_MAINMENU MENU +BEGIN + POPUP "á&¿éÁ" + BEGIN + MENUITEM "ã&ËÁè...", ID_NEW + MENUITEM "à&»Ô´...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "»Ô&´\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "»Ô´&·Ñé§ËÁ´", ID_CLOSEALL,GRAYED + MENUITEM SEPARATOR + MENUITEM "&ºÑ¹·Ö¡", ID_SAVE, GRAYED + MENUITEM "ºÑ¹&·Ö¡ à»ç¹...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&ÀÒ¾¡èÍ¹¾ÔÁ¾ì", ID_PRINTPRE,GRAYED + MENUITEM "&¾ÔÁ¾ì...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&¤Ø³ÊÁºÑµÔ...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "&ÍÍ¡¨Ò¡â»Ãá¡ÃÁ\tAlt+F4", ID_EXIT + END + POPUP "á&¡éä¢" + BEGIN + MENUITEM "à&ÅÔ¡·Ó", ID_UNDO, GRAYED + MENUITEM "&ÂéÍ¹¡ÅÑº", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "&µÑ´", ID_CUT, GRAYED + MENUITEM "&¤Ñ´ÅÍ¡", ID_COPY, GRAYED + MENUITEM "&ÇÒ§", ID_PASTE, GRAYED + MENUITEM "ÇÒ&§à»ç¹ÀÒ¾ãËÁè", ID_PASTENEWIMAGE, GRAYED + MENUITEM SEPARATOR + MENUITEM "àÅ×Í¡·Ñé§ËÁ&´", ID_SELALL, GRAYED + END + POPUP "&ÁØÁÁÍ§" + BEGIN + MENUITEM "à¤Ã×èÍ§Á×&Í", ID_TOOLS + MENUITEM "&ÊÕ", ID_COLOR + MENUITEM "&»ÃÐÇÑµÔ", ID_HISTORY + MENUITEM "á&¶ºÊ¶Ò¹Ð", ID_STATUSBAR + END + POPUP "&»ÃÑºáµè§" + BEGIN + MENUITEM "¤ÇÒÁÊÇèÒ§...", ID_BRIGHTNESS + MENUITEM "¤ÇÒÁªÑ´...", ID_CONTRAST + MENUITEM "¤ÇÒÁà¢éÁáÊ§/¤ÇÒÁÍÔèÁµÑÇ...", -1, GRAYED + POPUP "ÊÕ" + BEGIN + MENUITEM "ÀÒ¾¢ÒÇ´Ó" ID_BLACKANDWHITE + MENUITEM "á»Å§ÊÕ" ID_INVERTCOLORS + END + MENUITEM SEPARATOR + MENUITEM "·ÓãËéÁÑÇ", ID_BLUR + MENUITEM "·ÓãËé¤ÁªÑ´", ID_SHARPEN + MENUITEM "·ÓãËé¢Íº¹ØèÁ", -1, GRAYED + MENUITEM "à¾ÔèÁà§Ò", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "¢¹Ò´ÀÒ¾...", -1, GRAYED + MENUITEM "¡ÅÑº·ÔÈ·Ò§", -1, GRAYED + MENUITEM "¡ÅÑº´éÒ¹", -1, GRAYED + MENUITEM "ËÁØ¹", -1, GRAYED + + END + POPUP "&ÊÕ" + BEGIN + MENUITEM "á¡éä&¢ÊÕ...", ID_EDITCOLOURS + END + POPUP "&Ë¹éÒµèÒ§" + BEGIN + MENUITEM "&«éÍ¹¡Ñ¹", ID_WINDOW_CASCADE + MENUITEM "ÇÒ§àÃÕÂ§á¹Ç&¹Í¹", ID_WINDOW_TILE_HORZ + MENUITEM "ÇÒ§àÃÕÂ§á¹Ç&µÑé§", ID_WINDOW_TILE_VERT + MENUITEM "¨Ñ´àÃÕÂ§ÊÑ&ÃÙ»", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "&¶Ñ´ä»\tCtrl+F6", ID_WINDOW_NEXT + END + POPUP "&ªèÇÂàËÅ×Í" + BEGIN + MENUITEM "&à¡ÕèÂÇ¡Ñº...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "à»Ô´Ë¹éÒµèÒ§ãËÁè" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 +CAPTION "¤ÇÒÁÊÇèÒ§" +FONT 8,"MS Sans Serif", 0, 0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN + LTEXT "ÃÙ»áººÊÕ:", IDC_STATIC, 135, 5, 36, 9 + GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 + CONTROL "·Ø¡ÊÕ (RGB)", IDC_BRI_FULL, "»ØèÁ¡´", BS_AUTORADIOBUTTON, 138, 18, 46, 9 + CONTROL "á´§", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 + CONTROL "à¢ÕÂÇ", IDC_BRI_GREEN, "»ØèÁ¡´", BS_AUTORADIOBUTTON, 142, 51, 42, 9 + CONTROL "¹éÓà§Ô¹", IDC_BRI_BLUE, "»ØèÁ¡´", BS_AUTORADIOBUTTON, 142, 64, 42, 9 + EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 + CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 + PUSHBUTTON "µ¡Å§", IDOK, 142, 88, 48, 13 + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 142, 105, 48, 13 +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "à¡ÕèÂÇ¡Ñºâ»Ãá¡ÃÁ ImageSoft" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +//EXSTYLE WS_EX_LAYERED +BEGIN + LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "»Ô´", IDOK, 75, 162, 44, 15 + ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + + +IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 +CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ÀÒ¾" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "ª×èÍ:", IDC_STATIC, 12, 5, 38, 9 + EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "¤Ø³ÊÁºÑµÔ¢Í§¢¹Ò´¾×é¹·ÕèÀÒ¾", IDC_STATIC, 4, 22, 148, 98 + LTEXT "»ÃÐàÀ·ÃÙ»ÀÒ¾:", IDC_STATIC, 12, 36, 42, 9 + CONTROL "", IDC_IMAGETYPE, "¡ÅèÍ§à¤Ã×èÍ§Á×Í", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 + LTEXT "¤ÇÒÁ¡ÇéÒ§:", IDC_STATIC, 12, 51, 42, 9 + EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 + LTEXT "¤ÇÒÁÊÙ§:", IDC_STATIC, 12, 68, 42, 9 + EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 + LTEXT "¤ÇÒÁÅÐàÍÕÂ´¢Í§ÀÒ¾:", IDC_STATIC, 12, 84, 42, 9 + EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 + LTEXT "Ë¹èÇÂ:", IDC_STATIC, 12, 99, 42, 9 + CONTROL "", IDC_UNIT, "¡ÅèÍ§à¤Ã×èÍ§Á×Í", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 + LTEXT "¢¹Ò´ÀÒ¾:", IDC_STATIC, 12, 125, 42, 9 + LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 + PUSHBUTTON "µ¡Å§", IDOK, 50, 144, 48, 13 + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 102, 144, 48, 13 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_READY " àÊÃç¨áÅéÇ." + IDS_TOOLBAR_STANDARD "ÁÒµÃ°Ò¹" + IDS_TOOLBAR_TEST "·´ÊÍº" + IDS_IMAGE_NAME "ÀÒ¾ %1!u!" + IDS_FLT_TOOLS "à¤Ã×èÍ§Á×Í" + IDS_FLT_COLORS "ÊÕ" + IDS_FLT_HISTORY "»ÃÐÇÑµÔ" +END + +/* imageprop.c */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGE_MONOCHROME "ÊÕà´ÕÂÇ (1 bit)" + IDS_IMAGE_GREYSCALE "ÀÒ¾¢ÒÇ´Ó (8 bit)" + IDS_IMAGE_PALETTE "á¶ºÊÕ 256 ÊÕ (8 bit)" + IDS_IMAGE_TRUECOLOR "ÊÕ¨ÃÔ§ (24 bit)" + + IDS_UNIT_PIXELS "àÁç´ÊÕ" + IDS_UNIT_CM "à«¹µÔàÁµÃ" + IDS_UNIT_INCHES "¹ÔéÇ" + IDS_UNIT_DOTSCM "¨Ø´ / à«¹µÔàÁµÃ" + IDS_UNIT_DPI "¨Ø´µèÍ¹ÔéÇ" + IDS_UNIT_KB "%d ¡ÔâÅäºµì" + IDS_UNIT_MB "%d àÁ¡¡Ðäºµì" +END + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "ãËÁè" + IDS_TOOLTIP_OPEN "à»Ô´" + IDS_TOOLTIP_SAVE "ºÑ¹·Ö¡" + IDS_TOOLTIP_PRINTPRE "ÀÒ¾¡èÍ¹¾ÔÁ¾ì" + IDS_TOOLTIP_PRINT "¾ÔÁ¾ì" + IDS_TOOLTIP_CUT "µÑ´" + IDS_TOOLTIP_COPY "¤Ñ´ÅÍ¡" + IDS_TOOLTIP_PASTE "ÇÒ§" + IDS_TOOLTIP_UNDO "àÅÔ¡·Ó" + IDS_TOOLTIP_REDO "ÂéÍ¹¡ÅÑº" +END + + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " ÊÃéÒ§àÍ¡ÊÒÃãËÁè." + IDS_HINT_OPEN " à»Ô´àÍ¡ÊÒÃ·ÕèÁÕÍÂÙè." + IDS_HINT_CLOSE " »Ô´Ë¹éÒµèÒ§¹Õé." + IDS_HINT_CLOSEALL " »Ô´Ë¹éÒµèÒ§·Ñé§ËÁ´." + IDS_HINT_SAVE " ºÑ¹·Ö¡àÍ¡ÊÒÃ·Õèà¡çºäÇé." + IDS_HINT_SAVEAS " ºÑ¹·Ö¡àÍ¡ÊÒÃ·Õè¡ÓÅÑ§·ÓÍÂÙè´éÇÂª×èÍãËÁè." + IDS_HINT_PRINTPRE " ÁÍ§ÀÒ¾¡èÍ¹¾ÔÁ¾ì¢Í§àÍ¡ÊÒÃ." + IDS_HINT_PRINT " ¾ÔÁ¾ìàÍ¡ÊÒÃ·Õè¡ÓÅÑ§·ÓÍÂÙè¹Õé." + IDS_HINT_PROP " áÊ´§¤Ø³ÊÁºÑµÔ¢Í§ÀÒ¾·Õè¡ÓÅÑ§·ÓÍÂÙè¹Õé." + IDS_HINT_EXIT " ÍÍ¡¨Ò¡¡ÒÃ·Ó§Ò¹." + + IDS_HINT_TOOLS " áÊ´§Ë¹éÒ«èÍ¹Ë¹éÒµèÒ§¢Í§á¶ºà¤Ã×èÍ§Á×Í." + IDS_HINT_COLORS " áÊ´§Ë¹éÒ«èÍ¹Ë¹éÒµèÒ§¢Í§á¶ºÊÕ." + IDS_HINT_HISTORY " áÊ´§Ë¹éÒ«èÍ¹Ë¹éÒµèÒ§¢Í§á¶º»ÃÐÇÑµÔ." + IDS_HINT_STATUS " áÊ´§Ë¹éÒ«èÍ¹Ë¹éÒµèÒ§¢Í§á¶ºÊ¶Ò¹Ð." + + IDS_HINT_CASCADE " àÃÕÂ§Ë¹éÒµèÒ§ÇÒ§«éÍ¹¡Ñ¹." + IDS_HINT_TILE_HORZ " àÃÕÂ§Ë¹éÒµèÒ§µÒÁá¹Ç¹Í¹." + IDS_HINT_TILE_VERT " àÃÕÂ§Ë¹éÒµèÒ§µÒÁá¹ÇµÑé§." + IDS_HINT_ARRANGE " ¨Ñ´àÃÕÂ§ÊÑÃÙ»·Õè´éÒ¹ÅèÒ§¢Í§Ë¹éÒµèÒ§." + IDS_HINT_NEXT " àÃÔèÁ·Ó§Ò¹Ë¹éÒµèÒ§¶Ñ´ä»." + + IDS_HINT_SYS_RESTORE " ¤×¹ÊÀÒ¾Ë¹éÒµèÒ§ÊÙè¢¹Ò´»¡µÔ." + IDS_HINT_SYS_MOVE " à¤Å×èÍ¹ÂéÒÂË¹éÒµèÒ§¹Õé." + IDS_HINT_SYS_SIZE " à»ÅÕèÂ¹¢¹Ò´Ë¹éÒµèÒ§¹Õé." + IDS_HINT_SYS_MINIMIZE " ÂèÍË¹éÒµèÒ§¹ÕéãËéà»ç¹ÊÑÃÙ»." + IDS_HINT_SYS_MAXIMIZE " ¢ÂÒÂË¹éÒµèÒ§¹Õé¨¹àµçÁË¹éÒ¨Í." +END Modified: trunk/reactos/base/applications/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… ============================================================================== --- trunk/reactos/base/applications/imagesoft/rsrc.rc (original) +++ trunk/reactos/base/applications/imagesoft/rsrc.rc Wed Feb 21 21:22:30 2007 @@ -11,4 +11,5 @@ #include "lang/en-US.rc" #include "lang/it-IT.rc" #include "lang/nb-NO.rc" +#include "lang/th-TH.rc" Added: trunk/reactos/base/applications/reporterror/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… ============================================================================== --- trunk/reactos/base/applications/reporterror/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/reporterror/lang/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,62 @@ +/* + * PROJECT: ReactOS Error Reporting Assistant + * LICENSE: See COPYING in the top level directory + * FILE: base/applications/reporterror/lang/th-TH.rc + * PURPOSE: Thai resources + * TRANSLATOR: Sumath Aowsakulsutthi + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "¡ÒÃÃÒÂ§Ò¹¼Å¤ÇÒÁ¼Ô´¾ÅÒ´" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ÃÐººä´é¡Ùé¢éÍÁÙÅ¡ÅÑº¨Ò¡¤ÇÒÁ¼Ô´¾ÅÒ´", -1, 115, 15, 160, 24 + LTEXT "¤Ø³ÍÂÒ¡ä´éÃÑºÃÒÂ§Ò¹¼Å¤ÇÒÁ¼Ô´¾ÅÒ´¨Ò¡Ë¹èÇÂ§Ò¹ ReactOS ºéÒ§äËÁ ?", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "¡ÒÃÃÒÂ§Ò¹¼Å¤ÇÒÁ¼Ô´¾ÅÒ´" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "¡ÃØ³ÒºÍ¡ÇèÒ¤Ø³¡ÓÅÑ§·ÓÍÐäÃ àÁ×èÍä´é¾º¤ÇÒÁ¼Ô´¾ÅÒ´à¡Ô´¢Öé¹\n\n¡´»ØèÁ '¶Ñ´ä»' à¾×èÍÊè§ÃÒÂ§Ò¹ä»ÂÑ§Ë¹èÇÂ§Ò¹¢Í§ ReactOS ËÃ×Í 'Â¡àÅÔ¡' â´ÂäÁèÊè§¢éÍÁÙÅã´æ",-1,10,0,225,40 + LTEXT "·ÕèÍÂÙèÍÕàÁÅì¢Í§¤Ø³ (µÑÇàÅ×Í¡):",-1,10,40,120,20 + EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12 + LTEXT "¤ÓºÃÃÂÒÂ»ÑËÒ (µÑÇàÅ×Í¡):",-1,10,55,120,20 + EDITTEXT IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,10,65,250,55,ES_WANTRETURN|ES_MULTILINE|ES_LEFT|WS_BORDER|WS_TABSTOP|WS_VSCROLL +END + +IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "¡ÒÃÃÒÂ§Ò¹¼Å¤ÇÒÁ¼Ô´¾ÅÒ´" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{Ê¶Ò¹Ð}",IDC_SUBMISSION_STATUS,25,58,225,8 + CONTROL "", IDC_SUBMITTING_IN_PROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "¡ÒÃÃÒÂ§Ò¹¼Å¤ÇÒÁ¼Ô´¾ÅÒ´" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "¡ÒÃÃÒÂ§Ò¹¼Å¤ÇÒÁ¼Ô´¾ÅÒ´ä´é¶Ù¡Êè§ä»ÂÑ§Ë¹èÇÂ§Ò¹¢Í§ ReactOS àÃÕÂºÃéÍÂáÅéÇ",-1,25,5,225,20 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "¡ÒÃÃÒÂ§Ò¹¤ÇÒÁ¼Ô´¾ÅÒ´ä´éÊè§ä»ÂÑ§Ë¹èÇÂ§Ò¹¢Í§ ReactOS" + IDS_FAILED_TO_CONTACT_SERVER "ÃÐººäÁèÊÒÁÒÃ¶µÔ´µèÍä»ÂÑ§à¤Ã×èÍ§áÁè¢èÒÂ·ÕèÃÑºÃÒÂ§Ò¹¼Å¤ÇÒÁ¼Ô´¾ÅÒ´\n¡ÃØ³Òá¹èã¨ÇèÒÃÐºº¢Í§¤Ø³ä´é·Ó¡ÒÃàª×èÍÁµèÍ¡ÑºÍÔ¹à·ÍÃìà¹çµ" + IDS_FAILED_TO_DELIVER_ERROR_REPORT "ÃÐººäÁèÊÒÁÒÃ¶Êè§ÃÒÂ§Ò¹¤ÇÒÁ¼Ô´¾ÅÒ´" +END + +STRINGTABLE +BEGIN + IDS_CONTACTING_SERVER "¡ÓÅÑ§µÔ´µèÍä»ÂÑ§à¤Ã×èÍ§áÁè¢èÒÂ·ÕèÃÑºÃÒÂ§Ò¹¼Å¤ÇÒÁ¼Ô´¾ÅÒ´..." + IDS_FAILED_TO_INITIALIZE_WINSOCK "ÅéÁàËÅÇ·Õè·Ó§Ò¹¡Ñº winsock ã¹µÍ¹áÃ¡(¡ÒÃà¢éÒÃËÑÊ¼Ô´¾ÅÒ´ %d)" + IDS_FAILED_TO_LOCATE_SERVER "ÅéÁàËÅÇã¹¡ÒÃµÔ´µèÍä»ÂÑ§à¤Ã×èÍ§áÁè¢èÒÂ·ÕèÃÑºÃÒÂ§Ò¹¼Å¤ÇÒÁ¼Ô´¾ÅÒ´" +END + Modified: trunk/reactos/base/applications/reporterror/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… ============================================================================== --- trunk/reactos/base/applications/reporterror/rsrc.rc (original) +++ trunk/reactos/base/applications/reporterror/rsrc.rc Wed Feb 21 21:22:30 2007 @@ -9,14 +9,15 @@ /* include localised resources */ +#include "lang/da-DK.rc" #include "lang/de-DE.rc" -#include "lang/da-DK.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" -#include "lang/sv-SE.rc" -#include "lang/hu-HU.rc" +#include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/ru-RU.rc" -#include "lang/nb-NO.rc" +#include "lang/sv-SE.rc" +#include "lang/th-TH.rc" Added: trunk/reactos/base/applications/sndvol32/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/th-TH.rc (added) +++ trunk/reactos/base/applications/sndvol32/lang/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,51 @@ +/* + * PROJECT: ReactOS Sound Volume Control + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sndvol32/lang/th-TH.rc + * PURPOSE: Thai language file for Volume Control + * TRANSLATOR: Sumath Aowsakulsutthi + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&µÑÇàÅ×Í¡" + BEGIN + MENUITEM "&¤Ø³ÊÁºÑµÔ", IDC_PROPERTIES + MENUITEM "¤Çº¤ØÁáºº&¢Ñé¹ÊÙ§", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "&ÍÍ¡¨Ò¡â»Ãá¡ÃÁ", IDC_EXIT + END + POPUP "&ªèÇÂàËÅ×Í" + BEGIN + MENUITEM "à&¹×éÍËÒã¹¡ÒÃªèÇÂàËÅ×Í", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "à&¡ÕèÂÇ¡Ñºá¼§¤Çº¤ØÁÃÐººàÊÕÂ§", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "á¼§¤Çº¤ØÁÃÐººàÊÕÂ§" + IDS_NOMIXERDEVICES "äÁè¾ºÍØ»¡Ã³ì¼ÊÁàÊÕÂ§ã´æàËÅ×ÍÍÂÙèàÅÂ! â»Ãá¡ÃÁ¹Õé¨Ð¶Ù¡»Ô´·Ñ¹·Õ" +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "¤Ø³ÊÁºÑµÔ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ÍØ»¡Ã³ì&»ÃÑºáµè§àÊÕÂ§:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "»ÃÑºáµè§ÃÐººàÊÕÂ§ãËé :", -1, 7,25,211,77 + PUSHBUTTON "à&Åè¹ÂéÍ¹", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&¡ÓÅÑ§ºÑ¹·Ö¡", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Í×è¹æ:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + LTEXT "áÊ´§¡ÒÃ¤Çº¤ØÁÃÐººàÊÕÂ§ :", IDC_LABELCONTROLS, 7, 109, 162, 8 + CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 + + PUSHBUTTON "µ¡Å§", IDOK, 114,226,50,14 + PUSHBUTTON "Â¡àÅÔ¡", IDCANCEL, 168,226,50,14 +END Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/rsrc.rc (original) +++ trunk/reactos/base/applications/sndvol32/rsrc.rc Wed Feb 21 21:22:30 2007 @@ -16,4 +16,5 @@ #include "lang/ja-JP.rc" #include "lang/nl-NL.rc" #include "lang/sv-SE.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rc (original) +++ trunk/reactos/base/setup/reactos/reactos.rc Wed Feb 21 21:22:30 2007 @@ -28,6 +28,7 @@ #include "nb-NO.rc" #include "ru-RU.rc" #include "sv-SE.rc" +#include "th-TH.rc" #include "uk-UA.rc" /* EOF */ Added: trunk/reactos/base/setup/reactos/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/th-TH.r… ============================================================================== --- trunk/reactos/base/setup/reactos/th-TH.rc (added) +++ trunk/reactos/base/setup/reactos/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,29 @@ +/* + * Thai language-specific resources + * Copyright (C) 2006 Sumath Aowsakulsutthi + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "¡ÒÃµÔ´µÑé§ ReactOS" + IDS_TEXT "¤Ø³äÁèÊÒÁÒÃ¶µÔ´µÑé§ ReactOS ¨Ò¡¡ÒÃÍèÒ¹á¼è¹«Õ´Õ¹Õéä´éâ´ÂµÃ§\n\n¡ÃØ³Òà»Ô´à¤Ã×èÍ§¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³ãËÁèÍÕ¡¤ÃÑé§\n\n¾ÃéÍÁãÊèá¼è¹«Õ´ÕáÅéÇ·ÓµÒÁ¤ÓÊÑè§ã¹¡ÒÃµÔ´µÑé§ ReactOS" +END + +/* EOF */ Added: trunk/reactos/base/setup/welcome/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/th… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/th-TH.rc (added) +++ trunk/reactos/base/setup/welcome/lang/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,67 @@ +/* + * PROJECT: ReactOS welcome/autorun application + * LICENSE: See COPYING in the top level directory + * FILE: base/setup/welcome/lang/th-TH.rc + * TRANSLATOR: Sumath Aowsakulsutthi + */ + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +/* String Tables */ + +/* Default settings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS - ÂÔ¹´ÕµéÍ¹ÃÑº" + IDS_DEFAULTTOPICTITLE "ReactOS" + IDS_DEFAULTTOPICDESC "ÂÔ¹´ÕµéÍ¹ÃÑºÊÙèÃÐºº»¯ÔºÑµÔ¡ÒÃ React \n\n¡´àÅ×Í¡à¹×éÍËÒº¹á¶º«éÒÂÁ×Í" +// IDS_CHECKTEXT "áÊ´§¤Óá¹Ð¹ÓÍÕ¡¤ÃÑé§" +// IDS_CLOSETEXT "ÍÍ¡¨Ò¡â»Ãá¡ÃÁ" +END + +/* Topic buttons */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICBUTTON0 "µÔ´µÑé§ ReactOS" + IDS_TOPICBUTTON1 "´ÙÃÒÂÅÐàÍÕÂ´¢Í§á¼è¹«Õ´Õ¹Õé" + IDS_TOPICBUTTON2 "ÍÍ¡¨Ò¡â»Ãá¡ÃÁ" +// IDS_TOPICBUTTON3 "Empty Topic 3" +// IDS_TOPICBUTTON4 "Empty Topic 4" +// IDS_TOPICBUTTON5 "Empty Topic 5" +// IDS_TOPICBUTTON6 "Empty Topic 6" +// IDS_TOPICBUTTON7 "Empty Topic 7" +// IDS_TOPICBUTTON8 "Empty Topic 8" +// IDS_TOPICBUTTON9 "Empty Topic 9" +END + +/* Topic titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICTITLE0 "µÔ´µÑé§ ReactOS" + IDS_TOPICTITLE1 "´ÙÃÒÂÅÐàÍÕÂ´¢Í§á¼è¹«Õ´Õ¹Õé" + IDS_TOPICTITLE2 "ÍÍ¡¨Ò¡â»Ãá¡ÃÁ" +// IDS_TOPICTITLE3 "Empty Topic Title 3" +// IDS_TOPICTITLE4 "Empty Topic Title 4" +// IDS_TOPICTITLE5 "Empty Topic Title 5" +// IDS_TOPICTITLE6 "Empty Topic Title 6" +// IDS_TOPICTITLE7 "Empty Topic Title 7" +// IDS_TOPICTITLE8 "Empty Topic Title 8" +// IDS_TOPICTITLE9 "Empty Topic Title 9" +END + +/* Topic descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICDESC0 "¤Ø³µéÍ§¡ÒÃµÔ´µÑé§ ReactOS Å§ã¹à¤Ã×èÍ§¤ÍÁ¾ÔÇàµÍÃì¢Í§¤Ø³\n\nËÃ×ÍµéÍ§¡ÒÃ»ÃÑºáµè§à¾ÔèÁàµÔÁ¨Ò¡·ÕèÁÕÍÂÙèà´ÔÁ." + IDS_TOPICDESC1 "´ÙÃÒÂÅÐàÍÕÂ´¢Í§á¼è¹«Õ´Õ¹Õé." + IDS_TOPICDESC2 "¡´àÅ×Í¡·Õè¹Õèà¾×èÍµéÍ§¡ÒÃÍÍ¡¨Ò¡¡ÒÃµÔ´µÑé§." +// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." +// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." +// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." +// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." +// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." +// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." +// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." +END + +/* EOF */ Modified: trunk/reactos/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/welcome/rsrc.rc (original) +++ trunk/reactos/base/setup/welcome/rsrc.rc Wed Feb 21 21:22:30 2007 @@ -41,17 +41,18 @@ /* Language-specific resources */ #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" #include "lang/de-DE.rc" -#include "lang/da-DK.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" +#include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/sv-SE.rc" +#include "lang/th-TH.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" -#include "lang/it-IT.rc" -#include "lang/nb-NO.rc" Added: trunk/reactos/base/system/expand/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/th… ============================================================================== --- trunk/reactos/base/system/expand/lang/th-TH.rc (added) +++ trunk/reactos/base/system/expand/lang/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,33 @@ +/* + * ReactOS File Expansion Utility + * + * Copyright 2006 Sumath Aowsakulsutthi (Thai translation) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "resource.h" + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_Copy, "â»Ãá¡ÃÁÍÃÃ¶»ÃÐâÂª¹ìà¾×èÍ»ÃÑºáµè§á¿éÁ¢Í§ ReactOS ÃØè¹·Õè 1.0\n\ +Ê§Ç¹ÅÔ¢ÊÔ·¸Ôì Victor Schneider 1997\n\n\ +ÊÀÒÇÐãªé§Ò¹: %s á¿éÁÀÒÂã¹ [á¿éÁÀÒÂ¹Í¡]\n" + +IDS_FAILS "¡ÒÃ¤Ñ´ÅÍ¡ÅéÁàËÅÇ: ÂéÍ¹¡ÅÑºà»ç¹ %ld\n" +} Modified: trunk/reactos/base/system/expand/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/expand/rsrc.rc (original) +++ trunk/reactos/base/system/expand/rsrc.rc Wed Feb 21 21:22:30 2007 @@ -13,3 +13,4 @@ #include "lang/nb-NO.rc" #include "lang/ru-RU.rc" #include "lang/sv-SE.rc" +#include "lang/th-TH.rc" Added: trunk/reactos/base/system/rundll32/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/th-TH.rc (added) +++ trunk/reactos/base/system/rundll32/lang/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,14 @@ +/* + * ReactOS rundll32 + * Copyright (C) 2003-2004 ReactOS Team + * Copyright (C) 2006 Sumath Aowsakulsutthi (Thai translation) + */ + +#include "resource.h" + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ +IDS_DllNotLoaded, "¡ÒÃºÃÃ¨Ø¤èÒÃÐººà¡Ô´¼Ô´¾ÅÒ´ '%s'" +IDS_MissingEntry, "¡ÒÃà¢éÒËÒµÓáË¹è§¼Ô´¾ÅÒ´: %s\n%s" +} Modified: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… ============================================================================== --- trunk/reactos/base/system/rundll32/rsrc.rc (original) +++ trunk/reactos/base/system/rundll32/rsrc.rc Wed Feb 21 21:22:30 2007 @@ -3,13 +3,14 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" -#include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" -#include "lang/ru-RU.rc" -#include "lang/el-GR.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" +#include "lang/ru-RU.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/system/userinit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/th-TH.rc (added) +++ trunk/reactos/base/system/userinit/lang/th-TH.rc Wed Feb 21 21:22:30 2007 @@ -1,0 +1,9 @@ +#include "resource.h" + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_USERINIT_FAIL, "¤èÒ¼Ùéãªé¼Ô´¾ÅÒ´ã¹µÍ¹à¢éÒÊÙèªÑé¹Ê¶Ò¹Ð!\n" + +} Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… ============================================================================== --- trunk/reactos/base/system/userinit/rsrc.rc (original) +++ trunk/reactos/base/system/userinit/rsrc.rc Wed Feb 21 21:22:30 2007 @@ -5,14 +5,15 @@ LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/nb-NO.rc" +#include "lang/ru-RU.rc" #include "lang/sv-SE.rc" -#include "lang/hu-HU.rc" -#include "lang/es-ES.rc" -#include "lang/ru-RU.rc" -#include "lang/el-GR.rc" +#include "lang/th-TH.rc" #include "lang/uk-UA.rc" -#include "lang/nb-NO.rc" -#include "lang/fr-FR.rc" -#include "lang/it-IT.rc"

17 years, 6 months

[dgorbachev] 25865: Thai translation by Sumath Aowsakulsutthi (punth1 at gmail dot com)

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Feb 21 21:22:11 2007 New Revision: 25865 URL: http://svn.reactos.org/svn/reactos?rev=25865&view=rev Log: Thai translation by Sumath Aowsakulsutthi (punth1 at gmail dot com) Added: trunk/reactos/subsystems/ntvdm/th-TH.rc Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.rc (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.rc Wed Feb 21 21:22:11 2007 @@ -7,10 +7,11 @@ #include <reactos/version.rc> #include "de-DE.rc" +#include "en-US.rc" #include "es-ES.rc" -#include "en-US.rc" #include "fr-FR.rc" #include "hu-HU.rc" #include "ja-JP.rc" #include "nb-NO.rc" +#include "th-TH.rc" #include "uk-UA.rc" Added: trunk/reactos/subsystems/ntvdm/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/th-TH.rc?… ============================================================================== --- trunk/reactos/subsystems/ntvdm/th-TH.rc (added) +++ trunk/reactos/subsystems/ntvdm/th-TH.rc Wed Feb 21 21:22:11 2007 @@ -1,0 +1,9 @@ +#include "resource.h" + +LANGUAGE LANG_THAI, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_WelcomeMsg, "ÃÍ§ÃÑº¡ÒÃ·Ó§Ò¹ÃÐºº´ÍÊàÊÁ×Í¹¢Í§ ReactOS\n" +STRING_PromptMsg, "áºº r<cr> à¾×èÍ·Ó§Ò¹, s<cr> à¾×èÍ»Ô´ÃÐººËÃ×Í q<cr> à¾×èÍÍÍ¡·Ñ¹·Õ" +}

17 years, 6 months

[fireball] 25864: - Merge 25830 (calc buffer fix)

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 21 19:44:24 2007 New Revision: 25864 URL: http://svn.reactos.org/svn/reactos?rev=25864&view=rev Log: - Merge 25830 (calc buffer fix) Modified: branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.c branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.h Modified: branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.c (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.c Wed Feb 21 19:44:24 2007 @@ -476,18 +476,23 @@ if (!(len = _tcslen(calc.display))) return 0; + if (!(s = calc.display)) + return 0; + + if (s[len - 1] == TEXT('.') || s[len - 1] == TEXT(',')) + len--; + if (!(hGlobalMemory = GlobalAlloc(GHND, (len + 1) * sizeof(TCHAR)))) return 0; if (!(pGlobalMemory = GlobalLock(hGlobalMemory))) return 0; - if (!(s = calc.display)) - return 0; - for (i = 0; i < len; i++) *pGlobalMemory++ = *s++; + pGlobalMemory[len - 1] = 0; + GlobalUnlock(hGlobalMemory); // call GetLastError() for exception handling if (!OpenClipboard(hWnd)) @@ -496,7 +501,7 @@ if (!EmptyClipboard()) return 0; - if (!SetClipboardData(CF_TEXT, hGlobalMemory)) + if (!SetClipboardData(CF_TTEXT, hGlobalMemory)) return 0; if (!CloseClipboard()) @@ -514,11 +519,11 @@ HGLOBAL hGlobalMemory; LPTSTR pGlobalMemory; - if (IsClipboardFormatAvailable(CF_TEXT)) { + if (IsClipboardFormatAvailable(CF_TTEXT)) { if (!OpenClipboard(hWnd)) return 0; - if (!(hGlobalMemory = GetClipboardData(CF_TEXT))) + if (!(hGlobalMemory = GetClipboardData(CF_TTEXT))) return 0; if (!(size = GlobalSize(hGlobalMemory))) Modified: branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.h (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/calc/winecalc.h Wed Feb 21 19:44:24 2007 @@ -19,6 +19,12 @@ */ ////////////////////////////////////////////////////////////////// + +#ifdef UNICODE +#define CF_TTEXT CF_UNICODETEXT +#else +#define CF_TTEXT CF_TEXT +#endif // numerics are defined here for easier porting

17 years, 6 months

[dgorbachev] 25863: Fix Italian resource file

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Feb 21 14:41:17 2007 New Revision: 25863 URL: http://svn.reactos.org/svn/reactos?rev=25863&view=rev Log: Fix Italian resource file Modified: trunk/reactos/base/system/expand/lang/it-IT.rc Modified: trunk/reactos/base/system/expand/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/it… ============================================================================== --- trunk/reactos/base/system/expand/lang/it-IT.rc (original) +++ trunk/reactos/base/system/expand/lang/it-IT.rc Wed Feb 21 14:41:17 2007 @@ -1,12 +1,7 @@ +#include "resource.h" + LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN -#include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE {

17 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
27
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 February 2007