Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 18858: Setup the hal startup process some bit. We still does not insate hal right yet.
by greatlrd＠svn.reactos.com 29 Oct '05

29 Oct '05

Setup the hal startup process some bit. We still does not insate hal right yet. Modified: trunk/reactos/lib/ddraw/hal/ddraw.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw.c --- trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 21:07:04 UTC (rev 18857) +++ trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 21:20:50 UTC (rev 18858) @@ -140,9 +140,7 @@ DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); DriverInfo.dwContext = This->DirectDrawGlobal.hDD; - - /* Get ColorControlCallbacks */ DriverInfo.guidInfo = GUID_ColorControlCallbacks; DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDColorControl; @@ -160,20 +158,20 @@ This->HalInfo.GetDriverInfo( &DriverInfo);*/ /* Get the D3DCallbacks2 */ - /* do we need alloc memmory for This->DirectDrawGlobal.lpD3DHALCallbacks2 */ + This->DirectDrawGlobal.lpD3DHALCallbacks2 = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_CALLBACKS2)); DriverInfo.guidInfo = GUID_D3DCallbacks2; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpD3DHALCallbacks2; + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks2; DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS2); This->HalInfo.GetDriverInfo( &DriverInfo); /* Get the D3DCallbacks3 */ - /* + This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_CALLBACKS3)); DriverInfo.guidInfo = GUID_D3DCallbacks3; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks; + DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS3); This->HalInfo.GetDriverInfo( &DriverInfo); - */ + /* Get the misc callback */ /* Problem with include files @@ -184,12 +182,13 @@ */ /* Get the D3DExtendedCaps */ - /* + + This->DirectDrawGlobal.lpD3DExtendedCaps = (ULONG_PTR)HeapAlloc(GetProcessHeap(), 0, sizeof(D3DHAL_D3DEXTENDEDCAPS)); DriverInfo.guidInfo = GUID_D3DExtendedCaps; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpD3DExtendedCaps; + DriverInfo.dwExpectedSize = sizeof(D3DHAL_D3DEXTENDEDCAPS); This->HalInfo.GetDriverInfo( &DriverInfo); - */ + /* Get the D3DParseUnknownCommandCallback */ /* @@ -215,9 +214,9 @@ /* Get the KernelCaps */ - /* Need Alloc memmory for lpDDKernelCaps ?? */ + This->DirectDrawGlobal.lpDDKernelCaps = (LPDDKERNELCAPS)HeapAlloc(GetProcessHeap(), 0, sizeof(DDHAL_DDKERNELCALLBACKS)); DriverInfo.guidInfo = GUID_KernelCaps; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDKernelCaps; + DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpDDKernelCaps; DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); This->HalInfo.GetDriverInfo( &DriverInfo);

1 0

[mbosma] 18857: Improve macro for stubs inside of ddraw. Thx to w3seek.
by mbosma＠svn.reactos.com 29 Oct '05

29 Oct '05

Improve macro for stubs inside of ddraw. Thx to w3seek. Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-29 20:08:49 UTC (rev 18856) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-29 21:07:04 UTC (rev 18857) @@ -93,6 +93,15 @@ /*********** Macros ***********/ -#define DX_STUB return DDERR_UNSUPPORTED; +#define DX_STUB \ + static BOOL firstcall = TRUE; \ + if (firstcall) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Function %s is not implemented yet (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ + OutputDebugStringA(buffer); \ + firstcall = FALSE; \ + } \ + return DDERR_UNSUPPORTED; #endif /* __DDRAW_PRIVATE */

1 0

[greatlrd] 18856: sorry forget This->DirectDrawGlobal
by greatlrd＠svn.reactos.com 29 Oct '05

29 Oct '05

sorry forget This->DirectDrawGlobal Modified: trunk/reactos/lib/ddraw/hal/ddraw.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw.c --- trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 20:06:23 UTC (rev 18855) +++ trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 20:08:49 UTC (rev 18856) @@ -138,7 +138,7 @@ DDHAL_GETDRIVERINFODATA DriverInfo; memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); - DriverInfo.dwContext = DirectDrawGlobal.hDD; + DriverInfo.dwContext = This->DirectDrawGlobal.hDD;

1 0

[greatlrd] 18855: Do not trust msdn what it say about dwContext in any struct "MSDN : it is not in use for windows nt", "My note: it is in use for all os, and it always point to DDRAWI_DIRECTDRAW_GBL.hDD and we doing that. now the callbacks works in startup process.
by greatlrd＠svn.reactos.com 29 Oct '05

29 Oct '05

Do not trust msdn what it say about dwContext in any struct "MSDN : it is not in use for windows nt", "My note: it is in use for all os, and it always point to DDRAWI_DIRECTDRAW_GBL.hDD and we doing that. now the callbacks works in startup process. Modified: trunk/reactos/lib/ddraw/hal/ddraw.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw.c --- trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 18:57:45 UTC (rev 18854) +++ trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 20:06:23 UTC (rev 18855) @@ -131,10 +131,18 @@ /* Todo add a check see if HalInfo.GetDriverInfo is supported or not */ + /* Do not trust msdn what it say about dwContext it is not in use for + windows nt, it is in use for all os, and it always pont to + DirectDrawGlobal.hDD */ + DDHAL_GETDRIVERINFODATA DriverInfo; memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); + DriverInfo.dwContext = DirectDrawGlobal.hDD; + + + /* Get ColorControlCallbacks */ DriverInfo.guidInfo = GUID_ColorControlCallbacks; DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDColorControl; @@ -207,12 +215,12 @@ /* Get the KernelCaps */ - /* + /* Need Alloc memmory for lpDDKernelCaps ?? */ DriverInfo.guidInfo = GUID_KernelCaps; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDKernelCaps; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); This->HalInfo.GetDriverInfo( &DriverInfo); - */ + /* Get the MiscellaneousCallbacks */ DriverInfo.guidInfo = GUID_MiscellaneousCallbacks; @@ -229,8 +237,7 @@ This->HalInfo.GetDriverInfo( &DriverInfo); */ - /* Get the MotionCompCallbacks */ - + /* Get the MotionCompCallbacks */ DriverInfo.guidInfo = GUID_MotionCompCallbacks; DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDMotionComp; DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMOTIONCOMPCALLBACKS);

