Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[tkreuzer] 52613: [NTDLL] add some stubs for amd64
by tkreuzer＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: tkreuzer Date: Sun Jul 10 16:43:03 2011 New Revision: 52613 URL: http://svn.reactos.org/svn/reactos?rev=52613&view=rev Log: [NTDLL] add some stubs for amd64 Modified: trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c Modified: trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/amd64/s… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/amd64/stubs.c [iso-8859-1] Sun Jul 10 16:43:03 2011 @@ -41,3 +41,27 @@ UNIMPLEMENTED; return; } + +VOID +NTAPI +KiRaiseUserExceptionDispatcher() +{ + UNIMPLEMENTED; + return; +} + +VOID +NTAPI +KiUserCallbackDispatcher() +{ + UNIMPLEMENTED; + return; +} + +VOID +NTAPI +KiUserExceptionDispatcher() +{ + UNIMPLEMENTED; + return; +}

1 0

[cgutman] 52612: [RTL] - Enable the proper implementation of RtlActivateActivationContextUnsafeFast
by cgutman＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: cgutman Date: Sun Jul 10 16:33:23 2011 New Revision: 52612 URL: http://svn.reactos.org/svn/reactos?rev=52612&view=rev Log: [RTL] - Enable the proper implementation of RtlActivateActivationContextUnsafeFast Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=52612… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sun Jul 10 16:33:23 2011 @@ -2763,13 +2763,12 @@ RtlActivateActivationContextUnsafeFast(IN PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame, IN PVOID Context) { -#if NEW_NTDLL_LOADER RTL_ACTIVATION_CONTEXT_STACK_FRAME *ActiveFrame; /* Get the curren active frame */ ActiveFrame = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame; - DPRINT1("ActiveFrame %p, &Frame->Frame %p, Context %p\n", ActiveFrame, &Frame->Frame, Context); + DPRINT("ActiveFrame %p, &Frame->Frame %p, Context %p\n", ActiveFrame, &Frame->Frame, Context); /* Actually activate it */ Frame->Frame.Previous = ActiveFrame; @@ -2801,18 +2800,6 @@ /* Return pointer to the activation frame */ return &Frame->Frame; -#else - - RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame = &Frame->Frame; - - frame->Previous = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame; - frame->ActivationContext = Context; - frame->Flags = 0; - - NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = frame; - - return STATUS_SUCCESS; -#endif } PRTL_ACTIVATION_CONTEXT_STACK_FRAME

1 0

[cgutman] 52611: [NTDLL] - Fix memory corruption by reverting part of r52603
by cgutman＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: cgutman Date: Sun Jul 10 16:25:42 2011 New Revision: 52611 URL: http://svn.reactos.org/svn/reactos?rev=52611&view=rev Log: [NTDLL] - Fix memory corruption by reverting part of r52603 Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sun Jul 10 16:25:42 2011 @@ -1292,7 +1292,7 @@ /* Set up the Act Ctx */ ActCtx.Size = sizeof(ActCtx); ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; - RtlZeroMemory(&ActCtx.Frame, sizeof(ActCtx)); + RtlZeroMemory(&ActCtx.Frame, sizeof(RTL_ACTIVATION_CONTEXT_STACK_FRAME)); /* Activate the ActCtx */ RtlActivateActivationContextUnsafeFast(&ActCtx, @@ -1416,7 +1416,7 @@ /* Set up the Act Ctx */ ActCtx.Size = sizeof(ActCtx); ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; - RtlZeroMemory(&ActCtx.Frame, sizeof(ActCtx)); + RtlZeroMemory(&ActCtx.Frame, sizeof(RTL_ACTIVATION_CONTEXT_STACK_FRAME)); /* Activate the ActCtx */ RtlActivateActivationContextUnsafeFast(&ActCtx,

1 0

