Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 25877: Move d3d8thk.h for it being use for apps that need todo win32k syscall for directx graphice part
by greatlrd＠svn.reactos.org 22 Feb '07

22 Feb '07

Author: greatlrd Date: Thu Feb 22 22:10:40 2007 New Revision: 25877 URL: http://svn.reactos.org/svn/reactos?rev=25877&view=rev Log: Move d3d8thk.h for it being use for apps that need todo win32k syscall for directx graphice part Added: trunk/reactos/include/reactos/dll/ trunk/reactos/include/reactos/dll/directx/ trunk/reactos/include/reactos/dll/directx/d3d8thk.h - copied, changed from r25874, trunk/reactos/dll/directx/d3d8thk/d3d8thk.h Removed: trunk/reactos/dll/directx/d3d8thk/d3d8thk.h Removed: trunk/reactos/dll/directx/d3d8thk/d3d8thk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8thk/d3d8th… ============================================================================== --- trunk/reactos/dll/directx/d3d8thk/d3d8thk.h (original) +++ trunk/reactos/dll/directx/d3d8thk/d3d8thk.h (removed) @@ -1,325 +1,0 @@ - -#ifndef __D3D8THK_H -#define __D3D8THK_H - -#include <ddrawint.h> -#include <d3dnthal.h> - -#ifdef __cplusplus -extern "C" { -#endif - -BOOL STDCALL OsThunkD3dContextCreate( - HANDLE hDirectDrawLocal, - HANDLE hSurfColor, - HANDLE hSurfZ, - PD3DNTHAL_CONTEXTCREATEDATA pdcci -); - -DWORD STDCALL OsThunkD3dContextDestroy( - PD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData -); - -DWORD STDCALL OsThunkD3dContextDestroyAll(VOID); - -DWORD STDCALL OsThunkD3dDrawPrimitives2( - HANDLE hCmdBuf, - HANDLE hVBuf, - PD3DNTHAL_DRAWPRIMITIVES2DATA pded, - FLATPTR *pfpVidMemCmd, - DWORD *pdwSizeCmd, - FLATPTR *pfpVidMemVtx, - DWORD *pdwSizeVtx -); - -DWORD STDCALL OsThunkD3dValidateTextureStageState( - PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData -); - -DWORD STDCALL OsThunkDdAddAttachedSurface( - HANDLE hSurface, - HANDLE hSurfaceAttached, - PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData -); - -DWORD STDCALL OsThunkDdAlphaBlt(VOID); - -BOOL STDCALL OsThunkDdAttachSurface( - HANDLE hSurfaceFrom, - HANDLE hSurfaceTo -); - -DWORD STDCALL OsThunkDdBeginMoCompFrame( - HANDLE hMoComp, - PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData -); - -DWORD STDCALL OsThunkDdBlt( - HANDLE hSurfaceDest, - HANDLE hSurfaceSrc, - PDD_BLTDATA puBltData -); - -DWORD STDCALL OsThunkDdCanCreateD3DBuffer( - HANDLE hDirectDraw, - PDD_CANCREATESURFACEDATA puCanCreateSurfaceData -); - -DWORD STDCALL OsThunkDdCanCreateSurface( - HANDLE hDirectDraw, - PDD_CANCREATESURFACEDATA puCanCreateSurfaceData -); - -DWORD STDCALL OsThunkDdColorControl( - HANDLE hSurface, - PDD_COLORCONTROLDATA puColorControlData -); - -DWORD STDCALL OsThunkDdCreateD3DBuffer( - HANDLE hDirectDraw, - HANDLE *hSurface, - DDSURFACEDESC *puSurfaceDescription, - DD_SURFACE_GLOBAL *puSurfaceGlobalData, - DD_SURFACE_LOCAL *puSurfaceLocalData, - DD_SURFACE_MORE *puSurfaceMoreData, - PDD_CREATESURFACEDATA puCreateSurfaceData, - HANDLE *puhSurface -); - -HANDLE STDCALL OsThunkDdCreateDirectDrawObject( - HDC hdc -); - -HANDLE STDCALL OsThunkDdCreateMoComp( - HANDLE hDirectDraw, - PDD_CREATEMOCOMPDATA puCreateMoCompData -); - -DWORD STDCALL OsThunkDdCreateSurface( - HANDLE hDirectDraw, - HANDLE *hSurface, - DDSURFACEDESC *puSurfaceDescription, - DD_SURFACE_GLOBAL *puSurfaceGlobalData, - DD_SURFACE_LOCAL *puSurfaceLocalData, - DD_SURFACE_MORE *puSurfaceMoreData, - PDD_CREATESURFACEDATA puCreateSurfaceData, - HANDLE *puhSurface -); - -DWORD STDCALL OsThunkDdCreateSurfaceEx( - HANDLE hDirectDraw, - HANDLE hSurface, - DWORD dwSurfaceHandle -); - -HANDLE STDCALL OsThunkDdCreateSurfaceObject( - HANDLE hDirectDrawLocal, - HANDLE hSurface, - PDD_SURFACE_LOCAL puSurfaceLocal, - PDD_SURFACE_MORE puSurfaceMore, - PDD_SURFACE_GLOBAL puSurfaceGlobal, - BOOL bComplete -); - -BOOL STDCALL OsThunkDdDeleteDirectDrawObject( - HANDLE hDirectDrawLocal -); - -BOOL STDCALL OsThunkDdDeleteSurfaceObject( - HANDLE hSurface -); - -DWORD STDCALL OsThunkDdDestroyD3DBuffer( - HANDLE hSurface -); - -DWORD STDCALL OsThunkDdDestroyMoComp( - HANDLE hMoComp, - PDD_DESTROYMOCOMPDATA puBeginFrameData -); - -DWORD STDCALL OsThunkDdDestroySurface( - HANDLE hSurface, - BOOL bRealDestroy -); - -DWORD STDCALL OsThunkDdEndMoCompFrame( - HANDLE hMoComp, - PDD_ENDMOCOMPFRAMEDATA puEndFrameData -); - -DWORD STDCALL OsThunkDdFlip( - HANDLE hSurfaceCurrent, - HANDLE hSurfaceTarget, - HANDLE hSurfaceCurrentLeft, - HANDLE hSurfaceTargetLeft, - PDD_FLIPDATA puFlipData -); - -DWORD STDCALL OsThunkDdFlipToGDISurface( - HANDLE hDirectDraw, - PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData -); - -DWORD STDCALL OsThunkDdGetAvailDriverMemory( - HANDLE hDirectDraw, - PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData -); - -DWORD STDCALL OsThunkDdGetBltStatus( - HANDLE hSurface, - PDD_GETBLTSTATUSDATA puGetBltStatusData -); - -HDC STDCALL OsThunkDdGetDC( - HANDLE hSurface, - PALETTEENTRY *puColorTable -); - -DWORD STDCALL OsThunkDdGetDriverInfo( - HANDLE hDirectDraw, - PDD_GETDRIVERINFODATA puGetDriverInfoData -); - -DWORD STDCALL OsThunkDdGetDriverState( - PDD_GETDRIVERSTATEDATA pdata -); - -DWORD STDCALL OsThunkDdGetDxHandle( - HANDLE hDirectDraw, - HANDLE hSurface, - BOOL bRelease -); - -DWORD STDCALL OsThunkDdGetFlipStatus( - HANDLE hSurface, - PDD_GETFLIPSTATUSDATA puGetFlipStatusData -); - -DWORD STDCALL OsThunkDdGetInternalMoCompInfo( - HANDLE hDirectDraw, - PDD_GETINTERNALMOCOMPDATA puGetInternalData -); - -DWORD STDCALL OsThunkDdGetMoCompBuffInfo( - HANDLE hDirectDraw, - PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData -); - -DWORD STDCALL OsThunkDdGetMoCompFormats( - HANDLE hDirectDraw, - PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData -); - -DWORD STDCALL OsThunkDdGetMoCompGuids( - HANDLE hDirectDraw, - PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData -); - -DWORD STDCALL OsThunkDdGetScanLine( - HANDLE hDirectDraw, - PDD_GETSCANLINEDATA puGetScanLineData -); - -DWORD STDCALL OsThunkDdLock( - HANDLE hSurface, - PDD_LOCKDATA puLockData, - HDC hdcClip -); - -DWORD STDCALL OsThunkDdLockD3D( - HANDLE hSurface, - PDD_LOCKDATA puLockData -); - -BOOL STDCALL OsThunkDdQueryDirectDrawObject( - HANDLE hDirectDrawLocal, - DD_HALINFO *pHalInfo, - DWORD *pCallBackFlags, - PD3DNTHAL_CALLBACKS puD3dCallbacks, - PD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - LPDDSURFACEDESC puD3dTextureFormats, - DWORD *puNumHeaps, - VIDEOMEMORY *puvmList, - DWORD *puNumFourCC, - DWORD *puFourCC -); - -DWORD STDCALL OsThunkDdQueryMoCompStatus( - HANDLE hMoComp, - PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData -); - -BOOL STDCALL OsThunkDdReenableDirectDrawObject( - HANDLE hDirectDrawLocal, - BOOL *pubNewMode -); - -BOOL STDCALL OsThunkDdReleaseDC( - HANDLE hSurface -); - -DWORD STDCALL OsThunkDdRenderMoComp( - HANDLE hMoComp, - PDD_RENDERMOCOMPDATA puRenderMoCompData -); - -BOOL STDCALL OsThunkDdResetVisrgn( - HANDLE hSurface, - HWND hwnd -); - -DWORD STDCALL OsThunkDdSetColorKey( - HANDLE hSurface, - PDD_SETCOLORKEYDATA puSetColorKeyData -); - -DWORD STDCALL OsThunkDdSetExclusiveMode( - HANDLE hDirectDraw, - PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData -); - -BOOL STDCALL OsThunkDdSetGammaRamp( - HANDLE hDirectDraw, - HDC hdc, - LPVOID lpGammaRamp -); - -DWORD STDCALL OsThunkDdSetOverlayPosition( - HANDLE hSurfaceSource, - HANDLE hSurfaceDestination, - PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData -); - -VOID STDCALL OsThunkDdUnattachSurface( - HANDLE hSurface, - HANDLE hSurfaceAttached -); - -DWORD STDCALL OsThunkDdUnlock( - HANDLE hSurface, - PDD_UNLOCKDATA puUnlockData -); - -DWORD STDCALL OsThunkDdUnlockD3D( - HANDLE hSurface, - PDD_UNLOCKDATA puUnlockData -); - -DWORD STDCALL OsThunkDdUpdateOverlay( - HANDLE hSurfaceDestination, - HANDLE hSurfaceSource, - PDD_UPDATEOVERLAYDATA puUpdateOverlayData -); - -DWORD STDCALL OsThunkDdWaitForVerticalBlank( - HANDLE hDirectDraw, - PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData -); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif // __D3D8THK_H Copied: trunk/reactos/include/reactos/dll/directx/d3d8thk.h (from r25874, trunk/reactos/dll/directx/d3d8thk/d3d8thk.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/direct… ============================================================================== --- trunk/reactos/dll/directx/d3d8thk/d3d8thk.h (original) +++ trunk/reactos/include/reactos/dll/directx/d3d8thk.h Thu Feb 22 22:10:40 2007 @@ -9,6 +9,7 @@ extern "C" { #endif +/* FIXME missing PD3DNTHAL_CONTEXTCREATEDATA BOOL STDCALL OsThunkD3dContextCreate( HANDLE hDirectDrawLocal, HANDLE hSurfColor, @@ -16,12 +17,15 @@ PD3DNTHAL_CONTEXTCREATEDATA pdcci ); + DWORD STDCALL OsThunkD3dContextDestroy( PD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData ); +*/ DWORD STDCALL OsThunkD3dContextDestroyAll(VOID); +/* FIXME PD3DNTHAL_DRAWPRIMITIVES2DATA, PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA missing DWORD STDCALL OsThunkD3dDrawPrimitives2( HANDLE hCmdBuf, HANDLE hVBuf, @@ -35,6 +39,7 @@ DWORD STDCALL OsThunkD3dValidateTextureStageState( PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData ); +*/ DWORD STDCALL OsThunkDdAddAttachedSurface( HANDLE hSurface, @@ -86,9 +91,7 @@ HANDLE *puhSurface ); -HANDLE STDCALL OsThunkDdCreateDirectDrawObject( - HDC hdc -); +HANDLE STDCALL OsThunkDdCreateDirectDrawObject(HDC hdc); HANDLE STDCALL OsThunkDdCreateMoComp( HANDLE hDirectDraw, @@ -232,12 +235,13 @@ PDD_LOCKDATA puLockData ); -BOOL STDCALL OsThunkDdQueryDirectDrawObject( + +BOOL STDCALL OsThunkDdQueryDirectDrawObject( HANDLE hDirectDrawLocal, - DD_HALINFO *pHalInfo, + DD_HALINFO *pHalInfo, DWORD *pCallBackFlags, - PD3DNTHAL_CALLBACKS puD3dCallbacks, - PD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, + LPD3DNTHAL_CALLBACKS puD3dCallbacks, + LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, LPDDSURFACEDESC puD3dTextureFormats, DWORD *puNumHeaps, @@ -246,6 +250,7 @@ DWORD *puFourCC ); + DWORD STDCALL OsThunkDdQueryMoCompStatus( HANDLE hMoComp, PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData

1 0

[spetreolle] 25876: fix build
by spetreolle＠svn.reactos.org 22 Feb '07

22 Feb '07

Author: spetreolle Date: Thu Feb 22 21:48:01 2007 New Revision: 25876 URL: http://svn.reactos.org/svn/reactos?rev=25876&view=rev Log: fix build Modified: trunk/reactos/ntoskrnl/mm/sysldr.c 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 21:48:01 2007 @@ -148,7 +148,7 @@ /* Get the hint and check if it's valid */ Hint = NameImport->Hint; if ((Hint < ExportDirectory->NumberOfNames) && - !(strcmp(NameImport->Name, (PCHAR)DllBase + NameTable[Hint]))) + !(strcmp((PCHAR) NameImport->Name, (PCHAR)DllBase + NameTable[Hint]))) { /* We have a match, get the ordinal number from here */ Ordinal = OrdinalTable[Hint]; @@ -163,7 +163,7 @@ Mid = (Low + High) >> 1; /* Compare name */ - Ret = strcmp(NameImport->Name, (PCHAR)DllBase + NameTable[Mid]); + Ret = strcmp((PCHAR)NameImport->Name, (PCHAR)DllBase + NameTable[Mid]); if (Ret < 0) { /* Update high */

1 0

[ion] 25875: - Rename LdrLoadModule to MmLoadSystemImage and change prototype. No code change except update callers and return ImageBaseAddress parameter when requested.
by ion＠svn.reactos.org 22 Feb '07