1 0

[greatlrd] 18854: Setup the hal inisate bit more. and commect the code. We still does not insate hal right yet.
by greatlrd＠svn.reactos.com 29 Oct '05

29 Oct '05

Setup the hal inisate bit more. and commect the code. We still does not insate hal right yet. Modified: trunk/reactos/lib/ddraw/hal/ddraw.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw.c --- trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 16:00:00 UTC (rev 18853) +++ trunk/reactos/lib/ddraw/hal/ddraw.c 2005-10-29 18:57:45 UTC (rev 18854) @@ -23,9 +23,7 @@ if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc)) return DDERR_INVALIDPARAMS; - - - + /* alloc all the space */ This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDHAL_CALLBACKS)); This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(D3DHAL_CALLBACKS)); @@ -40,6 +38,7 @@ This->HalInfo.lpDDPaletteCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDPalette; This->HalInfo.lpDDSurfaceCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDSurface; + /* FIXME The insate is not right we need the info that the three NULL return */ /* query all kinds of infos from the driver */ if(!DdQueryDirectDrawObject ( @@ -59,7 +58,11 @@ return 1; } - /* ms wants us to call that function twice */ + /* FIXME The insate is not right we need the info that the three NULL return and use it here*/ + + /* Fixme shall we selected the pixel type before we call the DdQueryDirectDrawObject second time + and fill in more info ?? */ + This->HalInfo.vmiData.pvmList = HeapAlloc(GetProcessHeap(), 0, sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); This->DirectDrawGlobal.lpdwFourCC = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); This->DirectDrawGlobal.lpZPixelFormats = HeapAlloc(GetProcessHeap(), 0, sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); @@ -83,33 +86,27 @@ return 1; } - /* Copy HalInfo to DirectDrawGlobal */ - - /* have not check where it should go into yet - LPDDHAL_DDCALLBACKS lpDDCallbacks; - LPDDHAL_DDSURFACECALLBACKS lpDDSurfaceCallbacks; - LPDDHAL_DDPALETTECALLBACKS lpDDPaletteCallbacks; - */ - + /* Copy HalInfo to DirectDrawGlobal (Not complete)*/ + RtlCopyMemory(&This->DirectDrawGlobal.vmiData,&This->HalInfo.vmiData,siz eof(VIDMEMINFO)); RtlCopyMemory(&This->DirectDrawGlobal.ddCaps,&This->HalInfo.ddCaps,sizeo f(DDCORECAPS)); This->DirectDrawGlobal.dwMonitorFrequency = This->HalInfo.dwMonitorFrequency; /* have not check where it should go into yet - LPDDHAL_GETDRIVERINFO GetDriverInfo; + This->HalInfo.GetDriverInfo datatype LPDDHAL_GETDRIVERINFO */ This->DirectDrawGlobal.dwModeIndex = This->HalInfo.dwModeIndex; /* have not check where it should go into yet - LPDWORD lpdwFourCC; + This->HalInfo.lpdwFourCC datatype LPDWORD */ This->DirectDrawGlobal.dwNumModes = This->HalInfo.dwNumModes; This->DirectDrawGlobal.lpModeInfo = This->HalInfo.lpModeInfo; /* have not check where it should go into yet - DWORD dwFlags; + This->HalInfo.dwFlags data type DWORD */ /* Unsure which of these two for lpPDevice @@ -120,18 +117,189 @@ This->DirectDrawGlobal.hInstance = This->HalInfo.hInstance; /* have not check where it should go into yet - ULONG_PTR lpD3DGlobalDriverData; - ULONG_PTR lpD3DHALCallbacks; - LPDDHAL_DDEXEBUFCALLBACKS lpDDExeBufCallbacks; + This->lpD3DGlobalDriverData datatype ULONG_PTR + This->lpD3DHALCallbacks datatype ULONG_PTR */ + RtlCopyMemory(&This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf,&This->HalI nfo.lpDDExeBufCallbacks,sizeof(DDHAL_DDEXEBUFCALLBACKS)); + + + /*********************************************************************** */ + /* Set up the rest of the callbacks all callbacks we get back from */ + /* gdi32.dll is user mode */ + /*********************************************************************** */ + /* Todo add a check see if HalInfo.GetDriverInfo is supported or not */ + + DDHAL_GETDRIVERINFODATA DriverInfo; + memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); + DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); + + /* Get ColorControlCallbacks */ + DriverInfo.guidInfo = GUID_ColorControlCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDColorControl; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDCOLORCONTROLCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + - This->DirectDrawGlobal.lpDDCBtmp->HALDD = This->DirectDrawGlobal.lpDDCBtmp->cbDDCallbacks; - This->DirectDrawGlobal.lpDDCBtmp->HALDDSurface = This->DirectDrawGlobal.lpDDCBtmp->cbDDSurfaceCallbacks; - This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf = This->DirectDrawGlobal.lpDDCBtmp->cbDDExeBufCallbacks; - This->DirectDrawGlobal.lpDDCBtmp->HALDDPalette = This->DirectDrawGlobal.lpDDCBtmp->cbDDPaletteCallbacks; + /* Get the GUID_D3DCallbacks callback */ + /* Problem with include files + DDHAL_DDMISCELLANEOUSCALLBACKS misc; + DriverInfo.guidInfo = GUID_D3DCallbacks; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo);*/ + + /* Get the D3DCallbacks2 */ + /* do we need alloc memmory for This->DirectDrawGlobal.lpD3DHALCallbacks2 */ + DriverInfo.guidInfo = GUID_D3DCallbacks2; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpD3DHALCallbacks2; + DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS2); + This->HalInfo.GetDriverInfo( &DriverInfo); + + + /* Get the D3DCallbacks3 */ + /* + DriverInfo.guidInfo = GUID_D3DCallbacks3; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the misc callback */ + /* Problem with include files + DriverInfo.guidInfo = GUID_D3DCaps; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the D3DExtendedCaps */ + /* + DriverInfo.guidInfo = GUID_D3DExtendedCaps; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the D3DParseUnknownCommandCallback */ + /* + DriverInfo.guidInfo = GUID_D3DParseUnknownCommandCallback; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the GetHeapAlignment */ + /* + DriverInfo.guidInfo = GUID_GetHeapAlignment; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the KernelCallbacks */ + DriverInfo.guidInfo = GUID_KernelCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDKernel; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + + + /* Get the KernelCaps */ + /* + DriverInfo.guidInfo = GUID_KernelCaps; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the MiscellaneousCallbacks */ + DriverInfo.guidInfo = GUID_MiscellaneousCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + + + /* Get the Miscellaneous2Callbacks */ + /* + DriverInfo.guidInfo = GUID_Miscellaneous2Callbacks; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the MotionCompCallbacks */ + + DriverInfo.guidInfo = GUID_MotionCompCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDMotionComp; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMOTIONCOMPCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + + + /* Get the NonLocalVidMemCaps */ + /* + DriverInfo.guidInfo = GUID_NonLocalVidMemCaps; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the NTCallbacks */ + /* + DriverInfo.guidInfo = GUID_NTCallbacks; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the NTPrivateDriverCaps */ + /* + DriverInfo.guidInfo = GUID_NTPrivateDriverCaps; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the UpdateNonLocalHeap */ + /* + DriverInfo.guidInfo = GUID_UpdateNonLocalHeap; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the VideoPortCallbacks */ + /* Problem with include files + DriverInfo.guidInfo = GUID_VideoPortCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDVideoPort; + DriverInfo.dwExpectedSize = sizeof(HALDDVideoPort); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + + /* Get the VideoPortCaps */ + /* + DriverInfo.guidInfo = GUID_VideoPortCaps; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the ZPixelFormats */ + /* + DriverInfo.guidInfo = GUID_ZPixelFormats; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + + /* FIXME add setup for one call ot get memmory */ + + + /* now all insate of HAL is done and we hopply do not have forget anything*/ + return DD_OK; }