[rharabien] 52610: [EVENTLOG] - Fix MSVC warnings
by rharabien＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: rharabien Date: Sun Jul 10 15:39:32 2011 New Revision: 52610 URL: http://svn.reactos.org/svn/reactos?rev=52610&view=rev Log: [EVENTLOG] - Fix MSVC warnings Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/file.c trunk/reactos/include/reactos/idl/eventlogrpc.idl Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Sun Jul 10 15:39:32 2011 @@ -463,7 +463,7 @@ SystemTimeToFileTime(pSystemTime, &Time.ft); SystemTimeToFileTime(&st1970, &u1970.ft); - *pEventTime = (Time.ll - u1970.ll) / 10000000; + *pEventTime = (DWORD)((Time.ll - u1970.ll) / 10000000ull); } VOID PRINT_HEADER(PEVENTLOGHEADER header) Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Sun Jul 10 15:39:32 2011 @@ -896,17 +896,17 @@ BOOL LogfDeleteOffsetInformation(PLOGFILE LogFile, ULONG ulNumber) { - int i; + DWORD i; if (ulNumber != LogFile->OffsetInfo[0].EventNumber) { return FALSE; } - for (i=0;i<LogFile->OffsetInfoNext-1; i++) - { - LogFile->OffsetInfo[i].EventNumber = LogFile->OffsetInfo[i+1].EventNumber; - LogFile->OffsetInfo[i].EventOffset = LogFile->OffsetInfo[i+1].EventOffset; + for (i = 0; i < LogFile->OffsetInfoNext - 1; i++) + { + LogFile->OffsetInfo[i].EventNumber = LogFile->OffsetInfo[i + 1].EventNumber; + LogFile->OffsetInfo[i].EventOffset = LogFile->OffsetInfo[i + 1].EventOffset; } LogFile->OffsetInfoNext--; return TRUE; @@ -1102,4 +1102,4 @@ } LogfFreeRecord(logBuffer); -} +} Modified: trunk/reactos/include/reactos/idl/eventlogrpc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/eventl… ============================================================================== --- trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/eventlogrpc.idl [iso-8859-1] Sun Jul 10 15:39:32 2011 @@ -190,24 +190,15 @@ /* Function 19 */ NTSTATUS ElfrRegisterClusterSvc( -#ifndef __midl - [in] handle_t BindingHandle -#endif - ); /* FIXME */ + [in] handle_t BindingHandle); /* Function 20 */ NTSTATUS ElfrDeregisterClusterSvc( -#ifndef __midl - [in] handle_t BindingHandle -#endif - ); /* FIXME */ + [in] handle_t BindingHandle); /* Function 21 */ NTSTATUS ElfrWriteClusterEvents( -#ifndef __midl - [in] handle_t BindingHandle -#endif - ); /* FIXME */ + [in] handle_t BindingHandle); /* Function 22 */ NTSTATUS ElfrGetLogInformation(

1 0

[spetreolle] 52609: [SFC_OS] Implement SfcFileException, required by VBox Guest additions to install 3D support.
by spetreolle＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: spetreolle Date: Sun Jul 10 15:05:14 2011 New Revision: 52609 URL: http://svn.reactos.org/svn/reactos?rev=52609&view=rev Log: [SFC_OS] Implement SfcFileException, required by VBox Guest additions to install 3D support. Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.c trunk/reactos/dll/win32/sfc_os/sfc_os.spec Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.c?… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.c [iso-8859-1] Sun Jul 10 15:05:14 2011 @@ -142,3 +142,24 @@ return FALSE; } +/****************************************************************** + * SfcFileException [sfc_os.@] + * + * Disable the protection for the given file during one minute + * + * PARAMS + * dwUnknown0 [I] Set to 0 + * pwszFile [I] Name of the file to unprotect + * dwUnknown1 [I] Set to -1 + * + * RETURNS + * Failure: 1; + * Success: 0; + * + */ +DWORD WINAPI SfcFileException(DWORD dwUnknown0, PWCHAR pwszFile, DWORD dwUnknown1) +{ + UNIMPLEMENTED; + /* Always return success */ + return 0; +} Modified: trunk/reactos/dll/win32/sfc_os/sfc_os.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/sfc_os.sp… ============================================================================== --- trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sfc_os/sfc_os.spec [iso-8859-1] Sun Jul 10 15:05:14 2011 @@ -2,7 +2,7 @@ @ stub sfc_os_2 @ stub sfc_os_3 @ stub sfc_os_4 -@ stub sfc_os_5 +@ stdcall SfcFileException(long ptr long) @ stub sfc_os_6 @ stub sfc_os_7 @ stdcall SfcGetNextProtectedFile(ptr ptr)

1 0

[rharabien] 52608: [NTDLL/LDR] - Fix one more USHORT and -1 comparison. Patch by Thomas Faber
by rharabien＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: rharabien Date: Sun Jul 10 15:02:00 2011 New Revision: 52608 URL: http://svn.reactos.org/svn/reactos?rev=52608&view=rev Log: [NTDLL/LDR] - Fix one more USHORT and -1 comparison. Patch by Thomas Faber Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sun Jul 10 15:02:00 2011 @@ -1281,7 +1281,7 @@ } /* Check the current Load Count */ - if (LdrEntry->LoadCount != -1) + if (LdrEntry->LoadCount != 0xFFFF) { /* Decrease it */ LdrEntry->LoadCount--;

