Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tretiakov] 25887: Fix warnings.
by tretiakov＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: tretiakov Date: Fri Feb 23 11:20:33 2007 New Revision: 25887 URL: http://svn.reactos.org/svn/reactos?rev=25887&view=rev Log: Fix warnings. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Fri Feb 23 11:20:33 2007 @@ -1537,9 +1537,9 @@ //FIXME: What to do with INPUTLANGCHANGE_SYSCHARSET ? - if(wParam & INPUTLANGCHANGE_BACKWARD) NewHkl = HKL_PREV; - else if(wParam & INPUTLANGCHANGE_FORWARD) NewHkl = HKL_NEXT; - else NewHkl = lParam; + if(wParam & INPUTLANGCHANGE_BACKWARD) NewHkl = (HKL) HKL_PREV; + else if(wParam & INPUTLANGCHANGE_FORWARD) NewHkl = (HKL) HKL_NEXT; + else NewHkl = (HKL) lParam; NtUserActivateKeyboardLayout(NewHkl, 0);

1 0

[ion] 25886: - Get rid of LdrGetModuleObject, since MmLoadSystemImage will now return the existing module object in case it has already been loaded, get rid of LdrGetProcedureAddress, it doesn't belong in the kernel. Move MmGetSystemRoutineAddress from mm.c to sysldr.c and rewrite it to use MiFindExportedRoutineByName instead. - Remove /ldr ntoskrnl directory, since this module is finally gone. - Make PsInit code search for ntdll lookups using LookupEntryPoint internal function, instead of LdrGe
by ion＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: ion Date: Fri Feb 23 10:56:01 2007 New Revision: 25886 URL: http://svn.reactos.org/svn/reactos?rev=25886&view=rev Log: - Get rid of LdrGetModuleObject, since MmLoadSystemImage will now return the existing module object in case it has already been loaded, get rid of LdrGetProcedureAddress, it doesn't belong in the kernel. Move MmGetSystemRoutineAddress from mm.c to sysldr.c and rewrite it to use MiFindExportedRoutineByName instead. - Remove /ldr ntoskrnl directory, since this module is finally gone. - Make PsInit code search for ntdll lookups using LookupEntryPoint internal function, instead of LdrGetProcedureAddress. Same code but done with recursion instead, and internal to this module (remove ANSI_STRINGs since we don't need them anymore). Removed: trunk/reactos/ntoskrnl/ldr/ Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ldr.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ldr.h Fri Feb 23 10:56:01 2007 @@ -6,8 +6,4 @@ #define DRIVER_ROOT_NAME L"\\Driver\\" #define FILESYSTEM_ROOT_NAME L"\\FileSystem\\" -PLDR_DATA_TABLE_ENTRY -NTAPI -LdrGetModuleObject(PUNICODE_STRING ModuleName); - #endif /* __INCLUDE_INTERNAL_LDR_H */ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri Feb 23 10:56:01 2007 @@ -435,34 +435,20 @@ return Status; } - /* - * Load the module. - */ - - *ModuleObject = LdrGetModuleObject(&ServiceImagePath); - - if (*ModuleObject == NULL) - { /* * Case for disabled drivers */ - if (ServiceStart >= 4) - { - /* FIXME: Check if it is the right status code */ - Status = STATUS_PLUGPLAY_NO_DEVICE; - } - else - { - DPRINT("Loading module\n"); - Status = MmLoadSystemImage(&ServiceImagePath, NULL, NULL, 0, (PVOID)ModuleObject, NULL); - } - } - else - { - DPRINT("Module already loaded\n"); - Status = STATUS_IMAGE_ALREADY_LOADED; - } + if (ServiceStart >= 4) + { + /* FIXME: Check if it is the right status code */ + Status = STATUS_PLUGPLAY_NO_DEVICE; + } + else + { + DPRINT("Loading module\n"); + Status = MmLoadSystemImage(&ServiceImagePath, NULL, NULL, 0, (PVOID)ModuleObject, NULL); + } ExFreePool(ServiceImagePath.Buffer); @@ -1062,7 +1048,6 @@ UNICODE_STRING ServiceName; UNICODE_STRING ObjectName; PDRIVER_OBJECT DriverObject; - PLDR_DATA_TABLE_ENTRY ModuleObject; NTSTATUS Status; LPWSTR Start; @@ -1146,16 +1131,6 @@ } /* - * ... and check if it's loaded - */ - - ModuleObject = LdrGetModuleObject(&ImagePath); - if (ModuleObject == NULL) - { - return STATUS_UNSUCCESSFUL; - } - - /* * Free the service path */ @@ -1169,7 +1144,7 @@ (*DriverObject->DriverUnload)(DriverObject); ObDereferenceObject(DriverObject); ObDereferenceObject(DriverObject); - MmUnloadSystemImage(ModuleObject); + MmUnloadSystemImage(DriverObject->DriverSection); return STATUS_SUCCESS; } @@ -1693,18 +1668,6 @@ DPRINT("Type: %lx\n", Type); /* - * See, if the driver module isn't already loaded - */ - - ModuleObject = LdrGetModuleObject(&ImagePath); - if (ModuleObject != NULL) - { - DPRINT("Image already loaded\n"); - Status = STATUS_IMAGE_ALREADY_LOADED; - goto ReleaseCapturedString; - } - - /* * Create device node */ 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 Fri Feb 23 10:56:01 2007 @@ -608,7 +608,7 @@ IsRaw = FALSE; } - ModuleObject = LdrGetModuleObject(ModuleName); + ModuleObject = NULL; if (ModuleObject != NULL) { Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=25886… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c (original) +++ trunk/reactos/ntoskrnl/mm/mm.c Fri Feb 23 10:56:01 2007 @@ -398,70 +398,6 @@ return (FALSE); } -/* - * @implemented - */ -PVOID -NTAPI -MmGetSystemRoutineAddress(IN PUNICODE_STRING SystemRoutineName) -{ - PVOID ProcAddress; - ANSI_STRING AnsiRoutineName; - NTSTATUS Status; - PLIST_ENTRY NextEntry; - extern LIST_ENTRY PsLoadedModuleList; - PLDR_DATA_TABLE_ENTRY LdrEntry; - BOOLEAN Found = FALSE; - UNICODE_STRING KernelName = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); - UNICODE_STRING HalName = RTL_CONSTANT_STRING(L"hal.dll"); - - /* Convert routine to ansi name */ - Status = RtlUnicodeStringToAnsiString(&AnsiRoutineName, - SystemRoutineName, - TRUE); - if (!NT_SUCCESS(Status)) return NULL; - - /* Loop the loaded module list */ - NextEntry = PsLoadedModuleList.Flink; - while (NextEntry != &PsLoadedModuleList) - { - /* Get the entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - /* Check if it's the kernel or HAL */ - if (RtlEqualUnicodeString(&KernelName, &LdrEntry->BaseDllName, TRUE)) - { - /* Found it */ - Found = TRUE; - } - else if (RtlEqualUnicodeString(&HalName, &LdrEntry->BaseDllName, TRUE)) - { - /* Found it */ - Found = TRUE; - } - - /* Check if we found a valid binary */ - if (Found) - { - /* Find the procedure name */ - Status = LdrGetProcedureAddress(LdrEntry->DllBase, - &AnsiRoutineName, - 0, - &ProcAddress); - break; - } - - /* Keep looping */ - NextEntry = NextEntry->Flink; - } - - /* Free the string and return */ - RtlFreeAnsiString(&AnsiRoutineName); - return (NT_SUCCESS(Status) ? ProcAddress : NULL); -} - NTSTATUS NTAPI NtGetWriteWatch(IN HANDLE ProcessHandle, Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c Fri Feb 23 10:56:01 2007 @@ -35,6 +35,10 @@ #pragma alloc_text(INIT, MmInitPagingFile) #endif +PVOID +NTAPI +MiFindExportedRoutineByName(IN PVOID DllBase, + IN PANSI_STRING ExportName); /* TYPES *********************************************************************/ @@ -694,7 +698,7 @@ UNICODE_STRING DiskDumpName = RTL_CONSTANT_STRING(L"DiskDump"); ANSI_STRING ProcName; PIO_STACK_LOCATION StackPtr; - PLDR_DATA_TABLE_ENTRY ModuleObject; + PLDR_DATA_TABLE_ENTRY ModuleObject = NULL; Status = ZwFsControlFile(PageFileHandle, 0, @@ -767,16 +771,14 @@ } /* Load the diskdump driver. */ - ModuleObject = LdrGetModuleObject(&DiskDumpName); + Status = MmLoadSystemImage(&DiskDumpName, NULL, NULL, 0, (PVOID)&ModuleObject, NULL); if (ModuleObject == NULL) { return(STATUS_OBJECT_NAME_NOT_FOUND); } RtlInitAnsiString(&ProcName, "DiskDumpFunctions"); - Status = LdrGetProcedureAddress(ModuleObject->DllBase, - &ProcName, - 0, - (PVOID*)&MmCoreDumpFunctions); + MmCoreDumpFunctions = MiFindExportedRoutineByName(ModuleObject->DllBase, + &ProcName); if (!NT_SUCCESS(Status)) { ObDereferenceObject(PageFile); Modified: 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 (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Fri Feb 23 10:56:01 2007 @@ -54,6 +54,77 @@ /* Otherwise, free the import list */ ExFreePool(LdrEntry->LoadedImports); +} + +PVOID +NTAPI +MiFindExportedRoutineByName(IN PVOID DllBase, + IN PANSI_STRING ExportName) +{ + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + LONG Low = 0, Mid = 0, High, Ret; + USHORT Ordinal; + PVOID Function; + ULONG ExportSize; + PULONG ExportTable; + PAGED_CODE(); + + /* Get the export directory */ + ExportDirectory = RtlImageDirectoryEntryToData(DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + if (!ExportDirectory) return NULL; + + /* Setup name tables */ + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Do a binary search */ + High = ExportDirectory->NumberOfNames - 1; + while (High >= Low) + { + /* Get new middle value */ + Mid = (Low + High) >> 1; + + /* Compare name */ + Ret = strcmp(ExportName->Buffer, (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 NULL; + + /* Otherwise, this is the ordinal */ + Ordinal = OrdinalTable[Mid]; + + /* Resolve the address and write it */ + ExportTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfFunctions); + Function = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); + + /* We found it! */ + ASSERT((Function > (PVOID)ExportDirectory) && + (Function < (PVOID)((ULONG_PTR)ExportDirectory + ExportSize))); + return Function; } PVOID @@ -1712,3 +1783,77 @@ return Status; } +/* + * @implemented + */ +PVOID +NTAPI +MmGetSystemRoutineAddress(IN PUNICODE_STRING SystemRoutineName) +{ + PVOID ProcAddress = NULL; + ANSI_STRING AnsiRoutineName; + NTSTATUS Status; + PLIST_ENTRY NextEntry; + extern LIST_ENTRY PsLoadedModuleList; + PLDR_DATA_TABLE_ENTRY LdrEntry; + BOOLEAN Found = FALSE; + UNICODE_STRING KernelName = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); + UNICODE_STRING HalName = RTL_CONSTANT_STRING(L"hal.dll"); + ULONG Modules = 0; + + /* Convert routine to ansi name */ + Status = RtlUnicodeStringToAnsiString(&AnsiRoutineName, + SystemRoutineName, + TRUE); + if (!NT_SUCCESS(Status)) return NULL; + + /* Lock the list */ + KeEnterCriticalRegion(); + + /* Loop the loaded module list */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Check if it's the kernel or HAL */ + if (RtlEqualUnicodeString(&KernelName, &LdrEntry->BaseDllName, TRUE)) + { + /* Found it */ + Found = TRUE; + Modules++; + } + else if (RtlEqualUnicodeString(&HalName, &LdrEntry->BaseDllName, TRUE)) + { + /* Found it */ + Found = TRUE; + Modules++; + } + + /* Check if we found a valid binary */ + if (Found) + { + /* Find the procedure name */ + ProcAddress = MiFindExportedRoutineByName(LdrEntry->DllBase, + &AnsiRoutineName); + + /* Break out if we found it or if we already tried both modules */ + if (ProcAddress) break; + if (Modules == 2) break; + } + + /* Keep looping */ + NextEntry = NextEntry->Flink; + } + + /* Release the lock */ + KeLeaveCriticalRegion(); + + /* Free the string and return */ + RtlFreeAnsiString(&AnsiRoutineName); + return ProcAddress; +} + 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 Fri Feb 23 10:56:01 2007 @@ -227,10 +227,6 @@ <file>kdio.c</file> <file>kdmain.c</file> </directory> - <directory name="ldr"> - <file>loader.c</file> - <file>rtl.c</file> - </directory> <directory name="lpc"> <file>close.c</file> <file>complete.c</file> Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Fri Feb 23 10:56:01 2007 @@ -38,15 +38,6 @@ PVOID PspSystemDllSection; PVOID PspSystemDllEntryPoint; -ANSI_STRING ThunkName = RTL_CONSTANT_STRING("LdrInitializeThunk"); -ANSI_STRING ApcName = RTL_CONSTANT_STRING("KiUserApcDispatcher"); -ANSI_STRING ExceptName = RTL_CONSTANT_STRING("KiUserExceptionDispatcher"); -ANSI_STRING CallbackName = RTL_CONSTANT_STRING("KiUserCallbackDispatcher"); -ANSI_STRING RaiseName = RTL_CONSTANT_STRING("KiRaiseUserExceptionDispatcher"); -ANSI_STRING FastName = RTL_CONSTANT_STRING("KiFastSystemCall"); -ANSI_STRING FastReturnName = RTL_CONSTANT_STRING("KiFastSystemCallRet"); -ANSI_STRING InterruptName = RTL_CONSTANT_STRING("KiIntSystemCall"); - UNICODE_STRING PsNtDllPathName = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\ntdll.dll"); @@ -67,13 +58,106 @@ /* PRIVATE FUNCTIONS *********************************************************/ +ULONG +NTAPI +NameToOrdinal(IN PCHAR Name, + IN PVOID DllBase, + IN ULONG NumberOfNames, + IN PULONG NameTable, + IN PUSHORT OrdinalTable) +{ + ULONG Mid; + LONG Ret; + + /* Fail if no names */ + if (!NumberOfNames) return -1; + + /* Do binary search */ + Mid = NumberOfNames >> 1; + Ret = strcmp(Name, (PCHAR)((ULONG_PTR)DllBase + NameTable[Mid])); + + /* Check if we found it */ + if (!Ret) return OrdinalTable[Mid]; + + /* We didn't. Check if we only had one name to check */ + if (NumberOfNames == 1) return -1; + + /* Check if we should look up or down */ + if (Ret < 0) + { + /* Loop down */ + NumberOfNames = Mid; + } + else + { + /* Look up, update tables */ + NameTable = &NameTable[Mid + 1]; + OrdinalTable = &OrdinalTable[Mid + 1]; + NumberOfNames -= (Mid - 1); + } + + /* Call us recursively */ + return NameToOrdinal(Name, DllBase, NumberOfNames, NameTable, OrdinalTable); +} + NTSTATUS NTAPI -PspLookupSystemDllEntryPoint(IN PANSI_STRING Name, +LookupEntryPoint(IN PVOID DllBase, + IN PCHAR Name, + OUT PVOID *EntryPoint) +{ + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + ULONG ExportSize; + CHAR Buffer[64]; + USHORT Ordinal; + PULONG ExportTable; + + /* Get the export directory */ + ExportDirectory = RtlImageDirectoryEntryToData(DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + + /* Validate the name and copy it */ + if (strlen(Name) > sizeof(Buffer) - 2) return STATUS_INVALID_PARAMETER; + strcpy(Buffer, Name); + + /* Setup name tables */ + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Get the ordinal */ + Ordinal = NameToOrdinal(Buffer, + DllBase, + ExportDirectory->NumberOfNames, + NameTable, + OrdinalTable); + + /* Make sure the ordinal is valid */ + if (Ordinal >= ExportDirectory->NumberOfFunctions) + { + /* It's not, fail */ + return STATUS_PROCEDURE_NOT_FOUND; + } + + /* Resolve the address and write it */ + ExportTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfFunctions); + *EntryPoint = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PspLookupSystemDllEntryPoint(IN PCHAR Name, IN PVOID *EntryPoint) { /* Call the LDR Routine */ - return LdrGetProcedureAddress(PspSystemDllBase, Name, 0, EntryPoint); + return LookupEntryPoint(PspSystemDllBase, Name, EntryPoint); } NTSTATUS @@ -83,22 +167,22 @@ NTSTATUS Status; /* Get user-mode APC trampoline */ - Status = PspLookupSystemDllEntryPoint(&ApcName, + Status = PspLookupSystemDllEntryPoint("KiUserApcDispatcher", &KeUserApcDispatcher); if (!NT_SUCCESS(Status)) return Status; /* Get user-mode exception dispatcher */ - Status = PspLookupSystemDllEntryPoint(&ExceptName, + Status = PspLookupSystemDllEntryPoint("KiUserExceptionDispatcher", &KeUserExceptionDispatcher); if (!NT_SUCCESS(Status)) return Status; /* Get user-mode callback dispatcher */ - Status = PspLookupSystemDllEntryPoint(&CallbackName, + Status = PspLookupSystemDllEntryPoint("KiUserCallbackDispatcher", &KeUserCallbackDispatcher); if (!NT_SUCCESS(Status)) return Status; /* Get user-mode exception raise trampoline */ - Status = PspLookupSystemDllEntryPoint(&RaiseName, + Status = PspLookupSystemDllEntryPoint("KiRaiseUserExceptionDispatcher", &KeRaiseUserExceptionDispatcher); if (!NT_SUCCESS(Status)) return Status; @@ -106,20 +190,20 @@ if (KeFeatureBits & KF_FAST_SYSCALL) { /* Get user-mode sysenter stub */ - Status = PspLookupSystemDllEntryPoint(&FastName, + Status = PspLookupSystemDllEntryPoint("KiFastSystemCall", (PVOID)&SharedUserData-> SystemCall); if (!NT_SUCCESS(Status)) return Status; /* Get user-mode sysenter return stub */ - Status = PspLookupSystemDllEntryPoint(&FastReturnName, + Status = PspLookupSystemDllEntryPoint("KiFastSystemCallRet", (PVOID)&SharedUserData-> SystemCallReturn); } else { /* Get the user-mode interrupt stub */ - Status = PspLookupSystemDllEntryPoint(&InterruptName, + Status = PspLookupSystemDllEntryPoint("KiIntSystemCall", (PVOID)&SharedUserData-> SystemCall); } @@ -250,7 +334,8 @@ NTSTATUS Status; /* Get user-mode startup thunk */ - Status = PspLookupSystemDllEntryPoint(&ThunkName, &PspSystemDllEntryPoint); + Status = PspLookupSystemDllEntryPoint("LdrInitializeThunk", + &PspSystemDllEntryPoint); if (!NT_SUCCESS(Status)) { /* Failed, bugcheck */