22 Feb '07

Author: ion Date: Thu Feb 22 21:30:50 2007 New Revision: 25875 URL: http://svn.reactos.org/svn/reactos?rev=25875&view=rev Log: - Rename LdrLoadModule to MmLoadSystemImage and change prototype. No code change except update callers and return ImageBaseAddress parameter when requested. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ldr.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ldr/loader.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Thu Feb 22 21:30:50 2007 @@ -1267,7 +1267,6 @@ PVOID ImageBase; ULONG_PTR EntryPoint; NTSTATUS Status; - PLDR_DATA_TABLE_ENTRY ModuleObject; ULONG DirSize; PIMAGE_NT_HEADERS NtHeader; @@ -1283,11 +1282,15 @@ /* Load the driver */ ImageName = DriverInfo->DriverName; - Status = LdrLoadModule(&ImageName, &ModuleObject); + Status = MmLoadSystemImage(&ImageName, + NULL, + NULL, + 0, + NULL, + &ImageBase); if (!NT_SUCCESS(Status)) return Status; /* Return the export pointer */ - ImageBase = ModuleObject->DllBase; DriverInfo->ExportSectionPointer = RtlImageDirectoryEntryToData(ImageBase, TRUE, @@ -1479,11 +1482,15 @@ ImageName = *(PUNICODE_STRING)Buffer; /* Load the image */ - Status = LdrLoadModule(&ImageName, &ModuleObject); + Status = MmLoadSystemImage(&ImageName, + NULL, + NULL, + 0, + (PVOID)&ModuleObject, + &ImageBase); if (!NT_SUCCESS(Status)) return Status; /* Get the headers */ - ImageBase = ModuleObject->DllBase; NtHeader = RtlImageNtHeader(ImageBase); if (!NtHeader) { 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 Thu Feb 22 21:30:50 2007 @@ -66,10 +66,12 @@ NTSTATUS NTAPI -LdrLoadModule( - PUNICODE_STRING Filename, - PLDR_DATA_TABLE_ENTRY *ModuleObject -); +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 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 Thu Feb 22 21:30:50 2007 @@ -455,7 +455,7 @@ else { DPRINT("Loading module\n"); - Status = LdrLoadModule(&ServiceImagePath, ModuleObject); + Status = MmLoadSystemImage(&ServiceImagePath, NULL, NULL, 0, (PVOID)ModuleObject, NULL); } } else @@ -1721,11 +1721,10 @@ * Load the driver module */ - Status = LdrLoadModule(&ImagePath, &ModuleObject); - + Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, NULL); if (!NT_SUCCESS(Status)) { - DPRINT("LdrLoadModule() failed (Status %lx)\n", Status); + DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); 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 Thu Feb 22 21:30:50 2007 @@ -173,9 +173,12 @@ // NTSTATUS NTAPI -LdrLoadModule( - PUNICODE_STRING FileName, - PLDR_DATA_TABLE_ENTRY *ModuleObject ) +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; @@ -199,7 +202,8 @@ PCHAR MissingApiName, Buffer; PWCHAR MissingDriverName; - *ModuleObject = NULL; + if (ModuleObject) *ModuleObject = NULL; + if (ImageBaseAddress) *ImageBaseAddress = NULL; DPRINT("Loading Module %wZ...\n", FileName); @@ -507,7 +511,8 @@ /* Cleanup */ ExFreePool(ModuleLoadBase); - *ModuleObject = Module; + if (ModuleObject) *ModuleObject = Module; + if (ImageBaseAddress) *ImageBaseAddress = Module->DllBase; /* Hook for KDB on loading a driver. */ KDB_LOADDRIVER_HOOK(FileName, Module); 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 21:30:50 2007 @@ -484,7 +484,12 @@ DllName.Buffer[(DllName.MaximumLength - 1) / 2] = UNICODE_NULL; /* Load the image */ - Status = LdrLoadModule(&DllName, &DllEntry); + Status = MmLoadSystemImage(&DllName, + NamePrefix, + NULL, + 0, + (PVOID)&DllEntry, + &DllBase); if (NT_SUCCESS(Status)) { /* We can free the DLL Name */ @@ -511,8 +516,7 @@ /* We're now loaded */ Loaded = TRUE; - /* Get the base address and other information */ - DllBase = DllEntry->DllBase; + /* Sanity check */ ASSERT(DllBase = DllEntry->DllBase); /* Call the initialization routines */

1 0

[ion] 25874: - Improve LdrGetModuleObject (in FreeLDR) to handle partial names too, so NTOSKRNL will still match NTOSKRNL.EXE. This is needed for forwarder support. - Implement LdrPEFixupForward in FreeLDR and update LdrPEGetExportByName to use it, so that FreeLDR can now parse import tables with forwarders. - Add call to MmInitSystem for Phase 0 in ExpInitializeExecutive. - Completely redesign the way boot drivers are handled. They're now re-mapped during Phase 0 MmInit (part of the re-mapping
by ion＠svn.reactos.org 22 Feb '07

22 Feb '07

