Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[ion] 52603: [NTDLL]: More fixes to the PE parsing code. [NTDLL]: Move and fix LdrUnloadDll to ldrapi.c [NTDLL]: Remove yet another cruft file.
by ion＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: ion Date: Sun Jul 10 13:23:19 2011 New Revision: 52603 URL: http://svn.reactos.org/svn/reactos?rev=52603&view=rev Log: [NTDLL]: More fixes to the PE parsing code. [NTDLL]: Move and fix LdrUnloadDll to ldrapi.c [NTDLL]: Remove yet another cruft file. Modified: trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/ldr/ldrpe.c trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/dll/ntdll/ntdll.rbuild Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Sun Jul 10 13:23:19 2011 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #define LDR_HASH_TABLE_ENTRIES 32 +#define LDR_GET_HASH_ENTRY(x) (RtlUpcaseUnicodeChar((x)) & (LDR_HASH_TABLE_ENTRIES - 1)) /* LdrpUpdateLoadCount2 flags */ #define LDRP_UPDATE_REFCOUNT 0x01 @@ -41,7 +42,7 @@ extern ULONG LdrpActiveUnloadCount; extern BOOLEAN LdrpShutdownInProgress; extern UNICODE_STRING LdrpKnownDllPath; -extern PLDR_DATA_TABLE_ENTRY LdrpGetModuleHandleCache; +extern PLDR_DATA_TABLE_ENTRY LdrpGetModuleHandleCache, LdrpLoadedDllHandleCache; /* ldrinit.c */ NTSTATUS NTAPI LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL); @@ -153,6 +154,10 @@ OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry, OUT PBOOLEAN Existing); +VOID +NTAPI +LdrpFinalizeAndDeallocateDataTableEntry(IN PLDR_DATA_TABLE_ENTRY Entry); + extern HANDLE WindowsApiPort; /* EOF */ 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 13:23:19 2011 @@ -15,6 +15,7 @@ /* GLOBALS *******************************************************************/ +LIST_ENTRY LdrpUnloadHead; LONG LdrpLoaderLockAcquisitonCount; BOOLEAN LdrpShowRecursiveLoads, LdrpBreakOnRecursiveDllLoads; UNICODE_STRING LdrApiDefaultExtension = RTL_CONSTANT_STRING(L".DLL"); @@ -1044,9 +1045,14 @@ return LdrQueryProcessModuleInformationEx(0, 0, ModuleInformation, Size, ReturnedSize); } +/* + * @implemented + */ NTSTATUS NTAPI -LdrEnumerateLoadedModules(BOOLEAN ReservedFlag, PLDR_ENUM_CALLBACK EnumProc, PVOID Context) +LdrEnumerateLoadedModules(IN BOOLEAN ReservedFlag, + IN PLDR_ENUM_CALLBACK EnumProc, + IN PVOID Context) { PLIST_ENTRY ListHead, ListEntry; PLDR_DATA_TABLE_ENTRY LdrEntry; @@ -1244,6 +1250,270 @@ /* * @implemented */ +NTSTATUS +NTAPI +LdrUnloadDll(IN PVOID BaseAddress) +{ + NTSTATUS Status = STATUS_SUCCESS; + PPEB Peb = NtCurrentPeb(); + PLDR_DATA_TABLE_ENTRY LdrEntry, CurrentEntry; + PVOID EntryPoint; + PLIST_ENTRY NextEntry; + LIST_ENTRY UnloadList; + RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED ActCtx; + PVOID CorImageData; + ULONG ComSectionSize; + + /* Get the LDR Lock */ + if (!LdrpInLdrInit) RtlEnterCriticalSection(Peb->LoaderLock); + + /* Increase the unload count */ + LdrpActiveUnloadCount++; + + /* Skip unload */ + if (LdrpShutdownInProgress) goto Quickie; + + /* Make sure the DLL is valid and get its entry */ + if (!LdrpCheckForLoadedDllHandle(BaseAddress, &LdrEntry)) + { + Status = STATUS_DLL_NOT_FOUND; + goto Quickie; + } + + /* Check the current Load Count */ + if (LdrEntry->LoadCount != -1) + { + /* Decrease it */ + LdrEntry->LoadCount--; + + /* If it's a dll */ + if (LdrEntry->Flags & LDRP_IMAGE_DLL) + { + /* 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)); + + /* Activate the ActCtx */ + RtlActivateActivationContextUnsafeFast(&ActCtx, + LdrEntry->EntryPointActivationContext); + + /* Update the load count */ + LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_DEREFCOUNT); + + /* Release the context */ + RtlDeactivateActivationContextUnsafeFast(&ActCtx); + } + } + else + { + /* The DLL is locked */ + goto Quickie; + } + + /* Show debug message */ + if (ShowSnaps) DPRINT1("LDR: UNINIT LIST\n"); + + /* Check if this is our only unload and initialize the list if so */ + if (LdrpActiveUnloadCount == 1) InitializeListHead(&LdrpUnloadHead); + + /* Loop the modules to build the list */ + NextEntry = Peb->Ldr->InInitializationOrderModuleList.Blink; + while (NextEntry != &Peb->Ldr->InInitializationOrderModuleList) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InInitializationOrderModuleList); + NextEntry = NextEntry->Blink; + + /* Remove flag */ + LdrEntry->Flags &= ~LDRP_UNLOAD_IN_PROGRESS; + + /* If the load count is now 0 */ + if (!LdrEntry->LoadCount) + { + /* Show message */ + if (ShowSnaps) + { + DPRINT1("(%d) [%ws] %ws (%lx) deinit %lx\n", + LdrpActiveUnloadCount, + LdrEntry->BaseDllName.Buffer, + LdrEntry->FullDllName.Buffer, + (ULONG)LdrEntry->LoadCount, + LdrEntry->EntryPoint); + } + + /* FIXME: Call Shim Engine and notify */ + + /* Unlink it */ + CurrentEntry = LdrEntry; + RemoveEntryList(&CurrentEntry->InInitializationOrderModuleList); + RemoveEntryList(&CurrentEntry->InMemoryOrderModuleList); + RemoveEntryList(&CurrentEntry->HashLinks); + + /* If there's more then one active unload */ + if (LdrpActiveUnloadCount > 1) + { + /* Flush the cached DLL handle and clear the list */ + LdrpLoadedDllHandleCache = NULL; + CurrentEntry->InMemoryOrderModuleList.Flink = NULL; + } + + /* Add the entry on the unload list */ + InsertTailList(&LdrpUnloadHead, &CurrentEntry->HashLinks); + } + } + + /* Only call the entrypoints once */ + if (LdrpActiveUnloadCount > 1) goto Quickie; + + /* Now loop the unload list and create our own */ + InitializeListHead(&UnloadList); + CurrentEntry = NULL; + NextEntry = LdrpUnloadHead.Flink; + while (NextEntry != &LdrpUnloadHead) + { + /* If we have an active entry */ + if (CurrentEntry) + { + /* Remove it */ + RemoveEntryList(&CurrentEntry->InLoadOrderLinks); + CurrentEntry = NULL; + + /* Reset list pointers */ + NextEntry = LdrpUnloadHead.Flink; + if (NextEntry == &LdrpUnloadHead) break; + } + + /* Get the current entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, HashLinks); + + /* FIXME: Log the Unload Event */ + //LdrpRecordUnloadEvent(LdrEntry); + + /* Set the entry and clear it from the list */ + CurrentEntry = LdrEntry; + LdrpLoadedDllHandleCache = NULL; + CurrentEntry->InMemoryOrderModuleList.Flink = NULL; + + /* Move it from the global to the local list */ + RemoveEntryList(&CurrentEntry->HashLinks); + InsertTailList(&UnloadList, &CurrentEntry->HashLinks); + + /* Get the entrypoint */ + EntryPoint = LdrEntry->EntryPoint; + + /* Check if we should call it */ + if ((EntryPoint) && (LdrEntry->Flags & LDRP_PROCESS_ATTACH_CALLED)) + { + /* Show message */ + if (ShowSnaps) + { + DPRINT1("LDR: Calling deinit %lx\n", EntryPoint); + } + + /* 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)); + + /* Activate the ActCtx */ + RtlActivateActivationContextUnsafeFast(&ActCtx, + LdrEntry->EntryPointActivationContext); + + /* Call the entrypoint */ + LdrpCallInitRoutine(LdrEntry->EntryPoint, + LdrEntry->DllBase, + DLL_PROCESS_DETACH, + NULL); + + /* Release the context */ + RtlDeactivateActivationContextUnsafeFast(&ActCtx); + } + + /* Remove it from the list */ + RemoveEntryList(&CurrentEntry->InLoadOrderLinks); + CurrentEntry = NULL; + NextEntry = LdrpUnloadHead.Flink; + } + + /* Now loop our local list */ + NextEntry = UnloadList.Flink; + while (NextEntry != &UnloadList) + { + /* Get the entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, HashLinks); + NextEntry = NextEntry->Flink; + CurrentEntry = LdrEntry; + + /* Notify Application Verifier */ + if (Peb->NtGlobalFlag & FLG_HEAP_ENABLE_TAIL_CHECK) + { + DPRINT1("We don't support Application Verifier yet\n"); + } + + /* Show message */ + if (ShowSnaps) + { + DPRINT1("LDR: Unmapping [%ws]\n", LdrEntry->BaseDllName.Buffer); + } + + /* Check if this is a .NET executable */ + CorImageData = RtlImageDirectoryEntryToData(LdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, + &ComSectionSize); + if (CorImageData) + { + /* FIXME */ + DPRINT1(".NET Images are not supported yet\n"); + } + + /* Check if we should unmap*/ + if (!(CurrentEntry->Flags & LDR_COR_OWNS_UNMAP)) + { + /* Unmap the DLL */ + Status = NtUnmapViewOfSection(NtCurrentProcess(), + CurrentEntry->DllBase); + ASSERT(NT_SUCCESS(Status)); + } + + /* Unload the alternate resource module, if any */ + LdrUnloadAlternateResourceModule(CurrentEntry->DllBase); + + /* FIXME: Send shutdown notification */ + //LdrpSendDllNotifications(CurrentEntry, 2, LdrpShutdownInProgress); + + /* Check if a Hotpatch is active */ + if (LdrEntry->PatchInformation) + { + /* FIXME */ + DPRINT1("We don't support Hotpatching yet\n"); + } + + /* Deallocate the Entry */ + LdrpFinalizeAndDeallocateDataTableEntry(CurrentEntry); + + /* If this is the cached entry, invalidate it */ + if (LdrpGetModuleHandleCache == CurrentEntry) + { + LdrpGetModuleHandleCache = NULL; + } + } + +Quickie: + /* Decrease unload count */ + LdrpActiveUnloadCount--; + if (!LdrpInLdrInit) RtlLeaveCriticalSection(Peb->LoaderLock); + + /* Return to caller */ + return Status; +} + +/* + * @implemented + */ BOOLEAN NTAPI RtlDllShutdownInProgress(VOID) 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:23:19 2011 @@ -27,21 +27,15 @@ IN PIMAGE_IMPORT_DESCRIPTOR IatEntry, IN BOOLEAN EntriesValid) { - PIMAGE_EXPORT_DIRECTORY ExportDirectory; - ULONG ExportSize; PVOID Iat; - SIZE_T ImportSize; - ULONG IatSize; - //PPEB Peb = NtCurrentPeb(); NTSTATUS Status; PIMAGE_THUNK_DATA OriginalThunk, FirstThunk; - LPSTR ImportName; - ULONG ForwarderChain; PIMAGE_NT_HEADERS NtHeader; PIMAGE_SECTION_HEADER SectionHeader; - ULONG i, Rva; - ULONG OldProtect; - + PIMAGE_EXPORT_DIRECTORY ExportDirectory; + LPSTR ImportName; + ULONG ForwarderChain, i, Rva, OldProtect, IatSize, ExportSize; + SIZE_T ImportSize; DPRINT("LdrpSnapIAT(%wZ %wZ %p %d)\n", &ExportLdrEntry->BaseDllName, &ImportLdrEntry->BaseDllName, IatEntry, EntriesValid); /* Get export directory */ @@ -51,7 +45,13 @@ &ExportSize); /* Make sure it has one */ - if (!ExportDirectory) return STATUS_INVALID_IMAGE_FORMAT; + if (!ExportDirectory) + { + /* Fail */ + DbgPrint("LDR: %wZ doesn't contain an EXPORT table\n", + &ExportLdrEntry->BaseDllName); + return STATUS_INVALID_IMAGE_FORMAT; + } /* Get the IAT */ Iat = RtlImageDirectoryEntryToData(ImportLdrEntry->DllBase, @@ -65,6 +65,7 @@ { /* Get the NT Header and the first section */ NtHeader = RtlImageNtHeader(ImportLdrEntry->DllBase); + if (!NtHeader) return STATUS_INVALID_IMAGE_FORMAT; SectionHeader = IMAGE_FIRST_SECTION(NtHeader); /* Get the RVA of the import directory */ @@ -89,8 +90,7 @@ IatSize = SectionHeader->Misc.VirtualSize; /* Deal with Watcom and other retarded compilers */ - if (!IatSize) - IatSize = SectionHeader->SizeOfRawData; + if (!IatSize) IatSize = SectionHeader->SizeOfRawData; /* Found it, get out */ break; @@ -102,7 +102,14 @@ } /* If we still don't have an IAT, that's bad */ - if (!Iat) return STATUS_INVALID_IMAGE_FORMAT; + if (!Iat) + { + /* Fail */ + DbgPrint("LDR: Unable to unprotect IAT for %wZ (Image Base %p)\n", + &ImportLdrEntry->BaseDllName, + ImportLdrEntry->DllBase); + return STATUS_INVALID_IMAGE_FORMAT; + } /* Set the right size */ ImportSize = IatSize; @@ -114,7 +121,14 @@ &ImportSize, PAGE_READWRITE, &OldProtect); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DbgPrint("LDR: Unable to unprotect IAT for %wZ (Status %x)\n", + &ImportLdrEntry->BaseDllName, + Status); + return Status; + } /* Check if the Thunks are already valid */ if (EntriesValid) @@ -400,6 +414,7 @@ if (Stale) { /* It was, so find the IAT entry for it */ + ++LdrpNormalSnap; ImportEntry = RtlImageDirectoryEntryToData(LdrEntry->DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, 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:23:19 2011 @@ -15,10 +15,7 @@ /* GLOBALS *******************************************************************/ -LIST_ENTRY LdrpUnloadHead; PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache, LdrpGetModuleHandleCache; - -#define LDR_GET_HASH_ENTRY(x) (RtlUpcaseUnicodeChar((x)) & (LDR_HASH_TABLE_ENTRIES - 1)) /* FUNCTIONS *****************************************************************/ @@ -283,35 +280,39 @@ /* Protect against invalid pointers */ _SEH2_TRY { - /* Make sure it's valid and we have an array */ - Array = (PIMAGE_TLS_CALLBACK *)TlsDirectory->AddressOfCallBacks; - if ((TlsDirectory) && (Array)) - { - /* Display debug */ - if (ShowSnaps) - { - DPRINT1("LDR: Tls Callbacks Found. Imagebase %p Tls %p CallBacks %p\n", - BaseAddress, TlsDirectory, Array); - } - - /* Loop the array */ - while (*Array) - { - /* Get the TLS Entrypoint */ - Callback = *Array++; - + /* Make sure it's valid */ + if (TlsDirectory) + { + /* Get the array */ + Array = (PIMAGE_TLS_CALLBACK *)TlsDirectory->AddressOfCallBacks; + if (Array) + { /* Display debug */ if (ShowSnaps) { - DPRINT1("LDR: Calling Tls Callback Imagebase %p Function %p\n", - BaseAddress, Callback); + DPRINT1("LDR: Tls Callbacks Found. Imagebase %p Tls %p CallBacks %p\n", + BaseAddress, TlsDirectory, Array); } - /* Call it */ - LdrpCallInitRoutine((PDLL_INIT_ROUTINE)Callback, - BaseAddress, - Reason, - NULL); + /* Loop the array */ + while (*Array) + { + /* Get the TLS Entrypoint */ + Callback = *Array++; + + /* Display debug */ + if (ShowSnaps) + { + DPRINT1("LDR: Calling Tls Callback Imagebase %p Function %p\n", + BaseAddress, Callback); + } + + /* Call it */ + LdrpCallInitRoutine((PDLL_INIT_ROUTINE)Callback, + BaseAddress, + Reason, + NULL); + } } } } @@ -2050,272 +2051,6 @@ return Status; } -/* - * @implemented - */ -NTSTATUS -NTAPI -LdrUnloadDll(IN PVOID BaseAddress) -{ - NTSTATUS Status = STATUS_SUCCESS; - PPEB Peb = NtCurrentPeb(); - PLDR_DATA_TABLE_ENTRY LdrEntry, CurrentEntry; - PVOID EntryPoint; - PLIST_ENTRY NextEntry; - LIST_ENTRY UnloadList; - RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED ActCtx; - PVOID CorImageData; - ULONG ComSectionSize; - - /* Get the LDR Lock */ - if (!LdrpInLdrInit) RtlEnterCriticalSection(Peb->LoaderLock); - - /* Increase the unload count */ - LdrpActiveUnloadCount++; - - /* Skip unload */ - if (LdrpShutdownInProgress) goto Quickie; - - /* Make sure the DLL is valid and get its entry */ - if (!LdrpCheckForLoadedDllHandle(BaseAddress, &LdrEntry)) - { - Status = STATUS_DLL_NOT_FOUND; - goto Quickie; - } - - /* Check the current Load Count */ - if (LdrEntry->LoadCount != 0xFFFF) - { - /* Decrease it */ - LdrEntry->LoadCount--; - - /* If it's a dll */ - if (LdrEntry->Flags & LDRP_IMAGE_DLL) - { - /* Set up the Act Ctx */ - ActCtx.Size = sizeof(ActCtx); - ActCtx.Format = 1; - RtlZeroMemory(&ActCtx.Frame, sizeof(RTL_ACTIVATION_CONTEXT_STACK_FRAME)); - - /* Activate the ActCtx */ - RtlActivateActivationContextUnsafeFast(&ActCtx, - LdrEntry->EntryPointActivationContext); - - /* Update the load count */ - LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_DEREFCOUNT); - - /* Release the context */ - RtlDeactivateActivationContextUnsafeFast(&ActCtx); - } - } - else - { - /* The DLL is locked */ - goto Quickie; - } - - /* Show debug message */ - if (ShowSnaps) DPRINT1("LDR: UNINIT LIST\n"); - - /* Check if this is our only unload */ - if (LdrpActiveUnloadCount == 1) - { - /* Initialize the unload list */ - InitializeListHead(&LdrpUnloadHead); - } - - /* Loop the modules to build the list */ - NextEntry = Peb->Ldr->InInitializationOrderModuleList.Blink; - while (NextEntry != &Peb->Ldr->InInitializationOrderModuleList) - { - /* Get the entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); - NextEntry = NextEntry->Blink; - - /* Remove flag */ - LdrEntry->Flags &= ~LDRP_UNLOAD_IN_PROGRESS; - - /* If the load count is now 0 */ - if (!LdrEntry->LoadCount) - { - /* Show message */ - if (ShowSnaps) - { - DPRINT1("(%d) [%ws] %ws (%lx) deinit %lx\n", - LdrpActiveUnloadCount, - LdrEntry->BaseDllName.Buffer, - LdrEntry->FullDllName.Buffer, - (ULONG)LdrEntry->LoadCount, - LdrEntry->EntryPoint); - } - - /* FIXME: Call Shim Engine and notify */ - - /* Unlink it */ - CurrentEntry = LdrEntry; - RemoveEntryList(&CurrentEntry->InInitializationOrderModuleList); - RemoveEntryList(&CurrentEntry->InMemoryOrderModuleList); - RemoveEntryList(&CurrentEntry->HashLinks); - - /* If there's more then one active unload */ - if (LdrpActiveUnloadCount > 1) - { - /* Flush the cached DLL handle and clear the list */ - LdrpLoadedDllHandleCache = NULL; - CurrentEntry->InMemoryOrderModuleList.Flink = NULL; - } - - /* Add the entry on the unload list */ - InsertTailList(&LdrpUnloadHead, &CurrentEntry->HashLinks); - } - } - - /* Only call the entrypoints once */ - if (LdrpActiveUnloadCount > 1) goto Quickie; - - /* Now loop the unload list and create our own */ - InitializeListHead(&UnloadList); - CurrentEntry = NULL; - NextEntry = LdrpUnloadHead.Flink; - while (NextEntry != &LdrpUnloadHead) - { - /* If we have an active entry */ - if (CurrentEntry) - { - /* Remove it */ - RemoveEntryList(&CurrentEntry->InLoadOrderLinks); - CurrentEntry = NULL; - - /* Reset list pointers */ - NextEntry = LdrpUnloadHead.Flink; - if (NextEntry == &LdrpUnloadHead) break; - } - - /* Get the current entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, HashLinks); - - /* Log the Unload Event */ - //LdrpRecordUnloadEvent(LdrEntry); - - /* Set the entry and clear it from the list */ - CurrentEntry = LdrEntry; - LdrpLoadedDllHandleCache = NULL; - CurrentEntry->InMemoryOrderModuleList.Flink = NULL; - - /* Move it from the global to the local list */ - RemoveEntryList(&CurrentEntry->HashLinks); - InsertTailList(&UnloadList, &CurrentEntry->HashLinks); - - /* Get the entrypoint */ - EntryPoint = LdrEntry->EntryPoint; - - /* Check if we should call it */ - if (EntryPoint && (LdrEntry->Flags & LDRP_PROCESS_ATTACH_CALLED)) - { - /* Show message */ - if (ShowSnaps) - { - DPRINT1("LDR: Calling deinit %lx\n", EntryPoint); - } - - /* Set up the Act Ctx */ - ActCtx.Size = sizeof(ActCtx); - ActCtx.Format = 1; - RtlZeroMemory(&ActCtx.Frame, sizeof(RTL_ACTIVATION_CONTEXT_STACK_FRAME)); - - /* Activate the ActCtx */ - RtlActivateActivationContextUnsafeFast(&ActCtx, - LdrEntry->EntryPointActivationContext); - - /* Call the entrypoint */ - LdrpCallInitRoutine(LdrEntry->EntryPoint, - LdrEntry->DllBase, - DLL_PROCESS_DETACH, - NULL); - - /* Release the context */ - RtlDeactivateActivationContextUnsafeFast(&ActCtx); - } - - /* Remove it from the list */ - RemoveEntryList(&CurrentEntry->InLoadOrderLinks); - CurrentEntry = NULL; - NextEntry = LdrpUnloadHead.Flink; - } - - /* Now loop our local list */ - NextEntry = UnloadList.Flink; - while (NextEntry != &UnloadList) - { - /* Get the entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, HashLinks); - NextEntry = NextEntry->Flink; - CurrentEntry = LdrEntry; - - /* Notify Application Verifier */ - if (Peb->NtGlobalFlag & FLG_HEAP_ENABLE_TAIL_CHECK) - { - DPRINT1("We don't support Application Verifier yet\n"); - } - - /* Show message */ - if (ShowSnaps) - { - DPRINT1("LDR: Unmapping [%ws]\n", LdrEntry->BaseDllName.Buffer); - } - - /* Check if this is a .NET executable */ - if ((CorImageData = RtlImageDirectoryEntryToData(LdrEntry->DllBase, - TRUE, - IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, - &ComSectionSize))) - { - /* FIXME */ - DPRINT1(".NET Images are not supported yet\n"); - } - - /* Check if we should unmap*/ - if (!(CurrentEntry->Flags & LDR_COR_OWNS_UNMAP)) - { - /* Unmap the DLL */ - Status = NtUnmapViewOfSection(NtCurrentProcess(), - CurrentEntry->DllBase); - } - - /* Unload the alternate resource module, if any */ - LdrUnloadAlternateResourceModule(CurrentEntry->DllBase); - - /* Send shutdown notification */ - //LdrpSendDllNotifications(CurrentEntry, 2, LdrpShutdownInProgress); - - /* Check if a Hotpatch is active */ - if (LdrEntry->PatchInformation) - { - /* FIXME */ - DPRINT1("We don't support Hotpatching yet\n"); - } - - /* Deallocate the Entry */ - LdrpFinalizeAndDeallocateDataTableEntry(CurrentEntry); - - /* If this is the cached entry, invalide it */ - if (LdrpGetModuleHandleCache == CurrentEntry) - { - LdrpGetModuleHandleCache = NULL; - } - } - -Quickie: - /* Decrease unload count */ - LdrpActiveUnloadCount--; - if (!LdrpInLdrInit) RtlLeaveCriticalSection(Peb->LoaderLock); - - /* FIXME: Rundown the Hotpatch data, if present */ - - /* Return to caller */ - return Status; -} - ULONG NTAPI LdrpClearLoadInProgress(VOID) Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Sun Jul 10 13:23:19 2011 @@ -51,7 +51,6 @@ <file>ldrinit.c</file> <file>ldrpe.c</file> <file>ldrutils.c</file> - <file>actctx.c</file> </directory> <directory name="rtl"> <file>libsupp.c</file>

1 0

[nyadav] 52602: [AUDSRV] Fix some Thread Synchronization bugs and some style fixes
by nyadav＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: nyadav Date: Sun Jul 10 12:55:38 2011 New Revision: 52602 URL: http://svn.reactos.org/svn/reactos?rev=52602&view=rev Log: [AUDSRV] Fix some Thread Synchronization bugs and some style fixes Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h branches/nyadav-audio-branch/base/services/audsrv/mixer.c branches/nyadav-audio-branch/base/services/audsrv/stream.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Sun Jul 10 12:55:38 2011 @@ -55,9 +55,10 @@ PVOID minsamplevalue; PVOID maxsamplevalue; - HANDLE played; + HANDLE stream_played_event; HANDLE threadready; HANDLE thread; + CRITICAL_SECTION CriticalSection; struct ServerStream * next; } ServerStream; Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Sun Jul 10 12:55:38 2011 @@ -13,6 +13,9 @@ { return NULL; } + +/*Filter Should ensure that sample data is divided equally on both side of Analog-Zero Sample value[0 for signed data,maxattainablevalue/2 for unsigned]*/ + void * MixS16(MixerEngine * mixer, int buffer) { @@ -41,15 +44,24 @@ /*Perform Actual Mixing*/ stream = mixer->serverstreamlist; - minsamplevalue = *(short *) stream->minsamplevalue; - maxsamplevalue = *(short *) stream->maxsamplevalue; + minsamplevalue = 0; + maxsamplevalue = 0; while( stream != NULL) { - localsrcbuf = stream->filteredbuf; - if(stream->ready == TRUE ) + EnterCriticalSection(&(stream->CriticalSection)); + + if(stream->ready == TRUE && *(short *) stream->minsamplevalue != 0 && *(short *) stream->minsamplevalue != 0) { coefficient = 1.0; + + localsrcbuf = stream->filteredbuf; + + if(minsamplevalue == 0) + minsamplevalue = *(short *) stream->minsamplevalue; + + if(maxsamplevalue == 0) + maxsamplevalue = *(short *) stream->maxsamplevalue; if( *(short *)stream->maxsamplevalue != maxsamplevalue || *(short *)stream->minsamplevalue != minsamplevalue ) @@ -60,12 +72,20 @@ else coefficient = (float) minsamplevalue / (float)*(short *)stream->minsamplevalue; } + for(i=0;i<stream->length_filtered/sizeof(short);i++) { localsinkbuf[i] = (short) (( (localsinkbuf[i] * streamcount) + ((short)((float) localsrcbuf[i] ) * coefficient) ) / (streamcount +1)); } + } //stream->ready = 0; /*TODO Enable it when actual filter thread starts working*/ + //HeapFree(GetProcessHeap(), + // 0, + // stream->filteredbuf); + SetEvent(stream->stream_played_event); + LeaveCriticalSection(&(stream->CriticalSection)); + streamcount++; stream = stream->next; } Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Sun Jul 10 12:55:38 2011 @@ -12,7 +12,7 @@ long GetNewStreamID() { long streamid= pengine->streamidpool; - pengine->streamidpool+=1; + pengine->streamidpool += 1; return streamid; } @@ -23,11 +23,11 @@ /*UGLY HACK--WILL be removed soon-- fill filtered buffer (1 second duration in the master stream format) directly until we are in a condition to get buffer directly from the client*/ /******************************************************/ - BOOL initmin=FALSE,initmax =FALSE; - short minimum=0,maximum=0; + BOOL initmin=FALSE,initmax = FALSE; + short minimum=0,maximum = 0; PSHORT tempbuf; - localstream->ready =TRUE; + localstream->length_filtered = localstream->freq * localstream->channels * localstream->bitspersample / 8; tempbuf = (PSHORT) HeapAlloc(GetProcessHeap(), 0, @@ -35,12 +35,12 @@ while (i < localstream->length_filtered / 2) { - tempbuf[i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * 6.28 / 48000); + tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 48000); if((localstream->streamid %2) == 0) - tempbuf[i] = 0; - - if(initmin) + tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 24000); + + if(initmin) { if(tempbuf[i]<minimum) minimum = tempbuf[i]; @@ -60,10 +60,10 @@ } i++; - tempbuf[i] = 0x7FFF * sin(0.5 * (i - 2) * 500 * 6.28 / 48000); - - if((localstream->streamid %2) != 0) - tempbuf[i] = 0; + tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 48000); + + if((localstream->streamid %2) == 0) + tempbuf[i] = 0x7FFF * sin(0.5 * i * 500 * 6.28 / 24000); if(initmin) @@ -86,13 +86,21 @@ *((int *)localstream->minsamplevalue) = minimum; *((int *)localstream->maxsamplevalue) = maximum; localstream->filteredbuf = tempbuf; + localstream->ready =TRUE; + /******************************************************/ +/*Do Some Initialization If needed.Only After these Initialization remaining system will be told that stream is ready*/ SetEvent(localstream->threadready); - while (1) - { - OutputDebugStringA("Stream Thread Running."); - Sleep(100); + while (TRUE) + { + /*Wait For Data Write Event,currently NO Wait considering Data has always been written*/ + + EnterCriticalSection(&(localstream->CriticalSection)); + + LeaveCriticalSection(&(localstream->CriticalSection)); + /*Wait For Stream Played Event*/ + WaitForSingleObject(localstream->stream_played_event,INFINITE); } /*Clean Stream's data*/ } @@ -164,7 +172,7 @@ newstream->next = NULL; - newstream->played = CreateEvent(NULL, + newstream->stream_played_event = CreateEvent(NULL, FALSE, FALSE, NULL); @@ -174,7 +182,13 @@ FALSE, NULL); - if(newstream->played == NULL || newstream->threadready == NULL) + if(newstream->stream_played_event == NULL || newstream->threadready == NULL) + goto error; + + newstream->streamid=GetNewStreamID(); + + if (!InitializeCriticalSectionAndSpinCount(&(newstream->CriticalSection), + 0x00000400) ) goto error; newstream->thread=CreateThread(NULL, @@ -187,11 +201,10 @@ if(newstream->thread == NULL) goto error; - WaitForSingleObject(newstream->threadready, INFINITE); - newstream->streamid=GetNewStreamID(); + if(localstream == NULL) { @@ -212,8 +225,11 @@ return newstream->streamid; error: - HeapFree(GetProcessHeap(), 0, newstream); + HeapFree(GetProcessHeap(), + 0, + newstream); return 0; } -/*Dont forget to clean ServerStream's minsamplevalue and maxsamplevalue while removing the stream*/ +/*Dont forget to clean ServerStream's minsamplevalue and maxsamplevalue while removing the stream*/ +/*Delete Critical Section while cleaning Stream*/ Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Sun Jul 10 12:55:38 2011 @@ -14,7 +14,9 @@ /*Initialize an audio stream *Return -1 if callbacks are NULL pointers */ -WINAPI int InitStream (ClientStream * clientstream, +int +WINAPI +InitStream (ClientStream * clientstream, LONG frequency, int channels, int bitspersample, @@ -69,7 +71,9 @@ return 0; } -WINAPI int PlayAudio ( ClientStream * clientstream ) +int +WINAPI +PlayAudio ( ClientStream * clientstream ) { /*This is an ActiveScheduler*/ clientstream->callbacks.OpenComplete(0); @@ -97,7 +101,9 @@ return 0; } -WINAPI int StopAudio (ClientStream * clientstream ) +int +WINAPI +StopAudio (ClientStream * clientstream ) { /*Server Side termination is remaining*/ /*If connected Properly call the remote audsrv_stop() function*/ @@ -106,19 +112,25 @@ return 0; } -WINAPI int Volume(ClientStream * clientstream, +int +WINAPI +Volume(ClientStream * clientstream, int * volume ) { return 0; } -WINAPI int SetVolume(ClientStream * clientstream , +int +WINAPI +SetVolume(ClientStream * clientstream , const int newvolume) { return 0; } -WINAPI int Write(ClientStream * clientstream , +int +WINAPI +Write(ClientStream * clientstream , const char * aData) { if(clientstream->dead) @@ -129,13 +141,17 @@ return 0; } -WINAPI int SetBalance(ClientStream * clientstream , +int +WINAPI +SetBalance(ClientStream * clientstream , float balance) { return 0; } -WINAPI int GetBalance(ClientStream * clientstream , +int +WINAPI +GetBalance(ClientStream * clientstream , float * balance) { return 0; Modified: branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] Sun Jul 10 12:55:38 2011 @@ -24,7 +24,9 @@ } ClientStream; /********************API Functions******************/ -WINAPI int InitStream (ClientStream * clientstream, +int +WINAPI +InitStream (ClientStream * clientstream, LONG frequency, int channels, int bitspersample, @@ -34,18 +36,34 @@ int mute, float balance); -WINAPI int PlayAudio ( ClientStream * clientstream); -WINAPI int StopAudio (ClientStream * clientstream ); +int +WINAPI +PlayAudio ( ClientStream * clientstream); -WINAPI int Volume(ClientStream * clientstream, +int +WINAPI +StopAudio (ClientStream * clientstream ); + +int +WINAPI +Volume(ClientStream * clientstream, int * volume ); -WINAPI int SetVolume(ClientStream * clientstream , +int +WINAPI +SetVolume(ClientStream * clientstream , const int newvolume); -WINAPI int Write(ClientStream * clientstream , +int +WINAPI +Write(ClientStream * clientstream , const char * aData); -WINAPI int SetBalance(ClientStream * clientstream , + +int +WINAPI +SetBalance(ClientStream * clientstream , float balance); -WINAPI int GetBalance(ClientStream * clientstream , +int +WINAPI +GetBalance(ClientStream * clientstream , float * balance); #endif

1 0

[rharabien] 52601: [NTDLL/LDR] - Don't use -1 for USHORT LDR_DATA_TABLE_ENTRY::LoadCount. When comparing ((USHORT)-1) == 0xFFFF vs (int)-1 it ends in comparison 0xFFFF vs 0xFFFFFFFF with is wrong. ...
by rharabien＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: rharabien Date: Sun Jul 10 11:49:52 2011 New Revision: 52601 URL: http://svn.reactos.org/svn/reactos?rev=52601&view=rev Log: [NTDLL/LDR] - Don't use -1 for USHORT LDR_DATA_TABLE_ENTRY::LoadCount. When comparing ((USHORT)-1) == 0xFFFF vs (int)-1 it ends in comparison 0xFFFF vs 0xFFFFFFFF with is wrong. Fixes shutdown from shell See issue #6345 for more details. 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 11:49:52 2011 @@ -105,7 +105,7 @@ FALSE, &Entry)) { - if (Entry->LoadCount != -1) + if (Entry->LoadCount != 0xFFFF) { /* Perform the required action */ switch (Flags) @@ -117,7 +117,7 @@ Entry->LoadCount--; break; case LDRP_UPDATE_PIN: - Entry->LoadCount = -1; + Entry->LoadCount = 0xFFFF; break; } @@ -149,7 +149,7 @@ FALSE, &Entry)) { - if (Entry->LoadCount != -1) + if (Entry->LoadCount != 0xFFFF) { /* Perform the required action */ switch (Flags) @@ -161,7 +161,7 @@ Entry->LoadCount--; break; case LDRP_UPDATE_PIN: - Entry->LoadCount = -1; + Entry->LoadCount = 0xFFFF; break; } @@ -218,7 +218,7 @@ FALSE, &Entry)) { - if (Entry->LoadCount != -1) + if (Entry->LoadCount != 0xFFFF) { /* Perform the required action */ switch (Flags) @@ -230,7 +230,7 @@ Entry->LoadCount--; break; case LDRP_UPDATE_PIN: - Entry->LoadCount = -1; + Entry->LoadCount = 0xFFFF; break; } @@ -1963,7 +1963,7 @@ } /* Update load count, unless it's locked */ - if (LdrEntry->LoadCount != -1) LdrEntry->LoadCount++; + if (LdrEntry->LoadCount != 0xFFFF) LdrEntry->LoadCount++; LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT); /* Check if we failed */ @@ -1982,7 +1982,7 @@ goto Quickie; } } - else if (LdrEntry->LoadCount != -1) + else if (LdrEntry->LoadCount != 0xFFFF) { /* Increase load count */ LdrEntry->LoadCount++; @@ -2014,7 +2014,7 @@ else { /* We were already loaded. Are we a DLL? */ - if ((LdrEntry->Flags & LDRP_IMAGE_DLL) && (LdrEntry->LoadCount != -1)) + if ((LdrEntry->Flags & LDRP_IMAGE_DLL) && (LdrEntry->LoadCount != 0xFFFF)) { /* Increase load count */ LdrEntry->LoadCount++; @@ -2026,7 +2026,7 @@ else { /* Not a DLL, just increase the load count */ - if (LdrEntry->LoadCount != -1) LdrEntry->LoadCount++; + if (LdrEntry->LoadCount != 0xFFFF) LdrEntry->LoadCount++; } } @@ -2084,7 +2084,7 @@ } /* Check the current Load Count */ - if (LdrEntry->LoadCount != -1) + if (LdrEntry->LoadCount != 0xFFFF) { /* Decrease it */ LdrEntry->LoadCount--;

1 0

[cgutman] 52600: [AFD] - Fix broken TDI address functions which were causing subtle memory corruptions, wasted memory, and incorrect or uninitialized values of the address length field - Remove som...
by cgutman＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: cgutman Date: Sun Jul 10 08:25:31 2011 New Revision: 52600 URL: http://svn.reactos.org/svn/reactos?rev=52600&view=rev Log: [AFD] - Fix broken TDI address functions which were causing subtle memory corruptions, wasted memory, and incorrect or uninitialized values of the address length field - Remove some buggy code that wasn't used anywhere - General refactoring to reduce code duplication - Handle an invalid address type properly Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/afd/include/tdiconn.h 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 08:25:31 2011 @@ -15,38 +15,61 @@ UINT TdiAddressSizeFromType( UINT AddressType ) { switch( AddressType ) { case TDI_ADDRESS_TYPE_IP: - return sizeof(TA_IP_ADDRESS); + return TDI_ADDRESS_LENGTH_IP; case TDI_ADDRESS_TYPE_APPLETALK: - return sizeof(TA_APPLETALK_ADDRESS); + return TDI_ADDRESS_LENGTH_APPLETALK; case TDI_ADDRESS_TYPE_NETBIOS: - return sizeof(TA_NETBIOS_ADDRESS); + return TDI_ADDRESS_LENGTH_NETBIOS; /* case TDI_ADDRESS_TYPE_NS: */ case TDI_ADDRESS_TYPE_IPX: - return sizeof(TA_IPX_ADDRESS); + return TDI_ADDRESS_LENGTH_IPX; case TDI_ADDRESS_TYPE_VNS: - return sizeof(TA_VNS_ADDRESS); + return TDI_ADDRESS_LENGTH_VNS; default: DbgPrint("TdiAddressSizeFromType - invalid type: %x\n", AddressType); return 0; } } -UINT TaLengthOfAddress( PTA_ADDRESS Addr ) { - UINT AddrLen = 2 * sizeof( USHORT ) + Addr->AddressLength; +UINT TaLengthOfAddress( PTA_ADDRESS Addr ) +{ + UINT AddrLen = Addr->AddressLength; + + if (!AddrLen) + return 0; + + AddrLen += 2 * sizeof( USHORT ); + AFD_DbgPrint(MID_TRACE,("AddrLen %x\n", AddrLen)); + return AddrLen; } -UINT TaLengthOfTransportAddress( PTRANSPORT_ADDRESS Addr ) { - UINT AddrLen = sizeof(ULONG) + TaLengthOfAddress(&Addr->Address[0]); +UINT TaLengthOfTransportAddress( PTRANSPORT_ADDRESS Addr ) +{ + UINT AddrLen = TaLengthOfAddress(&Addr->Address[0]); + + if (!AddrLen) + return 0; + + AddrLen += sizeof(ULONG); + AFD_DbgPrint(MID_TRACE,("AddrLen %x\n", AddrLen)); + return AddrLen; } UINT TaLengthOfTransportAddressByType(UINT AddressType) { - UINT AddrLen = sizeof(ULONG) + 2 * sizeof(USHORT) + TdiAddressSizeFromType(AddressType); + UINT AddrLen = TdiAddressSizeFromType(AddressType); + + if (!AddrLen) + return 0; + + AddrLen += sizeof(ULONG) + 2 * sizeof(USHORT); + AFD_DbgPrint(MID_TRACE,("AddrLen %x\n", AddrLen)); + return AddrLen; } @@ -58,9 +81,14 @@ PTA_ADDRESS TaCopyAddress( PTA_ADDRESS Source ) { UINT AddrLen = TaLengthOfAddress( Source ); + if (!AddrLen) + return NULL; + PVOID Buffer = ExAllocatePool( NonPagedPool, AddrLen ); + if (Buffer) RtlCopyMemory( Buffer, Source, AddrLen ); + return Buffer; } @@ -74,8 +102,10 @@ UINT AddrLen; PTRANSPORT_ADDRESS A; - ASSERT(OtherAddress->TAAddressCount == 1); AddrLen = TaLengthOfTransportAddress( OtherAddress ); + if (!AddrLen) + return NULL; + A = ExAllocatePool( NonPagedPool, AddrLen ); if( A ) @@ -84,20 +114,39 @@ return A; } +NTSTATUS TdiBuildNullTransportAddressInPlace(PTRANSPORT_ADDRESS A, UINT AddressType) +{ + A->TAAddressCount = 1; + + A->Address[0].AddressLength = TdiAddressSizeFromType(AddressType); + if (!A->Address[0].AddressLength) + return STATUS_INVALID_PARAMETER; + + A->Address[0].AddressType = AddressType; + + RtlZeroMemory(A->Address[0].Address, A->Address[0].AddressLength); + + return STATUS_SUCCESS; +} + PTRANSPORT_ADDRESS TaBuildNullTransportAddress(UINT AddressType) { UINT AddrLen; PTRANSPORT_ADDRESS A; AddrLen = TaLengthOfTransportAddressByType(AddressType); + if (!AddrLen) + return NULL; + A = ExAllocatePool(NonPagedPool, AddrLen); if (A) { - A->TAAddressCount = 1; - A->Address[0].AddressLength = TdiAddressSizeFromType(AddressType); - A->Address[0].AddressType = AddressType; - RtlZeroMemory(A->Address[0].Address, A->Address[0].AddressLength); + if (TdiBuildNullTransportAddressInPlace(A, AddressType) != STATUS_SUCCESS) + { + ExFreePool(A); + return NULL; + } } return A; @@ -118,7 +167,7 @@ ULONG TdiAddressSize; PTRANSPORT_ADDRESS TransportAddress; - TdiAddressSize = TdiAddressSizeFromType(Type); + TdiAddressSize = TaLengthOfTransportAddressByType(Type); if (!TdiAddressSize) return STATUS_INVALID_PARAMETER; @@ -130,10 +179,8 @@ ConnInfo->RemoteAddressLength = TdiAddressSize; ConnInfo->RemoteAddress = TransportAddress = (PTRANSPORT_ADDRESS)&ConnInfo[1]; - TransportAddress->TAAddressCount = 1; - TransportAddress->Address[0].AddressType = Type; - - return STATUS_SUCCESS; + + return TdiBuildNullTransportAddressInPlace(TransportAddress, Type); } NTSTATUS TdiBuildNullConnectionInfo @@ -153,7 +200,7 @@ ULONG TdiAddressSize; NTSTATUS Status; - TdiAddressSize = TdiAddressSizeFromType(Type); + TdiAddressSize = TaLengthOfTransportAddressByType(Type); if (!TdiAddressSize) { *ConnectionInfo = NULL; return STATUS_INVALID_PARAMETER; @@ -170,15 +217,13 @@ Status = TdiBuildNullConnectionInfoInPlace( ConnInfo, Type ); - if (!NT_SUCCESS(Status)) { + if (!NT_SUCCESS(Status)) + { ExFreePool( ConnInfo ); - *ConnectionInfo = NULL; - return Status; - } else - *ConnectionInfo = ConnInfo; - - ConnInfo->RemoteAddress = (PTA_ADDRESS)&ConnInfo[1]; - ConnInfo->RemoteAddressLength = TdiAddressSize; + ConnInfo = NULL; + } + + *ConnectionInfo = ConnInfo; return Status; } @@ -215,60 +260,3 @@ return Status; } -NTSTATUS -TdiBuildConnectionInfoPair -( PTDI_CONNECTION_INFO_PAIR ConnectionInfo, - PTRANSPORT_ADDRESS From, PTRANSPORT_ADDRESS To ) -/* - * FUNCTION: Fill a TDI_CONNECTION_INFO_PAIR struct will the two addresses - * given. - * ARGUMENTS: - * ConnectionInfo: The pair - * From: The from address - * To: The to address - * RETURNS: - * Status of the operation - */ -{ - PCHAR LayoutFrame; - UINT SizeOfEntry; - ULONG TdiAddressSize; - PTDI_CONNECTION_INFORMATION FromTdiConn, ToTdiConn; - - if (!From) return STATUS_INVALID_PARAMETER; - - /* FIXME: Get from socket information */ - TdiAddressSize = TdiAddressSizeFromType(From->Address[0].AddressType); - if (!TdiAddressSize) - return STATUS_INVALID_PARAMETER; - - SizeOfEntry = TdiAddressSize + sizeof(TDI_CONNECTION_INFORMATION); - - LayoutFrame = (PCHAR)ExAllocatePool(NonPagedPool, 2 * SizeOfEntry); - - if (!LayoutFrame) { - AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlZeroMemory( LayoutFrame, 2 * SizeOfEntry ); - - FromTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame; - ToTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame + SizeOfEntry; - - TdiBuildConnectionInfoInPlace( FromTdiConn, From ); - - TdiBuildConnectionInfoInPlace( ToTdiConn, To ); - - return STATUS_SUCCESS; -} - -PTA_ADDRESS TdiGetRemoteAddress( PTDI_CONNECTION_INFORMATION TdiConn ) -/* - * Convenience function that rounds out the abstraction of - * the TDI_CONNECTION_INFORMATION struct. - */ -{ - return TdiConn->RemoteAddress; -} - Modified: trunk/reactos/drivers/network/afd/include/tdiconn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/tdiconn.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/tdiconn.h [iso-8859-1] Sun Jul 10 08:25:31 2011 @@ -24,8 +24,3 @@ ( PTDI_CONNECTION_INFORMATION ConnInfo, ULONG Type ); NTSTATUS TdiBuildNullConnectionInfo ( PTDI_CONNECTION_INFORMATION *ConnectionInfo, ULONG Type ); -NTSTATUS TdiBuildConnectionInfoPair -( PTDI_CONNECTION_INFO_PAIR ConnectionInfo, - PTRANSPORT_ADDRESS From, - PTRANSPORT_ADDRESS To ); -PTA_ADDRESS TdiGetRemoteAddress( PTDI_CONNECTION_INFORMATION TdiConn );

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