Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 52599: [KMTEST] - improve user friendliness by making the service management functions actually work
by tfaber＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: tfaber Date: Sun Jul 10 08:03:15 2011 New Revision: 52599 URL: http://svn.reactos.org/svn/reactos?rev=52599&view=rev Log: [KMTEST] - improve user friendliness by making the service management functions actually work Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Sun Jul 10 08:03:15 2011 @@ -22,11 +22,20 @@ #define SERVICE_NAME L"Kmtest" #define SERVICE_PATH L"kmtest_drv.sys" +#define SERVICE_DESCRIPTION L"ReactOS Kernel-Mode Test Suite Driver" #define LOGBUFFER_SIZE 16364 #define RESULTBUFFER_SIZE FIELD_OFFSET(KMT_RESULTBUFFER, LogBuffer[LOGBUFFER_SIZE]) +typedef enum +{ + KMT_DO_NOTHING, + KMT_LIST_TESTS, + KMT_RUN_TEST, +} KMT_OPERATION; + HANDLE KmtestHandle; +SC_HANDLE KmtestServiceHandle; PCSTR ErrorFileAndLine = "No error"; static void OutputError(DWORD Error); @@ -211,6 +220,8 @@ PKMT_TESTFUNC TestFunction; DWORD BytesRead; + assert(TestName != NULL); + ResultBuffer = KmtAllocateResultBuffer(LOGBUFFER_SIZE); if (!DeviceIoControl(KmtestHandle, IOCTL_KMTEST_SET_RESULTBUFFER, ResultBuffer, RESULTBUFFER_SIZE, NULL, 0, &BytesRead, NULL)) error_goto(Error, cleanup); @@ -253,44 +264,70 @@ { INT Status = EXIT_SUCCESS; DWORD Error = ERROR_SUCCESS; - SC_HANDLE ServiceHandle; PCSTR AppName = "kmtest.exe"; - PCSTR TestName; + PCSTR TestName = NULL; + KMT_OPERATION Operation = KMT_DO_NOTHING; Error = KmtServiceInit(); if (Error) goto cleanup; - Error = KmtCreateAndStartService(SERVICE_NAME, SERVICE_PATH, L"ReactOS Kernel-Mode Test Suite Driver", &ServiceHandle, FALSE); - if (Error) - goto cleanup; - - KmtestHandle = CreateFile(KMTEST_DEVICE_PATH, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); - if (KmtestHandle == INVALID_HANDLE_VALUE) - error_goto(Error, cleanup); - if (ArgCount >= 1) AppName = Arguments[0]; if (ArgCount <= 1) { - printf("Usage: %s <test_name> - run the specified test\n", AppName); + printf("Usage: %s <test_name> - run the specified test (creates/starts the driver(s) as appropriate)\n", AppName); printf(" %s --list - list available tests\n", AppName); printf(" %s <create|delete|start|stop> - manage the kmtest driver\n\n", AppName); - Error = ListTests(); + Operation = KMT_LIST_TESTS; } else { TestName = Arguments[1]; - if (!lstrcmpA(Arguments[1], "--list")) - Error = ListTests(); + if (!lstrcmpA(TestName, "create")) + Error = KmtCreateService(SERVICE_NAME, SERVICE_PATH, SERVICE_DESCRIPTION, &KmtestServiceHandle); + else if (!lstrcmpA(TestName, "delete")) + Error = KmtDeleteService(SERVICE_NAME, &KmtestServiceHandle); + else if (!lstrcmpA(TestName, "start")) + Error = KmtStartService(SERVICE_NAME, &KmtestServiceHandle); + else if (!lstrcmpA(TestName, "stop")) + Error = KmtStopService(SERVICE_NAME, &KmtestServiceHandle); + + else if (!lstrcmpA(TestName, "--list")) + Operation = KMT_LIST_TESTS; else - Error = RunTest(TestName); + Operation = KMT_RUN_TEST; + } + + if (Operation) + { + Error = KmtCreateAndStartService(SERVICE_NAME, SERVICE_PATH, SERVICE_DESCRIPTION, &KmtestServiceHandle, FALSE); + if (Error) + goto cleanup; + + KmtestHandle = CreateFile(KMTEST_DEVICE_PATH, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + if (KmtestHandle == INVALID_HANDLE_VALUE) + error_goto(Error, cleanup); + + switch (Operation) + { + case KMT_LIST_TESTS: + Error = ListTests(); + break; + case KMT_RUN_TEST: + Error = RunTest(TestName); + break; + default: + assert(FALSE); + } } cleanup: if (KmtestHandle) CloseHandle(KmtestHandle); + + KmtCloseService(&KmtestServiceHandle); if (Error) KmtServiceCleanup(TRUE); @@ -298,10 +335,11 @@ Error = KmtServiceCleanup(FALSE); if (Error) + { OutputError(Error); - if (Error) Status = EXIT_FAILURE; + } return Status; } Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] Sun Jul 10 08:03:15 2011 @@ -17,39 +17,6 @@ #include <kmt_public.h> #include <kmt_test.h> -/* pseudo-tests */ -START_TEST(Create) -{ - // nothing to do here. All tests create the service if needed -} - -START_TEST(Delete) -{ - SC_HANDLE Handle = NULL; - DWORD Error = KmtDeleteService(L"Kmtest", &Handle); - - ok_eq_hex(Error, (DWORD)ERROR_SUCCESS); -} - -START_TEST(Start) -{ - // nothing to do here. All tests start the service -} - -START_TEST(Stop) -{ - // TODO: requiring the service to be started for this is... bad, - // especially when it's marked for deletion and won't start ;) - SC_HANDLE Handle = NULL; - DWORD Error = KmtStopService(L"Kmtest", &Handle); - - ok_eq_hex(Error, (DWORD)ERROR_SUCCESS); - Error = KmtCloseService(&Handle); - ok_eq_hex(Error, (DWORD)ERROR_SUCCESS); -} - -/* test support functions for special-purpose drivers */ - extern HANDLE KmtestHandle; /** Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] Sun Jul 10 08:03:15 2011 @@ -10,19 +10,11 @@ #include <windows.h> #include <kmt_test.h> -VOID Test_Create(VOID); -VOID Test_Delete(VOID); -VOID Test_Start(VOID); -VOID Test_Stop(VOID); VOID Test_Example(VOID); /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = { - { "-create", Test_Create }, - { "-delete", Test_Delete }, - { "-start", Test_Start }, - { "-stop", Test_Stop, }, { "Example", Test_Example }, { NULL, NULL }, };

1 0

[cgutman] 52598: [KERNEL32]: Fix build
by cgutman＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: cgutman Date: Sun Jul 10 07:15:26 2011 New Revision: 52598 URL: http://svn.reactos.org/svn/reactos?rev=52598&view=rev Log: [KERNEL32]: Fix build Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Sun Jul 10 07:15:26 2011 @@ -863,7 +863,7 @@ if (!(dwPublicFlags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) { /* Add reference to this DLL */ - Status = LdrAddRefDll((dwPublicFlags & GET_MODULE_HANDLE_EX_FLAG_PIN) ? LDR_PIN_MODULE : 0, + Status = LdrAddRefDll((dwPublicFlags & GET_MODULE_HANDLE_EX_FLAG_PIN) ? LDR_ADDREF_DLL_PIN : 0, hModule); }

1 0

[cgutman] 52597: [AFD] - Probe and lock pages with the KernelMode access mode instead of Irp->RequestorMode (UserMode) since we're dealing with memory that we allocated in kernel-mode - Fixes getpe...
by cgutman＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: cgutman Date: Sun Jul 10 02:23:12 2011 New Revision: 52597 URL: http://svn.reactos.org/svn/reactos?rev=52597&view=rev Log: [AFD] - Probe and lock pages with the KernelMode access mode instead of Irp->RequestorMode (UserMode) since we're dealing with memory that we allocated in kernel-mode - Fixes getpeername() and HTTPS browsing in Firefox Modified: trunk/reactos/drivers/network/afd/afd/info.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sun Jul 10 02:23:12 2011 @@ -262,7 +262,7 @@ if (Mdl) { _SEH2_TRY { - MmProbeAndLockPages(Mdl, Irp->RequestorMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); Status = _SEH2_GetExceptionCode();

1 0