1 0

[ion] 52607: [NTDLL]: Fix parsing and buffer overflow in LdrpLoadDll. Add more debug prints, and add some missing code (commented out) for later.
by ion＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: ion Date: Sun Jul 10 13:51:40 2011 New Revision: 52607 URL: http://svn.reactos.org/svn/reactos?rev=52607&view=rev Log: [NTDLL]: Fix parsing and buffer overflow in LdrpLoadDll. Add more debug prints, and add some missing code (commented out) for later. Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sun Jul 10 13:51:40 2011 @@ -16,6 +16,7 @@ /* GLOBALS *******************************************************************/ PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache, LdrpGetModuleHandleCache; +BOOLEAN g_ShimsEnabled; /* FUNCTIONS *****************************************************************/ @@ -1849,6 +1850,7 @@ PPEB Peb = NtCurrentPeb(); NTSTATUS Status = STATUS_SUCCESS; PWCHAR p1, p2; + WCHAR c; WCHAR NameBuffer[266]; LPWSTR RawDllName; UNICODE_STRING RawDllNameString; @@ -1857,39 +1859,47 @@ /* Find the name without the extension */ p1 = DllName->Buffer; -StartLoop: p2 = NULL; while (*p1) { - if (*p1++ == L'.') + c = *p1++; + if (c == L'.') { p2 = p1; } - else if (*p1 == L'\\') - { - goto StartLoop; + else if (c == L'\\') + { + p2 = NULL; } } /* Save the Raw DLL Name */ RawDllName = NameBuffer; - if (DllName->Length >= sizeof(NameBuffer)) - { - /* The DLL's name is too long */ - return STATUS_NAME_TOO_LONG; - } + if (DllName->Length >= sizeof(NameBuffer)) return STATUS_NAME_TOO_LONG; RtlMoveMemory(RawDllName, DllName->Buffer, DllName->Length); /* Check if no extension was found or if we got a slash */ - if (!p2 || *p2 == '\\') + if (!(p2) || (*p2 == '\\')) { /* Check that we have space to add one */ - if (DllName->Length + LdrApiDefaultExtension.Length >= sizeof(NameBuffer)) + if ((DllName->Length + LdrApiDefaultExtension.Length + sizeof(UNICODE_NULL)) >= + sizeof(NameBuffer)) { /* No space to add the extension */ + DbgPrintEx(81, //DPFLTR_LDR_ID, + 0, + "LDR: %s - Dll name missing extension; with extension " + "added the name is too long\n" + " DllName: (@ %p) \"%wZ\"\n" + " DllName->Length: %u\n", + __FUNCTION__, + DllName, + DllName, + DllName->Length); return STATUS_NAME_TOO_LONG; } + /* FIXME: CLEAN THIS UP WITH Rtl String Functions */ /* Add it */ RtlMoveMemory((PVOID)((ULONG_PTR)RawDllName + DllName->Length), LdrApiDefaultExtension.Buffer, @@ -1941,16 +1951,18 @@ Redirected, &LdrEntry); if (!NT_SUCCESS(Status)) goto Quickie; - - /* Check if IMAGE_FILE_EXECUTABLE_IMAGE was provided */ - if (DllCharacteristics && - (*DllCharacteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) - { - LdrEntry->EntryPoint = NULL; - LdrEntry->Flags &= ~LDRP_IMAGE_DLL; - } - - /* FIXME Mark the DLL Ranges for Stack Traces later */ + + /* FIXME: Need to mark the DLL range for the stack DB */ + //RtlpStkMarkDllRange(LdrEntry); + + /* Check if IMAGE_FILE_EXECUTABLE_IMAGE was provided */ + if ((DllCharacteristics) && + (*DllCharacteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) + { + /* This is not a DLL, so remove such data */ + LdrEntry->EntryPoint = NULL; + LdrEntry->Flags &= ~LDRP_IMAGE_DLL; + } /* Make sure it's a DLL */ if (LdrEntry->Flags & LDRP_IMAGE_DLL) @@ -1974,8 +1986,17 @@ InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, &LdrEntry->InInitializationOrderModuleList); - /* Cancel the load and unload the DLL */ + /* Cancel the load */ LdrpClearLoadInProgress(); + + /* Unload the DLL */ + if (ShowSnaps) + { + DbgPrint("LDR: Unloading %wZ due to error %x walking " + "import descriptors", + DllName, + Status); + } LdrUnloadDll(LdrEntry->DllBase); /* Return the error */ @@ -1996,12 +2017,26 @@ if (CallInit && LdrpLdrDatabaseIsSetup) { /* FIXME: Notify Shim Engine */ - + if (g_ShimsEnabled) + { + /* Call it */ + //ShimLoadCallback = RtlDecodeSystemPointer(g_pfnSE_DllLoaded); + //ShimLoadCallback(LdrEntry); + } + /* Run the init routine */ Status = LdrpRunInitializeRoutines(NULL); if (!NT_SUCCESS(Status)) { /* Failed, unload the DLL */ + if (ShowSnaps) + { + DbgPrint("LDR: Unloading %wZ because either its init " + "routine or one of its static imports failed; " + "status = 0x%08lx\n", + DllName, + Status); + } LdrUnloadDll(LdrEntry->DllBase); } }