1 0

[ion] 25885: - Merge DbgUnLoadImageSymbols from KD branch. - Rename LdrUnloadModule to MmUnloadSystemImage and: - Use MmSystemLoadLock. - Take into consideration the import list. - Honour load count. - Unload symbols if really unloading the image. - Dereference and clear imports. - Do proper LdrEntry cleanup. - Stub MiDereferenceImports and MmCallDllInitialize. - Implement MiLocateExportName and MiClearImports. - We don't yet fully support reference counting imports...this is still TBD.
by ion＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: ion Date: Fri Feb 23 10:13:19 2007 New Revision: 25885 URL: http://svn.reactos.org/svn/reactos?rev=25885&view=rev Log: - Merge DbgUnLoadImageSymbols from KD branch. - Rename LdrUnloadModule to MmUnloadSystemImage and: - Use MmSystemLoadLock. - Take into consideration the import list. - Honour load count. - Unload symbols if really unloading the image. - Dereference and clear imports. - Do proper LdrEntry cleanup. - Stub MiDereferenceImports and MmCallDllInitialize. - Implement MiLocateExportName and MiClearImports. - We don't yet fully support reference counting imports...this is still TBD. Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/debug.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ldr.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ldr/loader.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Fri Feb 23 10:13:19 2007 @@ -2514,6 +2514,14 @@ IN ULONG ProcessId ); +VOID +NTAPI +DbgUnLoadImageSymbols( + IN PANSI_STRING Name, + IN PVOID Base, + IN ULONG_PTR ProcessId +); + // // Generic Table Functions // Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=25885&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c (original) +++ trunk/reactos/lib/rtl/debug.c Fri Feb 23 10:13:19 2007 @@ -348,4 +348,25 @@ DebugService2(Name, &SymbolInfo, BREAKPOINT_LOAD_SYMBOLS); return STATUS_SUCCESS; } + +/* + * @implemented + */ +VOID +NTAPI +DbgUnLoadImageSymbols(IN PANSI_STRING Name, + IN PVOID Base, + IN ULONG_PTR ProcessId) +{ + KD_SYMBOLS_INFO SymbolInfo; + + /* Setup the symbol data */ + SymbolInfo.BaseOfDll = Base; + SymbolInfo.ProcessId = (PVOID)ProcessId; + SymbolInfo.CheckSum = SymbolInfo.SizeOfImage = 0; + + /* Load the symbols */ + DebugService2(Name, &SymbolInfo, BREAKPOINT_UNLOAD_SYMBOLS); +} + /* EOF */ 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 Fri Feb 23 10:13:19 2007 @@ -1495,7 +1495,7 @@ if (!NtHeader) { /* Fail */ - LdrUnloadModule(ModuleObject); + MmUnloadSystemImage(ModuleObject); return STATUS_INVALID_IMAGE_FORMAT; } @@ -1514,7 +1514,7 @@ ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); /* Unload if we failed */ - if (!NT_SUCCESS(Status)) LdrUnloadModule(ModuleObject); + if (!NT_SUCCESS(Status)) MmUnloadSystemImage(ModuleObject); return Status; } Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ldr.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ldr.h Fri Feb 23 10:13:19 2007 @@ -6,77 +6,6 @@ #define DRIVER_ROOT_NAME L"\\Driver\\" #define FILESYSTEM_ROOT_NAME L"\\FileSystem\\" -extern ULONG_PTR LdrHalBase; - -NTSTATUS -NTAPI -LdrLoadInitialProcess( - PHANDLE ProcessHandle, - PHANDLE ThreadHandle -); - -VOID -NTAPI -LdrLoadAutoConfigDrivers(VOID); - -NTSTATUS -NTAPI -LdrpMapImage( - HANDLE ProcessHandle, - HANDLE SectionHandle, - PVOID *ImageBase -); - -NTSTATUS -NTAPI -LdrpLoadImage( - PUNICODE_STRING DriverName, - PVOID *ModuleBase, - PVOID *SectionPointer, - PVOID *EntryPoint, - PVOID *ExportDirectory -); - -NTSTATUS -NTAPI -LdrpUnloadImage(PVOID ModuleBase); - -NTSTATUS -NTAPI -LdrpLoadAndCallImage(PUNICODE_STRING DriverName); - -NTSTATUS -NTAPI -LdrpQueryModuleInformation( - PVOID Buffer, - ULONG Size, - PULONG ReqSize -); - -VOID -NTAPI -LdrInit1(VOID); - -VOID -NTAPI -LdrInitDebug( - PLOADER_MODULE Module, - PWCH Name -); - -NTSTATUS -NTAPI -MmLoadSystemImage(IN PUNICODE_STRING FileName, - IN PUNICODE_STRING NamePrefix OPTIONAL, - IN PUNICODE_STRING LoadedName OPTIONAL, - IN ULONG Flags, - OUT PVOID *ModuleObject, - OUT PVOID *ImageBaseAddress); - -NTSTATUS -NTAPI -LdrUnloadModule(PLDR_DATA_TABLE_ENTRY ModuleObject); - PLDR_DATA_TABLE_ENTRY NTAPI LdrGetModuleObject(PUNICODE_STRING ModuleName); Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Fri Feb 23 10:13:19 2007 @@ -332,16 +332,6 @@ BOOLEAN Dirty ); - -/* FUNCTIONS */ - -NTSTATUS -NTAPI -MmCheckSystemImage( - IN HANDLE ImageHandle, - IN BOOLEAN PurgeSection -); - /* aspace.c ******************************************************************/ VOID @@ -1429,6 +1419,8 @@ OUT PULONG ResultLength ); +/* sysldr.c ******************************************************************/ + VOID NTAPI MiReloadBootLoadedDrivers( @@ -1441,5 +1433,28 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +NTSTATUS +NTAPI +MmLoadSystemImage( + IN PUNICODE_STRING FileName, + IN PUNICODE_STRING NamePrefix OPTIONAL, + IN PUNICODE_STRING LoadedName OPTIONAL, + IN ULONG Flags, + OUT PVOID *ModuleObject, + OUT PVOID *ImageBaseAddress +); + +NTSTATUS +NTAPI +MmUnloadSystemImage( + IN PVOID ImageHandle +); + +NTSTATUS +NTAPI +MmCheckSystemImage( + IN HANDLE ImageHandle, + IN BOOLEAN PurgeSection +); #endif Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri Feb 23 10:13:19 2007 @@ -1169,7 +1169,7 @@ (*DriverObject->DriverUnload)(DriverObject); ObDereferenceObject(DriverObject); ObDereferenceObject(DriverObject); - LdrUnloadModule(ModuleObject); + MmUnloadSystemImage(ModuleObject); return STATUS_SUCCESS; } @@ -1750,7 +1750,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopInitializeDriver() failed (Status %lx)\n", Status); - LdrUnloadModule(ModuleObject); + MmUnloadSystemImage(ModuleObject); IopFreeDeviceNode(DeviceNode); goto ReleaseCapturedString; } 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 Fri Feb 23 10:13:19 2007 @@ -133,30 +133,4 @@ return(NULL); } -// -// Used when unloading drivers -// -NTSTATUS -NTAPI -LdrUnloadModule ( PLDR_DATA_TABLE_ENTRY ModuleObject ) -{ - KIRQL Irql; - - /* Remove the module from the module list */ - KeAcquireSpinLock(&PsLoadedModuleSpinLock,&Irql); - RemoveEntryList(&ModuleObject->InLoadOrderLinks); - KeReleaseSpinLock(&PsLoadedModuleSpinLock, 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); -} - /* EOF */ Modified: 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 (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Fri Feb 23 10:13:19 2007 @@ -20,6 +20,135 @@ KMUTANT MmSystemLoadLock; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +MiDereferenceImports(IN PLOAD_IMPORTS ImportList) +{ + /* Check if there's no imports or if we're a boot driver */ + if ((ImportList == (PVOID)-1) || (ImportList == (PVOID)-2)) + { + /* Then there's nothing to do */ + return STATUS_SUCCESS; + } + + /* Otherwise, FIXME */ + DPRINT1("Imports not dereferenced!\n"); + return STATUS_UNSUCCESSFUL; +} + +VOID +NTAPI +MiClearImports(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PAGED_CODE(); + + /* Check if there's no imports or we're a boot driver or only one entry */ + if ((LdrEntry->LoadedImports == (PVOID)-1) || + (LdrEntry->LoadedImports == (PVOID)-2) || + ((ULONG_PTR)LdrEntry->LoadedImports & 1)) + { + /* Nothing to do */ + return; + } + + /* Otherwise, free the import list */ + ExFreePool(LdrEntry->LoadedImports); +} + +PVOID +NTAPI +MiLocateExportName(IN PVOID DllBase, + IN PCHAR ExportName) +{ + PULONG NameTable; + PUSHORT OrdinalTable; + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + LONG Low = 0, Mid = 0, High, Ret; + USHORT Ordinal; + PVOID Function; + ULONG ExportSize; + PULONG ExportTable; + PAGED_CODE(); + + /* Get the export directory */ + ExportDirectory = RtlImageDirectoryEntryToData(DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, + &ExportSize); + if (!ExportDirectory) return NULL; + + /* Setup name tables */ + NameTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNames); + OrdinalTable = (PUSHORT)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfNameOrdinals); + + /* Do a binary search */ + High = ExportDirectory->NumberOfNames - 1; + while (High >= Low) + { + /* Get new middle value */ + Mid = (Low + High) >> 1; + + /* Compare name */ + Ret = strcmp(ExportName, (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 NULL; + + /* Otherwise, this is the ordinal */ + Ordinal = OrdinalTable[Mid]; + + /* Resolve the address and write it */ + ExportTable = (PULONG)((ULONG_PTR)DllBase + + ExportDirectory->AddressOfFunctions); + Function = (PVOID)((ULONG_PTR)DllBase + ExportTable[Ordinal]); + + /* Check if the function is actually a forwarder */ + if (((ULONG_PTR)Function > (ULONG_PTR)ExportDirectory) && + ((ULONG_PTR)Function < ((ULONG_PTR)ExportDirectory + ExportSize))) + { + /* It is, fail */ + return NULL; + } + + /* We found it */ + return Function; +} + +NTSTATUS +NTAPI +MmCallDllInitialize(IN PLDR_DATA_TABLE_ENTRY LdrEntry, + IN PLIST_ENTRY ListHead) +{ + PMM_DLL_INITIALIZE DllInit; + + /* Try to see if the image exports a DllInitialize routine */ + DllInit = (PMM_DLL_INITIALIZE)MiLocateExportName(LdrEntry->DllBase, + "DllInitialize"); + if (!DllInit) return STATUS_SUCCESS; + + /* FIXME: TODO */ + DPRINT1("DllInitialize not called!\n"); + return STATUS_UNSUCCESSFUL; +} VOID NTAPI @@ -321,6 +450,92 @@ NTSTATUS NTAPI +MmUnloadSystemImage(IN PVOID ImageHandle) +{ + PLDR_DATA_TABLE_ENTRY LdrEntry = ImageHandle; + PVOID BaseAddress = LdrEntry->DllBase; + NTSTATUS Status; + ANSI_STRING TempName; + BOOLEAN HadEntry = FALSE; + + /* Acquire the loader lock */ + KeEnterCriticalRegion(); + KeWaitForSingleObject(&MmSystemLoadLock, + WrVirtualMemory, + KernelMode, + FALSE, + NULL); + + /* Check if this driver was loaded at boot and didn't get imports parsed */ + if (LdrEntry->LoadedImports == (PVOID)-1) goto Done; + + /* We should still be alive */ + ASSERT(LdrEntry->LoadCount != 0); + LdrEntry->LoadCount--; + + /* Check if we're still loaded */ + if (LdrEntry->LoadCount) goto Done; + + /* We should cleanup... are symbols loaded */ + if (LdrEntry->Flags & LDRP_DEBUG_SYMBOLS_LOADED) + { + /* Create the ANSI name */ + Status = RtlUnicodeStringToAnsiString(&TempName, + &LdrEntry->BaseDllName, + TRUE); + if (NT_SUCCESS(Status)) + { + /* Unload the symbols */ + DbgUnLoadImageSymbols(&TempName, BaseAddress, -1); + RtlFreeAnsiString(&TempName); + } + } + + /* FIXME: Free the driver */ + //MmFreeSection(LdrEntry->DllBase); + + /* Check if we're linked in */ + if (LdrEntry->InLoadOrderLinks.Flink) + { + /* Remove us */ + MiProcessLoaderEntry(LdrEntry, FALSE); + HadEntry = TRUE; + } + + /* Dereference and clear the imports */ + MiDereferenceImports(LdrEntry->LoadedImports); + MiClearImports(LdrEntry); + + /* Check if the entry needs to go away */ + if (HadEntry) + { + /* Check if it had a name */ + if (LdrEntry->FullDllName.Buffer) + { + /* Free it */ + ExFreePool(LdrEntry->FullDllName.Buffer); + } + + /* Check if we had a section */ + if (LdrEntry->SectionPointer) + { + /* Dereference it */ + ObDereferenceObject(LdrEntry->SectionPointer); + } + + /* Free the entry */ + ExFreePool(LdrEntry); + } + + /* Release the system lock and return */ +Done: + KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); + KeLeaveCriticalRegion(); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI MiResolveImageReferences(IN PVOID ImageBase, IN PUNICODE_STRING ImageFileDirectory, IN PUNICODE_STRING NamePrefix OPTIONAL, @@ -406,8 +621,7 @@ if ((GdiLink) && (NormalLink)) { /* It's not, it's importing stuff it shouldn't be! */ - DPRINT1("Invalid driver!\n"); - //MiDereferenceImports(LoadedImports); + MiDereferenceImports(LoadedImports); if (LoadedImports) ExFreePool(LoadedImports); return STATUS_PROCEDURE_NOT_FOUND; } @@ -432,7 +646,7 @@ if (!NT_SUCCESS(Status)) { /* Failed */ - //MiDereferenceImports(LoadedImports); + MiDereferenceImports(LoadedImports); if (LoadedImports) ExFreePool(LoadedImports); return Status; } @@ -517,7 +731,6 @@ else { /* Fill out the information for the error */ - DPRINT1("Failed to import: %S\n", DllName.Buffer); *MissingDriver = DllName.Buffer; *(PULONG)MissingDriver |= 1; *MissingApi = NULL; @@ -539,7 +752,6 @@ ASSERT(DllBase = DllEntry->DllBase); /* Call the initialization routines */ -#if 0 Status = MmCallDllInitialize(DllEntry, &PsLoadedModuleList); if (!NT_SUCCESS(Status)) { @@ -548,16 +760,14 @@ 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); + MiDereferenceImports(LoadedImports); if (LoadedImports) ExFreePool(LoadedImports); return Status; } @@ -590,8 +800,7 @@ if (!ExportDirectory) { /* Cleanup and return */ - DPRINT1("Invalid driver: %wZ\n", &LdrEntry->BaseDllName); - //MiDereferenceImports(LoadedImports); + MiDereferenceImports(LoadedImports); if (LoadedImports) ExFreePool(LoadedImports); return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; } @@ -620,7 +829,7 @@ if (!NT_SUCCESS(Status)) { /* Cleanup and return */ - //MiDereferenceImports(LoadedImports); + MiDereferenceImports(LoadedImports); if (LoadedImports) ExFreePool(LoadedImports); return Status; }