[ion] 52596: [NTDLL]: More attempts at fixing up the loader, this time in the PE side of things.
by ion＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: ion Date: Sun Jul 10 02:14:29 2011 New Revision: 52596 URL: http://svn.reactos.org/svn/reactos?rev=52596&view=rev Log: [NTDLL]: More attempts at fixing up the loader, this time in the PE side of things. Modified: trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/ldrpe.c 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 02:14:29 2011 @@ -145,6 +145,14 @@ ULONG LdrpGetResidentSize(PIMAGE_NT_HEADERS NTHeaders); +NTSTATUS +NTAPI +LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL, + IN LPSTR ImportName, + IN PVOID DllBase, + OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry, + OUT PBOOLEAN Existing); + extern HANDLE WindowsApiPort; /* EOF */ 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 02:14:29 2011 @@ -13,20 +13,10 @@ #include <debug.h> /* GLOBALS *******************************************************************/ + ULONG LdrpFatalHardErrorCount; PVOID LdrpManifestProberRoutine; - -/* PROTOTYPES ****************************************************************/ - -#define IMAGE_REL_BASED_HIGH3ADJ 11 - -NTSTATUS -NTAPI -LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL, - IN LPSTR ImportName, - IN PVOID DllBase, - OUT PLDR_DATA_TABLE_ENTRY *DataTableEntry, - OUT PBOOLEAN Existing); +ULONG LdrpNormalSnap; /* FUNCTIONS *****************************************************************/ @@ -511,22 +501,21 @@ NTAPI LdrpHandleOneOldFormatImportDescriptor(IN LPWSTR DllPath OPTIONAL, IN PLDR_DATA_TABLE_ENTRY LdrEntry, - IN PIMAGE_IMPORT_DESCRIPTOR ImportEntry) + IN PIMAGE_IMPORT_DESCRIPTOR *ImportEntry) { - //ULONG IatSize, i; LPSTR ImportName; NTSTATUS Status; - BOOLEAN AlreadyLoaded = FALSE, StaticEntriesValid = FALSE, SkipSnap = FALSE; + BOOLEAN AlreadyLoaded = FALSE; PLDR_DATA_TABLE_ENTRY DllLdrEntry; PIMAGE_THUNK_DATA FirstThunk; PPEB Peb = NtCurrentPeb(); /* Get the import name's VA */ - ImportName = (LPSTR)((ULONG_PTR)LdrEntry->DllBase + ImportEntry->Name); + ImportName = (LPSTR)((ULONG_PTR)LdrEntry->DllBase + (*ImportEntry)->Name); /* Get the first thunk */ FirstThunk = (PIMAGE_THUNK_DATA)((ULONG_PTR)LdrEntry->DllBase + - ImportEntry->FirstThunk); + (*ImportEntry)->FirstThunk); /* Make sure it's valid */ if (!FirstThunk->u1.Function) goto SkipEntry; @@ -545,7 +534,21 @@ LdrEntry->DllBase, &DllLdrEntry, &AlreadyLoaded); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + /* Fail */ + if (ShowSnaps) + { + DbgPrint("LDR: LdrpWalkImportTable - LdrpLoadImportModule failed " + "on import %s with status %x\n", + ImportName, + Status); + } + + /* Return */ + *ImportEntry = *ImportEntry; + return Status; + } /* Show debug message */ if (ShowSnaps) @@ -555,41 +558,8 @@ ImportName); } - /* Check if the image was bound when compiled */ - if (ImportEntry->OriginalFirstThunk) - { - /* It was, so check if the static IAT entries are still valid */ - if ((ImportEntry->TimeDateStamp) && - (ImportEntry->TimeDateStamp == DllLdrEntry->TimeDateStamp) && - (!(DllLdrEntry->Flags & LDRP_IMAGE_NOT_AT_BASE))) - { - /* Show debug message */ - if (ShowSnaps) - { - DPRINT1("LDR: Snap bypass %s from %wZ\n", - ImportName, - &LdrEntry->BaseDllName); - } - - /* - * They are still valid, so we can skip snapping them. - * Additionally, if we have no forwarders, we are totally - * done. - */ - if (ImportEntry->ForwarderChain == -1) - { - /* Totally skip LdrpSnapIAT */ - SkipSnap = TRUE; - } - else - { - /* Set this so LdrpSnapIAT will only do forwarders */ - StaticEntriesValid = TRUE; - } - } - } - /* Check if it wasn't already loaded */ + ++LdrpNormalSnap; if (!AlreadyLoaded) { /* Add the DLL to our list */ @@ -597,18 +567,26 @@ &DllLdrEntry->InInitializationOrderModuleList); } - /* Check if we should snap at all */ - if (!SkipSnap) - { - /* Now snap the IAT Entry */ - Status = LdrpSnapIAT(DllLdrEntry, - LdrEntry, - ImportEntry, - StaticEntriesValid); - if (!NT_SUCCESS(Status)) return Status; + /* Now snap the IAT Entry */ + Status = LdrpSnapIAT(DllLdrEntry, LdrEntry, *ImportEntry, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + if (ShowSnaps) + { + DbgPrint("LDR: LdrpWalkImportTable - LdrpSnapIAT #2 failed with " + "status %x\n", + Status); + } + + /* Return */ + *ImportEntry = *ImportEntry; + return Status; } SkipEntry: + /* Move on */ + *ImportEntry = (*ImportEntry)++; return STATUS_SUCCESS; } @@ -621,34 +599,31 @@ NTSTATUS Status; /* Check for Name and Thunk */ - while (ImportEntry->Name && ImportEntry->FirstThunk) + while ((ImportEntry->Name) && (ImportEntry->FirstThunk)) { /* Parse this descriptor */ Status = LdrpHandleOneOldFormatImportDescriptor(DllPath, LdrEntry, - ImportEntry); + &ImportEntry); if (!NT_SUCCESS(Status)) return Status; - - /* Move to the next entry */ - ImportEntry++; } /* Done */ return STATUS_SUCCESS; } -USHORT NTAPI -LdrpNameToOrdinal(LPSTR ImportName, - ULONG NumberOfNames, - PVOID ExportBase, - PULONG NameTable, - PUSHORT OrdinalTable) +USHORT +NTAPI +LdrpNameToOrdinal(IN LPSTR ImportName, + IN ULONG NumberOfNames, + IN PVOID ExportBase, + IN PULONG NameTable, + IN PUSHORT OrdinalTable) { - ULONG Start, End, Next; - LONG CmpResult; + LONG Start, End, Next, CmpResult; /* Use classical binary search to find the ordinal */ - Start = 0; + Start = Next = 0; End = NumberOfNames - 1; while (End >= Start) { @@ -663,9 +638,13 @@ /* We didn't find, update our range then */ if (CmpResult < 0) + { End = Next - 1; + } else if (CmpResult > 0) + { Start = Next + 1; + } } /* If end is before start, then the search failed */ @@ -686,13 +665,12 @@ PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry = NULL; PIMAGE_IMPORT_DESCRIPTOR ImportEntry; ULONG BoundSize, IatSize; - DPRINT("LdrpWalkImportDescriptor('%S' %x)\n", DllPath, LdrEntry); /* Set up the Act Ctx */ ActCtx.Size = sizeof(ActCtx); - ActCtx.Format = 1; - RtlZeroMemory(&ActCtx.Frame, sizeof(RTL_ACTIVATION_CONTEXT_STACK_FRAME)); + ActCtx.Format = RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_FORMAT_WHISTLER; + RtlZeroMemory(&ActCtx.Frame, sizeof(ActCtx)); /* Check if we have a manifest prober routine */ if (LdrpManifestProberRoutine) @@ -705,7 +683,16 @@ /* Get the Active ActCtx */ Status = RtlGetActiveActivationContext(&LdrEntry->EntryPointActivationContext); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + /* Exit */ + DbgPrintEx(51, // DPFLTR_SXS_ID + DPFLTR_WARNING_LEVEL, + "LDR: RtlGetActiveActivationContext() failed; ntstatus = " + "0x%08lx\n", + Status); + return Status; + } /* Activate the ActCtx */ RtlActivateActivationContextUnsafeFast(&ActCtx, @@ -728,7 +715,7 @@ &IatSize); /* Check if we got at least one */ - if (BoundEntry || ImportEntry) + if ((BoundEntry) || (ImportEntry)) { /* Do we have a Bound IAT */ if (BoundEntry) @@ -782,6 +769,7 @@ return Status; } +/* FIXME: This function is missing SxS support and has wrong prototype */ NTSTATUS NTAPI LdrpLoadImportModule(IN PWSTR DllPath OPTIONAL,

1 0

