Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[ion] 55677: [CSRSRV]: Port CsrCallServerFromServer (and hackplement a reactos-compatible implememntation) from CSRSRV2. [CSRSRV/CSRSRV2]: Fix CsrLockProcessByPid -- it was skipping the root proces...
by ion＠svn.reactos.org 18 Feb '12

18 Feb '12

Author: ion Date: Sat Feb 18 01:27:50 2012 New Revision: 55677 URL: http://svn.reactos.org/svn/reactos?rev=55677&view=rev Log: [CSRSRV]: Port CsrCallServerFromServer (and hackplement a reactos-compatible implememntation) from CSRSRV2. [CSRSRV/CSRSRV2]: Fix CsrLockProcessByPid -- it was skipping the root process itself, so requests coming from a CSRSS-hosted DLL would fail (which is exactly what server-to-server depends on). [NTDLL]: Enable support for server-to-server calls! Server-to-server calls work now, and one of the multiple mapping hacks is gone. User32 and kernel32 still need a bit of fixes to get rid of the other hacks, though. Also, Perf++. Modified: trunk/reactos/dll/ntdll/csr/connect.c trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/subsystems/csr/csrsrv/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Sat Feb 18 01:27:50 2012 @@ -19,7 +19,6 @@ HANDLE CsrPortHeap; ULONG_PTR CsrPortMemoryDelta; BOOLEAN InsideCsrProcess = FALSE; -BOOLEAN UsingOldCsr = TRUE; typedef NTSTATUS (NTAPI *PCSR_SERVER_API_ROUTINE)(IN PPORT_MESSAGE Request, @@ -151,7 +150,7 @@ else { /* This is a server-to-server call. Save our CID and do a direct call */ - DbgBreakPoint(); + DPRINT1("Next gen server-to-server call\n"); ApiMessage->Header.ClientId = NtCurrentTeb()->ClientId; Status = CsrServerApiRoutine(&ApiMessage->Header, &ApiMessage->Header); @@ -366,10 +365,10 @@ InsideCsrProcess = (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_NATIVE); /* Now we can check if we are inside or not */ - if (InsideCsrProcess && !UsingOldCsr) + if (InsideCsrProcess) { /* We're inside, so let's find csrsrv */ - DbgBreakPoint(); + DPRINT1("Next-GEN CSRSS support\n"); RtlInitUnicodeString(&CsrSrvName, L"csrsrv"); Status = LdrGetDllHandle(NULL, NULL, Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sat Feb 18 01:27:50 2012 @@ -513,7 +513,7 @@ sizeof(CSR_API_MESSAGE)); if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) { - DPRINT1("Failed to tell csrss about new process\n"); + DPRINT1("Failed to tell csrss about new process: %lx %lx\n", Status, CsrRequest.Status); return CsrRequest.Status; } Modified: trunk/reactos/subsystems/csr/csrsrv/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/proc… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] Sat Feb 18 01:27:50 2012 @@ -1074,7 +1074,7 @@ { PLIST_ENTRY NextEntry; PCSR_PROCESS CurrentProcess = NULL; - NTSTATUS Status = STATUS_UNSUCCESSFUL; + NTSTATUS Status; /* Acquire the lock */ CsrAcquireProcessLock(); @@ -1084,31 +1084,37 @@ *CsrProcess = NULL; /* Setup the List Pointers */ - NextEntry = CsrRootProcess->ListLink.Flink; - while (NextEntry != &CsrRootProcess->ListLink) + NextEntry = &CsrRootProcess->ListLink; + do { /* Get the Process */ CurrentProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink); /* Check for PID Match */ - if (CurrentProcess->ClientId.UniqueProcess == Pid) break; + if (CurrentProcess->ClientId.UniqueProcess == Pid) + { + Status = STATUS_SUCCESS; + break; + } /* Next entry */ NextEntry = NextEntry->Flink; - } + } while (NextEntry != &CsrRootProcess->ListLink); /* Check if we didn't find it in the list */ - if (NextEntry == &CsrRootProcess->ListLink) + if (!NT_SUCCESS(Status)) { /* Nothing found, release the lock */ CsrReleaseProcessLock(); - return Status; - } - - /* Lock the found process and return it */ - Status = STATUS_SUCCESS; - CurrentProcess->ReferenceCount++; - *CsrProcess = CurrentProcess; + } + else + { + /* Lock the found process and return it */ + CsrLockedReferenceProcess(CurrentProcess); + *CsrProcess = CurrentProcess; + } + + /* Return the result */ return Status; } Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sat Feb 18 01:27:50 2012 @@ -111,6 +111,128 @@ /* Call the hard error handler in win32csr */ CallHardError(ThreadData, Message); +} + +/*++ + * @name CsrCallServerFromServer + * @implemented NT4 + * + * The CsrCallServerFromServer routine calls a CSR API from within a server. + * It avoids using LPC messages since the request isn't coming from a client. + * + * @param ReceiveMsg + * Pointer to the CSR API Message to send to the server. + * + * @param ReplyMsg + * Pointer to the CSR API Message to receive from the server. + * + * @return STATUS_SUCCESS in case of success, STATUS_ILLEGAL_FUNCTION + * if the opcode is invalid, or STATUS_ACCESS_VIOLATION if there + * was a problem executing the API. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrCallServerFromServer(PCSR_API_MESSAGE ReceiveMsg, + PCSR_API_MESSAGE ReplyMsg) +{ +#if 0 // real code + ULONG ServerId; + PCSR_SERVER_DLL ServerDll; + ULONG ApiId; + ULONG Reply; + NTSTATUS Status; + + /* Get the Server ID */ + ServerId = CSR_SERVER_ID_FROM_OPCODE(ReceiveMsg->Opcode); + + /* Make sure that the ID is within limits, and the Server DLL loaded */ + if ((ServerId >= CSR_SERVER_DLL_MAX) || + (!(ServerDll = CsrLoadedServerDll[ServerId]))) + { + /* We are beyond the Maximum Server ID */ + DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n", ServerId, ServerDll); + ReplyMsg->Status = (ULONG)STATUS_ILLEGAL_FUNCTION; + return STATUS_ILLEGAL_FUNCTION; + } + else + { + /* Get the API ID */ + ApiId = CSR_API_ID_FROM_OPCODE(ReceiveMsg->Opcode); + + /* Normalize it with our Base ID */ + ApiId -= ServerDll->ApiBase; + + /* Make sure that the ID is within limits, and the entry exists */ + if ((ApiId >= ServerDll->HighestApiSupported) || + ((ServerDll->ValidTable) && !(ServerDll->ValidTable[ApiId]))) + { + /* We are beyond the Maximum API ID, or it doesn't exist */ + DPRINT1("CSRSS: %lx (%s) is invalid ApiTableIndex for %Z or is an " + "invalid API to call from the server.\n", + ServerDll->ValidTable[ApiId], + ((ServerDll->NameTable) && (ServerDll->NameTable[ApiId])) ? + ServerDll->NameTable[ApiId] : "*** UNKNOWN ***", &ServerDll->Name); + DbgBreakPoint(); + ReplyMsg->Status = (ULONG)STATUS_ILLEGAL_FUNCTION; + return STATUS_ILLEGAL_FUNCTION; + } + } + + if (CsrDebug & 2) + { + DPRINT1("CSRSS: %s Api Request received from server process\n", + ServerDll->NameTable[ApiId]); + } + + /* Validation complete, start SEH */ + _SEH2_TRY + { + /* Call the API and get the result */ + Status = (ServerDll->DispatchTable[ApiId])(ReceiveMsg, &Reply); + + /* Return the result, no matter what it is */ + ReplyMsg->Status = Status; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* If we got an exception, return access violation */ + ReplyMsg->Status = STATUS_ACCESS_VIOLATION; + } + _SEH2_END; + + /* Return success */ + return STATUS_SUCCESS; +#else // Hacky reactos code + PCSR_PROCESS ProcessData; + + /* Get the Process Data */ + ProcessData = CsrGetProcessData(ReceiveMsg->Header.ClientId.UniqueProcess); + if (!ProcessData) + { + DPRINT1("Message: Unable to find data for process 0x%x\n", + ReceiveMsg->Header.ClientId.UniqueProcess); + return STATUS_NOT_SUPPORTED; + } + + /* Validation complete, start SEH */ + _SEH2_TRY + { + /* Call the API and get the result */ + CsrApiCallHandler(ProcessData, ReplyMsg); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* If we got an exception, return access violation */ + ReplyMsg->Status = STATUS_ACCESS_VIOLATION; + } + _SEH2_END; + + /* Return success */ + return STATUS_SUCCESS; +#endif } /*++ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/csrsrv.spec [iso-8859-1] Sat Feb 18 01:27:50 2012 @@ -1,5 +1,5 @@ @ stdcall CsrAddStaticServerThread(ptr ptr long) -;@ stdcall CsrCallServerFromServer(ptr ptr) +@ stdcall CsrCallServerFromServer(ptr ptr) ;@ stdcall CsrConnectToUser() ;@ stdcall CsrCreateProcess(ptr ptr ptr ptr long ptr) ;@ stdcall CsrCreateRemoteThread(ptr ptr) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Sat Feb 18 01:27:50 2012 @@ -810,6 +810,7 @@ { PLIST_ENTRY NextEntry; PCSR_PROCESS CurrentProcess = NULL; + NTSTATUS Status; /* Acquire the lock */ CsrAcquireProcessLock(); @@ -819,31 +820,38 @@ *CsrProcess = NULL; /* Setup the List Pointers */ - NextEntry = CsrRootProcess->ListLink.Flink; - while (NextEntry != &CsrRootProcess->ListLink) + NextEntry = &CsrRootProcess->ListLink; + do { /* Get the Process */ CurrentProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink); /* Check for PID Match */ - if (CurrentProcess->ClientId.UniqueProcess == Pid) break; + if (CurrentProcess->ClientId.UniqueProcess == Pid) + { + Status = STATUS_SUCCESS; + break; + } /* Next entry */ NextEntry = NextEntry->Flink; - } + } while (NextEntry != &CsrRootProcess->ListLink); /* Check if we didn't find it in the list */ - if (NextEntry == &CsrRootProcess->ListLink) + if (!NT_SUCCESS(Status)) { /* Nothing found, release the lock */ CsrReleaseProcessLock(); - return STATUS_UNSUCCESSFUL; - } - - /* Lock the found process and return it */ - CsrLockedReferenceProcess(CurrentProcess); - *CsrProcess = CurrentProcess; - return STATUS_SUCCESS; + } + else + { + /* Lock the found process and return it */ + CsrLockedReferenceProcess(CurrentProcess); + *CsrProcess = CurrentProcess; + } + + /* Return the result */ + return Status; } /* EOF */