1 0

[ion] 25884: - Fix build.
by ion＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: ion Date: Fri Feb 23 09:59:10 2007 New Revision: 25884 URL: http://svn.reactos.org/svn/reactos?rev=25884&view=rev Log: - Fix build. Modified: trunk/reactos/ntoskrnl/mm/verifier.c 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 Fri Feb 23 09:59:10 2007 @@ -164,7 +164,7 @@ if (!LdrEntry) return FALSE; /* Check if we're verifying or not */ - return (LdrEntry->Flags & LDRP_DRIVER_VERIFYING) ? TRUE: FALSE; + return (LdrEntry->Flags & LDRP_IMAGE_VERIFYING) ? TRUE: FALSE; } /*

1 0

[ion] 25883: - Fix MmCreateImageSection to use previous mode instead of hardcoding UserMode. - Implement MiProcessLoaderEntry for adding/removing entries on the PsLoadedModuleList. - Move MmLoadSystemImage from loader.c to sysldr.c - Update MmLoadSystemImage: - Use MmSystemLoadLock. - Support returning the entry for an already-loaded image, instead of loading it twice. - Use Section APIs to map the image... we're still doing a dirty ZwReadFile hack, but at least now we can depend on the PE code
by ion＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: ion Date: Fri Feb 23 08:39:42 2007 New Revision: 25883 URL: http://svn.reactos.org/svn/reactos?rev=25883&view=rev Log: - Fix MmCreateImageSection to use previous mode instead of hardcoding UserMode. - Implement MiProcessLoaderEntry for adding/removing entries on the PsLoadedModuleList. - Move MmLoadSystemImage from loader.c to sysldr.c - Update MmLoadSystemImage: - Use MmSystemLoadLock. - Support returning the entry for an already-loaded image, instead of loading it twice. - Use Section APIs to map the image... we're still doing a dirty ZwReadFile hack, but at least now we can depend on the PE code to validate the image (so removed the hardcoded validation). - Add more generic cleanup got so we can just jump to it. - Add more stub code and detection code for upcoming features. Modified: trunk/reactos/ntoskrnl/ldr/loader.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/sysldr.c 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 Fri Feb 23 08:39:42 2007 @@ -19,15 +19,6 @@ #include <debug.h> /* FUNCTIONS *****************************************************************/ - -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 ( @@ -168,372 +159,4 @@ return(STATUS_SUCCESS); } -// -// Used by NtLoadDriver/IoMgr -// -NTSTATUS -NTAPI -MmLoadSystemImage(IN PUNICODE_STRING FileName, - IN PUNICODE_STRING NamePrefix OPTIONAL, - IN PUNICODE_STRING LoadedName OPTIONAL, - IN ULONG Flags, - OUT PVOID *ModuleObject, - OUT PVOID *ImageBaseAddress) -{ - PVOID ModuleLoadBase; - NTSTATUS Status; - HANDLE FileHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - PLDR_DATA_TABLE_ENTRY Module; - FILE_STANDARD_INFORMATION FileStdInfo; - IO_STATUS_BLOCK IoStatusBlock; - unsigned int DriverSize, Idx; - ULONG CurrentSize; - PVOID DriverBase; - PIMAGE_DOS_HEADER PEDosHeader; - PIMAGE_NT_HEADERS PENtHeaders; - PIMAGE_SECTION_HEADER PESectionHeaders; - KIRQL Irql; - PIMAGE_NT_HEADERS NtHeader; - UNICODE_STRING BaseName, BaseDirectory, PrefixName; - PLDR_DATA_TABLE_ENTRY LdrEntry; - ULONG EntrySize; - PLOAD_IMPORTS LoadedImports = (PVOID)-2; - PCHAR MissingApiName, Buffer; - PWCHAR MissingDriverName; - PAGED_CODE(); - - /* Detect session-load */ - if (Flags) - { - /* Sanity checks */ - ASSERT(NamePrefix == NULL); - ASSERT(LoadedName == NULL); - - /* Make sure the process is in session too */ - if (!PsGetCurrentProcess()->ProcessInSession) return STATUS_NO_MEMORY; - } - - if (ModuleObject) *ModuleObject = NULL; - if (ImageBaseAddress) *ImageBaseAddress = NULL; - - /* Allocate a buffer we'll use for names */ - Buffer = ExAllocatePoolWithTag(NonPagedPool, MAX_PATH, TAG_LDR_WSTR); - if (!Buffer) - { - /* Fail */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* 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 = (USHORT)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, which for now is just the name itself */ - PrefixName = *FileName; - - /* Check if we have a prefix */ - if (NamePrefix) DPRINT1("Prefixed images are not yet supported!\n"); - - /* Check if we already have a name, use it instead */ - if (LoadedName) BaseName = *LoadedName; - - /* Open the Module */ - InitializeObjectAttributes(&ObjectAttributes, - FileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwOpenFile(&FileHandle, - GENERIC_READ, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT); - - if (!NT_SUCCESS(Status)) - { - DPRINT("Could not open module file: %wZ (Status 0x%08lx)\n", FileName, Status); - return(Status); - } - - - /* Get the size of the file */ - Status = ZwQueryInformationFile(FileHandle, - &IoStatusBlock, - &FileStdInfo, - sizeof(FileStdInfo), - FileStandardInformation); - if (!NT_SUCCESS(Status)) - { - DPRINT("Could not get file size\n"); - NtClose(FileHandle); - return(Status); - } - - - /* Allocate nonpageable memory for driver */ - ModuleLoadBase = ExAllocatePoolWithTag(NonPagedPool, - FileStdInfo.EndOfFile.u.LowPart, - TAG_DRIVER_MEM); - if (ModuleLoadBase == NULL) - { - DPRINT("Could not allocate memory for module"); - NtClose(FileHandle); - return(STATUS_INSUFFICIENT_RESOURCES); - } - - - /* Load driver into memory chunk */ - Status = ZwReadFile(FileHandle, - 0, 0, 0, - &IoStatusBlock, - ModuleLoadBase, - FileStdInfo.EndOfFile.u.LowPart, - 0, 0); - if (!NT_SUCCESS(Status)) - { - DPRINT("Could not read module file into memory"); - ExFreePool(ModuleLoadBase); - NtClose(FileHandle); - return(Status); - } - - - ZwClose(FileHandle); - - 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); - - - /* Check file magic numbers */ - if (PEDosHeader->e_magic != IMAGE_DOS_SIGNATURE) - { - DPRINT("Incorrect MZ magic: %04x\n", PEDosHeader->e_magic); - return STATUS_UNSUCCESSFUL; - } - if (PEDosHeader->e_lfanew == 0) - { - DPRINT("Invalid lfanew offset: %08x\n", PEDosHeader->e_lfanew); - return STATUS_UNSUCCESSFUL; - } - if (PENtHeaders->Signature != IMAGE_NT_SIGNATURE) - { - DPRINT("Incorrect PE magic: %08x\n", PENtHeaders->Signature); - return STATUS_UNSUCCESSFUL; - } - if (PENtHeaders->FileHeader.Machine != IMAGE_FILE_MACHINE_I386) - { - DPRINT("Incorrect Architechture: %04x\n", PENtHeaders->FileHeader.Machine); - return STATUS_UNSUCCESSFUL; - } - - - /* FIXME: if image is fixed-address load, then fail */ - - /* FIXME: check/verify OS version number */ - - DPRINT("OptionalHdrMagic:%04x LinkVersion:%d.%d\n", - PENtHeaders->OptionalHeader.Magic, - PENtHeaders->OptionalHeader.MajorLinkerVersion, - PENtHeaders->OptionalHeader.MinorLinkerVersion); - DPRINT("Entry Point:%08lx\n", PENtHeaders->OptionalHeader.AddressOfEntryPoint); - - /* Determine the size of the module */ - DriverSize = 0; - for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) - { - if (!(PESectionHeaders[Idx].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) - { - CurrentSize = PESectionHeaders[Idx].VirtualAddress + PESectionHeaders[Idx].Misc.VirtualSize; - DriverSize = max(DriverSize, CurrentSize); - } - } - DriverSize = ROUND_UP(DriverSize, PENtHeaders->OptionalHeader.SectionAlignment); - DPRINT("DriverSize %x, SizeOfImage %x\n",DriverSize, PENtHeaders->OptionalHeader.SizeOfImage); - - /* Allocate a virtual section for the module */ - DriverBase = NULL; - DriverBase = MmAllocateSection(DriverSize, DriverBase); - if (DriverBase == 0) - { - DPRINT("Failed to allocate a virtual section for driver\n"); - return STATUS_UNSUCCESSFUL; - } - DPRINT("DriverBase for %wZ: %x\n", FileName, DriverBase); - - /* Copy headers over */ - memcpy(DriverBase, ModuleLoadBase, PENtHeaders->OptionalHeader.SizeOfHeaders); - - /* Copy image sections into virtual section */ - for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) - { - CurrentSize = PESectionHeaders[Idx].VirtualAddress + PESectionHeaders[Idx].Misc.VirtualSize; - /* Copy current section into current offset of virtual section */ - if (CurrentSize <= DriverSize && - PESectionHeaders[Idx].SizeOfRawData) - { - DPRINT("PESectionHeaders[Idx].VirtualAddress + DriverBase %x\n", - PESectionHeaders[Idx].VirtualAddress + (ULONG_PTR)DriverBase); - memcpy((PVOID)((ULONG_PTR)DriverBase + PESectionHeaders[Idx].VirtualAddress), - (PVOID)((ULONG_PTR)ModuleLoadBase + PESectionHeaders[Idx].PointerToRawData), - PESectionHeaders[Idx].Misc.VirtualSize > PESectionHeaders[Idx].SizeOfRawData - ? PESectionHeaders[Idx].SizeOfRawData : PESectionHeaders[Idx].Misc.VirtualSize ); - } - } - - /* Relocate the driver */ - Status = LdrRelocateImageWithBias(DriverBase, - 0, - "SYSLDR", - STATUS_SUCCESS, - STATUS_CONFLICTING_ADDRESSES, - STATUS_INVALID_IMAGE_FORMAT); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - return Status; - } - - /* 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; - } - - /* 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; - } - - /* 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 = LdrEntry; - - /* Now write the DLL name */ - LdrEntry->BaseDllName.Buffer = (PVOID)(LdrEntry + 1); - 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(&PsLoadedModuleSpinLock, &Irql); - InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks); - KeReleaseSpinLock(&PsLoadedModuleSpinLock, Irql); - - /* Resolve imports */ - MissingApiName = Buffer; - Status = MiResolveImageReferences(DriverBase, - &BaseDirectory, - NULL, - &MissingApiName, - &MissingDriverName, - &LoadedImports); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - ExFreePool(LdrEntry->FullDllName.Buffer); - ExFreePool(LdrEntry); - return Status; - } - - /* Return */ - Module = LdrEntry; - - /* Cleanup */ - ExFreePool(ModuleLoadBase); - - if (ModuleObject) *ModuleObject = Module; - if (ImageBaseAddress) *ImageBaseAddress = Module->DllBase; - - /* Hook for KDB on loading a driver. */ - KDB_LOADDRIVER_HOOK(FileName, Module); - - return(STATUS_SUCCESS); -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Fri Feb 23 08:39:42 2007 @@ -3292,7 +3292,7 @@ Status = ObReferenceObjectByHandle(FileHandle, FileAccess, IoFileObjectType, - UserMode, + ExGetPreviousMode(), (PVOID*)(PVOID)&FileObject, NULL); Modified: 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 (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Fri Feb 23 08:39:42 2007 @@ -20,6 +20,24 @@ KMUTANT MmSystemLoadLock; /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +MiProcessLoaderEntry(IN PLDR_DATA_TABLE_ENTRY LdrEntry, + IN BOOLEAN Insert) +{ + KIRQL OldIrql; + + /* Acquire the lock */ + KeAcquireSpinLock(&PsLoadedModuleSpinLock, &OldIrql); + + /* Insert or remove from the list */ + Insert ? InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks) : + RemoveEntryList(&LdrEntry->InLoadOrderLinks); + + /* Release the lock */ + KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql); +} VOID NTAPI @@ -1019,3 +1037,469 @@ ZwClose(SectionHandle); return Status; } + +NTSTATUS +NTAPI +MmLoadSystemImage(IN PUNICODE_STRING FileName, + IN PUNICODE_STRING NamePrefix OPTIONAL, + IN PUNICODE_STRING LoadedName OPTIONAL, + IN ULONG Flags, + OUT PVOID *ModuleObject, + OUT PVOID *ImageBaseAddress) +{ + PVOID ModuleLoadBase = NULL; + NTSTATUS Status; + HANDLE FileHandle = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + FILE_STANDARD_INFORMATION FileStdInfo; + IO_STATUS_BLOCK IoStatusBlock; + ULONG DriverSize = 0, Size, i; + PVOID DriverBase; + PIMAGE_SECTION_HEADER SectionHeaders; + PIMAGE_NT_HEADERS NtHeader; + UNICODE_STRING BaseName, BaseDirectory, PrefixName; + PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; + ULONG EntrySize; + PLOAD_IMPORTS LoadedImports = (PVOID)-2; + PCHAR MissingApiName, Buffer; + PWCHAR MissingDriverName; + HANDLE SectionHandle; + ACCESS_MASK DesiredAccess; + PVOID Section = NULL; + BOOLEAN LockOwned = FALSE; + PLIST_ENTRY NextEntry; + PAGED_CODE(); + + /* Detect session-load */ + if (Flags) + { + /* Sanity checks */ + ASSERT(NamePrefix == NULL); + ASSERT(LoadedName == NULL); + + /* Make sure the process is in session too */ + if (!PsGetCurrentProcess()->ProcessInSession) return STATUS_NO_MEMORY; + } + + if (ModuleObject) *ModuleObject = NULL; + if (ImageBaseAddress) *ImageBaseAddress = NULL; + + /* Allocate a buffer we'll use for names */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, MAX_PATH, TAG_LDR_WSTR); + if (!Buffer) return STATUS_INSUFFICIENT_RESOURCES; + + /* 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 = (USHORT)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, which for now is just the name itself */ + PrefixName = *FileName; + + /* Check if we have a prefix */ + if (NamePrefix) DPRINT1("Prefixed images are not yet supported!\n"); + + /* Check if we already have a name, use it instead */ + if (LoadedName) BaseName = *LoadedName; + + /* Acquire the load lock */ +LoaderScan: + ASSERT(LockOwned == FALSE); + LockOwned = TRUE; + KeEnterCriticalRegion(); + KeWaitForSingleObject(&MmSystemLoadLock, + WrVirtualMemory, + KernelMode, + FALSE, + NULL); + + /* Scan the module list */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + /* Get the entry and compare the names */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + if (RtlEqualUnicodeString(&PrefixName, &LdrEntry->FullDllName, TRUE)) + { + /* Found it, break out */ + break; + } + + /* Keep scanning */ + NextEntry = NextEntry->Flink; + } + + /* Check if we found the image */ + if (NextEntry != &PsLoadedModuleList) + { + /* Check if we had already mapped a section */ + if (Section) + { + /* Dereference and clear */ + ObDereferenceObject(Section); + Section = NULL; + } + + /* Check if this was supposed to be a session load */ + if (!Flags) + { + /* It wasn't, so just return the data */ + *ModuleObject = LdrEntry; + *ImageBaseAddress = LdrEntry->DllBase; + Status = STATUS_IMAGE_ALREADY_LOADED; + } + else + { + /* We don't support session loading yet */ + DPRINT1("Unsupported Session-Load!\n"); + while (TRUE); + } + + /* Do cleanup */ + goto Quickie; + } + else if (!Section) + { + /* It wasn't loaded, and we didn't have a previous attempt */ + KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); + KeLeaveCriticalRegion(); + LockOwned = FALSE; + + /* Check if KD is enabled */ + if ((KdDebuggerEnabled) && !(KdDebuggerNotPresent)) + { + /* FIXME: Attempt to get image from KD */ + } + + /* We don't have a valid entry */ + LdrEntry = NULL; + + /* Setup image attributes */ + InitializeObjectAttributes(&ObjectAttributes, + FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Open the image */ + Status = ZwOpenFile(&FileHandle, + FILE_EXECUTE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Validate it */ + Status = MmCheckSystemImage(FileHandle, FALSE); + if ((Status == STATUS_IMAGE_CHECKSUM_MISMATCH) || + (Status == STATUS_IMAGE_MP_UP_MISMATCH) || + (Status == STATUS_INVALID_IMAGE_FORMAT)) + { + /* Fail loading */ + goto Quickie; + } + + /* Get image size */ + Status = ZwQueryInformationFile(FileHandle, + &IoStatusBlock, + &FileStdInfo, + sizeof(FileStdInfo), + FileStandardInformation); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Allocate memory for image */ + ModuleLoadBase = ExAllocatePoolWithTag(NonPagedPool, + FileStdInfo.EndOfFile.u.LowPart, + TAG_DRIVER_MEM); + + /* Read the image */ + Status = ZwReadFile(FileHandle, + 0, + 0, + 0, + &IoStatusBlock, + ModuleLoadBase, + FileStdInfo.EndOfFile.u.LowPart, + 0, + 0); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Check if this is a session-load */ + if (Flags) + { + /* Then we only need read and execute */ + DesiredAccess = SECTION_MAP_READ | SECTION_MAP_EXECUTE; + } + else + { + /* Otherwise, we can allow write access */ + DesiredAccess = SECTION_ALL_ACCESS; + } + + /* Initialize the attributes for the section */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Create the section */ + Status = ZwCreateSection(&SectionHandle, + DesiredAccess, + &ObjectAttributes, + NULL, + PAGE_EXECUTE, + SEC_IMAGE, + FileHandle); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Now get the section pointer */ + Status = ObReferenceObjectByHandle(SectionHandle, + SECTION_MAP_EXECUTE, + MmSectionObjectType, + KernelMode, + &Section, + NULL); + ZwClose(SectionHandle); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Check if this was supposed to be a session-load */ + if (Flags) + { + /* We don't support session loading yet */ + DPRINT1("Unsupported Session-Load!\n"); + while (TRUE); + } + + /* Check the loader list again, we should end up in the path below */ + goto LoaderScan; + } + else + { + /* We don't have a valid entry */ + LdrEntry = NULL; + } + + /* We should have a valid module base */ + ASSERT(ModuleLoadBase != NULL); + + /* Get header pointers */ + NtHeader = RtlImageNtHeader(ModuleLoadBase); + + /* Get header pointers */ + SectionHeaders = IMAGE_FIRST_SECTION(NtHeader); + + /* Determine the size of the module */ + for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) + { + /* Skip this section if we're not supposed to load it */ + if (!(SectionHeaders[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + { + /* Add the size of this section into the total size */ + Size = SectionHeaders[i].VirtualAddress + + SectionHeaders[i].Misc.VirtualSize; + DriverSize = max(DriverSize, Size); + } + } + + /* Round up the driver size to section alignment */ + DriverSize = ROUND_UP(DriverSize, NtHeader->OptionalHeader.SectionAlignment); + + /* Allocate a virtual section for the module */ + DriverBase = MmAllocateSection(DriverSize, NULL); + + /* Copy headers over */ + RtlCopyMemory(DriverBase, + ModuleLoadBase, + NtHeader->OptionalHeader.SizeOfHeaders); + + /* Copy image sections into virtual section */ + for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) + { + /* Get the size of this section and check if it's valid and on-disk */ + Size = SectionHeaders[i].VirtualAddress + + SectionHeaders[i].Misc.VirtualSize; + if ((Size <= DriverSize) && (SectionHeaders[i].SizeOfRawData)) + { + /* Copy the data from the disk to the image */ + RtlCopyMemory((PVOID)((ULONG_PTR)DriverBase + + SectionHeaders[i].VirtualAddress), + (PVOID)((ULONG_PTR)ModuleLoadBase + + SectionHeaders[i].PointerToRawData), + SectionHeaders[i].Misc.VirtualSize > + SectionHeaders[i].SizeOfRawData ? + SectionHeaders[i].SizeOfRawData : + SectionHeaders[i].Misc.VirtualSize); + } + } + + /* Relocate the driver */ + Status = LdrRelocateImageWithBias(DriverBase, + 0, + "SYSLDR", + STATUS_SUCCESS, + STATUS_CONFLICTING_ADDRESSES, + STATUS_INVALID_IMAGE_FORMAT); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* 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 */ + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* 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; + } + + /* 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 = LdrEntry; + + /* Now write the DLL name */ + LdrEntry->BaseDllName.Buffer = (PVOID)(LdrEntry + 1); + 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; + } + + /* Add the entry */ + MiProcessLoaderEntry(LdrEntry, TRUE); + + /* Resolve imports */ + MissingApiName = Buffer; + Status = MiResolveImageReferences(DriverBase, + &BaseDirectory, + NULL, + &MissingApiName, + &MissingDriverName, + &LoadedImports); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + MiProcessLoaderEntry(LdrEntry, FALSE); + + /* Check if we need to free the name */ + if (LdrEntry->FullDllName.Buffer) + { + /* Free it */ + ExFreePool(LdrEntry->FullDllName.Buffer); + } + + /* Free the entry itself */ + ExFreePool(LdrEntry); + LdrEntry = NULL; + goto Quickie; + } + + if (ModuleObject) *ModuleObject = LdrEntry; + if (ImageBaseAddress) *ImageBaseAddress = LdrEntry->DllBase; + + /* Hook for KDB on loading a driver. */ + KDB_LOADDRIVER_HOOK(FileName, LdrEntry); + +Quickie: + /* If we have a file handle, close it */ + if (FileHandle) ZwClose(FileHandle); + + /* Cleanup */ + if (ModuleLoadBase) ExFreePool(ModuleLoadBase); + + /* Check if we have the lock acquired */ + if (LockOwned) + { + /* Release the lock */ + KeReleaseMutant(&MmSystemLoadLock, 1, FALSE, FALSE); + KeLeaveCriticalRegion(); + LockOwned = FALSE; + } + + /* Check if we had a prefix */ + if (NamePrefix) ExFreePool(PrefixName.Buffer); + + /* Free the name buffer and return status */ + ExFreePool(Buffer); + return Status; +} +