[ion] 52595: [NTDLL]: Multiple fixes and cleanups to several loader functions in ldrutils. [NTDLL]: Use original symbolic function names instead of modified ones. [NTDLL]: Fixup some incorrect flag...
by ion＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: ion Date: Sun Jul 10 01:34:19 2011 New Revision: 52595 URL: http://svn.reactos.org/svn/reactos?rev=52595&view=rev Log: [NTDLL]: Multiple fixes and cleanups to several loader functions in ldrutils. [NTDLL]: Use original symbolic function names instead of modified ones. [NTDLL]: Fixup some incorrect flag and typedef definitions with correct ones. [NTDLL]: Tag functions which seem broken/lacking in functionality/very different from the rest of the code the LDR rewrite was based on. Modified: trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/include/ndk/ldrtypes.h 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 01:34:19 2011 @@ -25,11 +25,6 @@ IMAGE_TLS_DIRECTORY TlsDirectory; } LDRP_TLS_DATA, *PLDRP_TLS_DATA; -typedef BOOL -(NTAPI *PDLLMAIN_FUNC)(HANDLE hInst, - ULONG ul_reason_for_call, - LPVOID lpReserved); - /* Global data */ extern RTL_CRITICAL_SECTION LdrpLoaderLock; extern BOOLEAN LdrpInLdrInit; @@ -54,8 +49,8 @@ NTSTATUS NTAPI LdrpInitializeTls(VOID); NTSTATUS NTAPI LdrpAllocateTls(VOID); VOID NTAPI LdrpFreeTls(VOID); -VOID NTAPI LdrpTlsCallback(PVOID BaseAddress, ULONG Reason); -BOOLEAN NTAPI LdrpCallDllEntry(PDLLMAIN_FUNC EntryPoint, PVOID BaseAddress, ULONG Reason, PVOID Context); +VOID NTAPI LdrpCallTlsInitializers(PVOID BaseAddress, ULONG Reason); +BOOLEAN NTAPI LdrpCallInitRoutine(PDLL_INIT_ROUTINE EntryPoint, PVOID BaseAddress, ULONG Reason, PVOID Context); NTSTATUS NTAPI LdrpInitializeProcess(PCONTEXT Context, PVOID SystemArgument1); VOID NTAPI LdrpInitFailure(NTSTATUS Status); VOID NTAPI LdrpValidateImageForMp(IN PLDR_DATA_TABLE_ENTRY LdrDataTableEntry); @@ -135,7 +130,7 @@ PVOID NTAPI LdrpFetchAddressOfEntryPoint(PVOID ImageBase); -BOOLEAN NTAPI +VOID NTAPI LdrpFreeUnicodeString(PUNICODE_STRING String); 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 01:34:19 2011 @@ -1159,6 +1159,91 @@ /* * @implemented */ +NTSTATUS +NTAPI +LdrAddRefDll(IN ULONG Flags, + IN PVOID BaseAddress) +{ + PLDR_DATA_TABLE_ENTRY LdrEntry; + NTSTATUS Status = STATUS_SUCCESS; + ULONG Cookie; + BOOLEAN Locked = FALSE; + + /* Check for invalid flags */ + if (Flags & ~(LDR_ADDREF_DLL_PIN)) + { + /* Fail with invalid parameter status if so */ + Status = STATUS_INVALID_PARAMETER; + goto quickie; + } + + /* Acquire the loader lock if not in init phase */ + if (!LdrpInLdrInit) + { + /* Acquire the lock */ + Status = LdrLockLoaderLock(0, NULL, &Cookie); + if (!NT_SUCCESS(Status)) goto quickie; + Locked = TRUE; + } + + /* Get this module's data table entry */ + if (LdrpCheckForLoadedDllHandle(BaseAddress, &LdrEntry)) + { + if (!LdrEntry) + { + /* Shouldn't happen */ + Status = STATUS_INTERNAL_ERROR; + goto quickie; + } + + /* If this is not a pinned module */ + if (LdrEntry->LoadCount != 0xFFFF) + { + /* Update its load count */ + if (Flags & LDR_ADDREF_DLL_PIN) + { + /* Pin it by setting load count to -1 */ + LdrEntry->LoadCount = 0xFFFF; + LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_PIN); + } + else + { + /* Increase its load count by one */ + LdrEntry->LoadCount++; + LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT); + } + + /* Clear load in progress */ + LdrpClearLoadInProgress(); + } + } + else + { + /* There was an error getting this module's handle, return invalid param status */ + Status = STATUS_INVALID_PARAMETER; + } + +quickie: + /* Check for error case */ + if (!NT_SUCCESS(Status)) + { + /* Print debug information */ + if ((ShowSnaps) || ((Status != STATUS_NO_SUCH_FILE) && + (Status != STATUS_DLL_NOT_FOUND) && + (Status != STATUS_OBJECT_NAME_NOT_FOUND))) + { + DPRINT1("LDR: LdrAddRefDll(%p) 0x%08lx\n", BaseAddress); + } + } + + /* Release the lock if needed */ + if (Locked) LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + return Status; +} + +/* + * @implemented + */ BOOLEAN NTAPI RtlDllShutdownInProgress(VOID) Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Sun Jul 10 01:34:19 2011 @@ -561,7 +561,7 @@ if (!LdrpShutdownInProgress) { /* Call TLS */ - LdrpTlsCallback(LdrEntry->DllBase, DLL_THREAD_ATTACH); + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_ATTACH); } } @@ -571,7 +571,7 @@ /* Call the Entrypoint */ DPRINT("%wZ - Calling entry point at %x for thread attaching\n", &LdrEntry->BaseDllName, LdrEntry->EntryPoint); - LdrpCallDllEntry(LdrEntry->EntryPoint, + LdrpCallInitRoutine(LdrEntry->EntryPoint, LdrEntry->DllBase, DLL_THREAD_ATTACH, NULL); @@ -600,7 +600,7 @@ LdrpImageEntry->EntryPointActivationContext); /* Do TLS callbacks */ - LdrpTlsCallback(Peb->ImageBaseAddress, DLL_THREAD_ATTACH); + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_ATTACH); /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -796,7 +796,7 @@ if (LdrEntry->TlsIndex && Context) { /* Call TLS */ - LdrpTlsCallback(LdrEntry->DllBase, DLL_PROCESS_ATTACH); + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_ATTACH); } /* Call the Entrypoint */ @@ -805,7 +805,7 @@ DPRINT1("%wZ - Calling entry point at %p for DLL_PROCESS_ATTACH\n", &LdrEntry->BaseDllName, EntryPoint); } - DllStatus = LdrpCallDllEntry(EntryPoint, + DllStatus = LdrpCallInitRoutine(EntryPoint, LdrEntry->DllBase, DLL_PROCESS_ATTACH, Context); @@ -859,7 +859,7 @@ LdrpImageEntry->EntryPointActivationContext); /* Do TLS callbacks */ - LdrpTlsCallback(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH); + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH); /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -956,13 +956,13 @@ if (LdrEntry->TlsIndex) { /* Call TLS */ - LdrpTlsCallback(LdrEntry->DllBase, DLL_PROCESS_DETACH); + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_DETACH); } /* Call the Entrypoint */ DPRINT("%wZ - Calling entry point at %x for thread detaching\n", &LdrEntry->BaseDllName, LdrEntry->EntryPoint); - LdrpCallDllEntry(EntryPoint, + LdrpCallInitRoutine(EntryPoint, LdrEntry->DllBase, DLL_PROCESS_DETACH, (PVOID)1); @@ -986,7 +986,7 @@ LdrpImageEntry->EntryPointActivationContext); /* Do TLS callbacks */ - LdrpTlsCallback(Peb->ImageBaseAddress, DLL_PROCESS_DETACH); + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_DETACH); /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -1067,7 +1067,7 @@ if (!LdrpShutdownInProgress) { /* Call TLS */ - LdrpTlsCallback(LdrEntry->DllBase, DLL_THREAD_DETACH); + LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_THREAD_DETACH); } } @@ -1077,7 +1077,7 @@ /* Call the Entrypoint */ DPRINT("%wZ - Calling entry point at %x for thread detaching\n", &LdrEntry->BaseDllName, LdrEntry->EntryPoint); - LdrpCallDllEntry(EntryPoint, + LdrpCallInitRoutine(EntryPoint, LdrEntry->DllBase, DLL_THREAD_DETACH, NULL); @@ -1103,7 +1103,7 @@ LdrpImageEntry->EntryPointActivationContext); /* Do TLS callbacks */ - LdrpTlsCallback(Peb->ImageBaseAddress, DLL_THREAD_DETACH); + LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_DETACH); /* Deactivate the ActCtx */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); 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 01:34:19 2011 @@ -14,11 +14,9 @@ #include <debug.h> /* GLOBALS *******************************************************************/ -#define IMAGE_DLLCHARACTERISTICS_WX86_DLL 0x1000 LIST_ENTRY LdrpUnloadHead; -PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache; -PLDR_DATA_TABLE_ENTRY LdrpGetModuleHandleCache; +PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache, LdrpGetModuleHandleCache; #define LDR_GET_HASH_ENTRY(x) (RtlUpcaseUnicodeChar((x)) & (LDR_HASH_TABLE_ENTRIES - 1)) @@ -26,15 +24,16 @@ BOOLEAN NTAPI -LdrpCallDllEntry(PDLLMAIN_FUNC EntryPoint, - PVOID BaseAddress, - ULONG Reason, - PVOID Context) +LdrpCallInitRoutine(IN PDLL_INIT_ROUTINE EntryPoint, + IN PVOID BaseAddress, + IN ULONG Reason, + IN PVOID Context) { /* Call the entry */ return EntryPoint(BaseAddress, Reason, Context); } +/* NOTE: This function is broken */ VOID NTAPI LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry, @@ -261,18 +260,15 @@ WCHAR Buffer[MAX_PATH]; UNICODE_STRING UpdateString; - /* Setup the string */ - UpdateString.Buffer = Buffer; - UpdateString.Length = 0; - UpdateString.MaximumLength = sizeof(Buffer); - - /* Call the extended API */ + /* Setup the string and call the extended API */ + RtlInitEmptyUnicodeString(&UpdateString, Buffer, sizeof(Buffer)); LdrpUpdateLoadCount3(LdrEntry, Flags, &UpdateString); } VOID NTAPI -LdrpTlsCallback(PVOID BaseAddress, ULONG Reason) +LdrpCallTlsInitializers(IN PVOID BaseAddress, + IN ULONG Reason) { PIMAGE_TLS_DIRECTORY TlsDirectory; PIMAGE_TLS_CALLBACK *Array, Callback; @@ -288,7 +284,8 @@ _SEH2_TRY { /* Make sure it's valid and we have an array */ - if (TlsDirectory && (Array = (PIMAGE_TLS_CALLBACK *)TlsDirectory->AddressOfCallBacks)) + Array = (PIMAGE_TLS_CALLBACK *)TlsDirectory->AddressOfCallBacks; + if ((TlsDirectory) && (Array)) { /* Display debug */ if (ShowSnaps) @@ -311,7 +308,10 @@ } /* Call it */ - LdrpCallDllEntry((PDLLMAIN_FUNC)Callback, BaseAddress, Reason, NULL); + LdrpCallInitRoutine((PDLL_INIT_ROUTINE)Callback, + BaseAddress, + Reason, + NULL); } } } @@ -324,9 +324,10 @@ NTSTATUS NTAPI -LdrpCodeAuthzCheckDllAllowed(PUNICODE_STRING FullName, - HANDLE DllHandle) +LdrpCodeAuthzCheckDllAllowed(IN PUNICODE_STRING FullName, + IN HANDLE DllHandle) { + /* Not implemented */ return STATUS_SUCCESS; } @@ -481,6 +482,7 @@ return Status; } +/* NOTE: This function is totally b0rked and doesn't handle the parameters/functionality it should */ BOOLEAN NTAPI LdrpResolveDllName(PWSTR DllPath, @@ -577,25 +579,25 @@ PVOID NTAPI -LdrpFetchAddressOfEntryPoint(PVOID ImageBase) +LdrpFetchAddressOfEntryPoint(IN PVOID ImageBase) { PIMAGE_NT_HEADERS NtHeaders; - ULONG_PTR EntryPoint; + ULONG_PTR EntryPoint = 0; /* Get entry point offset from NT headers */ NtHeaders = RtlImageNtHeader(ImageBase); - EntryPoint = NtHeaders->OptionalHeader.AddressOfEntryPoint; - - /* If it's 0 - return so */ - if (!EntryPoint) return NULL; - - /* Add image base */ - EntryPoint += (ULONG_PTR)ImageBase; - - /* Return calculated pointer */ + if (NtHeaders) + { + /* Add image base */ + EntryPoint = NtHeaders->OptionalHeader.AddressOfEntryPoint; + if (EntryPoint) EntryPoint += (ULONG_PTR)ImageBase; + } + + /* Return calculated pointer (or zero in case of failure) */ return (PVOID)EntryPoint; } +/* NOTE: This function is broken, wrong number of parameters, no SxS, etc */ HANDLE NTAPI LdrpCheckForKnownDll(PWSTR DllName, @@ -702,31 +704,36 @@ /* Get the NT headers */ NtHeaders = RtlImageNtHeader(ViewBase); + if (!NtHeaders) return STATUS_INVALID_IMAGE_FORMAT; /* Compute address of the first section header */ - Section = (PIMAGE_SECTION_HEADER)( - (ULONG_PTR)NtHeaders + sizeof(ULONG) + sizeof(IMAGE_FILE_HEADER) + - NtHeaders->FileHeader.SizeOfOptionalHeader); + Section = IMAGE_FIRST_SECTION(NtHeaders); /* Go through all sections */ for (i = 0; i < NtHeaders->FileHeader.NumberOfSections; i++) { - if (Section->SizeOfRawData && + /* Check for read-only non-zero section */ + if ((Section->SizeOfRawData) && !(Section->Characteristics & IMAGE_SCN_MEM_WRITE)) { - /* This section is not writable and has some size, so we need to change - its protection */ + /* Check if we are setting or restoring protection */ if (Restore) { /* Set it to either EXECUTE or READONLY */ if (Section->Characteristics & IMAGE_SCN_MEM_EXECUTE) + { NewProtection = PAGE_EXECUTE; + } else + { NewProtection = PAGE_READONLY; + } /* Add PAGE_NOCACHE if needed */ if (Section->Characteristics & IMAGE_SCN_MEM_NOT_CACHED) + { NewProtection |= PAGE_NOCACHE; + } } else { @@ -734,9 +741,9 @@ NewProtection = PAGE_READWRITE; } + /* Get the section VA */ SectionBase = (PVOID)((ULONG_PTR)ViewBase + Section->VirtualAddress); SectionSize = Section->SizeOfRawData; - if (SectionSize) { /* Set protection */ @@ -745,7 +752,6 @@ &SectionSize, NewProtection, &OldProtection); - if (!NT_SUCCESS(Status)) return Status; } } @@ -756,10 +762,10 @@ /* Flush instruction cache if necessary */ if (Restore) ZwFlushInstructionCache(NtCurrentProcess(), NULL, 0); - return STATUS_SUCCESS; } +/* NOTE: Not yet reviewed */ NTSTATUS NTAPI LdrpMapDll(IN PWSTR SearchPath OPTIONAL, @@ -1275,11 +1281,11 @@ LdrpAllocateDataTableEntry(IN PVOID BaseAddress) { PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; - PIMAGE_NT_HEADERS NtHeader = RtlImageNtHeader(BaseAddress); - + PIMAGE_NT_HEADERS NtHeader; DPRINT("LdrpAllocateDataTableEntry(%p), NtHeader %p\n", BaseAddress, NtHeader); /* Make sure the header is valid */ + NtHeader = RtlImageNtHeader(BaseAddress); if (NtHeader) { /* Allocate an entry */ @@ -1294,6 +1300,7 @@ LdrEntry->DllBase = BaseAddress; LdrEntry->SizeOfImage = NtHeader->OptionalHeader.SizeOfImage; LdrEntry->TimeDateStamp = NtHeader->FileHeader.TimeDateStamp; + LdrEntry->PatchInformation = NULL; } } @@ -1308,36 +1315,33 @@ PPEB_LDR_DATA PebData = NtCurrentPeb()->Ldr; ULONG i; - /* Get the Hash entry */ + /* 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); } VOID NTAPI -LdrpFinalizeAndDeallocateDataTableEntry(PLDR_DATA_TABLE_ENTRY Entry) +LdrpFinalizeAndDeallocateDataTableEntry(IN PLDR_DATA_TABLE_ENTRY Entry) { + /* Sanity check */ ASSERT(Entry != NULL); - /* Release the activation context if it exists */ - if (Entry->EntryPointActivationContext) - { - /* Check if it wasn't already released */ - if ((HANDLE)Entry->EntryPointActivationContext != INVALID_HANDLE_VALUE) - { - RtlReleaseActivationContext(Entry->EntryPointActivationContext); - - /* Mark it as invalid */ - Entry->EntryPointActivationContext = INVALID_HANDLE_VALUE; - } + /* Release the activation context if it exists and wasn't already released */ + if ((Entry->EntryPointActivationContext) && + (Entry->EntryPointActivationContext != INVALID_HANDLE_VALUE)) + { + /* Mark it as invalid */ + RtlReleaseActivationContext(Entry->EntryPointActivationContext); + Entry->EntryPointActivationContext = INVALID_HANDLE_VALUE; } /* Release the full dll name string */ - if (Entry->FullDllName.Buffer) - LdrpFreeUnicodeString(&Entry->FullDllName); + if (Entry->FullDllName.Buffer) LdrpFreeUnicodeString(&Entry->FullDllName); /* Finally free the entry's memory */ RtlFreeHeap(RtlGetProcessHeap(), 0, Entry); @@ -1352,7 +1356,8 @@ PLIST_ENTRY ListHead, Next; /* Check the cache first */ - if (LdrpLoadedDllHandleCache && LdrpLoadedDllHandleCache->DllBase == Base) + if ((LdrpLoadedDllHandleCache) && + (LdrpLoadedDllHandleCache->DllBase == Base)) { /* We got lucky, return the cached entry */ *LdrEntry = LdrpLoadedDllHandleCache; @@ -1362,12 +1367,12 @@ /* Time for a lookup */ ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; Next = ListHead->Flink; - while(Next != ListHead) + while (Next != ListHead) { /* Get the current entry */ - Current = CONTAINING_RECORD(Next, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); + Current = CONTAINING_RECORD(Next, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); /* Make sure it's not unloading and check for a match */ if ((Current->InMemoryOrderModuleList.Flink) && (Base == Current->DllBase)) @@ -2223,10 +2228,10 @@ LdrEntry->EntryPointActivationContext); /* Call the entrypoint */ - LdrpCallDllEntry(LdrEntry->EntryPoint, - LdrEntry->DllBase, - DLL_PROCESS_DETACH, - NULL); + LdrpCallInitRoutine(LdrEntry->EntryPoint, + LdrEntry->DllBase, + DLL_PROCESS_DETACH, + NULL); /* Release the context */ RtlDeactivateActivationContextUnsafeFast(&ActCtx); @@ -2313,139 +2318,55 @@ ULONG NTAPI -LdrpClearLoadInProgress() +LdrpClearLoadInProgress(VOID) { - PLIST_ENTRY ListHead; - PLIST_ENTRY Entry; - PLDR_DATA_TABLE_ENTRY Module; + PLIST_ENTRY ListHead, Entry; + PLDR_DATA_TABLE_ENTRY LdrEntry; ULONG ModulesCount = 0; /* Traverse the init list */ ListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList; Entry = ListHead->Flink; - while (Entry != ListHead) { - Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); + /* Get the loader entry */ + LdrEntry = CONTAINING_RECORD(Entry, + LDR_DATA_TABLE_ENTRY, + InInitializationOrderModuleList); /* Clear load in progress flag */ - Module->Flags &= ~LDRP_LOAD_IN_PROGRESS; - - /* Increase counter for modules with entry point count but not processed yet */ - if (Module->EntryPoint && - !(Module->Flags & LDRP_ENTRY_PROCESSED)) ModulesCount++; + LdrEntry->Flags &= ~LDRP_LOAD_IN_PROGRESS; + + /* Check for modules with entry point count but not processed yet */ + if ((LdrEntry->EntryPoint) && + !(LdrEntry->Flags & LDRP_ENTRY_PROCESSED)) + { + /* Increase counter */ + ModulesCount++; + } /* Advance to the next entry */ Entry = Entry->Flink; } + /* Return final count */ return ModulesCount; } -/* - * @implemented - */ -NTSTATUS NTAPI -LdrAddRefDll(IN ULONG Flags, - IN PVOID BaseAddress) +VOID +NTAPI +LdrpFreeUnicodeString(IN PUNICODE_STRING StringIn) { - PLDR_DATA_TABLE_ENTRY LdrEntry; - NTSTATUS Status = STATUS_SUCCESS; - ULONG Cookie; - BOOLEAN Locked = FALSE; - - /* Check for invalid flags */ - if (Flags & ~(LDR_PIN_MODULE)) - { - /* Fail with invalid parameter status if so */ - Status = STATUS_INVALID_PARAMETER; - goto quickie; - } - - /* Acquire the loader lock if not in init phase */ - if (!LdrpInLdrInit) - { - /* Acquire the lock */ - Status = LdrLockLoaderLock(0, NULL, &Cookie); - if (!NT_SUCCESS(Status)) goto quickie; - Locked = TRUE; - } - - /* Get this module's data table entry */ - if (LdrpCheckForLoadedDllHandle(BaseAddress, &LdrEntry)) - { - if (!LdrEntry) - { - /* Shouldn't happen */ - Status = STATUS_INTERNAL_ERROR; - goto quickie; - } - - /* If this is not a pinned module */ - if (LdrEntry->LoadCount != -1) - { - /* Update its load count */ - if (Flags & LDR_PIN_MODULE) - { - /* Pin it by setting load count to -1 */ - LdrEntry->LoadCount = -1; - LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_PIN); - } - else - { - /* Increase its load count by one */ - LdrEntry->LoadCount++; - LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT); - } - - /* Clear load in progress */ - LdrpClearLoadInProgress(); - } - } - else - { - /* There was an error getting this module's handle, return invalid param status */ - Status = STATUS_INVALID_PARAMETER; - goto quickie; - } - -quickie: - if (!NT_SUCCESS(Status)) - { - if (ShowSnaps || - (Status != STATUS_NO_SUCH_FILE && - Status != STATUS_DLL_NOT_FOUND && - Status != STATUS_OBJECT_NAME_NOT_FOUND)) - { - DPRINT1("LDR: LdrAddRefDll(%p) 0x%08lx\n", BaseAddress); - } - } - - /* Release the lock if needed */ - if (Locked) LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); - - return Status; + ASSERT(StringIn != NULL); + + /* If Buffer is not NULL - free it */ + if (StringIn->Buffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, StringIn->Buffer); + } + + /* Zero it out */ + RtlInitEmptyUnicodeString(StringIn, NULL, 0); } - -BOOLEAN -NTAPI -LdrpFreeUnicodeString(PUNICODE_STRING String) -{ - BOOLEAN Result = FALSE; - - ASSERT(String != NULL); - - /* If Buffer is not NULL - free it */ - if (String->Buffer) - Result = RtlFreeHeap(RtlGetProcessHeap(), 0, String->Buffer); - - /* Zero it out */ - String->Length = 0; - String->MaximumLength = 0; - String->Buffer = NULL; - - return Result; -} - /* EOF */ Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Sun Jul 10 01:34:19 2011 @@ -66,7 +66,7 @@ // // LdrAddRef Flags // -#define LDR_PIN_MODULE 0x00000001 +#define LDR_ADDREF_DLL_PIN 0x00000001 // // LdrLockLoaderLock Flags @@ -84,6 +84,7 @@ // #define LDR_GET_DLL_HANDLE_EX_UNCHANGED_REFCOUNT 0x00000001 #define LDR_GET_DLL_HANDLE_EX_PIN 0x00000002 + #define LDR_LOCK_LOADER_LOCK_DISPOSITION_INVALID 0 #define LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED 1 @@ -216,4 +217,14 @@ typedef VOID (NTAPI LDR_ENUM_CALLBACK)(IN PLDR_DATA_TABLE_ENTRY ModuleInformation, IN PVOID Parameter, OUT BOOLEAN *Stop); typedef LDR_ENUM_CALLBACK *PLDR_ENUM_CALLBACK; +// +// DLL Main Routine +// +typedef BOOLEAN +(NTAPI *PDLL_INIT_ROUTINE)( + IN PVOID DllHandle, + IN ULONG Reason, + IN PCONTEXT Context OPTIONAL +); + #endif