1 0

[rharabien] 52606: [NTDLL/LDR] - Fix CMake build - Minor improvements Path by Thomas Faber
by rharabien＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: rharabien Date: Sun Jul 10 13:44:19 2011 New Revision: 52606 URL: http://svn.reactos.org/svn/reactos?rev=52606&view=rev Log: [NTDLL/LDR] - Fix CMake build - Minor improvements Path by Thomas Faber Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/ntdll/ldr/ldrpe.c trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Sun Jul 10 13:44:19 2011 @@ -15,7 +15,6 @@ csr/capture.c csr/connect.c dbg/dbgui.c - ldr/actctx.c ldr/ldrapi.c ldr/ldrinit.c ldr/ldrpe.c Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Sun Jul 10 13:44:19 2011 @@ -561,7 +561,6 @@ } /* Return */ - *ImportEntry = *ImportEntry; return Status; } @@ -595,13 +594,12 @@ } /* Return */ - *ImportEntry = *ImportEntry; return Status; } SkipEntry: /* Move on */ - *ImportEntry = (*ImportEntry)++; + (*ImportEntry)++; return STATUS_SUCCESS; } Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sun Jul 10 13:44:19 2011 @@ -38,8 +38,6 @@ OUT PUNICODE_STRING UpdateString) { PIMAGE_BOUND_FORWARDER_REF NewImportForwarder; - - PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry; PIMAGE_IMPORT_DESCRIPTOR ImportEntry; PIMAGE_THUNK_DATA FirstThunk; @@ -461,7 +459,7 @@ DPRINT1("LDR: Loading of (%wZ) blocked by Winsafer\n", &FullName); } - + /* Failure case, close section handle */ NtClose(*SectionHandle); *SectionHandle = NULL; @@ -885,7 +883,7 @@ /* We couldn't resolve the name, is this a static load? */ if (Static) { - /* + /* * This is BAD! Static loads are CRITICAL. Bugcheck! * Initialize the strings for the error */ @@ -1283,10 +1281,11 @@ { PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; PIMAGE_NT_HEADERS NtHeader; - DPRINT("LdrpAllocateDataTableEntry(%p), NtHeader %p\n", BaseAddress, NtHeader); /* Make sure the header is valid */ NtHeader = RtlImageNtHeader(BaseAddress); + DPRINT("LdrpAllocateDataTableEntry(%p), NtHeader %p\n", BaseAddress, NtHeader); + if (NtHeader) { /* Allocate an entry */ @@ -1319,7 +1318,7 @@ /* Insert into hash table */ i = LDR_GET_HASH_ENTRY(LdrEntry->BaseDllName.Buffer[0]); InsertTailList(&LdrpHashTable[i], &LdrEntry->HashLinks); - + /* Insert into other lists */ InsertTailList(&PebData->InLoadOrderModuleList, &LdrEntry->InLoadOrderLinks); InsertTailList(&PebData->InMemoryOrderModuleList, &LdrEntry->InMemoryOrderModuleList);

1 0