1 0

[dgorbachev] 25882: Indonesian translation by Zaenal Mutaqin (ade999 at gmail dot com)
by dgorbachev＠svn.reactos.org 23 Feb '07

23 Feb '07

Author: dgorbachev Date: Fri Feb 23 04:42:52 2007 New Revision: 25882 URL: http://svn.reactos.org/svn/reactos?rev=25882&view=rev Log: Indonesian translation by Zaenal Mutaqin (ade999 at gmail dot com) Added: trunk/reactos/base/applications/cacls/lang/id-ID.rc trunk/reactos/base/applications/calc/lang/id-ID.rc trunk/reactos/base/applications/charmap/lang/id-ID.rc trunk/reactos/base/applications/control/lang/id-ID.rc trunk/reactos/base/applications/devmgmt/lang/id-ID.rc trunk/reactos/base/applications/downloader/translations/id.rc trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc trunk/reactos/base/applications/games/winemine/lang/id-ID.rc trunk/reactos/base/applications/getfirefox/lang/id-ID.rc trunk/reactos/base/applications/imagesoft/lang/id-ID.rc trunk/reactos/base/applications/msconfig/lang/id-ID.rc trunk/reactos/base/applications/network/ipconfig/id-ID.rc trunk/reactos/base/applications/notepad/lang/id-ID.rc trunk/reactos/base/applications/reporterror/lang/id-ID.rc trunk/reactos/base/applications/servman/id-ID.rc trunk/reactos/base/applications/sm/lang/id-ID.rc trunk/reactos/base/applications/sndvol32/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/setup/reactos/id-ID.rc trunk/reactos/base/setup/vmwinst/lang/id-ID.rc trunk/reactos/base/setup/welcome/lang/id-ID.rc trunk/reactos/base/shell/explorer/explorer-id.rc trunk/reactos/base/system/expand/lang/id-ID.rc trunk/reactos/base/system/format/lang/id-ID.rc trunk/reactos/base/system/regsvr32/lang/id-ID.rc trunk/reactos/base/system/rundll32/lang/id-ID.rc trunk/reactos/base/system/userinit/lang/id-ID.rc trunk/reactos/base/system/winlogon/lang/id-ID.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/rsrc.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/control/rsrc.rc trunk/reactos/base/applications/devmgmt/rsrc.rc trunk/reactos/base/applications/downloader/rsrc.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/getfirefox/rsrc.rc trunk/reactos/base/applications/imagesoft/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/reporterror/rsrc.rc trunk/reactos/base/applications/sm/rsrc.rc trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/base/applications/taskmgr/taskmgr.rc trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/setup/welcome/rsrc.rc trunk/reactos/base/system/expand/rsrc.rc trunk/reactos/base/system/format/rsrc.rc trunk/reactos/base/system/regsvr32/rsrc.rc trunk/reactos/base/system/rundll32/rsrc.rc trunk/reactos/base/system/userinit/rsrc.rc trunk/reactos/base/system/winlogon/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/cacls/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… Added: trunk/reactos/base/applications/calc/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… Added: trunk/reactos/base/applications/charmap/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Added: trunk/reactos/base/applications/control/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Modified: trunk/reactos/base/applications/control/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Added: trunk/reactos/base/applications/devmgmt/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… Modified: trunk/reactos/base/applications/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… Modified: trunk/reactos/base/applications/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… Added: trunk/reactos/base/applications/downloader/translations/id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… Added: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Added: trunk/reactos/base/applications/games/winemine/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Added: trunk/reactos/base/applications/getfirefox/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Added: trunk/reactos/base/applications/imagesoft/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… Modified: trunk/reactos/base/applications/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… Added: trunk/reactos/base/applications/msconfig/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Added: trunk/reactos/base/applications/network/ipconfig/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Added: trunk/reactos/base/applications/notepad/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Added: trunk/reactos/base/applications/reporterror/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Added: trunk/reactos/base/applications/servman/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Added: trunk/reactos/base/applications/sm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/lang/… Modified: trunk/reactos/base/applications/sm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sm/rsrc.… Added: trunk/reactos/base/applications/sndvol32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Added: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Added: trunk/reactos/base/setup/reactos/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/id-ID.r… Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… Added: trunk/reactos/base/setup/vmwinst/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/id… Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… Added: trunk/reactos/base/setup/welcome/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/id… Modified: trunk/reactos/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/rsrc.rc… Added: trunk/reactos/base/shell/explorer/explorer-id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Added: trunk/reactos/base/system/expand/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/lang/id… Modified: trunk/reactos/base/system/expand/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/rsrc.rc… Added: trunk/reactos/base/system/format/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/id… Modified: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… Added: trunk/reactos/base/system/regsvr32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.… Added: trunk/reactos/base/system/rundll32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… Added: trunk/reactos/base/system/userinit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… Added: trunk/reactos/base/system/winlogon/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.…