1 0

[cmihail] 52594: [IP/lwIP] - Fix graceful closure hanging bug
by cmihail＠svn.reactos.org 10 Jul '11

10 Jul '11

Author: cmihail Date: Sun Jul 10 00:38:29 2011 New Revision: 52594 URL: http://svn.reactos.org/svn/reactos?rev=52594&view=rev Log: [IP/lwIP] - Fix graceful closure hanging bug Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Sun Jul 10 00:38:29 2011 @@ -90,11 +90,18 @@ Bucket->Status = Status; Bucket->Information = 0; - CompleteBucket(Connection, Bucket, TRUE); - } - + CompleteBucket(Connection, Bucket, FALSE); + } + + /* Calling with Status == STATUS_SUCCESS means that we got a graceful closure + * so we don't want to kill everything else since send is still valid in this state + */ if (Status == STATUS_SUCCESS) - Status = STATUS_FILE_CLOSED; + { + DbgPrint("[IP, FlushAllQueues] Flushed recv only after graceful closure\n"); + DereferenceObject(Connection); + return; + } while ((Entry = ExInterlockedRemoveHeadList(&Connection->ListenRequest, &Connection->Lock))) { @@ -106,7 +113,7 @@ DbgPrint("[IP, FlushAllQueues] Completing Listen request for Connection = 0x%x\n", Bucket->AssociatedEndpoint); DereferenceObject(Bucket->AssociatedEndpoint); - CompleteBucket(Connection, Bucket, TRUE); + CompleteBucket(Connection, Bucket, FALSE); } while ((Entry = ExInterlockedRemoveHeadList(&Connection->SendRequest, &Connection->Lock))) @@ -120,7 +127,7 @@ Bucket->Status = Status; Bucket->Information = 0; - CompleteBucket(Connection, Bucket, TRUE); + CompleteBucket(Connection, Bucket, FALSE); } while ((Entry = ExInterlockedRemoveHeadList(&Connection->ConnectRequest, &Connection->Lock))) @@ -132,7 +139,7 @@ DbgPrint("[IP, FlushAllQueues] Completing Connection request for Connection = 0x%x\n", Bucket->AssociatedEndpoint); - CompleteBucket(Connection, Bucket, TRUE); + CompleteBucket(Connection, Bucket, FALSE); } DereferenceObject(Connection); @@ -145,8 +152,12 @@ { PCONNECTION_ENDPOINT Connection = arg; - /* We're already closed so we don't want to call lwip_close */ - Connection->SocketContext = NULL; + /* Only clear the pointer if the shutdown was caused by an error */ + if (err != ERR_OK) + { + /* We're already closed by the error so we don't want to call lwip_close */ + Connection->SocketContext = NULL; + } DbgPrint("[IP, TCPFinEventHandler] Called for Connection( 0x%x )-> SocketContext = pcb (0x%x)\n", Connection, Connection->SocketContext); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Sun Jul 10 00:38:29 2011 @@ -127,8 +127,11 @@ } else if (err == ERR_OK) { + /* Complete pending reads with 0 bytes to indicate a graceful closure, + * but note that send is still possible in this state so we don't close the + * whole socket here (by calling tcp_close()) as that would violate TCP specs + */ TCPFinEventHandler(arg, ERR_OK); - tcp_close(pcb); } DbgPrint("[lwIP, InternalRecvEventHandler] Done ERR_OK 3\n");