Author: ion Date: Thu Feb 22 21:02:53 2007 New Revision: 25874 URL: http://svn.reactos.org/svn/reactos?rev=25874&view=rev Log: - Improve LdrGetModuleObject (in FreeLDR) to handle partial names too, so NTOSKRNL will still match NTOSKRNL.EXE. This is needed for forwarder support. - Implement LdrPEFixupForward in FreeLDR and update LdrPEGetExportByName to use it, so that FreeLDR can now parse import tables with forwarders. - Add call to MmInitSystem for Phase 0 in ExpInitializeExecutive. - Completely redesign the way boot drivers are handled. They're now re-mapped during Phase 0 MmInit (part of the re-mapping is a hack until FreeLDR 2.5 is ready) and the IoMgr only does I/O stuff, not PE loading anymore (this is only half-true, we still process imports until FreeLDR 2.5 is done). - Also re-design the way the module list head is initialized and used. LdrInit1 is now gone, Phase 0 MmInit now handles initializing it and copying boot loader data to it. - Some code is still missing and functions still need to be improved. - When FreeLDR 2.5 is ready some of the hacks will go away, they're #ifed for now to make it easy to switch. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ldr/loader.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Thu Feb 22 21:02:53 2007 @@ -127,6 +127,12 @@ IN INT nPos, IN BOOLEAN IsKernel); +PVOID +NTAPI +LdrPEGetExportByName(PVOID BaseAddress, + PUCHAR SymbolName, + USHORT Hint); + /* FUNCTIONS *****************************************************************/ /*++ @@ -300,6 +306,46 @@ PageDir->Pde[0].PageFrameNumber = 1; } +PLOADER_MODULE +NTAPI +LdrGetModuleObject(PCHAR ModuleName) +{ + ULONG i; + + for (i = 0; i < LoaderBlock.ModsCount; i++) + { + if (strstr(_strupr((PCHAR)reactos_modules[i].String), _strupr(ModuleName))) + { + return &reactos_modules[i]; + } + } + + return NULL; +} + +PVOID +NTAPI +LdrPEFixupForward(IN PCHAR ForwardName) +{ + CHAR NameBuffer[128]; + PCHAR p; + PLOADER_MODULE ModuleObject; + + strcpy(NameBuffer, ForwardName); + p = strchr(NameBuffer, '.'); + if (p == NULL) return NULL; + *p = 0; + + ModuleObject = LdrGetModuleObject(NameBuffer); + if (!ModuleObject) + { + DbgPrint("LdrPEFixupForward: failed to find module %s\n", NameBuffer); + return NULL; + } + + return LdrPEGetExportByName((PVOID)ModuleObject->ModStart, (PUCHAR)(p + 1), 0xffff); +} + PVOID NTAPI LdrPEGetExportByName(PVOID BaseAddress, @@ -360,10 +406,10 @@ if ((ULONG_PTR)Function >= (ULONG_PTR)ExportDir && (ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize) { - Function = NULL; + Function = LdrPEFixupForward((PCHAR)Function); if (Function == NULL) { - DbgPrint("LdrPEGetExportByName(): failed to find %s\n",SymbolName); + DbgPrint("LdrPEGetExportByName(): failed to find %s\n", Function); } return Function; } @@ -390,10 +436,10 @@ if ((ULONG_PTR)Function >= (ULONG_PTR)ExportDir && (ULONG_PTR)Function < (ULONG_PTR)ExportDir + ExportDirSize) { - Function = NULL; + Function = LdrPEFixupForward((PCHAR)Function); if (Function == NULL) { - DbgPrint("LdrPEGetExportByName(): failed to find %s\n",SymbolName); + DbgPrint("1: failed to find %s\n", Function); } return Function; } @@ -413,7 +459,7 @@ } ExName = RVA(BaseAddress, ExNames[mid]); - DbgPrint("LdrPEGetExportByName(): failed to find %s\n",SymbolName); + DbgPrint("2: failed to find %s\n",SymbolName); return (PVOID)NULL; } @@ -472,23 +518,6 @@ FunctionNameList++; } return STATUS_SUCCESS; -} - -PLOADER_MODULE -NTAPI -LdrGetModuleObject(PCHAR ModuleName) -{ - ULONG i; - - for (i = 0; i < LoaderBlock.ModsCount; i++) - { - if (!_stricmp((PCHAR)reactos_modules[i].String, ModuleName)) - { - return &reactos_modules[i]; - } - } - - return NULL; } NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=258… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Feb 22 21:02:53 2007 @@ -896,6 +896,9 @@ /* Initialize the executive at phase 0 */ if (!ExInitSystem()) KEBUGCHECK(PHASE0_INITIALIZATION_FAILED); + /* Initialize the memory manager at phase 0 */ + if (!MmInitSystem(0, LoaderBlock)) KeBugCheck(MEMORY1_INITIALIZATION_FAILED); + /* Load boot symbols */ ExpLoadBootSymbols(LoaderBlock); Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Thu Feb 22 21:02:53 2007 @@ -20,6 +20,7 @@ ULONG ExpAnsiCodePageDataOffset, ExpOemCodePageDataOffset; ULONG ExpUnicodeCaseTableDataOffset; PVOID ExpNlsSectionPointer; +extern ULONG ExpInitializationPhase; typedef struct _EXHANDLE { 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 Thu Feb 22 21:02:53 2007 @@ -1429,4 +1429,17 @@ OUT PULONG ResultLength ); +VOID +NTAPI +MiReloadBootLoadedDrivers( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +BOOLEAN +NTAPI +MiInitializeLoadedModuleList( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + + #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 Thu Feb 22 21:02:53 2007 @@ -34,10 +34,10 @@ /* DECLARATIONS ***************************************************************/ NTSTATUS -LdrProcessModule( - PVOID ModuleLoadBase, - PUNICODE_STRING ModuleName, - PLDR_DATA_TABLE_ENTRY *ModuleObject +NTAPI +LdrTemporaryDriverHack( + PLDR_DATA_TABLE_ENTRY ModuleObject, + PUNICODE_STRING ModuleName ); /* PRIVATE FUNCTIONS **********************************************************/ @@ -452,66 +452,6 @@ /* FIXME: Check if it is the right status code */ Status = STATUS_PLUGPLAY_NO_DEVICE; } - - /* - * Special case for boot modules that were loaded by boot loader. - */ - - else if (KeLoaderBlock) - { - WCHAR SearchNameBuffer[256]; - UNICODE_STRING SearchName; - PLIST_ENTRY ListHead, NextEntry; - PLDR_DATA_TABLE_ENTRY LdrEntry; - - Status = STATUS_UNSUCCESSFUL; - - /* - * FIXME: - * Improve this searching algorithm by using the image name - * stored in registry entry ImageName and use the whole path - * (requires change in FreeLoader). - */ - swprintf(SearchNameBuffer, L"%wZ.sys", ServiceName); - RtlInitUnicodeString(&SearchName, SearchNameBuffer); - - /* Loop the boot modules */ - ListHead = &KeLoaderBlock->LoadOrderListHead; - NextEntry = ListHead->Flink->Flink; - while (ListHead != NextEntry) - { - /* Get the entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - /* Compare names */ - if (RtlEqualUnicodeString(&LdrEntry->BaseDllName, &SearchName, TRUE)) - { - /* Tell, that the module is already loaded */ - LdrEntry->Flags |= LDRP_ENTRY_INSERTED; - - Status = LdrProcessModule(LdrEntry->DllBase, - &ServiceImagePath, - ModuleObject); - - KDB_SYMBOLFILE_HOOK(&SearchName); - break; - } - - /* Go to the next driver */ - NextEntry = NextEntry->Flink; - } - - if (!NT_SUCCESS(Status)) - /* Try to load it. It may just have been installed by PnP manager */ - Status = LdrLoadModule(&ServiceImagePath, ModuleObject); - } - - /* - * Case for rest of the drivers - */ - else { DPRINT("Loading module\n"); @@ -805,28 +745,116 @@ return STATUS_SUCCESS; } +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); + +extern KSPIN_LOCK PsLoadedModuleSpinLock; + +// +// Used for images already loaded (boot drivers) +// +NTSTATUS +NTAPI +LdrProcessDriverModule(PLDR_DATA_TABLE_ENTRY LdrEntry, + PUNICODE_STRING FileName, + PLDR_DATA_TABLE_ENTRY *ModuleObject) +{ + NTSTATUS Status; + PLDR_DATA_TABLE_ENTRY NewEntry; + UNICODE_STRING BaseName, BaseDirectory; + PLOAD_IMPORTS LoadedImports = (PVOID)-2; + PCHAR MissingApiName, Buffer; + PWCHAR MissingDriverName; + PVOID DriverBase = LdrEntry->DllBase; + + /* 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; + + NewEntry = LdrEntry; + + /* 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 */ + *ModuleObject = LdrEntry; + return STATUS_SUCCESS; +} + /* * IopInitializeBuiltinDriver * * Initialize a driver that is already loaded in memory. */ -NTSTATUS FASTCALL INIT_FUNCTION -IopInitializeBuiltinDriver( - PDEVICE_NODE ModuleDeviceNode, - PVOID ModuleLoadBase, - PUNICODE_STRING ModuleName, - ULONG ModuleLength) -{ - PLDR_DATA_TABLE_ENTRY ModuleObject; - PDEVICE_NODE DeviceNode; - PDRIVER_OBJECT DriverObject; - NTSTATUS Status; - PWCHAR FileNameWithoutPath; - LPWSTR FileExtension; - - DPRINT("Initializing driver '%wZ' at %08lx, length 0x%08lx\n", - ModuleName, ModuleLoadBase, ModuleLength); +NTSTATUS +NTAPI +IopInitializeBuiltinDriver(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PDEVICE_NODE DeviceNode; + PDRIVER_OBJECT DriverObject; + NTSTATUS Status; + PWCHAR FileNameWithoutPath; + LPWSTR FileExtension; + PUNICODE_STRING ModuleName = &LdrEntry->BaseDllName; + PLDR_DATA_TABLE_ENTRY ModuleObject; + /* * Display 'Loading XXX...' message @@ -836,9 +864,6 @@ /* * Determine the right device object */ - - if (ModuleDeviceNode == NULL) - { /* Use IopRootDeviceNode for now */ Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); if (!NT_SUCCESS(Status)) @@ -846,15 +871,11 @@ CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return(Status); } - } else - { - DeviceNode = ModuleDeviceNode; - } + /* * Generate filename without path (not needed by freeldr) */ - FileNameWithoutPath = wcsrchr(ModuleName->Buffer, L'\\'); if (FileNameWithoutPath == NULL) { @@ -866,17 +887,15 @@ } /* - * Load the module + * Load the module. Remove for FreeLDR 2.5. */ RtlCreateUnicodeString(&DeviceNode->ServiceName, FileNameWithoutPath); - Status = LdrProcessModule(ModuleLoadBase, &DeviceNode->ServiceName, - &ModuleObject); + Status = LdrProcessDriverModule(LdrEntry, &DeviceNode->ServiceName, &ModuleObject); if (!NT_SUCCESS(Status)) { - if (ModuleDeviceNode == NULL) - IopFreeDeviceNode(DeviceNode); - CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); - return Status; + IopFreeDeviceNode(DeviceNode); + CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); + return Status; } /* Load symbols */ @@ -885,7 +904,6 @@ /* * Strip the file extension from ServiceName */ - FileExtension = wcsrchr(DeviceNode->ServiceName.Buffer, '.'); if (FileExtension != NULL) { @@ -896,13 +914,11 @@ /* * Initialize the driver */ - Status = IopInitializeDriverModule(DeviceNode, ModuleObject, &DeviceNode->ServiceName, FALSE, &DriverObject); if (!NT_SUCCESS(Status)) { - if (ModuleDeviceNode == NULL) IopFreeDeviceNode(DeviceNode); CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; @@ -1005,31 +1021,9 @@ if (!(LdrEntry->Flags & LDRP_ENTRY_INSERTED)) { /* Initialize it */ - IopInitializeBuiltinDriver(NULL, - LdrEntry->DllBase, - &LdrEntry->BaseDllName, - LdrEntry->SizeOfImage); + IopInitializeBuiltinDriver(LdrEntry); } } - - /* Go to the next driver */ - NextEntry = NextEntry->Flink; - } - - /* Loop modules again */ - NextEntry = ListHead->Flink; - while (ListHead != NextEntry) - { - /* Get the entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - /* Free memory */ - DPRINT("Driver at: %p ending at: %p for module: %wZ\n", - LdrEntry->DllBase, - (ULONG_PTR)LdrEntry->DllBase+ LdrEntry->SizeOfImage, - &LdrEntry->FullDllName); /* Go to the next driver */ NextEntry = NextEntry->Flink; Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Thu Feb 22 21:02:53 2007 @@ -533,9 +533,6 @@ 0, 4096); - /* Sets up the Text Sections of the Kernel and HAL for debugging */ - LdrInit1(); - /* Set the NX Support policy */ SharedUserData->NXSupportPolicy = (UCHAR)NXSupportPolicy; 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 21:02:53 2007 @@ -17,13 +17,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -/* GLOBALS *******************************************************************/ - -LIST_ENTRY PsLoadedModuleList; -KSPIN_LOCK ModuleListLock; -LDR_DATA_TABLE_ENTRY NtoskrnlModuleObject; -LDR_DATA_TABLE_ENTRY HalModuleObject; /* FUNCTIONS *****************************************************************/ @@ -105,52 +98,7 @@ return(0); } -VOID -INIT_FUNCTION -NTAPI -LdrInit1(VOID) -{ - PLDR_DATA_TABLE_ENTRY HalModuleObject, NtoskrnlModuleObject, LdrEntry; - - /* Initialize the module list and spinlock */ - InitializeListHead(&PsLoadedModuleList); - KeInitializeSpinLock(&ModuleListLock); - - /* Get the NTOSKRNL Entry from the loader */ - LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - /* Initialize ModuleObject for NTOSKRNL */ - NtoskrnlModuleObject = ExAllocatePoolWithTag(PagedPool, - sizeof(LDR_DATA_TABLE_ENTRY), - TAG('M', 'm', 'L', 'd')); - NtoskrnlModuleObject->DllBase = LdrEntry->DllBase; - RtlInitUnicodeString(&NtoskrnlModuleObject->FullDllName, KERNEL_MODULE_NAME); - NtoskrnlModuleObject->BaseDllName = NtoskrnlModuleObject->FullDllName; - NtoskrnlModuleObject->EntryPoint = LdrEntry->EntryPoint; - NtoskrnlModuleObject->SizeOfImage = LdrEntry->SizeOfImage; - - /* Insert it into the list */ - InsertTailList(&PsLoadedModuleList, &NtoskrnlModuleObject->InLoadOrderLinks); - - /* Get the HAL Entry from the loader */ - LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink->Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - /* Initialize ModuleObject for HAL */ - HalModuleObject = ExAllocatePoolWithTag(PagedPool, - sizeof(LDR_DATA_TABLE_ENTRY), - TAG('M', 'm', 'L', 'd')); - HalModuleObject->DllBase = LdrEntry->DllBase; - RtlInitUnicodeString(&HalModuleObject->FullDllName, HAL_MODULE_NAME); - HalModuleObject->BaseDllName = HalModuleObject->FullDllName; - HalModuleObject->EntryPoint = LdrEntry->EntryPoint; - HalModuleObject->SizeOfImage = LdrEntry->SizeOfImage; - - /* Insert it into the list */ - InsertTailList(&PsLoadedModuleList, &HalModuleObject->InLoadOrderLinks); - - /* Hook for KDB on initialization of the loader. */ - KDB_LOADERINIT_HOOK(NtoskrnlModuleObject, HalModuleObject); -} +extern KSPIN_LOCK PsLoadedModuleSpinLock; // // Used for checking if a module is already in the module list. @@ -166,7 +114,7 @@ DPRINT("LdrGetModuleObject(%wZ) called\n", ModuleName); - KeAcquireSpinLock(&ModuleListLock,&Irql); + KeAcquireSpinLock(&PsLoadedModuleSpinLock,&Irql); Entry = PsLoadedModuleList.Flink; while (Entry != &PsLoadedModuleList) @@ -180,14 +128,14 @@ if (!LdrpCompareModuleNames(&Module->BaseDllName, ModuleName)) { DPRINT("Module %wZ\n", &Module->BaseDllName); - KeReleaseSpinLock(&ModuleListLock, Irql); + KeReleaseSpinLock(&PsLoadedModuleSpinLock, Irql); return(Module); } Entry = Entry->Flink; } - KeReleaseSpinLock(&ModuleListLock, Irql); + KeReleaseSpinLock(&PsLoadedModuleSpinLock, Irql); DPRINT("Could not find module '%wZ'\n", ModuleName); @@ -204,9 +152,9 @@ KIRQL Irql; /* Remove the module from the module list */ - KeAcquireSpinLock(&ModuleListLock,&Irql); + KeAcquireSpinLock(&PsLoadedModuleSpinLock,&Irql); RemoveEntryList(&ModuleObject->InLoadOrderLinks); - KeReleaseSpinLock(&ModuleListLock, Irql); + KeReleaseSpinLock(&PsLoadedModuleSpinLock, Irql); /* Hook for KDB on unloading a driver. */ KDB_UNLOADDRIVER_HOOK(ModuleObject); @@ -221,29 +169,104 @@ } // -// Used for images already loaded (boot drivers) +// Used by NtLoadDriver/IoMgr // NTSTATUS -LdrProcessModule(PVOID ModuleLoadBase, - PUNICODE_STRING FileName, - PLDR_DATA_TABLE_ENTRY *ModuleObject) +NTAPI +LdrLoadModule( + PUNICODE_STRING FileName, + PLDR_DATA_TABLE_ENTRY *ModuleObject ) { + 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; - NTSTATUS Status; KIRQL Irql; PIMAGE_NT_HEADERS NtHeader; UNICODE_STRING BaseName, BaseDirectory, PrefixName; PLDR_DATA_TABLE_ENTRY LdrEntry; ULONG EntrySize; PLOAD_IMPORTS LoadedImports = (PVOID)-2; - PWSTR NameBuffer; PCHAR MissingApiName, Buffer; PWCHAR MissingDriverName; + + *ModuleObject = NULL; + + DPRINT("Loading Module %wZ...\n", FileName); + + /* 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); @@ -414,9 +437,6 @@ LdrEntry->Flags |= 0x80000000; } - /* We'll put the name after the entry */ - NameBuffer = (PVOID)(LdrEntry + 1); - /* Setup the rest of the entry */ LdrEntry->DllBase = DriverBase; LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)DriverBase + @@ -426,7 +446,7 @@ LdrEntry->SectionPointer = LdrEntry; /* Now write the DLL name */ - LdrEntry->BaseDllName.Buffer = NameBuffer; + LdrEntry->BaseDllName.Buffer = (PVOID)(LdrEntry + 1); LdrEntry->BaseDllName.Length = BaseName.Length; LdrEntry->BaseDllName.MaximumLength = BaseName.Length; @@ -461,9 +481,9 @@ } /* Insert the entry */ - KeAcquireSpinLock(&ModuleListLock, &Irql); + KeAcquireSpinLock(&PsLoadedModuleSpinLock, &Irql); InsertTailList(&PsLoadedModuleList, &LdrEntry->InLoadOrderLinks); - KeReleaseSpinLock(&ModuleListLock, Irql); + KeReleaseSpinLock(&PsLoadedModuleSpinLock, Irql); /* Resolve imports */ MissingApiName = Buffer; @@ -482,105 +502,7 @@ } /* Return */ - *ModuleObject = LdrEntry; - return STATUS_SUCCESS; -} - -// -// Used by NtLoadDriver/IoMgr -// -NTSTATUS -NTAPI -LdrLoadModule( - PUNICODE_STRING Filename, - PLDR_DATA_TABLE_ENTRY *ModuleObject ) -{ - PVOID ModuleLoadBase; - NTSTATUS Status; - HANDLE FileHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - PLDR_DATA_TABLE_ENTRY Module; - FILE_STANDARD_INFORMATION FileStdInfo; - IO_STATUS_BLOCK IoStatusBlock; - - *ModuleObject = NULL; - - DPRINT("Loading Module %wZ...\n", Filename); - - /* 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); - - Status = LdrProcessModule(ModuleLoadBase, - Filename, - &Module); - if (!NT_SUCCESS(Status)) - { - DPRINT("Could not process module\n"); - ExFreePool(ModuleLoadBase); - return(Status); - } + Module = LdrEntry; /* Cleanup */ ExFreePool(ModuleLoadBase); @@ -588,7 +510,7 @@ *ModuleObject = Module; /* Hook for KDB on loading a driver. */ - KDB_LOADDRIVER_HOOK(Filename, Module); + KDB_LOADDRIVER_HOOK(FileName, Module); return(STATUS_SUCCESS); } 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 21:02:53 2007 @@ -459,7 +459,18 @@ MmInitSystem(IN ULONG Phase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - if (Phase == 1) + if (Phase == 0) + { + /* Reload boot drivers */ + MiReloadBootLoadedDrivers(LoaderBlock); + + /* Initialize the loaded module list */ + MiInitializeLoadedModuleList(LoaderBlock); + + /* We're done, for now */ + DPRINT("Mm0: COMPLETE\n"); + } + else if (Phase == 1) { MmInitializeRmapList(); RmapReady = TRUE; 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 21:02:53 2007 @@ -12,7 +12,77 @@ #define NDEBUG #include <debug.h> +/* GLOBALS *******************************************************************/ + +LIST_ENTRY PsLoadedModuleList; +KSPIN_LOCK PsLoadedModuleSpinLock; +PVOID PsNtosImageBase; + /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +MiUpdateThunks(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PVOID OldBase, + IN PVOID NewBase, + IN ULONG Size) +{ + ULONG_PTR OldBaseTop, Delta; + PLDR_DATA_TABLE_ENTRY LdrEntry; + PLIST_ENTRY NextEntry; + ULONG ImportSize; + PIMAGE_IMPORT_DESCRIPTOR ImportDescriptor; + PULONG ImageThunk; + + /* Calculate the top and delta */ + OldBaseTop = (ULONG_PTR)OldBase + Size - 1; + Delta = (ULONG_PTR)NewBase - (ULONG_PTR)OldBase; + + /* Loop the loader block */ + for (NextEntry = LoaderBlock->LoadOrderListHead.Flink; + NextEntry != &LoaderBlock->LoadOrderListHead; + NextEntry = NextEntry->Flink) + { + /* Get the loader entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Get the import table */ + ImportDescriptor = RtlImageDirectoryEntryToData(LdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_IMPORT, + &ImportSize); + if (!ImportDescriptor) continue; + + /* Make sure we have an IAT */ + DPRINT("[Mm0]: Updating thunks in: %wZ\n", &LdrEntry->BaseDllName); + while ((ImportDescriptor->Name) && + (ImportDescriptor->OriginalFirstThunk)) + { + /* Get the image thunk */ + ImageThunk = (PVOID)((ULONG_PTR)LdrEntry->DllBase + + ImportDescriptor->FirstThunk); + while (*ImageThunk) + { + /* Check if it's within this module */ + if ((*ImageThunk >= (ULONG_PTR)OldBase) && (*ImageThunk <= OldBaseTop)) + { + /* Relocate it */ + DPRINT("[Mm0]: Updating IAT at: %p. Old Entry: %p. New Entry: %p.\n", + ImageThunk, *ImageThunk, *ImageThunk + Delta); + *ImageThunk += Delta; + } + + /* Go to the next thunk */ + ImageThunk++; + } + + /* Go to the next import */ + ImportDescriptor++; + } + } +} NTSTATUS NTAPI @@ -584,3 +654,259 @@ return STATUS_SUCCESS; } +VOID +NTAPI +MiReloadBootLoadedDrivers(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextEntry; + ULONG i = 0; + PIMAGE_NT_HEADERS NtHeader; + PLDR_DATA_TABLE_ENTRY LdrEntry; + PIMAGE_FILE_HEADER FileHeader; + BOOLEAN ValidRelocs; + PIMAGE_DATA_DIRECTORY DataDirectory; + PVOID DllBase, NewImageAddress; + NTSTATUS Status; + ULONG DriverSize = 0, Size; + PIMAGE_SECTION_HEADER Section; + + /* Loop driver list */ + for (NextEntry = LoaderBlock->LoadOrderListHead.Flink; + NextEntry != &LoaderBlock->LoadOrderListHead; + NextEntry = NextEntry->Flink) + { + /* Get the loader entry and NT header */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + NtHeader = RtlImageNtHeader(LdrEntry->DllBase); + + /* Debug info */ + DPRINT("[Mm0]: Driver at: %p ending at: %p for module: %wZ\n", + LdrEntry->DllBase, + (ULONG_PTR)LdrEntry->DllBase+ LdrEntry->SizeOfImage, + &LdrEntry->FullDllName); + + /* Skip kernel and HAL */ + /* ROS HACK: Skip BOOTVID/KDCOM too */ + i++; + if (i <= 4) continue; + + /* Skip non-drivers */ + if (!NtHeader) continue; + +#if 1 // Disable for FreeLDR 2.5 + /* Get header pointers */ + Section = 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 (!(Section[i].Characteristics & IMAGE_SCN_TYPE_NOLOAD)) + { + /* Add the size of this section into the total size */ + Size = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; + DriverSize = max(DriverSize, Size); + } + } + + /* Round up the driver size to section alignment */ + DriverSize = ROUND_UP(DriverSize, NtHeader->OptionalHeader.SectionAlignment); +#endif + + /* Get the file header and make sure we can relocate */ + FileHeader = &NtHeader->FileHeader; + if (FileHeader->Characteristics & IMAGE_FILE_RELOCS_STRIPPED) continue; + if (NtHeader->OptionalHeader.NumberOfRvaAndSizes < + IMAGE_DIRECTORY_ENTRY_BASERELOC) continue; + + /* Everything made sense until now, check the relocation section too */ + DataDirectory = &NtHeader->OptionalHeader. + DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + if (!DataDirectory->VirtualAddress) + { + /* We don't really have relocations */ + ValidRelocs = FALSE; + } + else + { + /* Make sure the size is valid */ + if ((DataDirectory->VirtualAddress + DataDirectory->Size) > + LdrEntry->SizeOfImage) + { + /* They're not, skip */ + continue; + } + + /* We have relocations */ + ValidRelocs = TRUE; + } + + /* Remember the original address */ + DllBase = LdrEntry->DllBase; + + /* Allocate a virtual section for the module */ + NewImageAddress = MmAllocateSection(DriverSize, NULL); + if (!NewImageAddress) + { + /* Shouldn't happen */ + DPRINT1("[Mm0]: Couldn't allocate driver section!\n"); + while (TRUE); + } + + /* Sanity check */ + DPRINT("[Mm0]: Copying from: %p to: %p\n", DllBase, NewImageAddress); + ASSERT(ExpInitializationPhase == 0); + +#if 0 // Enable for FreeLDR 2.5 + /* Now copy the entire driver over */ + RtlCopyMemory(NewImageAddress, DllBase, DriverSize); +#else + /* Copy headers over */ + RtlCopyMemory(NewImageAddress, + DllBase, + 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 = Section[i].VirtualAddress + Section[i].Misc.VirtualSize; + if ((Size <= DriverSize) && (Section[i].SizeOfRawData)) + { + /* Copy the data from the disk to the image */ + RtlCopyMemory((PVOID)((ULONG_PTR)NewImageAddress + + Section[i].VirtualAddress), + (PVOID)((ULONG_PTR)DllBase + + Section[i].PointerToRawData), + Section[i].Misc.VirtualSize > + Section[i].SizeOfRawData ? + Section[i].SizeOfRawData : + Section[i].Misc.VirtualSize); + } + } +#endif + + /* Sanity check */ + ASSERT(*(PULONG)NewImageAddress == *(PULONG)DllBase); + + /* Set the image base to the old address */ + NtHeader->OptionalHeader.ImageBase = (ULONG_PTR)DllBase; + + /* Check if we had relocations */ + if (ValidRelocs) + { + /* Relocate the image */ + Status = LdrRelocateImageWithBias(NewImageAddress, + 0, + "SYSLDR", + STATUS_SUCCESS, + STATUS_CONFLICTING_ADDRESSES, + STATUS_INVALID_IMAGE_FORMAT); + if (!NT_SUCCESS(Status)) + { + /* This shouldn't happen */ + DPRINT1("Relocations failed!\n"); + while (TRUE); + } + } + + /* Update the loader entry */ + LdrEntry->DllBase = NewImageAddress; + + /* Update the thunks */ + DPRINT("[Mm0]: Updating thunks to: %wZ\n", &LdrEntry->BaseDllName); + MiUpdateThunks(LoaderBlock, + DllBase, + NewImageAddress, + LdrEntry->SizeOfImage); + + /* Update the loader entry */ + LdrEntry->Flags |= 0x01000000; + LdrEntry->EntryPoint = (PVOID)((ULONG_PTR)NewImageAddress + + NtHeader->OptionalHeader.AddressOfEntryPoint); + LdrEntry->SizeOfImage = DriverSize; + } +} + +BOOLEAN +NTAPI +MiInitializeLoadedModuleList(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLDR_DATA_TABLE_ENTRY LdrEntry, NewEntry; + PLIST_ENTRY ListHead, NextEntry; + ULONG EntrySize; + + /* Setup the loaded module list and lock */ + KeInitializeSpinLock(&PsLoadedModuleSpinLock); + InitializeListHead(&PsLoadedModuleList); + + /* Get loop variables and the kernel entry */ + ListHead = &LoaderBlock->LoadOrderListHead; + NextEntry = ListHead->Flink; + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + PsNtosImageBase = LdrEntry->DllBase; + + /* Loop the loader block */ + while (NextEntry != ListHead) + { + /* Get the loader entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* FIXME: ROS HACK. Make sure this is a driver */ + if (!RtlImageNtHeader(LdrEntry->DllBase)) + { + /* Skip this entry */ + NextEntry= NextEntry->Flink; + continue; + } + + /* Calculate the size we'll need and allocate a copy */ + EntrySize = sizeof(LDR_DATA_TABLE_ENTRY) + + LdrEntry->BaseDllName.MaximumLength + + sizeof(UNICODE_NULL); + NewEntry = ExAllocatePoolWithTag(NonPagedPool, EntrySize, TAG_LDR_WSTR); + if (!NewEntry) return FALSE; + + /* Copy the entry over */ + *NewEntry = *LdrEntry; + + /* Allocate the name */ + NewEntry->FullDllName.Buffer = + ExAllocatePoolWithTag(PagedPool, + LdrEntry->FullDllName.MaximumLength + + sizeof(UNICODE_NULL), + TAG_LDR_WSTR); + if (!NewEntry->FullDllName.Buffer) return FALSE; + + /* Set the base name */ + NewEntry->BaseDllName.Buffer = (PVOID)(NewEntry + 1); + + /* Copy the full and base name */ + RtlCopyMemory(NewEntry->FullDllName.Buffer, + LdrEntry->FullDllName.Buffer, + LdrEntry->FullDllName.MaximumLength); + RtlCopyMemory(NewEntry->BaseDllName.Buffer, + LdrEntry->BaseDllName.Buffer, + LdrEntry->BaseDllName.MaximumLength); + + /* Null-terminate the base name */ + NewEntry->BaseDllName.Buffer[NewEntry->BaseDllName.Length / + sizeof(WCHAR)] = UNICODE_NULL; + + /* Insert the entry into the list */ + InsertTailList(&PsLoadedModuleList, &NewEntry->InLoadOrderLinks); + NextEntry = NextEntry->Flink; + } + + /* Build the import lists for the boot drivers */ + //MiBuildImportsForBootDrivers(); + + /* We're done */ + return TRUE; +}