1 0

[ion] 25881: - Move some Mm routines from pe.c to sysldr.c where they belong. - Create and initialize Mm Loader lock. - Re-arrange some code in MmLoadSystemImage, no code changes yet. - Add new LDRP_ flags for LDR_DATA_TABLE_ENTRY to the NDK.
by ion＠svn.reactos.org 22 Feb '07

22 Feb '07

Author: ion Date: Thu Feb 22 23:55:02 2007 New Revision: 25881 URL: http://svn.reactos.org/svn/reactos?rev=25881&view=rev Log: - Move some Mm routines from pe.c to sysldr.c where they belong. - Create and initialize Mm Loader lock. - Re-arrange some code in MmLoadSystemImage, no code changes yet. - Add new LDRP_ flags for LDR_DATA_TABLE_ENTRY to the NDK. Modified: trunk/reactos/include/ndk/ldrtypes.h trunk/reactos/ntoskrnl/ldr/loader.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/pe.c trunk/reactos/ntoskrnl/mm/sysldr.c 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 23:55:02 2007 @@ -49,8 +49,14 @@ #define LDRP_IMAGE_NOT_AT_BASE 0x00200000 #define LDRP_COR_IMAGE 0x00400000 #define LDR_COR_OWNS_UNMAP 0x00800000 -#define LDRP_DRIVER_VERIFYING 0x02000000 +#define LDRP_SYSTEM_MAPPED 0x01000000 +#define LDRP_IMAGE_VERIFYING 0x02000000 +#define LDRP_DRIVER_DEPENDENT_DLL 0x04000000 +#define LDRP_ENTRY_NATIVE 0x08800000 #define LDRP_REDIRECTED 0x10000000 +#define LDRP_NON_PAGED_DEBUG_INFO 0x20000000 +#define LDRP_MM_LOADED 0x40000000 +#define LDRP_COMPAT_DATABASE_PROCESSED 0x80000000 // // Dll Characteristics for LdrLoadDll 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 23:55:02 2007 @@ -201,11 +201,71 @@ PLOAD_IMPORTS LoadedImports = (PVOID)-2; PCHAR MissingApiName, Buffer; PWCHAR MissingDriverName; + PAGED_CODE(); + + /* Detect session-load */ + if (Flags) + { + /* Sanity checks */ + ASSERT(NamePrefix == NULL); + ASSERT(LoadedName == NULL); + + /* Make sure the process is in session too */ + if (!PsGetCurrentProcess()->ProcessInSession) return STATUS_NO_MEMORY; + } if (ModuleObject) *ModuleObject = NULL; if (ImageBaseAddress) *ImageBaseAddress = NULL; - DPRINT("Loading Module %wZ...\n", FileName); + /* Allocate a buffer we'll use for names */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, MAX_PATH, TAG_LDR_WSTR); + if (!Buffer) + { + /* Fail */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* 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 = (USHORT)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, which for now is just the name itself */ + PrefixName = *FileName; + + /* Check if we have a prefix */ + if (NamePrefix) DPRINT1("Prefixed images are not yet supported!\n"); + + /* Check if we already have a name, use it instead */ + if (LoadedName) BaseName = *LoadedName; /* Open the Module */ InitializeObjectAttributes(&ObjectAttributes, @@ -370,50 +430,6 @@ return Status; } - /* Allocate a buffer we'll use for names */ - Buffer = ExAllocatePoolWithTag(NonPagedPool, MAX_PATH, TAG_LDR_WSTR); - if (!Buffer) - { - /* Fail */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* 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 = (USHORT)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 + Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Feb 22 23:55:02 2007 @@ -453,6 +453,7 @@ } BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; +extern KMUTANT MmSystemLoadLock; BOOLEAN NTAPI @@ -461,6 +462,9 @@ { if (Phase == 0) { + /* Initialize the Loader Lock */ + KeInitializeMutant(&MmSystemLoadLock, FALSE); + /* Reload boot drivers */ MiReloadBootLoadedDrivers(LoaderBlock); Modified: trunk/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pe.c?rev=25881… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pe.c (original) +++ trunk/reactos/ntoskrnl/mm/pe.c Thu Feb 22 23:55:02 2007 @@ -677,108 +677,4 @@ return nStatus; } -BOOLEAN -NTAPI -MmVerifyImageIsOkForMpUse(IN PVOID BaseAddress) -{ - PIMAGE_NT_HEADERS NtHeader; - PAGED_CODE(); - - /* Get NT Headers */ - NtHeader = RtlImageNtHeader(BaseAddress); - if (NtHeader) - { - /* Check if this image is only safe for UP while we have 2+ CPUs */ - if ((KeNumberProcessors > 1) && - (NtHeader->FileHeader.Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY)) - { - /* Fail */ - return FALSE; - } - } - - /* Otherwise, it's safe */ - return TRUE; -} - -NTSTATUS -NTAPI -MmCheckSystemImage(IN HANDLE ImageHandle, - IN BOOLEAN PurgeSection) -{ - NTSTATUS Status; - HANDLE SectionHandle; - PVOID ViewBase = NULL; - SIZE_T ViewSize = 0; - IO_STATUS_BLOCK IoStatusBlock; - FILE_STANDARD_INFORMATION FileStandardInfo; - KAPC_STATE ApcState; - PAGED_CODE(); - - /* Create a section for the DLL */ - Status = ZwCreateSection(&SectionHandle, - SECTION_MAP_EXECUTE, - NULL, - NULL, - PAGE_EXECUTE, - SEC_COMMIT, - ImageHandle); - if (!NT_SUCCESS(Status)) return Status; - - /* Make sure we're in the system process */ - KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); - - /* Map it */ - Status = ZwMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &ViewBase, - 0, - 0, - NULL, - &ViewSize, - ViewShare, - 0, - PAGE_EXECUTE); - if (!NT_SUCCESS(Status)) - { - /* We failed, close the handle and return */ - KeUnstackDetachProcess(&ApcState); - ZwClose(SectionHandle); - return Status; - } - - /* Now query image information */ - Status = ZwQueryInformationFile(ImageHandle, - &IoStatusBlock, - &FileStandardInfo, - sizeof(FileStandardInfo), - FileStandardInformation); - if ( NT_SUCCESS(Status) ) - { - /* First, verify the checksum */ - if (!LdrVerifyMappedImageMatchesChecksum(ViewBase, - FileStandardInfo. - EndOfFile.LowPart, - FileStandardInfo. - EndOfFile.LowPart)) - { - /* Set checksum failure */ - Status = STATUS_IMAGE_CHECKSUM_MISMATCH; - } - - /* Check that it's a valid SMP image if we have more then one CPU */ - if (!MmVerifyImageIsOkForMpUse(ViewBase)) - { - /* Otherwise it's not the right image */ - Status = STATUS_IMAGE_MP_UP_MISMATCH; - } - } - - /* Unmap the section, close the handle, and return status */ - ZwUnmapViewOfSection(NtCurrentProcess(), ViewBase); - KeUnstackDetachProcess(&ApcState); - ZwClose(SectionHandle); - return Status; -} - /* EOF */ Modified: 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 (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Thu Feb 22 23:55:02 2007 @@ -17,6 +17,7 @@ LIST_ENTRY PsLoadedModuleList; KSPIN_LOCK PsLoadedModuleSpinLock; PVOID PsNtosImageBase; +KMUTANT MmSystemLoadLock; /* FUNCTIONS *****************************************************************/ @@ -914,3 +915,107 @@ /* We're done */ return TRUE; } + +BOOLEAN +NTAPI +MmVerifyImageIsOkForMpUse(IN PVOID BaseAddress) +{ + PIMAGE_NT_HEADERS NtHeader; + PAGED_CODE(); + + /* Get NT Headers */ + NtHeader = RtlImageNtHeader(BaseAddress); + if (NtHeader) + { + /* Check if this image is only safe for UP while we have 2+ CPUs */ + if ((KeNumberProcessors > 1) && + (NtHeader->FileHeader.Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY)) + { + /* Fail */ + return FALSE; + } + } + + /* Otherwise, it's safe */ + return TRUE; +} + +NTSTATUS +NTAPI +MmCheckSystemImage(IN HANDLE ImageHandle, + IN BOOLEAN PurgeSection) +{ + NTSTATUS Status; + HANDLE SectionHandle; + PVOID ViewBase = NULL; + SIZE_T ViewSize = 0; + IO_STATUS_BLOCK IoStatusBlock; + FILE_STANDARD_INFORMATION FileStandardInfo; + KAPC_STATE ApcState; + PAGED_CODE(); + + /* Create a section for the DLL */ + Status = ZwCreateSection(&SectionHandle, + SECTION_MAP_EXECUTE, + NULL, + NULL, + PAGE_EXECUTE, + SEC_COMMIT, + ImageHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* Make sure we're in the system process */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + + /* Map it */ + Status = ZwMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &ViewBase, + 0, + 0, + NULL, + &ViewSize, + ViewShare, + 0, + PAGE_EXECUTE); + if (!NT_SUCCESS(Status)) + { + /* We failed, close the handle and return */ + KeUnstackDetachProcess(&ApcState); + ZwClose(SectionHandle); + return Status; + } + + /* Now query image information */ + Status = ZwQueryInformationFile(ImageHandle, + &IoStatusBlock, + &FileStandardInfo, + sizeof(FileStandardInfo), + FileStandardInformation); + if ( NT_SUCCESS(Status) ) + { + /* First, verify the checksum */ + if (!LdrVerifyMappedImageMatchesChecksum(ViewBase, + FileStandardInfo. + EndOfFile.LowPart, + FileStandardInfo. + EndOfFile.LowPart)) + { + /* Set checksum failure */ + Status = STATUS_IMAGE_CHECKSUM_MISMATCH; + } + + /* Check that it's a valid SMP image if we have more then one CPU */ + if (!MmVerifyImageIsOkForMpUse(ViewBase)) + { + /* Otherwise it's not the right image */ + Status = STATUS_IMAGE_MP_UP_MISMATCH; + } + } + + /* Unmap the section, close the handle, and return status */ + ZwUnmapViewOfSection(NtCurrentProcess(), ViewBase); + KeUnstackDetachProcess(&ApcState); + ZwClose(SectionHandle); + return Status; +}