1 0

[ion] 55676: [NTOSKRNL]: And finally, the third part of Richard's patch, cleaned up and ready to go. This cleans up the INIT and SCN_MEM_DISCARDABLE sections from all drivers and the kernel. Reduce...
by ion＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: ion Date: Fri Feb 17 22:57:32 2012 New Revision: 55676 URL: http://svn.reactos.org/svn/reactos?rev=55676&view=rev Log: [NTOSKRNL]: And finally, the third part of Richard's patch, cleaned up and ready to go. This cleans up the INIT and SCN_MEM_DISCARDABLE sections from all drivers and the kernel. Reduces RAM usage by another 350KB on my test box. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Fri Feb 17 22:57:32 2012 @@ -422,6 +422,10 @@ return Status; } +VOID +NTAPI +MmFreeDriverInitialization(IN PLDR_DATA_TABLE_ENTRY LdrEntry); + /* * IopInitializeDriverModule * @@ -513,6 +517,8 @@ DPRINT("IopCreateDriver() failed (Status 0x%08lx)\n", Status); return Status; } + + MmFreeDriverInitialization((PLDR_DATA_TABLE_ENTRY)Driver->DriverSection); /* Set the driver as initialized */ IopReadyDeviceObjects(Driver); Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Fri Feb 17 22:57:32 2012 @@ -1373,6 +1373,243 @@ VOID NTAPI +MiFreeInitializationCode(IN PVOID InitStart, + IN PVOID InitEnd) +{ + PMMPTE PointerPte; + PFN_NUMBER PagesFreed; + + /* Get the start PTE */ + PointerPte = MiAddressToPte(InitStart); + ASSERT(MI_IS_PHYSICAL_ADDRESS(InitStart) == FALSE); + + /* Compute the number of pages we expect to free */ + PagesFreed = (PFN_NUMBER)(MiAddressToPte(InitEnd) - PointerPte + 1); + + /* Try to actually free them */ + PagesFreed = MiDeleteSystemPageableVm(PointerPte, + PagesFreed, + 0, + NULL); +} + +VOID +NTAPI +INIT_FUNCTION +MiFindInitializationCode(OUT PVOID *StartVa, + OUT PVOID *EndVa) +{ + ULONG Size, SectionCount, Alignment; + PLDR_DATA_TABLE_ENTRY LdrEntry; + ULONG_PTR DllBase, InitStart, InitEnd, ImageEnd, InitCode; + PLIST_ENTRY NextEntry; + PIMAGE_NT_HEADERS NtHeader; + PIMAGE_SECTION_HEADER Section, LastSection; + BOOLEAN InitFound; + + /* So we don't free our own code yet */ + InitCode = (ULONG_PTR)&MiFindInitializationCode; + + /* Assume failure */ + *StartVa = NULL; + + /* Enter a critical region while we loop the list */ + KeEnterCriticalRegion(); + + /* Loop all loaded modules */ + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) + { + /* Get the loader entry and its DLL base */ + LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + DllBase = (ULONG_PTR)LdrEntry->DllBase; + + /* Get the NT header */ + NtHeader = RtlImageNtHeader((PVOID)DllBase); + if (!NtHeader) + { + /* Keep going */ + NextEntry = NextEntry->Flink; + continue; + } + + /* Get the first section, the section count, and scan them all */ + Section = IMAGE_FIRST_SECTION(NtHeader); + SectionCount = NtHeader->FileHeader.NumberOfSections; + InitStart = 0; + while (SectionCount > 0) + { + /* Assume failure */ + InitFound = FALSE; + + /* Is this the INIT section or a discardable section? */ + if ((*(PULONG)Section->Name == 'TINI') || + ((Section->Characteristics & IMAGE_SCN_MEM_DISCARDABLE))) + { + /* Remember this */ + InitFound = TRUE; + } + + if (InitFound) + { + /* Pick the biggest size -- either raw or virtual */ + Size = max(Section->SizeOfRawData, Section->Misc.VirtualSize); + + /* Read the section alignment */ + Alignment = NtHeader->OptionalHeader.SectionAlignment; + + /* Align the start and end addresses appropriately */ + InitStart = DllBase + Section->VirtualAddress; + InitEnd = ((Alignment + InitStart + Size - 2) & 0xFFFFF000) - 1; + InitStart = (InitStart + (PAGE_SIZE - 1)) & 0xFFFFF000; + + /* Have we reached the last section? */ + if (SectionCount == 1) + { + /* Remember this */ + LastSection = Section; + } + else + { + /* We have not, loop all the sections */ + LastSection = NULL; + do + { + /* Keep going until we find a non-discardable section range */ + SectionCount--; + Section++; + if (Section->Characteristics & IMAGE_SCN_MEM_DISCARDABLE) + { + /* Discardable, so record it, then keep going */ + LastSection = Section; + } + else + { + /* Non-contigous discard flag, or no flag, break out */ + break; + } + } + while (SectionCount > 1); + } + + /* Have we found a discardable or init section? */ + if (LastSection) + { + /* Pick the biggest size -- either raw or virtual */ + Size = max(LastSection->SizeOfRawData, LastSection->Misc.VirtualSize); + + /* Use this as the end of the section address */ + InitEnd = DllBase + LastSection->VirtualAddress + Size - 1; + + /* Have we reached the last section yet? */ + if (SectionCount != 1) + { + /* Then align this accross the session boundary */ + InitEnd = ((Alignment + InitEnd - 1) & 0XFFFFF000) - 1; + } + } + + /* Make sure we don't let the init section go past the image */ + ImageEnd = DllBase + LdrEntry->SizeOfImage; + if (InitEnd > ImageEnd) InitEnd = (ImageEnd - 1) | (PAGE_SIZE - 1); + + /* Make sure we have a valid, non-zero init section */ + if (InitStart <= InitEnd) + { + /* Make sure we are not within this code itself */ + if ((InitCode >= InitStart) && (InitCode <= InitEnd)) + { + /* Return it, we can't free ourselves now */ + ASSERT(*StartVa == 0); + *StartVa = (PVOID)InitStart; + *EndVa = (PVOID)InitEnd; + } + else + { + /* This isn't us -- go ahead and free it */ + ASSERT(MI_IS_PHYSICAL_ADDRESS((PVOID)InitStart) == FALSE); + MiFreeInitializationCode((PVOID)InitStart, (PVOID)InitEnd); + } + } + } + + /* Move to the next section */ + SectionCount--; + Section++; + } + + /* Move to the next module */ + NextEntry = NextEntry->Flink; + } + + /* Leave the critical region and return */ + KeLeaveCriticalRegion(); +} + +/* + * Note: This function assumes that all discardable sections are at the end of + * the PE file. It searches backwards until it finds the non-discardable section + */ +VOID +NTAPI +MmFreeDriverInitialization(IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PMMPTE StartPte, EndPte; + PFN_NUMBER PageCount; + PVOID DllBase; + ULONG i; + PIMAGE_NT_HEADERS NtHeader; + PIMAGE_SECTION_HEADER Section, DiscardSection; + ULONG PagesDeleted; + + /* Get the base address and the page count */ + DllBase = LdrEntry->DllBase; + PageCount = LdrEntry->SizeOfImage >> PAGE_SHIFT; + + /* Get the last PTE in this image */ + EndPte = MiAddressToPte(DllBase) + PageCount; + + /* Get the NT header */ + NtHeader = RtlImageNtHeader(DllBase); + if (!NtHeader) return; + + /* Get the last section and loop each section backwards */ + Section = IMAGE_FIRST_SECTION(NtHeader) + NtHeader->FileHeader.NumberOfSections; + DiscardSection = NULL; + for (i = 0; i < NtHeader->FileHeader.NumberOfSections; i++) + { + /* Go back a section and check if it's discardable */ + Section--; + if (Section->Characteristics & IMAGE_SCN_MEM_DISCARDABLE) + { + /* It is, select it for freeing */ + DiscardSection = Section; + } + else + { + /* No more discardable sections exist, bail out */ + break; + } + } + + /* Bail out if there's nothing to free */ + if (!DiscardSection) return; + + /* Push the DLL base to the first disacrable section, and get its PTE */ + DllBase = (PVOID)ROUND_TO_PAGES((ULONG_PTR)DllBase + DiscardSection->VirtualAddress); + ASSERT(MI_IS_PHYSICAL_ADDRESS(DllBase) == FALSE); + StartPte = MiAddressToPte(DllBase); + + /* Check how many pages to free total */ + PageCount = (PFN_NUMBER)(EndPte - StartPte); + if (!PageCount) return; + + /* Delete this many PTEs */ + PagesDeleted = MiDeleteSystemPageableVm(StartPte, PageCount, 0, NULL); +} + +VOID +NTAPI INIT_FUNCTION MiReloadBootLoadedDrivers(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { Modified: trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/zeropage.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c [iso-8859-1] Fri Feb 17 22:57:32 2012 @@ -24,19 +24,29 @@ VOID NTAPI +MiFindInitializationCode(OUT PVOID *StartVa, +OUT PVOID *EndVa); + +VOID +NTAPI +MiFreeInitializationCode(IN PVOID StartVa, +IN PVOID EndVa); + +VOID +NTAPI MmZeroPageThread(VOID) { PKTHREAD Thread = KeGetCurrentThread(); - //PVOID StartAddress, EndAddress; + PVOID StartAddress, EndAddress; PVOID WaitObjects[2]; KIRQL OldIrql; PVOID ZeroAddress; PFN_NUMBER PageIndex, FreePage; PMMPFN Pfn1; - /* FIXME: Get the discardable sections to free them */ -// MiFindInitializationCode(&StartAddress, &EndAddress); -// if (StartAddress) MiFreeInitializationCode(StartAddress, EndAddress); + /* Get the discardable sections to free them */ + MiFindInitializationCode(&StartAddress, &EndAddress); + if (StartAddress) MiFreeInitializationCode(StartAddress, EndAddress); DPRINT1("Free non-cache pages: %lx\n", MmAvailablePages + MiMemoryConsumers[MC_CACHE].PagesUsed); /* Set our priority to 0 */