1 0

[hpoussin] 25873: Fix build with gcc 4.1.2
by hpoussin＠svn.reactos.org 22 Feb '07

22 Feb '07

Author: hpoussin Date: Thu Feb 22 03:14:20 2007 New Revision: 25873 URL: http://svn.reactos.org/svn/reactos?rev=25873&view=rev Log: Fix build with gcc 4.1.2 Modified: branches/alex-kd-branch/reactos/hal/hal/hal.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c Modified: branches/alex-kd-branch/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/hal/hal/… ============================================================================== --- branches/alex-kd-branch/reactos/hal/hal/hal.c (original) +++ branches/alex-kd-branch/reactos/hal/hal/hal.c Thu Feb 22 03:14:20 2007 @@ -17,7 +17,6 @@ #include <ndk/halfuncs.h> #include <ndk/iofuncs.h> #include <ndk/kdfuncs.h> -#include <internal/kd.h> #define NDEBUG #include <debug.h> Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c Thu Feb 22 03:14:20 2007 @@ -1093,7 +1093,7 @@ NTAPI KdEnableDebuggerWithLock(BOOLEAN NeedLock) { - KIRQL OldIrql; + KIRQL OldIrql = PASSIVE_LEVEL; /* Check if we need to acquire the lock */ if (NeedLock)

1 0

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

22 Feb '07

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

1 0

[greatlrd] 25871: merge r25870 it take care of unexpect crash in NtGdiDdCreateDirectDrawObject for it using seh now
by greatlrd＠svn.reactos.org 21 Feb '07

21 Feb '07

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

1 0

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

21 Feb '07

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

1 0

[tkreuzer] 25869: Silence some warnings
by tkreuzer＠svn.reactos.org 21 Feb '07

21 Feb '07

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

1 0

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

21 Feb '07

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

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