1 0

[tretiakov] 25880: Handle WM_INPUTLANGCHANGE and WM_INPUTLANGCHANGEREQUEST in DefWindowProc.
by tretiakov＠svn.reactos.org 22 Feb '07

22 Feb '07

Author: tretiakov Date: Thu Feb 22 22:43:27 2007 New Revision: 25880 URL: http://svn.reactos.org/svn/reactos?rev=25880&view=rev Log: Handle WM_INPUTLANGCHANGE and WM_INPUTLANGCHANGEREQUEST in DefWindowProc. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Thu Feb 22 22:43:27 2007 @@ -987,6 +987,8 @@ } + + LRESULT STDCALL User32DefWindowProc(HWND hWnd, UINT Msg, @@ -1522,7 +1524,34 @@ { return (1); } - + + case WM_INPUTLANGCHANGEREQUEST: + { + HKL NewHkl; + + if(wParam & INPUTLANGCHANGE_BACKWARD + && wParam & INPUTLANGCHANGE_FORWARD) + { + return FALSE; + } + + //FIXME: What to do with INPUTLANGCHANGE_SYSCHARSET ? + + if(wParam & INPUTLANGCHANGE_BACKWARD) NewHkl = HKL_PREV; + else if(wParam & INPUTLANGCHANGE_FORWARD) NewHkl = HKL_NEXT; + else NewHkl = lParam; + + NtUserActivateKeyboardLayout(NewHkl, 0); + + return TRUE; + } + + case WM_INPUTLANGCHANGE: + { + //FIXME: What to do? + return TRUE; + } + case WM_ENDSESSION: if (wParam) PostQuitMessage(0); return 0; Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Thu Feb 22 22:43:27 2007 @@ -90,6 +90,9 @@ #define KLF_NOTELLSHELL 128 #define KLF_SETFORPROCESS 256 #define KL_NAMELENGTH 9 +#define INPUTLANGCHANGE_BACKWARD 4 +#define INPUTLANGCHANGE_FORWARD 2 +#define INPUTLANGCHANGE_SYSCHARSET 1 #define MF_ENABLED 0 #define MF_GRAYED 1 #define MF_DISABLED 2