1 0

[tkreuzer] 55675: [FREELDR] - Fix heap code for 64 bit (before someone asks: the reason to use ULONG_PTR instead of ULONG is warning free code without casts)
by tkreuzer＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: tkreuzer Date: Fri Feb 17 17:22:14 2012 New Revision: 55675 URL: http://svn.reactos.org/svn/reactos?rev=55675&view=rev Log: [FREELDR] - Fix heap code for 64 bit (before someone asks: the reason to use ULONG_PTR instead of ULONG is warning free code without casts) Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] Fri Feb 17 17:22:14 2012 @@ -39,8 +39,8 @@ typedef struct _BLOCK_DATA { - ULONG_PTR Flink; - ULONG_PTR Blink; + ULONG_PTR Flink:32; + ULONG_PTR Blink:32; } BLOCK_DATA, *PBLOCK_DATA; typedef struct _HEAP_BLOCK

1 0

[jgardou] 55674: [NTOSKRNL/ARM3] - remove useless code : Page Directories Entries are backed by ARM3 managed pages
by jgardou＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: jgardou Date: Fri Feb 17 16:14:12 2012 New Revision: 55674 URL: http://svn.reactos.org/svn/reactos?rev=55674&view=rev Log: [NTOSKRNL/ARM3] - remove useless code : Page Directories Entries are backed by ARM3 managed pages Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Fri Feb 17 16:14:12 2012 @@ -1351,8 +1351,6 @@ PMMPFN Pfn1, Pfn2; KIRQL OldIrql; PFN_NUMBER PageFrameIndex; - PULONG PageDir; - ULONG i; //ASSERT(Process->CommitCharge == 0); @@ -1370,27 +1368,6 @@ /* Check for fully initialized process */ if (Process->AddressSpaceInitialized == 2) { - /* Map the PDE */ - PageDir = MmCreateHyperspaceMapping(Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT); - for (i = 0; i < ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i++) - { - /* Loop all page tables */ - if (PageDir[i] != 0) - { - /* Check if they are RosMm-owned */ - if (MI_IS_ROS_PFN(MiGetPfnEntry(PageDir[i] >> PAGE_SHIFT))) - { - /* Free them through the RosMm ABI */ - //DPRINT1("Freeing MC_SYSTEM: %lx\n", PageDir[i]); - MmReleasePageMemoryConsumer(MC_SYSTEM, PageDir[i] >> PAGE_SHIFT); - } - } - } - - /* Unmap the PDE */ - //DPRINT1("Done\n"); - MmDeleteHyperspaceMapping(PageDir); - /* Map the working set page and its page table */ Pfn1 = MiGetPfnEntry(Process->WorkingSetPage); Pfn2 = MiGetPfnEntry(Pfn1->u4.PteFrame);

1 0

[janderwald] 55673: [KERNEL32] - Fix error status of GetQueuedCompletionStatus, which should set the error to WAIT_TIMEOUT - Fixes 4 failing winetests - Patch by Samuel Serapion (samcharly_hotmail_...
by janderwald＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: janderwald Date: Fri Feb 17 16:11:40 2012 New Revision: 55673 URL: http://svn.reactos.org/svn/reactos?rev=55673&view=rev Log: [KERNEL32] - Fix error status of GetQueuedCompletionStatus, which should set the error to WAIT_TIMEOUT - Fixes 4 failing winetests - Patch by Samuel Serapion (samcharly_hotmail_com) See issue #6907 for more details. Modified: trunk/reactos/dll/win32/kernel32/client/file/iocompl.c Modified: trunk/reactos/dll/win32/kernel32/client/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] Fri Feb 17 16:11:40 2012 @@ -123,7 +123,12 @@ if (!NT_SUCCESS(errCode) || errCode == STATUS_TIMEOUT) { *lpOverlapped = NULL; - BaseSetLastNTError(errCode); + + if(errCode == STATUS_TIMEOUT) + SetLastError(WAIT_TIMEOUT); + else + BaseSetLastNTError(errCode); + return FALSE; }

1 0

[jgardou] 55672: [CMAKE] - use quotes in reactos.dff for every platform. Paths beginning with '.' are no longer seen as directives
by jgardou＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: jgardou Date: Fri Feb 17 15:54:05 2012 New Revision: 55672 URL: http://svn.reactos.org/svn/reactos?rev=55672&view=rev Log: [CMAKE] - use quotes in reactos.dff for every platform. Paths beginning with '.' are no longer seen as directives Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Feb 17 15:54:05 2012 @@ -155,11 +155,7 @@ #add it in reactos.cab dir_to_num(${_CD_DESTINATION} _num) file(RELATIVE_PATH __relative_file ${REACTOS_SOURCE_DIR} ${_CD_FILE}) - if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${__relative_file} ${_num}\n") - else() - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${__relative_file}\" ${_num}\n") - endif() + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${__relative_file}\" ${_num}\n") unset(__relative_file) if(_CD_TARGET) #manage dependency

1 0

[tkreuzer] 55671: [WIN32K] Fix another bug in NtGdiSelectBitmap, where selecting the same bitmap a second time, would release the bitmap
by tkreuzer＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: tkreuzer Date: Fri Feb 17 15:51:13 2012 New Revision: 55671 URL: http://svn.reactos.org/svn/reactos?rev=55671&view=rev Log: [WIN32K] Fix another bug in NtGdiSelectBitmap, where selecting the same bitmap a second time, would release the bitmap Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Fri Feb 17 15:51:13 2012 @@ -261,11 +261,9 @@ IN HBITMAP hbmp) { PDC pdc; - PDC_ATTR pdcattr; HBITMAP hbmpOld; PSURFACE psurfNew, psurfOld; HRGN hVisRgn; - SIZEL sizlBitmap = {1, 1}; HDC hdcOld; ASSERT_NOGDILOCKS(); @@ -278,7 +276,6 @@ { return NULL; } - pdcattr = pdc->pdcattr; /* Must be a memory dc to select a bitmap */ if (pdc->dctype != DC_TYPE_MEMORY) @@ -290,10 +287,34 @@ /* Save the old bitmap */ psurfOld = pdc->dclevel.pSurface; + /* Check if there is a bitmap selected */ + if (psurfOld) + { + /* Get the old bitmap's handle */ + hbmpOld = psurfOld->BaseObject.hHmgr; + } + else + { + /* Use the default bitmap */ + hbmpOld = StockObjects[DEFAULT_BITMAP]; + } + + /* Check if the new bitmap is already selected */ + if (hbmp == hbmpOld) + { + /* Unlock the DC and return the old bitmap */ + DC_UnlockDc(pdc); + return hbmpOld; + } + /* Check if the default bitmap was passed */ if (hbmp == StockObjects[DEFAULT_BITMAP]) { psurfNew = NULL; + + /* Default bitmap is 1x1 pixel */ + pdc->dclevel.sizl.cx = 1; + pdc->dclevel.sizl.cy = 1; // HACK psurfNew = SURFACE_ShareLockSurface(hbmp); @@ -308,28 +329,32 @@ return NULL; } - /* Set the bitmp's hdc */ + /* Set the bitmap's hdc and check if it was set before */ hdcOld = InterlockedCompareExchangePointer((PVOID*)&psurfNew->hdc, hdc, 0); - if (hdcOld != NULL && hdcOld != hdc) - { - /* The bitmap is already selected, fail */ + if (hdcOld != NULL) + { + /* The bitmap is already selected into a different DC */ + ASSERT(hdcOld != hdc); + + /* Dereference the bitmap, unlock the DC and fail. */ SURFACE_ShareUnlockSurface(psurfNew); DC_UnlockDc(pdc); return NULL; } - /* Get the bitmap size */ - sizlBitmap = psurfNew->SurfObj.sizlBitmap; + /* Copy the bitmap size */ + pdc->dclevel.sizl = psurfNew->SurfObj.sizlBitmap; /* Check if the bitmap is a dibsection */ if(psurfNew->hSecure) { /* Set DIBSECTION attribute */ - pdcattr->ulDirty_ |= DC_DIBSECTION; + pdc->pdcattr->ulDirty_ |= DC_DIBSECTION; } else { - pdcattr->ulDirty_ &= ~DC_DIBSECTION; + /* Remove DIBSECTION attribute */ + pdc->pdcattr->ulDirty_ &= ~DC_DIBSECTION; } } @@ -339,37 +364,30 @@ /* Check if there was a bitmap selected before */ if (psurfOld) { - /* Get the old bitmap's handle */ - hbmpOld = psurfOld->BaseObject.hHmgr; - - /* Reset hdc of the old bitmap,it isn't selected anymore */ + /* Reset hdc of the old bitmap, it isn't selected anymore */ psurfOld->hdc = NULL; /* Dereference the old bitmap */ SURFACE_ShareUnlockSurface(psurfOld); } - else - { - /* Return default bitmap */ - hbmpOld = StockObjects[DEFAULT_BITMAP]; - } /* Mark the dc brushes invalid */ - pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; - - /* Unlock the DC */ - DC_UnlockDc(pdc); + pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; /* FIXME: Improve by using a region without a handle and selecting it */ hVisRgn = IntSysCreateRectRgn( 0, 0, - sizlBitmap.cx, - sizlBitmap.cy); + pdc->dclevel.sizl.cx, + pdc->dclevel.sizl.cy); + if (hVisRgn) { GdiSelectVisRgn(hdc, hVisRgn); GreDeleteObject(hVisRgn); } + + /* Unlock the DC */ + DC_UnlockDc(pdc); /* Return the old bitmap handle */ return hbmpOld;

1 0

[khornicek] 55670: [ROSAUTOTEST] If the last chunk of the string sent to StringOut isn't a whole line and forcePrint is set to false, send back what's left after processing. The caller is then resp...
by khornicek＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: khornicek Date: Fri Feb 17 12:31:32 2012 New Revision: 55670 URL: http://svn.reactos.org/svn/reactos?rev=55670&view=rev Log: [ROSAUTOTEST] If the last chunk of the string sent to StringOut isn't a whole line and forcePrint is set to false, send back what's left after processing. The caller is then responsible for prepending that string next time it calls StringOut. Should fix the rest of debug log corruptions. Modified: trunk/rostests/rosautotest/CJournaledTestList.cpp trunk/rostests/rosautotest/CWebService.cpp trunk/rostests/rosautotest/CWineTest.cpp trunk/rostests/rosautotest/main.cpp trunk/rostests/rosautotest/precomp.h trunk/rostests/rosautotest/shutdown.cpp trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/CJournaledTestList.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CJournaledTes… ============================================================================== --- trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -144,7 +144,7 @@ CTestInfo* TestInfo; DWORD BytesWritten; - StringOut("Writing initial journal file...\n\n"); + StringOut("Writing initial journal file...\n\n", TRUE); m_ListIterator = 0; @@ -189,7 +189,7 @@ DWORD BytesRead; DWORD RemainingSize; - StringOut("Loading journal file...\n\n"); + StringOut("Loading journal file...\n\n", TRUE); OpenJournal(GENERIC_READ); RemainingSize = GetFileSize(m_hJournal, NULL); Modified: trunk/rostests/rosautotest/CWebService.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWebService.c… ============================================================================== --- trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -207,7 +207,7 @@ Response.reset(DoRequest(Data)); ss << "The server responded:" << endl << Response << endl; - StringOut(ss.str()); + StringOut(ss.str(), TRUE); if(strcmp(Response, "OK")) EXCEPTION("Aborted!\n"); Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -266,9 +266,10 @@ stringstream ss, ssFinish; DWORD StartTime = GetTickCount(); float TotalTime; + string tailString; ss << "Running Wine Test, Module: " << TestInfo->Module << ", Test: " << TestInfo->Test << endl; - StringOut(ss.str()); + StringOut(ss.str(), TRUE); StartTime = GetTickCount(); @@ -299,9 +300,9 @@ if(!ReadFile(m_hReadPipe, Buffer, BytesAvailable, &Temp, NULL)) FATAL("ReadFile failed for the test run\n"); - /* Output all test output through StringOut, even while the test is still running */ + /* Output text through StringOut, even while the test is still running */ Buffer[BytesAvailable] = 0; - StringOut(string(Buffer)); + tailString = StringOut(tailString.append(string(Buffer)), FALSE); if(Configuration.DoSubmit()) TestInfo->Log += Buffer; @@ -310,10 +311,14 @@ while(!BreakLoop); } + /* Print what's left */ + if(!tailString.empty()) + StringOut(tailString, TRUE); + TotalTime = ((float)GetTickCount() - StartTime)/1000; ssFinish << "Test " << TestInfo->Test << " completed in "; ssFinish << setprecision(2) << fixed << TotalTime << " seconds." << endl; - StringOut(ssFinish.str()); + StringOut(ssFinish.str(), TRUE); } /** @@ -370,6 +375,6 @@ if(Configuration.DoSubmit() && !TestInfo->Log.empty()) WebService->Submit("wine", TestInfo); - StringOut("\n\n"); - } -} + StringOut("\n\n", TRUE); + } +} Modified: trunk/rostests/rosautotest/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.cpp?rev=… ============================================================================== --- trunk/rostests/rosautotest/main.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -60,7 +60,7 @@ ss << "\n\nSystem uptime " << setprecision(2) << fixed ; ss << ((float)GetTickCount()/1000) << " seconds\n"; - StringOut(ss.str()); + StringOut(ss.str(), TRUE); /* Run the tests */ WineTest.Run(); @@ -76,7 +76,7 @@ } catch(CSimpleException& e) { - StringOut(e.GetMessage()); + StringOut(e.GetMessage(), TRUE); } catch(CFatalException& e) { @@ -87,7 +87,7 @@ << "File: " << e.GetFile() << endl << "Line: " << e.GetLine() << endl << "Last Win32 Error: " << GetLastError() << endl; - StringOut(ss.str()); + StringOut(ss.str(), TRUE); } /* For sysreg2 to notice if rosautotest itself failed */ Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -51,7 +51,7 @@ string EscapeString(const string& Input); string GetINIValue(PCWCH AppName, PCWCH KeyName, PCWCH FileName); bool IsNumber(const char* Input); -void StringOut(const string& String); +string StringOut(const string& String, const BOOL forcePrint); string UnicodeToAscii(PCWSTR UnicodeString); string UnicodeToAscii(const wstring& UnicodeString); Modified: trunk/rostests/rosautotest/shutdown.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/shutdown.cpp?… ============================================================================== --- trunk/rostests/rosautotest/shutdown.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/shutdown.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -20,14 +20,14 @@ if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) { - StringOut("OpenProcessToken failed\n"); + StringOut("OpenProcessToken failed\n", TRUE); return false; } /* Get the LUID for the Shutdown privilege */ if (!LookupPrivilegeValueW(NULL, SE_SHUTDOWN_NAME, &Privileges.Privileges[0].Luid)) { - StringOut("LookupPrivilegeValue failed\n"); + StringOut("LookupPrivilegeValue failed\n", TRUE); return false; } @@ -37,14 +37,14 @@ if (!AdjustTokenPrivileges(hToken, FALSE, &Privileges, 0, NULL, NULL)) { - StringOut("AdjustTokenPrivileges failed\n"); + StringOut("AdjustTokenPrivileges failed\n", TRUE); return false; } /* Finally shut down the system */ if(!ExitWindowsEx(EWX_POWEROFF, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) { - StringOut("ExitWindowsEx failed\n"); + StringOut("ExitWindowsEx failed\n", TRUE); return false; } Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -92,8 +92,8 @@ * @param String * The std::string to output */ -void -StringOut(const string& String) +string +StringOut(const string& String, const BOOL forcePrint) { char DbgString[DBGPRINT_BUFSIZE + 1]; size_t i, start = 0, last_newline = 0, size = 0, curr_pos = 0; @@ -122,7 +122,7 @@ if((curr_pos - start) >= DBGPRINT_BUFSIZE) { /* No newlines so far, or the string just fits */ - if(last_newline <= start || (curr_pos - start) == DBGPRINT_BUFSIZE) + if(last_newline <= start || ((curr_pos - start == DBGPRINT_BUFSIZE) && NewString[curr_pos - 1] == '\n')) { size = curr_pos - start; memcpy(DbgString, NewString.c_str() + start, size); @@ -143,14 +143,24 @@ } } - /* The rest of the string is <= DBGPRINT_BUFSIZE so just print it*/ - size = curr_pos - start; - memcpy(DbgString, NewString.c_str() + start, size); - DbgString[size] = 0; - DbgPrint(DbgString); - /* Output the string */ cout << NewString; + + size = curr_pos - start; + + /* Only print if forced to or if the rest is a whole line */ + if(forcePrint == true || NewString[curr_pos - 1] == '\n') + { + memcpy(DbgString, NewString.c_str() + start, size); + DbgString[size] = 0; + DbgPrint(DbgString); + + NewString.clear(); + return NewString; + } + + /* Return the remaining chunk */ + return NewString.substr(start, size); } /**

1 0

[janderwald] 55669: [CDROM_NEW] - Misc build fixes for mingw and msvc with cmake
by janderwald＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: janderwald Date: Fri Feb 17 12:07:17 2012 New Revision: 55669 URL: http://svn.reactos.org/svn/reactos?rev=55669&view=rev Log: [CDROM_NEW] - Misc build fixes for mingw and msvc with cmake Added: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt (with props) Modified: trunk/reactos/drivers/storage/class/CMakeLists.txt trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c trunk/reactos/drivers/storage/class/cdrom_new/mmc.c Modified: trunk/reactos/drivers/storage/class/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/CMak… ============================================================================== --- trunk/reactos/drivers/storage/class/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/CMakeLists.txt [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -1,5 +1,5 @@ - add_subdirectory(cdrom) +add_subdirectory(cdrom_new) add_subdirectory(class2) add_subdirectory(disk) add_subdirectory(disk_new) Added: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt (added) +++ trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -1,0 +1,15 @@ +include_directories(..) + +add_library(cdrom_new SHARED cdrom.c data.c ioctl.c mmc.c sec.c) + +target_link_libraries(cdrom_new libcntpr wdmguid) +if(ARCH MATCHES i386) + if(MSVC) + add_target_compile_flags(cdrom_new "/Gz") + else() + add_target_compile_flags(cdrom_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") + endif() +endif() + +set_module_type(cdrom_new kernelmodedriver) +add_importlibs(cdrom_new classpnp ntoskrnl hal) Propchange: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -114,7 +114,7 @@ status = IoAllocateDriverObjectExtension(DriverObject, CDROM_DRIVER_EXTENSION_ID, sizeof(CDROM_DRIVER_EXTENSION), - &driverExtension); + (PVOID*)&driverExtension); if (!NT_SUCCESS(status)) { TraceLog((CdromDebugWarning, @@ -555,7 +555,7 @@ PVOID senseData = NULL; ULONG timeOut; - PCDROM_DATA cddata; + PCDROM_DATA cddata = NULL; BOOLEAN changerDevice; BOOLEAN isMmcDevice = FALSE; @@ -3366,7 +3366,7 @@ } if ((startingOffset.QuadPart > commonExtension->PartitionLength.QuadPart) || - (transferByteCount & fdoExtension->DiskGeometry.BytesPerSector - 1)) { + (transferByteCount & (fdoExtension->DiskGeometry.BytesPerSector - 1))) { // // Fail request with status of invalid parameters. @@ -3390,18 +3390,18 @@ IN PVOID Context ) { - PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; - PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; - - PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); - PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); - BOOLEAN use6Byte = TEST_FLAG(cdData->XAFlags, XA_USE_6_BYTE); PIO_STACK_LOCATION realIrpStack; PIO_STACK_LOCATION realIrpNextStack; - PSCSI_REQUEST_BLOCK srb = Context; PIRP realIrp = NULL; NTSTATUS status; BOOLEAN retry; + PSCSI_REQUEST_BLOCK srb = Context; + PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; + PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; + PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); + PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); + BOOLEAN use6Byte = TEST_FLAG(cdData->XAFlags, XA_USE_6_BYTE); + ULONG retryCount; // // Extract the 'real' irp from the irpstack. @@ -3454,7 +3454,17 @@ retry = TRUE; } - if (retry && realIrpNextStack->Parameters.Others.Argument1--) { + // + // get current retry count + // + retryCount = PtrToUlong(realIrpNextStack->Parameters.Others.Argument1); + + if (retry && retryCount) { + + // + // decrement retryCount and update + // + realIrpNextStack->Parameters.Others.Argument1 = UlongToPtr(retryCount-1); if (((ULONG)(ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { @@ -5923,6 +5933,8 @@ ULONG pickDvdRegion; ULONG defaultDvdRegion; ULONG dvdRegion; + ULONG a, b; + PAGED_CODE(); @@ -5948,8 +5960,7 @@ } - ULONG a, b; - + a = max(sizeof(DVD_DESCRIPTOR_HEADER) + sizeof(DVD_COPYRIGHT_DESCRIPTOR), sizeof(DVD_READ_STRUCTURE) @@ -6434,7 +6445,9 @@ NTSTATUS --*/ -NTSTATUS + +VOID +NTAPI CdRomMmcErrorHandler( IN PDEVICE_OBJECT Fdo, IN PSCSI_REQUEST_BLOCK Srb, @@ -6600,8 +6613,6 @@ } // end of SenseKey switch } // end of SRB_STATUS_AUTOSENSE_VALID - - return STATUS_SUCCESS; } /*++ @@ -6748,6 +6759,7 @@ --*/ NTSTATUS +NTAPI CdRomShutdownFlushCompletion( IN PDEVICE_OBJECT Fdo, IN PIRP NewIrp, @@ -6836,7 +6848,7 @@ newIrpStack = IoGetCurrentIrpStackLocation(newIrp); newIrpStack->DeviceObject = Fdo; IoSetCompletionRoutine(newIrp, - CdRomShutdownFlushCompletion, + (PIO_COMPLETION_ROUTINE)CdRomShutdownFlushCompletion, OriginalIrp, TRUE, TRUE, TRUE); IoSetNextIrpStackLocation(newIrp); Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -45,7 +45,7 @@ CdromDebug = z, // set bit 0x00000000 in nt!kd_cdrom_mask #endif CdromDebugFeatures = 32 // set bit 0x80000000 in nt!kd_cdrom_mask -}; +}CdromError; #define CDROM_GET_CONFIGURATION_TIMEOUT (0x4) @@ -744,7 +744,8 @@ OUT PBOOLEAN IsMmc ); -NTSTATUS +VOID +NTAPI CdRomMmcErrorHandler( IN PDEVICE_OBJECT Fdo, IN PSCSI_REQUEST_BLOCK Srb, Modified: trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -2086,6 +2086,7 @@ NTSTATUS status; BOOLEAN retry; + ULONG retryCount; // // Extract the 'real' irp from the irpstack. @@ -2231,7 +2232,17 @@ } - if (retry && realIrpNextStack->Parameters.Others.Argument1--) { + // + // get current retry count + // + retryCount = PtrToUlong(realIrpNextStack->Parameters.Others.Argument1); + + if (retry && retryCount) { + + // + // update retry count + // + realIrpNextStack->Parameters.Others.Argument1 = UlongToPtr(retryCount-1); if (((ULONG)(ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { @@ -2844,6 +2855,7 @@ PIRP realIrp = NULL; NTSTATUS status; BOOLEAN retry; + ULONG retryCount; // // Extract the 'real' irp from the irpstack. @@ -2901,7 +2913,18 @@ retry = TRUE; } - if (retry && realIrpNextStack->Parameters.Others.Argument1--) { + // + // get current retry count + // + retryCount = PtrToUlong(realIrpNextStack->Parameters.Others.Argument1); + + if (retry && retryCount) { + + // + // update retry count + // + realIrpNextStack->Parameters.Others.Argument1 = UlongToPtr(retryCount-1); + if (((ULONG)(ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { Modified: trunk/reactos/drivers/storage/class/cdrom_new/mmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/mmc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/mmc.c [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -837,6 +837,7 @@ } NTSTATUS +NTAPI CdRomUpdateMmcDriveCapabilitiesCompletion( IN PDEVICE_OBJECT Unused, IN PIRP Irp, @@ -851,6 +852,9 @@ PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); NTSTATUS status = STATUS_UNSUCCESSFUL; PIRP delayedIrp; + ULONG retryCount; + LARGE_INTEGER delay; + // completion routine should retry as neccessary. // when success, clear the flag to allow startio to proceed. @@ -910,9 +914,19 @@ retry = TRUE; } - if (retry && irpStack->Parameters.Others.Argument4--) { - - LARGE_INTEGER delay; + // + // get current retry count + // + retryCount = PtrToUlong(irpStack->Parameters.Others.Argument1); + + if (retry && retryCount) { + + // + // update retry count + // + irpStack->Parameters.Others.Argument1 = UlongToPtr(retryCount-1); + + delay.QuadPart = retryInterval; delay.QuadPart *= (LONGLONG)1000 * 1000 * 10; @@ -1038,7 +1052,7 @@ nextStack->Parameters.Scsi.Srb = srb; irp->MdlAddress = mmcData->CapabilitiesMdl; irp->AssociatedIrp.SystemBuffer = mmcData->CapabilitiesBuffer; - IoSetCompletionRoutine(irp, CdRomUpdateMmcDriveCapabilitiesCompletion, Fdo, + IoSetCompletionRoutine(irp, (PIO_COMPLETION_ROUTINE)CdRomUpdateMmcDriveCapabilitiesCompletion, Fdo, TRUE, TRUE, TRUE); return;

1 0

[tfaber] 55668: [CABMAN] - Fix MSVC build
by tfaber＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: tfaber Date: Fri Feb 17 08:26:33 2012 New Revision: 55668 URL: http://svn.reactos.org/svn/reactos?rev=55668&view=rev Log: [CABMAN] - Fix MSVC build Modified: trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Fri Feb 17 08:26:33 2012 @@ -22,6 +22,10 @@ #include <stdio.h> #include <string.h> #include <limits.h> + +#ifndef PATH_MAX +#define PATH_MAX MAX_PATH +#endif #if defined(_WIN32) #define DIR_SEPARATOR_CHAR '\\'

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
58
Older →

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 February 2012