[jgardou] 52605: [AFD] - fix MSVC build
by jgardou＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: jgardou Date: Sun Jul 10 13:28:47 2011 New Revision: 52605 URL: http://svn.reactos.org/svn/reactos?rev=52605&view=rev Log: [AFD] - fix MSVC build Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Sun Jul 10 13:28:47 2011 @@ -81,10 +81,11 @@ PTA_ADDRESS TaCopyAddress( PTA_ADDRESS Source ) { UINT AddrLen = TaLengthOfAddress( Source ); + PVOID Buffer; if (!AddrLen) return NULL; - PVOID Buffer = ExAllocatePool( NonPagedPool, AddrLen ); + Buffer = ExAllocatePool( NonPagedPool, AddrLen ); if (Buffer) RtlCopyMemory( Buffer, Source, AddrLen );

1 0

[ion] 52604: [NTDLL]: Actually delete the file.
by ion＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: ion Date: Sun Jul 10 13:23:54 2011 New Revision: 52604 URL: http://svn.reactos.org/svn/reactos?rev=52604&view=rev Log: [NTDLL]: Actually delete the file. Removed: trunk/reactos/dll/ntdll/ldr/actctx.c Removed: trunk/reactos/dll/ntdll/ldr/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/actctx.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/actctx.c (removed) @@ -1,91 +1,0 @@ - -#include <ntdll.h> -#define NDEBUG -#include <debug.h> - -#include "wine/unicode.h" - - -/*********************************************************************** - * create_module_activation_context - */ -NTSTATUS create_module_activation_context( LDR_DATA_TABLE_ENTRY *module ) -{ - NTSTATUS status; - LDR_RESOURCE_INFO info; - IMAGE_RESOURCE_DATA_ENTRY *entry; - - info.Type = (ULONG)RT_MANIFEST; - info.Name = (ULONG)ISOLATIONAWARE_MANIFEST_RESOURCE_ID; - info.Language = 0; - if (!(status = LdrFindResource_U( module->DllBase, &info, 3, &entry ))) - { - ACTCTXW ctx; - ctx.cbSize = sizeof(ctx); - ctx.lpSource = NULL; - ctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID | ACTCTX_FLAG_HMODULE_VALID; - ctx.hModule = module->DllBase; - ctx.lpResourceName = (LPCWSTR)ISOLATIONAWARE_MANIFEST_RESOURCE_ID; - status = RtlCreateActivationContext( &module->EntryPointActivationContext, &ctx ); - } - return status; -} - -NTSTATUS find_actctx_dll( LPCWSTR libname, WCHAR *fullname ) -{ - static const WCHAR winsxsW[] = {'\\','w','i','n','s','x','s','\\',0}; - /* FIXME: Handle modules that have a private manifest file - static const WCHAR dotManifestW[] = {'.','m','a','n','i','f','e','s','t',0}; */ - - ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *info; - ACTCTX_SECTION_KEYED_DATA data; - UNICODE_STRING nameW; - NTSTATUS status; - SIZE_T needed, size = 1024; - - RtlInitUnicodeString( &nameW, libname ); - data.cbSize = sizeof(data); - status = RtlFindActivationContextSectionString( FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, - ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, - &nameW, &data ); - if (status != STATUS_SUCCESS) return status; - - for (;;) - { - if (!(info = RtlAllocateHeap( RtlGetProcessHeap(), 0, size ))) - { - status = STATUS_NO_MEMORY; - goto done; - } - status = RtlQueryInformationActivationContext( 0, data.hActCtx, &data.ulAssemblyRosterIndex, - AssemblyDetailedInformationInActivationContext, - info, size, &needed ); - if (status == STATUS_SUCCESS) break; - if (status != STATUS_BUFFER_TOO_SMALL) goto done; - RtlFreeHeap( RtlGetProcessHeap(), 0, info ); - size = needed; - } - - DPRINT("manafestpath === %S\n", info->lpAssemblyManifestPath); - DPRINT("DirectoryName === %S\n", info->lpAssemblyDirectoryName); - if (!info->lpAssemblyManifestPath || !info->lpAssemblyDirectoryName) - { - status = STATUS_SXS_KEY_NOT_FOUND; - goto done; - } - - DPRINT("%S. %S\n", info->lpAssemblyManifestPath, info->lpAssemblyDirectoryName); - wcscpy(fullname , SharedUserData->NtSystemRoot); - wcscat(fullname, winsxsW); - wcscat(fullname, info->lpAssemblyDirectoryName); - wcscat(fullname, L"\\"); - wcscat(fullname, libname); - DPRINT("Successfully found a side by side %S\n", fullname); - status = STATUS_SUCCESS; - -done: - RtlFreeHeap( RtlGetProcessHeap(), 0, info ); - RtlReleaseActivationContext( data.hActCtx ); - DPRINT("%S\n", fullname); - return status; -}

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2011