1 0

[tretiakov] 25879: NtUserLoadKeyboardLayoutEx: Support KLF_REORDER and KLF_ACTIVATE. NtUserActivateKeyboardLayout: Support HKL_NEXT, HKL_PREV, KLF_REORDER.
by tretiakov＠svn.reactos.org 22 Feb '07

22 Feb '07

Author: tretiakov Date: Thu Feb 22 22:41:10 2007 New Revision: 25879 URL: http://svn.reactos.org/svn/reactos?rev=25879&view=rev Log: NtUserLoadKeyboardLayoutEx: Support KLF_REORDER and KLF_ACTIVATE. NtUserActivateKeyboardLayout: Support HKL_NEXT, HKL_PREV, KLF_REORDER. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Thu Feb 22 22:41:10 2007 @@ -328,7 +328,7 @@ Thread->KeyboardLayout = pKbl; pKbl->RefCount++; - // Post WM_INPUTLANGCHANGE to thread's focus window + // Send WM_INPUTLANGCHANGE to thread's focus window Msg.hwnd = Thread->MessageQueue->FocusWindow; Msg.message = WM_INPUTLANGCHANGE; @@ -457,33 +457,46 @@ IN DWORD Unused4) { HKL Ret = NULL; - PKBL pKbl; + PKBL pKbl = NULL, Cur; UserEnterExclusive(); - pKbl = KBLList; + Cur = KBLList; do { - if(pKbl->klid == dwKLID) - { - Ret = pKbl->hkl; + if(Cur->klid == dwKLID) + { + pKbl = Cur; + break; + } + + Cur = (PKBL) Cur->List.Flink; + } while(Cur != KBLList); + + if(!pKbl) + { + pKbl = UserLoadDllAndCreateKbl(dwKLID); + + if(!pKbl) + { goto the_end; } - pKbl = (PKBL) pKbl->List.Flink; - } while(pKbl != KBLList); - - pKbl = UserLoadDllAndCreateKbl(dwKLID); - - if(!pKbl) - { - goto the_end; - } - - InsertTailList(&KBLList->List, &pKbl->List); + InsertTailList(&KBLList->List, &pKbl->List); + } + + if(Flags & KLF_REORDER) KBLList = pKbl; + + if(Flags & KLF_ACTIVATE) + { + UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl); + } + Ret = pKbl->hkl; //FIXME: Respect Flags! + // KLF_NOTELLSHELL KLF_SETFORPROCESS + // KLF_REPLACELANG KLF_SUBSTITUTE_OK the_end: UserLeave(); @@ -502,17 +515,35 @@ UserEnterExclusive(); - pKbl = UserHklToKbl(hKl); - - //FIXME: Respect flags! + pWThread = PsGetCurrentThreadWin32Thread(); + + if(pWThread->KeyboardLayout->hkl == hKl) + { + Ret = hKl; + goto the_end; + } + + if(hKl == (HKL)HKL_NEXT) + { + pKbl = (PKBL)pWThread->KeyboardLayout->List.Flink; + } + else if(hKl == (HKL)HKL_PREV) + { + pKbl = (PKBL)pWThread->KeyboardLayout->List.Blink; + } + else pKbl = UserHklToKbl(hKl); + + //FIXME: KLF_RESET, KLF_SHIFTLOCK + //FIXME: KLF_SETFORPROCESS if(pKbl) { - pWThread = PsGetCurrentThreadWin32Thread(); - - if(pWThread->KeyboardLayout->hkl == hKl) - { - Ret = hKl; + if(Flags & KLF_REORDER) + KBLList = pKbl; + + if(pKbl == pWThread->KeyboardLayout) + { + Ret = pKbl->hkl; } else { @@ -521,6 +552,7 @@ } } +the_end: UserLeave(); return Ret; }

1 0

[greatlrd] 25878: win32k dx test are now compatible with all Windows and ReactOS that got a d3d8thk.dll file rember that file are diffent for Windows 2000 and Windows XP/2003 ReactOS d38thk.dll are Windows XP/2003 compatible.
by greatlrd＠svn.reactos.org 22 Feb '07

22 Feb '07