1 0

[rharabien] 52593: [NTDLL/LDR] - Fix build (not sure if its right place for IMAGE_LOADER_FLAGS_*) - Remove unused label
by rharabien＠svn.reactos.org 09 Jul '11

09 Jul '11

Author: rharabien Date: Sat Jul 9 22:26:23 2011 New Revision: 52593 URL: http://svn.reactos.org/svn/reactos?rev=52593&view=rev Log: [NTDLL/LDR] - Fix build (not sure if its right place for IMAGE_LOADER_FLAGS_*) - Remove unused label Modified: trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/include/ddk/ntimage.h 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] Sat Jul 9 22:26:23 2011 @@ -14,6 +14,10 @@ #define LDRP_UPDATE_REFCOUNT 0x01 #define LDRP_UPDATE_DEREFCOUNT 0x02 #define LDRP_UPDATE_PIN 0x03 + +/* Loader flags */ +#define IMAGE_LOADER_FLAGS_COMPLUS 0x00000001 +#define IMAGE_LOADER_FLAGS_SYSTEM_GLOBAL 0x01000000 typedef struct _LDRP_TLS_DATA { 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] Sat Jul 9 22:26:23 2011 @@ -474,7 +474,6 @@ } } -Quickie: /* Close the file handle, we don't need it */ NtClose(FileHandle); Modified: trunk/reactos/include/ddk/ntimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntimage.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntimage.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntimage.h [iso-8859-1] Sat Jul 9 22:26:23 2011 @@ -420,6 +420,12 @@ #define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000 // +// Loader Flags +// +#define IMAGE_LOADER_FLAGS_COMPLUS 0x00000001 +#define IMAGE_LOADER_FLAGS_SYSTEM_GLOBAL 0x01000000 + +// // Directory Entry Specifiers // #define IMAGE_DIRECTORY_ENTRY_EXPORT 0

1 0

[tfaber] 52592: [KMTESTS] - decrease log buffer size because ROS has a problem with unlocking it otherwise ; ) - add test for critical/guarded regions - add test for executive resources (part 1)
by tfaber＠svn.reactos.org 09 Jul '11

09 Jul '11

Author: tfaber Date: Sat Jul 9 22:02:54 2011 New Revision: 52592 URL: http://svn.reactos.org/svn/reactos?rev=52592&view=rev Log: [KMTESTS] - decrease log buffer size because ROS has a problem with unlocking it otherwise ;) - add test for critical/guarded regions - add test for executive resources (part 1) Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c (with props) branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Sat Jul 9 22:02:54 2011 @@ -15,11 +15,13 @@ example/Example.c ntos_ex/ExPools.c + ntos_ex/ExResource.c ntos_ex/ExTimer.c ntos_fsrtl/FsRtlExpression.c ntos_io/IoDeviceInterface.c ntos_io/IoIrp.c ntos_io/IoMdl.c + ntos_ke/KeApc.c ntos_ke/KeDpc.c ntos_ke/KeIrql.c ntos_ke/KeProcessor.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Sat Jul 9 22:02:54 2011 @@ -23,7 +23,7 @@ #define SERVICE_NAME L"Kmtest" #define SERVICE_PATH L"kmtest_drv.sys" -#define LOGBUFFER_SIZE 65000 +#define LOGBUFFER_SIZE 16364 #define RESULTBUFFER_SIZE FIELD_OFFSET(KMT_RESULTBUFFER, LogBuffer[LOGBUFFER_SIZE]) HANDLE KmtestHandle; Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Sat Jul 9 22:02:54 2011 @@ -14,6 +14,7 @@ </directory> <directory name="ntos_ex"> <file>ExPools.c</file> + <file>ExResource.c</file> <file>ExTimer.c</file> </directory> <directory name="ntos_fsrtl"> @@ -25,6 +26,7 @@ <file>IoMdl.c</file> </directory> <directory name="ntos_ke"> + <file>KeApc.c</file> <file>KeDpc.c</file> <file>KeIrql.c</file> <file>KeProcessor.c</file> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sat Jul 9 22:02:54 2011 @@ -10,11 +10,13 @@ KMT_TESTFUNC Test_Example; KMT_TESTFUNC Test_ExPools; +KMT_TESTFUNC Test_ExResource; KMT_TESTFUNC Test_ExTimer; KMT_TESTFUNC Test_FsRtlExpression; KMT_TESTFUNC Test_IoDeviceInterface; KMT_TESTFUNC Test_IoIrp; KMT_TESTFUNC Test_IoMdl; +KMT_TESTFUNC Test_KeApc; KMT_TESTFUNC Test_KeDpc; KMT_TESTFUNC Test_KeIrql; KMT_TESTFUNC Test_KeProcessor; @@ -24,11 +26,13 @@ { { "Example", Test_Example }, { "ExPools", Test_ExPools }, + { "ExResource", Test_ExResource }, { "ExTimer", Test_ExTimer }, { "FsRtlExpression", Test_FsRtlExpression }, { "IoDeviceInterface", Test_IoDeviceInterface }, { "IoIrp", Test_IoIrp }, { "IoMdl", Test_IoMdl }, + { "KeApc", Test_KeApc }, { "KeDpc", Test_KeDpc }, { "KeIrql", Test_KeIrql }, { "KeProcessor", Test_KeProcessor }, Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] Sat Jul 9 22:02:54 2011 @@ -1,0 +1,270 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Executive Resource test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03SP1 +#include <ntddk.h> +#include <ntifs.h> +#include <ndk/extypes.h> +#include <kmt_test.h> +#include <pseh/pseh2.h> + +//#define NDEBUG +#include <debug.h> + +/* TODO: this is the Windows Server 2003 version! ROS should use this! + * This declaration can be removed once ROS headers are corrected */ +typedef struct _ERESOURCE_2K3 { + LIST_ENTRY SystemResourcesList; + POWNER_ENTRY OwnerTable; + SHORT ActiveCount; + USHORT Flag; + volatile PKSEMAPHORE SharedWaiters; + volatile PKEVENT ExclusiveWaiters; + OWNER_ENTRY OwnerThreads[2]; + ULONG ContentionCount; + USHORT NumberOfSharedWaiters; + USHORT NumberOfExclusiveWaiters; +#if defined(_WIN64) + PVOID Reserved2; /* TODO: not sure if this should be in here for 2k3 */ +#endif + _ANONYMOUS_UNION union { + PVOID Address; + ULONG_PTR CreatorBackTraceIndex; + } DUMMYUNIONNAME; + KSPIN_LOCK SpinLock; +} ERESOURCE_2K3, *PERESOURCE_2K3; + +#define CheckResourceFields(Res) do \ +{ \ + ok_eq_pointer((Res)->SystemResourcesList.Flink->Blink, &(Res)->SystemResourcesList); \ + ok_eq_pointer((Res)->SystemResourcesList.Blink->Flink, &(Res)->SystemResourcesList); \ + ok_eq_pointer((Res)->OwnerTable, NULL); \ + ok_eq_int((Res)->ActiveCount, 0); \ + ok_eq_uint((Res)->Flag, 0); \ + ok_eq_pointer((Res)->SharedWaiters, NULL); \ + ok_eq_pointer((Res)->ExclusiveWaiters, NULL); \ + ok_eq_pointer((PVOID)(Res)->OwnerThreads[0].OwnerThread, NULL); \ + ok_eq_ulong((Res)->OwnerThreads[0].TableSize, 0LU); \ + ok_eq_pointer((PVOID)(Res)->OwnerThreads[1].OwnerThread, NULL); \ + ok_eq_ulong((Res)->OwnerThreads[1].TableSize, 0LU); \ + ok_eq_ulong((Res)->ContentionCount, 0LU); \ + ok_eq_uint((Res)->NumberOfSharedWaiters, 0); \ + ok_eq_uint((Res)->NumberOfExclusiveWaiters, 0); \ + /* ok_eq_pointer((Res)->Reserved2, NULL); */ \ + ok_eq_pointer((Res)->Address, NULL); \ + ok_eq_pointer((PVOID)(Res)->SpinLock, NULL); \ +} while (0) + +#define CheckResourceStatus(Res, Exclusive, Shared, ExclusiveWaiters, SharedWaiters) do \ +{ \ + if (Exclusive) \ + ok_bool_true(ExIsResourceAcquiredExclusiveLite(Res), "ExIsResourceAcquiredExclusiveLite returned"); \ + else \ + ok_bool_false(ExIsResourceAcquiredExclusiveLite(Res), "ExIsResourceAcquiredExclusiveLite returned"); \ + ok_eq_ulong(ExIsResourceAcquiredSharedLite(Res), Shared); \ + ok_eq_ulong(ExGetExclusiveWaiterCount(Res), ExclusiveWaiters); \ + ok_eq_ulong(ExGetSharedWaiterCount(Res), SharedWaiters); \ +} while (0) + +static +VOID +TestResourceSharedAccess( + IN PERESOURCE Res) +{ + LONG Count = 0; + + KeEnterCriticalRegion(); + ok_bool_true(ExAcquireResourceSharedLite(Res, FALSE), "ExAcquireResourceSharedLite returned"); ++Count; + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + ok_bool_true(ExAcquireResourceSharedLite(Res, FALSE), "ExAcquireResourceSharedLite returned"); ++Count; + ok_bool_true(ExAcquireResourceSharedLite(Res, TRUE), "ExAcquireResourceSharedLite returned"); ++Count; + ok_bool_true(ExAcquireSharedStarveExclusive(Res, FALSE), "ExAcquireSharedStarveExclusive returned"); ++Count; + ok_bool_true(ExAcquireSharedStarveExclusive(Res, TRUE), "ExAcquireSharedStarveExclusive returned"); ++Count; + ok_bool_true(ExAcquireSharedWaitForExclusive(Res, FALSE), "ExAcquireSharedWaitForExclusive returned"); ++Count; + ok_bool_true(ExAcquireSharedWaitForExclusive(Res, TRUE), "ExAcquireSharedWaitForExclusive returned"); ++Count; + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + /* this one fails, TRUE would deadlock */ + ok_bool_false(ExAcquireResourceExclusiveLite(Res, FALSE), "ExAcquireResourceExclusiveLite returned"); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + /* this must not crash or deadlock (but can assert) */ + ExConvertExclusiveToSharedLite(Res); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + while (Count--) + ExReleaseResourceLite(Res); + KeLeaveCriticalRegion(); +} + +static +VOID +TestResourceExclusiveAccess( + IN PERESOURCE Res) +{ + LONG Count = 0; + + KeEnterCriticalRegion(); + ok_bool_true(ExAcquireResourceExclusiveLite(Res, FALSE), "ExAcquireResourceExclusiveLite returned"); ++Count; + + CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); + + ok_bool_true(ExAcquireResourceExclusiveLite(Res, TRUE), "ExAcquireResourceExclusiveLite returned"); ++Count; + CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); + + ok_bool_true(ExAcquireResourceSharedLite(Res, FALSE), "ExAcquireResourceSharedLite returned"); ++Count; + ok_bool_true(ExAcquireResourceSharedLite(Res, TRUE), "ExAcquireResourceSharedLite returned"); ++Count; + ok_bool_true(ExAcquireSharedStarveExclusive(Res, FALSE), "ExAcquireSharedStarveExclusive returned"); ++Count; + ok_bool_true(ExAcquireSharedStarveExclusive(Res, TRUE), "ExAcquireSharedStarveExclusive returned"); ++Count; + ok_bool_true(ExAcquireSharedWaitForExclusive(Res, FALSE), "ExAcquireSharedWaitForExclusive returned"); ++Count; + ok_bool_true(ExAcquireSharedWaitForExclusive(Res, TRUE), "ExAcquireSharedWaitForExclusive returned"); ++Count; + CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); + + ExConvertExclusiveToSharedLite(Res); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + while (Count--) + ExReleaseResourceLite(Res); + KeLeaveCriticalRegion(); +} + +static +VOID +TestResourceUndocumentedShortcuts( + IN PERESOURCE Res, + IN BOOLEAN AreApcsDisabled) +{ + PVOID Ret; + LONG Count = 0; + + ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + ok_eq_uint(KeAreAllApcsDisabled(), AreApcsDisabled); + + /* ExEnterCriticalRegionAndAcquireResourceShared, ExEnterCriticalRegionAndAcquireSharedWaitForExclusive */ + Count = 0; + Ret = ExEnterCriticalRegionAndAcquireResourceShared(Res); ++Count; + ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); + ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + Ret = ExEnterCriticalRegionAndAcquireResourceShared(Res); ++Count; + ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); + ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + ExEnterCriticalRegionAndAcquireSharedWaitForExclusive(Res); ++Count; + ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); + ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + while (Count-- > 1) + { + ExReleaseResourceAndLeaveCriticalRegion(Res); + ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + } + + ExReleaseResourceAndLeaveCriticalRegion(Res); + ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); + + /* ExEnterCriticalRegionAndAcquireResourceExclusive */ + Count = 0; + ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + Ret = ExEnterCriticalRegionAndAcquireResourceExclusive(Res); ++Count; + ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); + ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); + + Ret = ExEnterCriticalRegionAndAcquireResourceExclusive(Res); ++Count; + ok_eq_pointer(Ret, KeGetCurrentThread()->Win32Thread); + ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); + + ExReleaseResourceAndLeaveCriticalRegion(Res); --Count; + ok_bool_true(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + ok_eq_bool(KeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, TRUE, Count, 0LU, 0LU); + + ExReleaseResourceAndLeaveCriticalRegion(Res); --Count; + ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + ok_eq_uint(KeAreAllApcsDisabled(), AreApcsDisabled); + CheckResourceStatus(Res, FALSE, Count, 0LU, 0LU); +} + +START_TEST(ExResource) +{ + NTSTATUS Status; + ERESOURCE Res; + KIRQL Irql; + + /* this must be true even with the different structure versions */ + ASSERT(sizeof(ERESOURCE) == sizeof(ERESOURCE_2K3)); + + /* functional tests & internals */ + Irql = KeRaiseIrqlToDpcLevel(); + Status = ExInitializeResourceLite(&Res); + ok_eq_hex(Status, STATUS_SUCCESS); + KeLowerIrql(APC_LEVEL); + + Status = ExDeleteResourceLite(&Res); + ok_eq_hex(Status, STATUS_SUCCESS); + KeLowerIrql(Irql); + + memset(&Res, 0x55, sizeof Res); + Status = ExInitializeResourceLite(&Res); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckResourceFields((PERESOURCE_2K3)&Res); + + CheckResourceStatus(&Res, FALSE, 0LU, 0LU, 0LU); + + TestResourceSharedAccess(&Res); + CheckResourceStatus(&Res, FALSE, 0LU, 0LU, 0LU); + + TestResourceExclusiveAccess(&Res); + CheckResourceStatus(&Res, FALSE, 0LU, 0LU, 0LU); + + TestResourceUndocumentedShortcuts(&Res, FALSE); + CheckResourceStatus(&Res, FALSE, 0LU, 0LU, 0LU); + KeRaiseIrql(APC_LEVEL, &Irql); + TestResourceUndocumentedShortcuts(&Res, TRUE); + KeLowerIrql(Irql); + ok_bool_false(KeAreApcsDisabled(), "KeAreApcsDisabled returned"); + CheckResourceStatus(&Res, FALSE, 0LU, 0LU, 0LU); + + /* ExReinitializeResourceLite cleans up after us */ + Status = ExReinitializeResourceLite(&Res); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckResourceFields((PERESOURCE_2K3)&Res); + CheckResourceStatus(&Res, FALSE, 0LU, 0LU, 0LU); + + Status = ExDeleteResourceLite(&Res); + ok_eq_hex(Status, STATUS_SUCCESS); + + /* parameter checks */ + Status = STATUS_SUCCESS; + _SEH2_TRY { + ExInitializeResourceLite(NULL); + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Status = _SEH2_GetExceptionCode(); + } _SEH2_END; + ok_eq_hex(Status, STATUS_ACCESS_VIOLATION); + + /* these bugcheck + ExDeleteResourceLite(NULL); + Status = ExDeleteResourceLite(&Res);*/ +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c [iso-8859-1] Sat Jul 9 22:02:54 2011 @@ -1,0 +1,153 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Asynchronous Procedure Call test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#undef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03SP1 +#include <ntddk.h> +#include <kmt_test.h> + +#define CheckApcs(KernelApcsDisabled, SpecialApcsDisabled, Irql) do \ +{ \ + ok_eq_bool(KeAreApcsDisabled(), KernelApcsDisabled); \ + ok_eq_bool(KeAreAllApcsDisabled(), SpecialApcsDisabled); \ + ok_irql(Irql); \ +} while (0) + +START_TEST(KeApc) +{ + KIRQL Irql; + + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + /* critical region */ + KeEnterCriticalRegion(); + CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + /* guarded region */ + KeEnterGuardedRegion(); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeEnterGuardedRegion(); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeEnterGuardedRegion(); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeLeaveGuardedRegion(); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeLeaveGuardedRegion(); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeLeaveGuardedRegion(); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + /* mix them */ + KeEnterGuardedRegion(); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeLeaveGuardedRegion(); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + KeEnterCriticalRegion(); + CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + KeEnterGuardedRegion(); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeLeaveGuardedRegion(); + CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + /* raised irql - APC_LEVEL should disable APCs */ + KeRaiseIrql(APC_LEVEL, &Irql); + CheckApcs(FALSE, TRUE, APC_LEVEL); + KeLowerIrql(Irql); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + /* KeAre*ApcsDisabled are documented to work up to DISPATCH_LEVEL... */ + KeRaiseIrql(DISPATCH_LEVEL, &Irql); + CheckApcs(FALSE, TRUE, DISPATCH_LEVEL); + KeLowerIrql(Irql); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + /* ... but also work on higher levels! */ + KeRaiseIrql(HIGH_LEVEL, &Irql); + CheckApcs(FALSE, TRUE, HIGH_LEVEL); + KeLowerIrql(Irql); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + /* now comes the crazy stuff */ + KeRaiseIrql(HIGH_LEVEL, &Irql); + CheckApcs(FALSE, TRUE, HIGH_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(TRUE, TRUE, HIGH_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(FALSE, TRUE, HIGH_LEVEL); + + KeEnterGuardedRegion(); + CheckApcs(TRUE, TRUE, HIGH_LEVEL); + KeLeaveGuardedRegion(); + CheckApcs(FALSE, TRUE, HIGH_LEVEL); + KeLowerIrql(Irql); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + KeRaiseIrql(HIGH_LEVEL, &Irql); + CheckApcs(FALSE, TRUE, HIGH_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(TRUE, TRUE, HIGH_LEVEL); + KeEnterGuardedRegion(); + CheckApcs(TRUE, TRUE, HIGH_LEVEL); + KeLowerIrql(Irql); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeLeaveGuardedRegion(); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + KeEnterGuardedRegion(); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeRaiseIrql(HIGH_LEVEL, &Irql); + CheckApcs(TRUE, TRUE, HIGH_LEVEL); + KeEnterCriticalRegion(); + CheckApcs(TRUE, TRUE, HIGH_LEVEL); + KeLeaveGuardedRegion(); + CheckApcs(TRUE, TRUE, HIGH_LEVEL); + KeLowerIrql(Irql); + CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + KeEnterCriticalRegion(); + CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + KeRaiseIrql(HIGH_LEVEL, &Irql); + CheckApcs(TRUE, TRUE, HIGH_LEVEL); + KeEnterGuardedRegion(); + CheckApcs(TRUE, TRUE, HIGH_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(TRUE, TRUE, HIGH_LEVEL); + KeLowerIrql(Irql); + CheckApcs(TRUE, TRUE, PASSIVE_LEVEL); + KeLeaveGuardedRegion(); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); + + KeEnterCriticalRegion(); + CheckApcs(TRUE, FALSE, PASSIVE_LEVEL); + KeRaiseIrql(HIGH_LEVEL, &Irql); + CheckApcs(TRUE, TRUE, HIGH_LEVEL); + KeLeaveCriticalRegion(); + CheckApcs(FALSE, TRUE, HIGH_LEVEL); + KeLowerIrql(Irql); + CheckApcs(FALSE, FALSE, PASSIVE_LEVEL); +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c [iso-8859-1] Sat Jul 9 22:02:54 2011 @@ -82,12 +82,12 @@ ok_eq_uint(Dpc.Type, DpcObject); ok_eq_uint(Dpc.Importance, DpcImportance); ok_eq_uint(Dpc.Number, 0); - ok_eq_pointer(Dpc.DpcListEntry.Flink, (LIST_ENTRY *)0x5555555555555555); - ok_eq_pointer(Dpc.DpcListEntry.Blink, (LIST_ENTRY *)0x5555555555555555); + ok_eq_pointer(Dpc.DpcListEntry.Flink, (LIST_ENTRY *)0x5555555555555555LL); + ok_eq_pointer(Dpc.DpcListEntry.Blink, (LIST_ENTRY *)0x5555555555555555LL); ok_eq_pointer(Dpc.DeferredRoutine, DpcHandler); ok_eq_pointer(Dpc.DeferredContext, &Dpc); - ok_eq_pointer(Dpc.SystemArgument1, (PVOID)0x5555555555555555); - ok_eq_pointer(Dpc.SystemArgument2, (PVOID)0x5555555555555555); + ok_eq_pointer(Dpc.SystemArgument1, (PVOID)0x5555555555555555LL); + ok_eq_pointer(Dpc.SystemArgument2, (PVOID)0x5555555555555555LL); ok_eq_pointer(Dpc.DpcData, NULL); /* simply run the Dpc a few times */ @@ -117,8 +117,6 @@ KeRaiseIrql(HIGH_LEVEL, &Irql3); ok_dpccount(); KeLowerIrql(Irql3); - ok_dpccount(); - DPRINT1("This is a debug print\n"); ok_dpccount(); KeLowerIrql(Irql2); ++ExpectedDpcCount;

1 0

[rharabien] 52591: [NTDLL/LDR] - Fix CMake build - Don't override failure status in LdrGetDllHandleEx - Minor improvements Fixes loading of mshtml.tlb in 2nd stage. Patch by Thomas Faber
by rharabien＠svn.reactos.org 09 Jul '11

09 Jul '11

Author: rharabien Date: Sat Jul 9 21:48:59 2011 New Revision: 52591 URL: http://svn.reactos.org/svn/reactos?rev=52591&view=rev Log: [NTDLL/LDR] - Fix CMake build - Don't override failure status in LdrGetDllHandleEx - Minor improvements Fixes loading of mshtml.tlb in 2nd stage. Patch by Thomas Faber Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/ntdll/ldr/ldrapi.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] Sat Jul 9 21:48:59 2011 @@ -20,8 +20,6 @@ ldr/ldrinit.c ldr/ldrpe.c ldr/ldrutils.c - ldr/startup.c - ldr/utils.c rtl/libsupp.c rtl/version.c def/ntdll.rc 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] Sat Jul 9 21:48:59 2011 @@ -148,7 +148,7 @@ /* A normal failure */ return STATUS_INVALID_PARAMETER_3; } - + /* Do or Do Not. There is no Try */ ASSERT((Disposition != NULL) || !(Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY)); @@ -388,7 +388,7 @@ /* Nothing to do */ if (!Ldr) return STATUS_NO_MORE_ENTRIES; - + /* Get the current entry */ LdrEntry = Ldr->EntryInProgress; if (LdrEntry) @@ -471,7 +471,7 @@ RtlInitEmptyUnicodeString(&RawDllName, NULL, 0); RedirectName = *DllName; pRedirectName = &RedirectName; - + /* Initialize state */ RedirectedDll = Locked = FALSE; LdrEntry = NULL; @@ -495,7 +495,7 @@ /* Acquire the lock */ Status = LdrLockLoaderLock(0, NULL, &Cookie); if (!NT_SUCCESS(Status)) goto Quickie; - + /* Remember we own it */ Locked = TRUE; } @@ -522,7 +522,11 @@ /* Unrecoverable SxS failure; */ goto Quickie; } - + else + { + ASSERT(pRedirectName == &RedirectName); + } + /* Set default failure code */ Status = STATUS_DLL_NOT_FOUND; @@ -533,28 +537,24 @@ if (RedirectedDll) { /* Check the flag */ + if (!(LdrpGetModuleHandleCache->Flags & LDRP_REDIRECTED)) + { + goto DontCompare; + } + + /* Use the right name */ + CompareName = &LdrpGetModuleHandleCache->FullDllName; + } + else + { + /* Check the flag */ if (LdrpGetModuleHandleCache->Flags & LDRP_REDIRECTED) { - /* Use the right name */ - CompareName = &LdrpGetModuleHandleCache->FullDllName; - } - else - { goto DontCompare; } - } - else - { - /* Check the flag */ - if (!(LdrpGetModuleHandleCache->Flags & LDRP_REDIRECTED)) - { - /* Use the right name */ - CompareName = &LdrpGetModuleHandleCache->BaseDllName; - } - else - { - goto DontCompare; - } + + /* Use the right name */ + CompareName = &LdrpGetModuleHandleCache->BaseDllName; } /* Check if the name matches */ @@ -604,7 +604,6 @@ /* Setup the string */ RawDllName.MaximumLength = Length; ASSERT(Length >= sizeof(UNICODE_NULL)); - RawDllName.Length = RawDllName.MaximumLength - sizeof(UNICODE_NULL); RawDllName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, RawDllName.MaximumLength); @@ -614,18 +613,9 @@ goto Quickie; } - /* Copy the buffer */ - RtlMoveMemory(RawDllName.Buffer, - pRedirectName->Buffer, - pRedirectName->Length); - - /* Add extension */ - RtlMoveMemory((PVOID)((ULONG_PTR)RawDllName.Buffer + pRedirectName->Length), - LdrApiDefaultExtension.Buffer, - LdrApiDefaultExtension.Length); - - /* Null terminate */ - RawDllName.Buffer[RawDllName.Length / sizeof(WCHAR)] = UNICODE_NULL; + /* Copy the string and add extension */ + RtlCopyUnicodeString(&RawDllName, pRedirectName); + RtlAppendUnicodeStringToString(&RawDllName, &LdrApiDefaultExtension); } else { @@ -643,7 +633,6 @@ /* Setup the string */ RawDllName.MaximumLength = pRedirectName->Length + sizeof(WCHAR); - RawDllName.Length = pRedirectName->Length; RawDllName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, RawDllName.MaximumLength); @@ -653,19 +642,14 @@ goto Quickie; } - /* Copy the buffer */ - RtlMoveMemory(RawDllName.Buffer, - pRedirectName->Buffer, - pRedirectName->Length); - - /* Null terminate */ - RawDllName.Buffer[RawDllName.Length / sizeof(WCHAR)] = UNICODE_NULL; + /* Copy the string */ + RtlCopyUnicodeString(&RawDllName, pRedirectName); } /* Display debug string */ if (ShowSnaps) { - DPRINT1("LDR: LdrGetDllHandle, searching for %wZ from %ws\n", + DPRINT1("LDR: LdrGetDllHandleEx, searching for %wZ from %ws\n", &RawDllName, DllPath ? ((ULONG_PTR)DllPath == 1 ? L"" : DllPath) : L""); } @@ -730,15 +714,15 @@ if (RawDllName.Buffer) { /* Free the heap-allocated buffer */ - Status = RtlFreeHeap(RtlGetProcessHeap(), 0, RawDllName.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, RawDllName.Buffer); RawDllName.Buffer = NULL; } /* Release lock */ if (Locked) { - Status = LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, - Cookie); + LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, + Cookie); } /* Return */ @@ -756,7 +740,7 @@ OUT PVOID *DllHandle) { /* Call the newer API */ - return LdrGetDllHandleEx(TRUE, + return LdrGetDllHandleEx(LDR_GET_DLL_HANDLE_EX_UNCHANGED_REFCOUNT, DllPath, DllCharacteristics, DllName, @@ -1134,10 +1118,10 @@ BOOLEAN LockHeld; ULONG_PTR Cookie; DPRINT("LdrDisableThreadCalloutsForDll (BaseAddress %p)\n", BaseAddress); - + /* Don't do it during shutdown */ if (LdrpShutdownInProgress) return STATUS_SUCCESS; - + /* Check if we should grab the lock */ LockHeld = FALSE; if (!LdrpInLdrInit) @@ -1147,7 +1131,7 @@ if (!NT_SUCCESS(Status)) return Status; LockHeld = TRUE; } - + /* Make sure the DLL is valid and get its entry */ Status = STATUS_DLL_NOT_FOUND; if (LdrpCheckForLoadedDllHandle(BaseAddress, &LdrEntry)) @@ -1167,7 +1151,7 @@ /* Release it */ LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); } - + /* Return the status */ return Status; }

1 0

[rharabien] 52590: [BZIP2] - Fix MSVC build
by rharabien＠svn.reactos.org 09 Jul '11

09 Jul '11

Author: rharabien Date: Sat Jul 9 21:07:30 2011 New Revision: 52590 URL: http://svn.reactos.org/svn/reactos?rev=52590&view=rev Log: [BZIP2] - Fix MSVC build Modified: trunk/reactos/lib/3rdparty/bzip2/CMakeLists.txt Modified: trunk/reactos/lib/3rdparty/bzip2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/CMakeLi… ============================================================================== --- trunk/reactos/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] Sat Jul 9 21:07:30 2011 @@ -16,5 +16,6 @@ set_module_type(bzip2 kernelmodedriver) add_importlibs(bzip2 ntoskrnl) +target_link_libraries(bzip2 libcntpr) set_target_properties(bzip2 PROPERTIES OUTPUT_NAME "unbzip2")

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