1 0

[weiden] 18853: - probe and capture parameters in NtCreateKey
by weiden＠svn.reactos.com 29 Oct '05

29 Oct '05

- probe and capture parameters in NtCreateKey - added ProbeForWriteUnicodeString and ProbeForReadUnicodeString macros Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-10-29 15:05:37 UTC (rev 18852) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-10-29 16:00:00 UTC (rev 18853) @@ -184,35 +184,70 @@ IN ULONG CreateOptions, OUT PULONG Disposition) { - UNICODE_STRING RemainingPath; + UNICODE_STRING RemainingPath = {0}; + BOOLEAN FreeRemainingPath = TRUE; + ULONG LocalDisposition; PKEY_OBJECT KeyObject; - NTSTATUS Status; - PVOID Object; + NTSTATUS Status = STATUS_SUCCESS; + PVOID Object = NULL; PWSTR Start; UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; unsigned i; REG_PRE_CREATE_KEY_INFORMATION PreCreateKeyInfo; REG_POST_CREATE_KEY_INFORMATION PostCreateKeyInfo; + KPROCESSOR_MODE PreviousMode; + UNICODE_STRING CapturedClass = {0}; + HANDLE hKey; PAGED_CODE(); - DPRINT("NtCreateKey (Name %wZ KeyHandle 0x%p Root 0x%p)\n", - ObjectAttributes->ObjectName, - KeyHandle, - ObjectAttributes->RootDirectory); + PreviousMode = KeGetPreviousMode(); + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWriteHandle(KeyHandle); + if (Disposition != NULL) + { + ProbeForWriteUlong(Disposition); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + + if (Class != NULL) + { + Status = ProbeAndCaptureUnicodeString(&CapturedClass, + PreviousMode, + Class); + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + /* Capture all the info */ DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, - KeGetPreviousMode(), + PreviousMode, CmiKeyType, &ObjectCreateInfo, &ObjectName); if (!NT_SUCCESS(Status)) { DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); - return Status; + goto Cleanup; } PostCreateKeyInfo.CompleteName = &ObjectName; @@ -221,13 +256,12 @@ if (!NT_SUCCESS(Status)) { ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); - return Status; + goto Cleanup; } Status = ObFindObject(&ObjectCreateInfo, &ObjectName, - (PVOID*)&Object, + (PVOID*)&Object, &RemainingPath, CmiKeyType); ObpReleaseCapturedAttributes(&ObjectCreateInfo); @@ -236,9 +270,9 @@ PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + DPRINT("CmpFindObject failed, Status: 0x%x\n", Status); - return(Status); + goto Cleanup; } DPRINT("RemainingPath %wZ\n", &RemainingPath); @@ -248,33 +282,29 @@ /* Fail if the key has been deleted */ if (((PKEY_OBJECT) Object)->Flags & KO_MARKED_FOR_DELETE) { - ObDereferenceObject(Object); - RtlFreeUnicodeString(&RemainingPath); PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = STATUS_UNSUCCESSFUL; CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + DPRINT("Object marked for delete!\n"); - return(STATUS_UNSUCCESSFUL); + Status = STATUS_UNSUCCESSFUL; + goto Cleanup; } - if (Disposition) - *Disposition = REG_OPENED_EXISTING_KEY; - Status = ObpCreateHandle(PsGetCurrentProcess(), Object, DesiredAccess, TRUE, - KeyHandle); + &hKey); DPRINT("ObpCreateHandle failed Status 0x%x\n", Status); - ObDereferenceObject(Object); - RtlFreeUnicodeString(&RemainingPath); + PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); - return Status; + + LocalDisposition = REG_OPENED_EXISTING_KEY; + goto SuccessReturn; } /* If RemainingPath contains \ we must return error @@ -287,23 +317,23 @@ { if (L'\\' == RemainingPath.Buffer[i]) { - ObDereferenceObject(Object); DPRINT1("NtCreateKey() doesn't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath); - RtlFreeUnicodeString(&RemainingPath); + PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = STATUS_OBJECT_NAME_NOT_FOUND; CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); - return STATUS_OBJECT_NAME_NOT_FOUND; + + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Cleanup; } } DPRINT("RemainingPath %S ParentObject 0x%p\n", RemainingPath.Buffer, Object); - Status = ObCreateObject(ExGetPreviousMode(), + Status = ObCreateObject(PreviousMode, CmiKeyType, NULL, - ExGetPreviousMode(), + PreviousMode, NULL, sizeof(KEY_OBJECT), 0, @@ -315,8 +345,8 @@ PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); - return(Status); + + goto Cleanup; } Status = ObInsertObject((PVOID)KeyObject, @@ -324,17 +354,17 @@ DesiredAccess, 0, NULL, - KeyHandle); + &hKey); if (!NT_SUCCESS(Status)) { ObDereferenceObject(KeyObject); - RtlFreeUnicodeString(&RemainingPath); DPRINT1("ObInsertObject() failed!\n"); + PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); - return(Status); + + goto Cleanup; } KeyObject->ParentKey = Object; @@ -361,7 +391,7 @@ KeyObject, &RemainingPath, TitleIndex, - Class, + &CapturedClass, CreateOptions); if (!NT_SUCCESS(Status)) { @@ -370,23 +400,23 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); ObDereferenceObject(KeyObject); - ObDereferenceObject(Object); - RtlFreeUnicodeString(&RemainingPath); + PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = STATUS_UNSUCCESSFUL; CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); - return STATUS_UNSUCCESSFUL; + + Status = STATUS_UNSUCCESSFUL; + goto Cleanup; } if (Start == RemainingPath.Buffer) { KeyObject->Name = RemainingPath; + FreeRemainingPath = FALSE; } else { RtlpCreateUnicodeString(&KeyObject->Name, Start, NonPagedPool); - RtlFreeUnicodeString(&RemainingPath); } if (KeyObject->RegistryHive == KeyObject->ParentKey->RegistryHive) @@ -400,10 +430,7 @@ KeyObject->KeyCell->SecurityKeyOffset = -1; /* This key must remain in memory unless it is deleted or file is unloaded */ - ObReferenceObjectByPointer(KeyObject, - STANDARD_RIGHTS_REQUIRED, - NULL, - UserMode); + ObReferenceObject(KeyObject); } CmiAddKeyToList(KeyObject->ParentKey, KeyObject); @@ -414,19 +441,39 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - - ObDereferenceObject(Object); - - if (Disposition) - *Disposition = REG_CREATED_NEW_KEY; - PostCreateKeyInfo.Object = KeyObject; PostCreateKeyInfo.Status = Status; CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); CmiSyncHives(); + + LocalDisposition = REG_CREATED_NEW_KEY; +SuccessReturn: + _SEH_TRY + { + *KeyHandle = hKey; + if (Disposition != NULL) + { + *Disposition = LocalDisposition; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + +Cleanup: + if (Class != NULL) + { + ReleaseCapturedUnicodeString(&CapturedClass, + PreviousMode); + } + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + if (FreeRemainingPath) RtlFreeUnicodeString(&RemainingPath); + if (Object != NULL) ObDereferenceObject(Object); + return Status; } _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-10-29 15:05:37 UTC (rev 18852) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-10-29 16:00:00 UTC (rev 18853) @@ -83,7 +83,64 @@ #define ExRaiseStatus RtlRaiseStatus +static const UNICODE_STRING __emptyUnicodeString = {0}; + /* + * NOTE: Alignment of the pointers is not verified! + */ +#define ProbeForWriteGenericType(Ptr, Type) \ + do { \ + if ((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ + (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) { \ + RtlRaiseStatus (STATUS_ACCESS_VIOLATION); \ + } \ + *(volatile Type *)(Ptr) = *(volatile Type *)(Ptr); \ + } while (0) + +#define ProbeForWriteBoolean(Ptr) ProbeForWriteGenericType(Ptr, BOOLEAN) +#define ProbeForWriteUchar(Ptr) ProbeForWriteGenericType(Ptr, UCHAR) +#define ProbeForWriteChar(Ptr) ProbeForWriteGenericType(Ptr, Char) +#define ProbeForWriteUshort(Ptr) ProbeForWriteGenericType(Ptr, USHORT) +#define ProbeForWriteShort(Ptr) ProbeForWriteGenericType(Ptr, SHORT) +#define ProbeForWriteUlong(Ptr) ProbeForWriteGenericType(Ptr, ULONG) +#define ProbeForWriteLong(Ptr) ProbeForWriteGenericType(Ptr, LONG) +#define ProbeForWriteUint(Ptr) ProbeForWriteGenericType(Ptr, UINT) +#define ProbeForWriteInt(Ptr) ProbeForWriteGenericType(Ptr, INT) +#define ProbeForWriteUlonglong(Ptr) ProbeForWriteGenericType(Ptr, ULONGLONG) +#define ProbeForWriteLonglong(Ptr) ProbeForWriteGenericType(Ptr, LONGLONG) +#define ProbeForWriteLonglong(Ptr) ProbeForWriteGenericType(Ptr, LONGLONG) +#define ProbeForWritePointer(Ptr) ProbeForWriteGenericType(Ptr, PVOID) +#define ProbeForWriteHandle(Ptr) ProbeForWriteGenericType(Ptr, HANDLE) +#define ProbeForWriteLangid(Ptr) ProbeForWriteGenericType(Ptr, LANGID) +#define ProbeForWriteLargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, LONGLONG) +#define ProbeForWriteUlargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, ULONGLONG) +#define ProbeForWriteUnicodeString(Ptr) ProbeForWriteGenericType(Ptr, UNICODE_STRING) + +#define ProbeForReadGenericType(Ptr, Type, Default) \ + (((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ + (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ? \ + ExRaiseStatus (STATUS_ACCESS_VIOLATION), Default : \ + *(volatile Type *)(Ptr)) + +#define ProbeForReadBoolean(Ptr) ProbeForReadGenericType(Ptr, BOOLEAN, FALSE) +#define ProbeForReadUchar(Ptr) ProbeForReadGenericType(Ptr, UCHAR, 0) +#define ProbeForReadChar(Ptr) ProbeForReadGenericType(Ptr, CHAR, 0) +#define ProbeForReadUshort(Ptr) ProbeForReadGenericType(Ptr, USHORT, 0) +#define ProbeForReadShort(Ptr) ProbeForReadGenericType(Ptr, SHORT, 0) +#define ProbeForReadUlong(Ptr) ProbeForReadGenericType(Ptr, ULONG, 0) +#define ProbeForReadLong(Ptr) ProbeForReadGenericType(Ptr, LONG, 0) +#define ProbeForReadUint(Ptr) ProbeForReadGenericType(Ptr, UINT, 0) +#define ProbeForReadInt(Ptr) ProbeForReadGenericType(Ptr, INT, 0) +#define ProbeForReadUlonglong(Ptr) ProbeForReadGenericType(Ptr, ULONGLONG, 0) +#define ProbeForReadLonglong(Ptr) ProbeForReadGenericType(Ptr, LONGLONG, 0) +#define ProbeForReadPointer(Ptr) ProbeForReadGenericType(Ptr, PVOID, NULL) +#define ProbeForReadHandle(Ptr) ProbeForReadGenericType(Ptr, HANDLE, NULL) +#define ProbeForReadLangid(Ptr) ProbeForReadGenericType(Ptr, LANGID, 0) +#define ProbeForReadLargeInteger(Ptr) ((LARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, LONGLONG, 0)) +#define ProbeForReadUlargeInteger(Ptr) ((ULARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, ULONGLONG, 0)) +#define ProbeForReadUnicodeString(Ptr) ProbeForReadGenericType(Ptr, UNICODE_STRING, __emptyUnicodeString) + +/* * Inlined Probing Macros */ static __inline @@ -102,10 +159,7 @@ { _SEH_TRY { - ProbeForRead(UnsafeSrc, - sizeof(UNICODE_STRING), - sizeof(ULONG)); - *Dest = *UnsafeSrc; + *Dest = ProbeForReadUnicodeString(UnsafeSrc); if(Dest->Buffer != NULL) { if (Dest->Length != 0) @@ -175,59 +229,6 @@ } /* - * NOTE: Alignment of the pointers is not verified! - */ -#define ProbeForWriteGenericType(Ptr, Type) \ - do { \ - if ((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ - (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) { \ - RtlRaiseStatus (STATUS_ACCESS_VIOLATION); \ - } \ - *(volatile Type *)(Ptr) = *(volatile Type *)(Ptr); \ - } while (0) - -#define ProbeForWriteBoolean(Ptr) ProbeForWriteGenericType(Ptr, BOOLEAN) -#define ProbeForWriteUchar(Ptr) ProbeForWriteGenericType(Ptr, UCHAR) -#define ProbeForWriteChar(Ptr) ProbeForWriteGenericType(Ptr, Char) -#define ProbeForWriteUshort(Ptr) ProbeForWriteGenericType(Ptr, USHORT) -#define ProbeForWriteShort(Ptr) ProbeForWriteGenericType(Ptr, SHORT) -#define ProbeForWriteUlong(Ptr) ProbeForWriteGenericType(Ptr, ULONG) -#define ProbeForWriteLong(Ptr) ProbeForWriteGenericType(Ptr, LONG) -#define ProbeForWriteUint(Ptr) ProbeForWriteGenericType(Ptr, UINT) -#define ProbeForWriteInt(Ptr) ProbeForWriteGenericType(Ptr, INT) -#define ProbeForWriteUlonglong(Ptr) ProbeForWriteGenericType(Ptr, ULONGLONG) -#define ProbeForWriteLonglong(Ptr) ProbeForWriteGenericType(Ptr, LONGLONG) -#define ProbeForWriteLonglong(Ptr) ProbeForWriteGenericType(Ptr, LONGLONG) -#define ProbeForWritePointer(Ptr) ProbeForWriteGenericType(Ptr, PVOID) -#define ProbeForWriteHandle(Ptr) ProbeForWriteGenericType(Ptr, HANDLE) -#define ProbeForWriteLangid(Ptr) ProbeForWriteGenericType(Ptr, LANGID) -#define ProbeForWriteLargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, LONGLONG) -#define ProbeForWriteUlargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, ULONGLONG) - -#define ProbeForReadGenericType(Ptr, Type, Default) \ - (((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ - (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ? \ - ExRaiseStatus (STATUS_ACCESS_VIOLATION), Default : \ - *(volatile Type *)(Ptr)) - -#define ProbeForReadBoolean(Ptr) ProbeForReadGenericType(Ptr, BOOLEAN, FALSE) -#define ProbeForReadUchar(Ptr) ProbeForReadGenericType(Ptr, UCHAR, 0) -#define ProbeForReadChar(Ptr) ProbeForReadGenericType(Ptr, CHAR, 0) -#define ProbeForReadUshort(Ptr) ProbeForReadGenericType(Ptr, USHORT, 0) -#define ProbeForReadShort(Ptr) ProbeForReadGenericType(Ptr, SHORT, 0) -#define ProbeForReadUlong(Ptr) ProbeForReadGenericType(Ptr, ULONG, 0) -#define ProbeForReadLong(Ptr) ProbeForReadGenericType(Ptr, LONG, 0) -#define ProbeForReadUint(Ptr) ProbeForReadGenericType(Ptr, UINT, 0) -#define ProbeForReadInt(Ptr) ProbeForReadGenericType(Ptr, INT, 0) -#define ProbeForReadUlonglong(Ptr) ProbeForReadGenericType(Ptr, ULONGLONG, 0) -#define ProbeForReadLonglong(Ptr) ProbeForReadGenericType(Ptr, LONGLONG, 0) -#define ProbeForReadPointer(Ptr) ProbeForReadGenericType(Ptr, PVOID, NULL) -#define ProbeForReadHandle(Ptr) ProbeForReadGenericType(Ptr, HANDLE, NULL) -#define ProbeForReadLangid(Ptr) ProbeForReadGenericType(Ptr, LANGID, 0) -#define ProbeForReadLargeInteger(Ptr) ((LARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, LONGLONG, 0)) -#define ProbeForReadUlargeInteger(Ptr) ((ULARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, ULONGLONG, 0)) - -/* * generic information class probing code */

1 0

[weiden] 18852: implemented the 32 bit version of GetSystemWow64DirectoryA/W (just set the last error code to ERROR_CALL_NOT_IMPLEMENTED)
by weiden＠svn.reactos.com 29 Oct '05

29 Oct '05

implemented the 32 bit version of GetSystemWow64DirectoryA/W (just set the last error code to ERROR_CALL_NOT_IMPLEMENTED) Modified: trunk/reactos/lib/kernel32/file/curdir.c Modified: trunk/reactos/lib/kernel32/misc/stubs.c _____ Modified: trunk/reactos/lib/kernel32/file/curdir.c --- trunk/reactos/lib/kernel32/file/curdir.c 2005-10-29 14:51:18 UTC (rev 18851) +++ trunk/reactos/lib/kernel32/file/curdir.c 2005-10-29 15:05:37 UTC (rev 18852) @@ -324,4 +324,53 @@ return GetWindowsDirectoryW( lpBuffer, uSize ); } +/* + * @unimplemented + */ +UINT +STDCALL +GetSystemWow64DirectoryW( + LPWSTR lpBuffer, + UINT uSize + ) +{ +#ifdef _WIN64 + DPRINT1("GetSystemWow64DirectoryW is UNIMPLEMENTED!\n"); + return 0; +#else + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +#endif +} + +/* + * @unimplemented + */ +UINT +STDCALL +GetSystemWow64DirectoryA( + LPSTR lpBuffer, + UINT uSize + ) +{ +#ifdef _WIN64 + WCHAR BufferW[MAX_PATH]; + UINT ret; + + ret = GetSystemWow64DirectoryW(BufferW, MAX_PATH); + + if (!ret) return 0; + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + return FilenameW2A_FitOrFail(lpBuffer, uSize, BufferW, ret+1); +#else + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +#endif +} + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/misc/stubs.c --- trunk/reactos/lib/kernel32/misc/stubs.c 2005-10-29 14:51:18 UTC (rev 18851) +++ trunk/reactos/lib/kernel32/misc/stubs.c 2005-10-29 15:05:37 UTC (rev 18852) @@ -1148,20 +1148,6 @@ /* * @unimplemented */ -UINT -STDCALL -GetSystemWow64DirectoryW( - LPWSTR lpBuffer, - UINT uSize - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ BOOL STDCALL GetVolumeNameForVolumeMountPointW( @@ -1393,20 +1379,6 @@ /* * @unimplemented */ -UINT -STDCALL -GetSystemWow64DirectoryA( - LPSTR lpBuffer, - UINT uSize - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ BOOL STDCALL GetVolumeNameForVolumeMountPointA(

1 0

[weiden] 18851: - deleting a registry value requires the KEY_SET_VALUE right
by weiden＠svn.reactos.com 29 Oct '05

29 Oct '05

- deleting a registry value requires the KEY_SET_VALUE right - capture the value name Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-10-29 14:12:20 UTC (rev 18850) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-10-29 14:51:18 UTC (rev 18851) @@ -1616,7 +1616,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("ObReferenceObjectByHandle() failed with status %x\n", Status); + DPRINT1("ObReferenceObjectByHandle() failed with status %x %p\n", Status, KeyHandle); return Status; } @@ -2038,27 +2038,42 @@ NTSTATUS Status; REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; + KPROCESSOR_MODE PreviousMode; + UNICODE_STRING CapturedValueName; PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); /* Verify that the handle is valid and is a registry key */ Status = ObReferenceObjectByHandle(KeyHandle, - KEY_QUERY_VALUE, + KEY_SET_VALUE, CmiKeyType, - UserMode, + PreviousMode, (PVOID *)&KeyObject, NULL); if (!NT_SUCCESS(Status)) { return Status; } - + + Status = ProbeAndCaptureUnicodeString(&CapturedValueName, + PreviousMode, + ValueName); + if (!NT_SUCCESS(Status)) + { + goto Fail; + } DeleteValueKeyInfo.Object = (PVOID)KeyObject; - DeleteValueKeyInfo.ValueName = ValueName; + DeleteValueKeyInfo.ValueName = &CapturedValueName; + /* FIXME - check if value exists before calling the callbacks? */ Status = CmiCallRegisteredCallbacks(RegNtPreDeleteValueKey, &DeleteValueKeyInfo); if (!NT_SUCCESS(Status)) { + ReleaseCapturedUnicodeString(&CapturedValueName, + PreviousMode); +Fail: ObDereferenceObject(KeyObject); return Status; } @@ -2081,6 +2096,9 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); + ReleaseCapturedUnicodeString(&CapturedValueName, + PreviousMode); + PostOperationInfo.Object = (PVOID)KeyObject; PostOperationInfo.Status = Status;

1 0

[hbirr] 18850: Merged MmReleaseMemoryArea into MmReleaseMmInfo.
by hbirr＠svn.reactos.com 29 Oct '05

29 Oct '05

Merged MmReleaseMemoryArea into MmReleaseMmInfo. We can only release the address space look if we are calling MmUnmapViewOfSection. Modified: trunk/reactos/ntoskrnl/mm/mm.c _____ Modified: trunk/reactos/ntoskrnl/mm/mm.c --- trunk/reactos/ntoskrnl/mm/mm.c 2005-10-29 14:10:35 UTC (rev 18849) +++ trunk/reactos/ntoskrnl/mm/mm.c 2005-10-29 14:12:20 UTC (rev 18850) @@ -28,59 +28,51 @@ /* FUNCTIONS ****************************************************************/ -NTSTATUS MmReleaseMemoryArea(PEPROCESS Process, PMEMORY_AREA Marea) +NTSTATUS +NTAPI +MmReleaseMmInfo(PEPROCESS Process) { - NTSTATUS Status; + PVOID Address; + PMEMORY_AREA MemoryArea; - DPRINT("MmReleaseMemoryArea(Process %x, Marea %x)\n",Process,Marea); + DPRINT("MmReleaseMmInfo(Process %x (%s))\n", Process, + Process->ImageFileName); - DPRINT("Releasing %x between %x %x (type %d)\n", - Marea, Marea->StartingAddress, Marea->EndingAddress, - Marea->Type); + MmLockAddressSpace(&Process->AddressSpace); - switch (Marea->Type) + while ((MemoryArea = Process->AddressSpace.MemoryAreaRoot) != NULL) { - case MEMORY_AREA_SECTION_VIEW: - Status = MmUnmapViewOfSection(Process, (PVOID)Marea->StartingAddress); - ASSERT(Status == STATUS_SUCCESS); - return(STATUS_SUCCESS); + switch (MemoryArea->Type) + { + case MEMORY_AREA_SECTION_VIEW: + Address = (PVOID)MemoryArea->StartingAddress; + MmUnlockAddressSpace(&Process->AddressSpace); + MmUnmapViewOfSection(Process, Address); + MmLockAddressSpace(&Process->AddressSpace); + break; - case MEMORY_AREA_VIRTUAL_MEMORY: - case MEMORY_AREA_PEB_OR_TEB: - MmFreeVirtualMemory(Process, Marea); - break; + case MEMORY_AREA_VIRTUAL_MEMORY: + case MEMORY_AREA_PEB_OR_TEB: + MmFreeVirtualMemory(Process, MemoryArea); + break; - case MEMORY_AREA_SHARED_DATA: - case MEMORY_AREA_NO_ACCESS: - Status = MmFreeMemoryArea(&Process->AddressSpace, - Marea, - NULL, - NULL); - break; + case MEMORY_AREA_SHARED_DATA: + case MEMORY_AREA_NO_ACCESS: + MmFreeMemoryArea(&Process->AddressSpace, + MemoryArea, + NULL, + NULL); + break; - case MEMORY_AREA_MDL_MAPPING: - KEBUGCHECK(PROCESS_HAS_LOCKED_PAGES); - break; + case MEMORY_AREA_MDL_MAPPING: + KEBUGCHECK(PROCESS_HAS_LOCKED_PAGES); + break; - default: - KEBUGCHECK(0); + default: + KEBUGCHECK(0); + } } - return(STATUS_SUCCESS); -} - -NTSTATUS -NTAPI -MmReleaseMmInfo(PEPROCESS Process) -{ - DPRINT("MmReleaseMmInfo(Process %x (%s))\n", Process, - Process->ImageFileName); - - MmLockAddressSpace(&Process->AddressSpace); - - while (Process->AddressSpace.MemoryAreaRoot != NULL) - MmReleaseMemoryArea(Process, Process->AddressSpace.MemoryAreaRoot); - Mmi386ReleaseMmInfo(Process); MmUnlockAddressSpace(&Process->AddressSpace);

1 0

[hbirr] 18849: - Lock always the address space if we changing the virtual mapping.
by hbirr＠svn.reactos.com 29 Oct '05

29 Oct '05

- Lock always the address space if we changing the virtual mapping. This is necessary because we can create or remove a page table. - If we unmap a section, we have to wait for all pending pageops for the section within the current process. We do this by waiting for all pageops for the section. Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-10-29 14:09:00 UTC (rev 18848) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-10-29 14:10:35 UTC (rev 18849) @@ -1278,6 +1278,7 @@ */ MiCopyFromUserPage(NewPage, PAddress); + MmLockAddressSpace(AddressSpace); /* * Delete the old entry. */ @@ -1286,7 +1287,6 @@ /* * Set the PTE to point to the new page */ - MmLockAddressSpace(AddressSpace); Status = MmCreateVirtualMapping(AddressSpace->Process, Address, Region->Protect, @@ -1298,7 +1298,6 @@ KEBUGCHECK(0); return(Status); } - MmInsertRmap(NewPage, AddressSpace->Process, PAddress); if (!NT_SUCCESS(Status)) { DbgPrint("Unable to create virtual mapping\n"); @@ -1314,6 +1313,7 @@ * Unshare the old page. */ MmDeleteRmap(OldPage, AddressSpace->Process, PAddress); + MmInsertRmap(NewPage, AddressSpace->Process, PAddress); MmLockSectionSegment(Segment); MmUnsharePageEntrySectionSegment(Section, Segment, Offset, FALSE, FALSE); MmUnlockSectionSegment(Segment); @@ -1332,6 +1332,11 @@ PFN_TYPE Page; PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context; + if (Process) + { + MmLockAddressSpace(&Process->AddressSpace); + } + MmDeleteVirtualMapping(Process, Address, FALSE, @@ -1343,14 +1348,21 @@ } if (!PageOutContext->Private) { + MmLockSectionSegment(PageOutContext->Segment); MmUnsharePageEntrySectionSegment(PageOutContext->Section, PageOutContext->Segment, PageOutContext->Offset, PageOutContext->WasDirty, TRUE); + MmUnlockSectionSegment(PageOutContext->Segment); } - else + if (Process) { + MmUnlockAddressSpace(&Process->AddressSpace); + } + + if (PageOutContext->Private) + { MmReleasePageMemoryConsumer(MC_USER, Page); } @@ -1561,9 +1573,11 @@ else if (!Context.WasDirty && Context.Private && SwapEntry != 0) { MmSetSavedSwapEntryPage(Page, 0); + MmLockAddressSpace(AddressSpace); Status = MmCreatePageFileMapping(AddressSpace->Process, Address, SwapEntry); + MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { KEBUGCHECK(0); @@ -1583,7 +1597,7 @@ if (SwapEntry == 0) { MmShowOutOfSpaceMessagePagingFile(); - + MmLockAddressSpace(AddressSpace); /* * For private pages restore the old mappings. */ @@ -1618,6 +1632,7 @@ Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); } + MmUnlockAddressSpace(AddressSpace); PageOp->Status = STATUS_UNSUCCESSFUL; MmspCompleteAndReleasePageOp(PageOp); return(STATUS_PAGEFILE_QUOTA); @@ -1636,6 +1651,7 @@ * As above: undo our actions. * FIXME: Also free the swap page. */ + MmLockAddressSpace(AddressSpace); if (Context.Private) { Status = MmCreateVirtualMapping(AddressSpace->Process, @@ -1662,6 +1678,7 @@ Entry = MAKE_SSE(Page << PAGE_SHIFT, 1); MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); } + MmUnlockAddressSpace(AddressSpace); PageOp->Status = STATUS_UNSUCCESSFUL; MmspCompleteAndReleasePageOp(PageOp); return(STATUS_UNSUCCESSFUL); @@ -1684,9 +1701,11 @@ if (Context.Private) { + MmLockAddressSpace(AddressSpace); Status = MmCreatePageFileMapping(AddressSpace->Process, Address, SwapEntry); + MmUnlockAddressSpace(AddressSpace); if (!NT_SUCCESS(Status)) { KEBUGCHECK(0); @@ -3797,7 +3816,7 @@ } } -NTSTATUS +STATIC NTSTATUS MmUnmapViewOfSegment(PMADDRESS_SPACE AddressSpace, PVOID BaseAddress) { @@ -3860,6 +3879,8 @@ PMEMORY_AREA MemoryArea; PMADDRESS_SPACE AddressSpace; PSECTION_OBJECT Section; + PMM_PAGEOP PageOp; + ULONG_PTR Offset; DPRINT("Opening memory area Process %x BaseAddress %x\n", Process, BaseAddress); @@ -3867,15 +3888,53 @@ ASSERT(Process); AddressSpace = &Process->AddressSpace; + + MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea == NULL || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW || MemoryArea->DeleteInProgress) { + MmUnlockAddressSpace(AddressSpace); return STATUS_NOT_MAPPED_VIEW; } + MemoryArea->DeleteInProgress = TRUE; + + while (MemoryArea->PageOpCount) + { + Offset = PAGE_ROUND_UP((ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress); + + while (Offset) + { + Offset -= PAGE_SIZE; + PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, + MemoryArea->Data.SectionData.Segment, + Offset + MemoryArea->Data.SectionData.ViewOffset); + if (PageOp) + { + MmUnlockAddressSpace(AddressSpace); + Status = MmspWaitForPageOpCompletionEvent(PageOp); + if (Status != STATUS_SUCCESS) + { + DPRINT1("Failed to wait for page op, status = %x\n", Status); + KEBUGCHECK(0); + } + MmLockAddressSpace(AddressSpace); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, + BaseAddress); + if (MemoryArea == NULL || + MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) + { + MmUnlockAddressSpace(AddressSpace); + return STATUS_NOT_MAPPED_VIEW; + } + break; + } + } + } + Section = MemoryArea->Data.SectionData.Section; if (Section->AllocationAttributes & SEC_IMAGE) @@ -3925,6 +3984,7 @@ { Status = MmUnmapViewOfSegment(AddressSpace, BaseAddress); } + MmUnlockAddressSpace(AddressSpace); return(STATUS_SUCCESS); } @@ -3970,9 +4030,7 @@ return(Status); } - MmLockAddressSpace(&Process->AddressSpace); Status = MmUnmapViewOfSection(Process, BaseAddress); - MmUnlockAddressSpace(&Process->AddressSpace); ObDereferenceObject(Process);

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