Author: greatlrd Date: Thu Feb 22 22:21:10 2007 New Revision: 25878 URL: http://svn.reactos.org/svn/reactos?rev=25878&view=rev Log: win32k dx test are now compatible with all Windows and ReactOS that got a d3d8thk.dll file rember that file are diffent for Windows 2000 and Windows XP/2003 ReactOS d38thk.dll are Windows XP/2003 compatible. Removed: trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h trunk/rosapps/dxtest/win32kdxtest/sysreactos.h trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj trunk/rosapps/dxtest/win32kdxtest/windowsos.h Modified: trunk/rosapps/dxtest/win32kdxtest/dump.c trunk/rosapps/dxtest/win32kdxtest/main.c trunk/rosapps/dxtest/win32kdxtest/test.h trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild Removed: trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/Window… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h (original) +++ trunk/rosapps/dxtest/win32kdxtest/Windows2000Sp4.h (removed) @@ -1,11 +1,0 @@ - - -#if !defined(__REACTOS__) - - #define syscallid_NtGdiDdCreateDirectDrawObject 0x1039 - #define syscallid_NtGdiDdDeleteDirectDrawObject 0x103E - #define syscallid_NtGdiDdQueryDirectDrawObject 0x1053 - -#endif - - Modified: trunk/rosapps/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/dump.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/dump.c (original) +++ trunk/rosapps/dxtest/win32kdxtest/dump.c Thu Feb 22 22:21:10 2007 @@ -11,7 +11,7 @@ void -dump(DD_HALINFO *pHalInfo, char *text) +dump_halinfo(DD_HALINFO *pHalInfo, char *text) { printf("dumping the DD_HALINFO from %s\n",text); Modified: trunk/rosapps/dxtest/win32kdxtest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/main.c… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/main.c (original) +++ trunk/rosapps/dxtest/win32kdxtest/main.c Thu Feb 22 22:21:10 2007 @@ -9,41 +9,17 @@ #include <wingdi.h> #include <winddi.h> #include <d3dnthal.h> - - - - +#include <dll/directx/d3d8thk.h> #include "test.h" -/* which syscall table shall we use WIndows or ReactOS */ +/* we using d3d8thk.dll it is doing the real syscall in windows 2000 + * in ReactOS and Windows XP and higher d3d8thk.dll it linking to + * gdi32.dll instead doing syscall, gdi32.dll export DdEntry1-56 + * and doing the syscall direcly. I did forget about it, This + * test program are now working on any Windows and ReactOS + * that got d3d8thk.dll + */ -/* Windows 2000 sp4 syscall table for win32k */ -#include "Windows2000Sp4.h" - -/* Windows syscall code */ -#include "windowsos.h" - -/* ReactOS syscall code */ -#include "sysreactos.h" - - -/* -#define DdQueryDirectDrawObject GdiEntry2 - -#define DdCreateSurfaceObject GdiEntry4 -#define DdDeleteSurfaceObject GdiEntry5 -#define DdResetVisrgn GdiEntry6 -#define DdGetDC GdiEntry7 -#define DdReleaseDC GdiEntry8 -#define DdCreateDIBSection GdiEntry9 -#define DdReenableDirectDrawObject GdiEntry10 -#define DdAttachSurface GdiEntry11 -#define DdUnattachSurface GdiEntry12 -#define DdQueryDisplaySettingsUniqueness GdiEntry13 -#define DdGetDxHandle GdiEntry14 -#define DdSetGammaRamp GdiEntry15 -#define DdSwapTextureHandles GdiEntry16 -*/ int main(int argc, char **argv) { HANDLE hDirectDrawLocal; @@ -69,10 +45,10 @@ printf("Start testing of NtGdiDdCreateDirectDrawObject\n"); - retValue = sysNtGdiDdCreateDirectDrawObject(NULL); + retValue = OsThunkDdCreateDirectDrawObject(NULL); testing_noteq(retValue,NULL,fails,"NtGdiDdCreateDirectDrawObject(NULL);\0"); - retValue = sysNtGdiDdCreateDirectDrawObject(hdc); + retValue = OsThunkDdCreateDirectDrawObject(hdc); testing_eq(retValue,NULL,fails,"NtGdiDdCreateDirectDrawObject(hdc);\0"); show_status(fails, "NtGdiDdCreateDirectDrawObject\0"); @@ -107,9 +83,9 @@ D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; DD_D3DBUFCALLBACKS D3dBufferCallbacks; DDSURFACEDESC D3dTextureFormats; - //DWORD NumHeaps = 0; + // DWORD NumHeaps = 0; VIDEOMEMORY vmList; - //DWORD NumFourCC = 0; + // DWORD NumFourCC = 0; //DWORD FourCC = 0; /* clear data */ @@ -124,7 +100,7 @@ printf("Start testing of NtGdiDdQueryDirectDrawObject\n"); /* testing NULL */ - retValue = sysNtGdiDdQueryDirectDrawObject( NULL, pHalInfo, + retValue = OsThunkDdQueryDirectDrawObject( NULL, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, @@ -140,7 +116,7 @@ testing_noteq(puNumFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(NULL, ...);\0"); - retValue = sysNtGdiDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, @@ -163,7 +139,7 @@ */ pHalInfo = &HalInfo; - retValue = sysNtGdiDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, @@ -181,18 +157,12 @@ testing_noteq(puFourCC,NULL,fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); testing_noteq(pHalInfo->dwSize,sizeof(DD_HALINFO),fails,"10. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, NULL, ...);\0"); -#if DBG - dump(pHalInfo, "NtGdiDdQueryDirectDrawObject frist call"); -#endif - //pCallBackFlags = (DWORD *)&CallBackFlags; - //retValue = sysNtGdiDdQueryDirectDrawObject( hDirectDrawLocal, NULL, - // pCallBackFlags, puD3dCallbacks, - // puD3dDriverData, puD3dBufferCallbacks, - // puD3dTextureFormats, puNumHeaps, - // puvmList, puNumFourCC, - // puFourCC); + + + + show_status(fails, "NtGdiDdQueryDirectDrawObject\0"); } @@ -208,10 +178,10 @@ BOOL retValue=FALSE; printf("Start testing of NtGdiDdDeleteDirectDrawObject\n"); - retValue = sysNtGdiDdDeleteDirectDrawObject(hDirectDrawLocal); + retValue = OsThunkDdDeleteDirectDrawObject(hDirectDrawLocal); testing_eq(retValue,FALSE,fails,"NtGdiDdDeleteDirectDrawObject(hDirectDrawLocal);\0"); - retValue = sysNtGdiDdDeleteDirectDrawObject(NULL); + retValue = OsThunkDdDeleteDirectDrawObject(NULL); testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0"); show_status(fails, "NtGdiDdDeleteDirectDrawObject\0"); Removed: trunk/rosapps/dxtest/win32kdxtest/sysreactos.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/sysrea… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/sysreactos.h (original) +++ trunk/rosapps/dxtest/win32kdxtest/sysreactos.h (removed) @@ -1,7 +1,0 @@ - - -#if defined(__REACTOS__) - #define sysNtGdiDdCreateDirectDrawObject NtGdiDdCreateDirectDrawObject - #define sysNtGdiDdDeleteDirectDrawObject NtGdiDdDeleteDirectDrawObject - #define sysNtGdiDdQueryDirectDrawObject NtGdiDdQueryDirectDrawObject -#endif Modified: trunk/rosapps/dxtest/win32kdxtest/test.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/test.h… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/test.h (original) +++ trunk/rosapps/dxtest/win32kdxtest/test.h Thu Feb 22 22:21:10 2007 @@ -4,30 +4,13 @@ void test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal); void test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal); -void dump(DD_HALINFO *pHalInfo, char *text); +void dump_halinfo(DD_HALINFO *pHalInfo, char *text); -HANDLE sysNtGdiDdCreateDirectDrawObject(HDC hdc); -BOOL sysNtGdiDdDeleteDirectDrawObject( HANDLE hDirectDrawLocal); -BOOL sysNtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - LPD3DNTHAL_CALLBACKS puD3dCallbacks, - LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, DWORD *puFourCC); -HANDLE NtGdiDdCreateDirectDrawObject(HDC hdc); -BOOL NtGdiDdDeleteDirectDrawObject( HANDLE hDirectDrawLocal); -BOOL NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - LPD3DNTHAL_CALLBACKS puD3dCallbacks, - LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, DWORD *puFourCC); + + + Modified: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild (original) +++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest.rbuild Thu Feb 22 22:21:10 2007 @@ -7,9 +7,7 @@ <library>kernel32</library> <library>user32</library> <library>gdi32</library> + <library>d3d8thk</library> <file>main.c</file> - <file>dump.c</file> - <file>../../../../dll/win32/gdi32/misc/win32k.S</file> - - + <file>dump.c</file> </module> Removed: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln (original) +++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.sln (removed) @@ -1,32 +1,0 @@ -ï»¿ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32kdxtest", "win32kdxtest_vc8_auto.vcproj", "{40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug - Wine headers|Win32 = Debug - Wine headers|Win32 - Debug|Win32 = Debug|Win32 - Release - Wine headers|Win32 = Release - Wine headers|Win32 - Release|Win32 = Release|Win32 - Speed - Wine headers|Win32 = Speed - Wine headers|Win32 - Speed|Win32 = Speed|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug - Wine headers|Win32.ActiveCfg = Debug - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug - Wine headers|Win32.Build.0 = Debug - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug|Win32.ActiveCfg = Debug|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Debug|Win32.Build.0 = Debug|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release - Wine headers|Win32.ActiveCfg = Release - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release - Wine headers|Win32.Build.0 = Release - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release|Win32.ActiveCfg = Release|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Release|Win32.Build.0 = Release|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed - Wine headers|Win32.ActiveCfg = Speed - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed - Wine headers|Win32.Build.0 = Speed - Wine headers|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed|Win32.ActiveCfg = Speed|Win32 - {40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}.Speed|Win32.Build.0 = Speed|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal Removed: trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/win32k… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj (original) +++ trunk/rosapps/dxtest/win32kdxtest/win32kdxtest_vc8_auto.vcproj (removed) @@ -1,617 +1,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="win32kdxtest" - ProjectGUID="{40A5198A-36E0-4ABF-B17B-2C7C1F8365EF}" - RootNamespace="win32kdxtest" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - <DefaultToolFile - FileName="masm.rules" - /> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug" - IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="MASM" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" - PreprocessorDefinitions=";DBG;STDCALL=__stdcall;_DEBUG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="true" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib" - OutputFile="$(OutDir)/win32kdxtest.exe" - LinkIncremental="2" - AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Debug;..\..\..\..\output-i386\dll\win32\user32\vc8\Debug" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/win32kdxtest.pdb" - SubSystem="1" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release" - IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="MASM" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - FavorSizeOrSpeed="1" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" - PreprocessorDefinitions=";DBG;STDCALL=__stdcall;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" - StringPooling="true" - MinimalRebuild="true" - BasicRuntimeChecks="0" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="false" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib" - OutputFile="$(OutDir)/win32kdxtest.exe" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Release;..\..\..\..\output-i386\dll\win32\user32\vc8\Release" - GenerateDebugInformation="true" - SubSystem="1" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Speed|Win32" - OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed" - IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="MASM" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" - PreprocessorDefinitions=";DBG;STDCALL=__stdcall;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" - MinimalRebuild="false" - BasicRuntimeChecks="0" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="false" - UsePrecompiledHeader="0" - WarningLevel="0" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib" - OutputFile="$(OutDir)/win32kdxtest.exe" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Speed;..\..\..\..\output-i386\dll\win32\user32\vc8\Speed" - GenerateDebugInformation="false" - SubSystem="1" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug - Wine headers|Win32" - OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug - Wine headers" - IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Debug - Wine headers" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="MASM" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" - PreprocessorDefinitions=";DBG;_DEBUG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" - GeneratePreprocessedFile="0" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="1" - BufferSecurityCheck="true" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - AssemblerOutput="3" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="4" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib" - OutputFile="$(OutDir)/win32kdxtest.exe" - LinkIncremental="2" - AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Debug - Wine headers;..\..\..\..\output-i386\dll\win32\user32\vc8\Debug - Wine headers" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/win32kdxtest.pdb" - SubSystem="1" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release - Wine headers|Win32" - OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release - Wine headers" - IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Release - Wine headers" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="MASM" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - FavorSizeOrSpeed="1" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" - PreprocessorDefinitions=";DBG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" - StringPooling="true" - MinimalRebuild="true" - BasicRuntimeChecks="0" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="false" - UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib" - OutputFile="$(OutDir)/win32kdxtest.exe" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Release - Wine headers;..\..\..\..\output-i386\dll\win32\user32\vc8\Release - Wine headers" - GenerateDebugInformation="true" - SubSystem="1" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Speed - Wine headers|Win32" - OutputDirectory="..\..\..\..\output-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed - Wine headers" - IntermediateDirectory="..\..\..\..\obj-i386\modules\rosapps\dxtest\win32kdxtest\vc8\Speed - Wine headers" - ConfigurationType="1" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="MASM" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - WholeProgramOptimization="false" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" - PreprocessorDefinitions=";DBG;_LIB;_M_IX86;_REACTOS_;_WIN32_IE=0x0501;_WIN32_WINNT=0x0501;_X86_;__USE_W32API;__i386__" - MinimalRebuild="false" - BasicRuntimeChecks="0" - BufferSecurityCheck="false" - EnableFunctionLevelLinking="false" - UsePrecompiledHeader="0" - WarningLevel="0" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="0" - CallingConvention="0" - CompileAs="1" - ForcedIncludeFiles="warning.h" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;../../../../.;../../../../include;../../../../include/ndk;../../../../include/reactos;../../../../include/reactos/libs;../../../../include/psdk;../../../../include/crt;../../../../include/ddk;../../../../include/GL" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib" - OutputFile="$(OutDir)/win32kdxtest.exe" - LinkIncremental="1" - AdditionalLibraryDirectories="..\..\..\..\output-i386\dll\win32\kernel32\vc8\Speed - Wine headers;..\..\..\..\output-i386\dll\win32\user32\vc8\Speed - Wine headers" - GenerateDebugInformation="false" - SubSystem="1" - LinkTimeCodeGeneration="0" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - EmbedManifest="false" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S" - > - <File - RelativePath=".\dump.c" - > - </File> - <File - RelativePath=".\main.c" - > - </File> - <File - RelativePath=".\sysreactos.h" - > - </File> - <File - RelativePath=".\test.h" - > - </File> - <File - RelativePath=".\Windows2000Sp4.h" - > - </File> - <File - RelativePath=".\windowsos.h" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl" - > - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Removed: trunk/rosapps/dxtest/win32kdxtest/windowsos.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dxtest/win32kdxtest/window… ============================================================================== --- trunk/rosapps/dxtest/win32kdxtest/windowsos.h (original) +++ trunk/rosapps/dxtest/win32kdxtest/windowsos.h (removed) @@ -1,32 +1,0 @@ - -#if !defined(__REACTOS__) - - HANDLE sysNtGdiDdCreateDirectDrawObject(HDC hdc) - { - INT retValue; - win_syscall(hdc,retValue, syscallid_NtGdiDdCreateDirectDrawObject); - return retValue; - } - - BOOL sysNtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal) - { - INT retValue; - win_syscall(hDirectDrawLocal,retValue, syscallid_NtGdiDdDeleteDirectDrawObject); - return retValue; - } - - BOOL sysNtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - LPD3DNTHAL_CALLBACKS puD3dCallbacks, - LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, DWORD *puFourCC) - { - INT retValue; - win_syscall(hDirectDrawLocal,retValue, syscallid_NtGdiDdQueryDirectDrawObject); - return retValue; - } - -#endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs