Ros-dev

ros-dev@reactos.org

5791 discussions

IServ secured access
by Pierre Schweitzer 18 Sep '11

18 Sep '11

Hi, small note to inform people who were having issues connecting to secured IServ services due to wrong SSL certificate (issued for the wrong address) that the certificate has been renewed today and the issues are gone. Regards, Pierre

2 2

Re: [ros-dev] [ros-diffs] [tkreuzer] 53695: [HAL] Implement lazy irql for APIC. This is useful for VMs, since APIC usually has high overhead due to the need of invoking the hypervisor on every irql raise and lower. With laz...
by Alex Ionescu 12 Sep '11

12 Sep '11

http://blogs.technet.com/b/askperf/archive/2010/07/23/windows-xp-guests-exh… Windows does have APIC Lazy IRQL, Microsoft are not idiots. Best regards, Alex Ionescu On Mon, Sep 12, 2011 at 2:46 AM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Mon Sep 12 09:46:20 2011 > New Revision: 53695 > > URL: http://svn.reactos.org/svn/reactos?rev=53695&view=rev > Log: > [HAL] > Implement lazy irql for APIC. This is useful for VMs, since APIC usually > has high overhead due to the need of invoking the hypervisor on every irql > raise and lower. With lazy irql we avoid that until absolutely neccessary. > Note that we misuse the PCR's IRR field to save the current hardware irql. > Its a huge performance boost (some parts take half the time), making APIC > performance close to PIC performance on VBox. This is something that Windows > doesn't have :) > > Modified: > trunk/reactos/hal/halx86/apic/apic.c > trunk/reactos/hal/halx86/apic/rtctimer.c > > Modified: trunk/reactos/hal/halx86/apic/apic.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.c?rev… > > ============================================================================== > --- trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] Mon Sep 12 09:46:20 > 2011 > @@ -17,6 +17,8 @@ > > #include "apic.h" > void HackEoi(void); > + > +#define APIC_LAZY_IRQL > > /* GLOBALS > ********************************************************************/ > > @@ -105,6 +107,46 @@ > > VOID > FORCEINLINE > +ApicWriteIORedirectionEntry( > + UCHAR Index, > + IOAPIC_REDIRECTION_REGISTER ReDirReg) > +{ > + IOApicWrite(IOAPIC_REDTBL + 2 * Index, ReDirReg.Long0); > + IOApicWrite(IOAPIC_REDTBL + 2 * Index + 1, ReDirReg.Long1); > +} > + > +IOAPIC_REDIRECTION_REGISTER > +FORCEINLINE > +ApicReadIORedirectionEntry( > + UCHAR Index) > +{ > + IOAPIC_REDIRECTION_REGISTER ReDirReg; > + > + ReDirReg.Long0 = IOApicRead(IOAPIC_REDTBL + 2 * Index); > + ReDirReg.Long1 = IOApicRead(IOAPIC_REDTBL + 2 * Index + 1); > + > + return ReDirReg; > +} > + > +VOID > +FORCEINLINE > +ApicRequestInterrupt(IN UCHAR Vector) > +{ > + APIC_COMMAND_REGISTER CommandRegister; > + > + /* Setup the command register */ > + CommandRegister.Long0 = 0; > + CommandRegister.Vector = Vector; > + CommandRegister.MessageType = APIC_MT_Fixed; > + CommandRegister.TriggerMode = APIC_TGM_Edge; > + CommandRegister.DestinationShortHand = APIC_DSH_Self; > + > + /* Write the low dword to send the interrupt */ > + ApicWrite(APIC_ICR0, CommandRegister.Long0); > +} > + > +VOID > +FORCEINLINE > ApicSendEOI(void) > { > //ApicWrite(APIC_EOI, 0); > @@ -125,6 +167,12 @@ > { > #ifdef _M_AMD64 > return (KIRQL)__readcr8(); > +#elif defined(APIC_LAZY_IRQL) > + // HACK: some magic to Sync VBox's APIC registers > + ApicRead(APIC_VER); > + > + /* Return the field in the PCR */ > + return (KIRQL)__readfsbyte(FIELD_OFFSET(KPCR, Irql)); > #else > // HACK: some magic to Sync VBox's APIC registers > ApicRead(APIC_VER); > @@ -136,16 +184,42 @@ > > VOID > FORCEINLINE > -ApicSetCurrentIrql(KIRQL Irql) > +ApicRaiseIrql(KIRQL Irql) > { > #ifdef _M_AMD64 > __writecr8(Irql); > +#elif defined(APIC_LAZY_IRQL) > + __writefsbyte(FIELD_OFFSET(KPCR, Irql), Irql); > #else > /* Convert IRQL and write the TPR */ > ApicWrite(APIC_TPR, IrqlToTpr(Irql)); > #endif > } > > +VOID > +FORCEINLINE > +ApicLowerIrql(KIRQL Irql) > +{ > +#ifdef _M_AMD64 > + __writecr8(Irql); > +#elif defined(APIC_LAZY_IRQL) > + __writefsbyte(FIELD_OFFSET(KPCR, Irql), Irql); > + > + /* Is the new Irql lower than set in the TPR? */ > + if (Irql < KeGetPcr()->IRR) > + { > + /* Save the new hard IRQL in the IRR field */ > + KeGetPcr()->IRR = Irql; > + > + /* Need to lower it back */ > + ApicWrite(APIC_TPR, IrqlToTpr(Irql)); > + } > +#else > + /* Convert IRQL and write the TPR */ > + ApicWrite(APIC_TPR, IrqlToTpr(Irql)); > +#endif > +} > + > UCHAR > FASTCALL > HalpIrqToVector(UCHAR Irq) > @@ -171,6 +245,13 @@ > HalpVectorToIrq(UCHAR Vector) > { > return HalpVectorToIndex[Vector]; > +} > + > +VOID > +NTAPI > +HalpSendEOI(VOID) > +{ > + ApicSendEOI(); > } > > VOID > @@ -311,31 +392,10 @@ > ApicWrite(APIC_ERRLVTR, LvtEntry.Long); > > /* Set the IRQL from the PCR */ > - ApicSetCurrentIrql(KeGetPcr()->Irql); > -} > - > - > -VOID > -FORCEINLINE > -ApicWriteIORedirectionEntry( > - UCHAR Index, > - IOAPIC_REDIRECTION_REGISTER ReDirReg) > -{ > - IOApicWrite(IOAPIC_REDTBL + 2 * Index, ReDirReg.Long0); > - IOApicWrite(IOAPIC_REDTBL + 2 * Index + 1, ReDirReg.Long1); > -} > - > -IOAPIC_REDIRECTION_REGISTER > -FORCEINLINE > -ApicReadIORedirectionEntry( > - UCHAR Index) > -{ > - IOAPIC_REDIRECTION_REGISTER ReDirReg; > - > - ReDirReg.Long0 = IOApicRead(IOAPIC_REDTBL + 2 * Index); > - ReDirReg.Long1 = IOApicRead(IOAPIC_REDTBL + 2 * Index + 1); > - > - return ReDirReg; > + ApicWrite(APIC_TPR, IrqlToTpr(KeGetPcr()->Irql)); > + > + /* Save the new hard IRQL in the IRR field */ > + KeGetPcr()->IRR = KeGetPcr()->Irql; > } > > UCHAR > @@ -486,6 +546,9 @@ > __writeeflags(EFlags); > } > > + > +/* SOFTWARE INTERRUPT TRAPS > ***************************************************/ > + > VOID > DECLSPEC_NORETURN > FASTCALL > @@ -493,17 +556,25 @@ > { > KPROCESSOR_MODE ProcessorMode; > KIRQL OldIrql; > - ASSERT(ApicGetCurrentIrql() < APC_LEVEL); > ASSERT(ApicGetProcessorIrql() == APC_LEVEL); > > /* Enter trap */ > KiEnterInterruptTrap(TrapFrame); > > +#ifdef APIC_LAZY_IRQL > + if (!HalBeginSystemInterrupt(APC_LEVEL, APC_VECTOR, &OldIrql)) > + { > + /* "Spurious" interrupt, exit the interrupt */ > + KiEoiHelper(TrapFrame); > + } > +#else > /* Save the old IRQL */ > OldIrql = ApicGetCurrentIrql(); > + ASSERT(OldIrql < APC_LEVEL); > +#endif > > /* Raise to APC_LEVEL */ > - ApicSetCurrentIrql(APC_LEVEL); > + ApicRaiseIrql(APC_LEVEL); > > /* End the interrupt */ > ApicSendEOI(); > @@ -521,7 +592,7 @@ > _disable(); > > /* Restore the old IRQL */ > - ApicSetCurrentIrql(OldIrql); > + ApicLowerIrql(OldIrql); > > /* Exit the interrupt */ > KiEoiHelper(TrapFrame); > @@ -534,17 +605,25 @@ > HalpDispatchInterruptHandler(IN PKTRAP_FRAME TrapFrame) > { > KIRQL OldIrql; > - ASSERT(ApicGetCurrentIrql() < DISPATCH_LEVEL); > ASSERT(ApicGetProcessorIrql() == DISPATCH_LEVEL); > > /* Enter trap */ > KiEnterInterruptTrap(TrapFrame); > > - /* Save the old IRQL */ > +#ifdef APIC_LAZY_IRQL > + if (!HalBeginSystemInterrupt(DISPATCH_LEVEL, DISPATCH_VECTOR, > &OldIrql)) > + { > + /* "Spurious" interrupt, exit the interrupt */ > + KiEoiHelper(TrapFrame); > + } > +#else > + /* Get the current IRQL */ > OldIrql = ApicGetCurrentIrql(); > + ASSERT(OldIrql < DISPATCH_LEVEL); > +#endif > > /* Raise to DISPATCH_LEVEL */ > - ApicSetCurrentIrql(DISPATCH_LEVEL); > + ApicRaiseIrql(DISPATCH_LEVEL); > > /* End the interrupt */ > ApicSendEOI(); > @@ -555,37 +634,23 @@ > _disable(); > > /* Restore the old IRQL */ > - ApicSetCurrentIrql(OldIrql); > + ApicLowerIrql(OldIrql); > > /* Exit the interrupt */ > KiEoiHelper(TrapFrame); > } > #endif > > -VOID > -NTAPI > -HalpSendEOI(VOID) > -{ > - ApicSendEOI(); > -} > - > -/* PUBLIC FUNCTIONS > ***********************************************************/ > + > +/* SOFTWARE INTERRUPTS > ********************************************************/ > + > > VOID > FASTCALL > HalRequestSoftwareInterrupt(IN KIRQL Irql) > { > - APIC_COMMAND_REGISTER CommandRegister; > - > - /* Setup the command register */ > - CommandRegister.Long0 = 0; > - CommandRegister.Vector = IrqlToTpr(Irql); > - CommandRegister.MessageType = APIC_MT_Fixed; > - CommandRegister.TriggerMode = APIC_TGM_Edge; > - CommandRegister.DestinationShortHand = APIC_DSH_Self; > - > - /* Write the low dword to send the interrupt */ > - ApicWrite(APIC_ICR0, CommandRegister.Long0); > + /* Convert irql to vector and request an interrupt */ > + ApicRequestInterrupt(IrqlToTpr(Irql)); > } > > VOID > @@ -595,6 +660,9 @@ > { > /* Nothing to do */ > } > + > + > +/* SYSTEM INTERRUPTS > **********************************************************/ > > BOOLEAN > NTAPI > @@ -678,11 +746,37 @@ > IN UCHAR Vector, > OUT PKIRQL OldIrql) > { > + KIRQL CurrentIrql; > + > /* Get the current IRQL */ > - *OldIrql = ApicGetCurrentIrql(); > + CurrentIrql = ApicGetCurrentIrql(); > + > +#ifdef APIC_LAZY_IRQL > + /* Check if this interrupt is allowed */ > + if (CurrentIrql >= Irql) > + { > + /* It is not, set the real Irql in the TPR! */ > + ApicWrite(APIC_TPR, IrqlToTpr(CurrentIrql)); > + > + /* Save the new hard IRQL in the IRR field */ > + KeGetPcr()->IRR = CurrentIrql; > + > + /* End this interrupt */ > + ApicSendEOI(); > + > + // FIXME: level interrupts > + /* Re-request the interrupt to be handled later */ > + ApicRequestInterrupt(Vector); > + > + /* Pretend it was a spurious interrupt */ > + return FALSE; > + } > +#endif > + /* Save the current IRQL */ > + *OldIrql = CurrentIrql; > > /* Set the new IRQL */ > - ApicSetCurrentIrql(Irql); > + ApicRaiseIrql(Irql); > > /* Turn on interrupts */ > _enable(); > @@ -701,9 +795,11 @@ > ApicSendEOI(); > > /* Restore the old IRQL */ > - ApicSetCurrentIrql(OldIrql); > -} > - > + ApicLowerIrql(OldIrql); > +} > + > + > +/* IRQL MANAGEMENT > ************************************************************/ > > KIRQL > NTAPI > @@ -726,8 +822,8 @@ > KeBugCheck(IRQL_NOT_LESS_OR_EQUAL); > } > #endif > - /* Convert the new IRQL to a TPR value and write the register */ > - ApicSetCurrentIrql(OldIrql); > + /* Set the new IRQL */ > + ApicLowerIrql(OldIrql); > } > > KIRQL > @@ -748,7 +844,7 @@ > } > #endif > /* Convert the new IRQL to a TPR value and write the register */ > - ApicSetCurrentIrql(NewIrql); > + ApicRaiseIrql(NewIrql); > > /* Return old IRQL */ > return OldIrql; > > Modified: trunk/reactos/hal/halx86/apic/rtctimer.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/rtctimer.c… > > ============================================================================== > --- trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] Mon Sep 12 > 09:46:20 2011 > @@ -111,7 +111,7 @@ > KiEnterInterruptTrap(TrapFrame); > > /* Start the interrupt */ > - if (HalBeginSystemInterrupt(CLOCK_LEVEL, PRIMARY_VECTOR_BASE, &Irql)) > + if (HalBeginSystemInterrupt(CLOCK_LEVEL, HalpClockVector, &Irql)) > { > /* Read register C, so that the next interrupt can happen */ > HalpReadCmos(RTC_REGISTER_C);; > > >

2 1

Re: [ros-dev] [ros-diffs] [fireball] 53635: - Downgrade some DPRINT1s to DPRINTs.
by Alex Ionescu 11 Sep '11

11 Sep '11

For the stuff that was obviously designed to warn at least once, have you filled out bug reports for all these missing features, or do you think that someone will now remember all this missing code? Best regards, Alex Ionescu On Thu, Sep 8, 2011 at 9:28 AM, <fireball(a)svn.reactos.org> wrote: > Author: fireball > Date: Thu Sep 8 08:28:41 2011 > New Revision: 53635 > > URL: http://svn.reactos.org/svn/reactos?rev=53635&view=rev > Log: > - Downgrade some DPRINT1s to DPRINTs. > > Modified: > trunk/reactos/dll/ntdll/ldr/ldrapi.c > trunk/reactos/dll/ntdll/ldr/ldrinit.c > trunk/reactos/ntoskrnl/mm/ARM3/procsup.c > trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c > trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c > > Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… > > ============================================================================== > --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) > +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Thu Sep 8 08:28:41 > 2011 > @@ -1542,8 +1542,8 @@ > NTAPI > LdrUnloadAlternateResourceModule(IN PVOID BaseAddress) > { > - static BOOLEAN WarnedOnce = FALSE; > - if (WarnedOnce == FALSE) { UNIMPLEMENTED; WarnedOnce = TRUE; } > + //static BOOLEAN WarnedOnce = FALSE; > + //if (WarnedOnce == FALSE) { UNIMPLEMENTED; WarnedOnce = TRUE; } > return FALSE; > } > > > 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] Thu Sep 8 08:28:41 > 2011 > @@ -728,7 +728,7 @@ > > /* Clear it */ > //Kernel32ProcessInitPostImportfunction = NULL; > - UNIMPLEMENTED; > + //UNIMPLEMENTED; > } > > /* No root entry? return */ > @@ -1988,7 +1988,7 @@ > if (NtHeader->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) > { > /* Load kernel32 and call BasePostImportInit... */ > - DPRINT1("Unimplemented codepath!\n"); > + DPRINT("Unimplemented codepath!\n"); > } > > /* Walk the IAT and load all the DLLs */ > @@ -2095,7 +2095,7 @@ > { > /* Check for Application Compatibility Goo */ > //LdrQueryApplicationCompatibilityGoo(hKey); > - DPRINT1("Querying app compat hacks is missing!\n"); > + DPRINT("Querying app compat hacks is missing!\n"); > } > > /* > > 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] Thu Sep 8 > 08:28:41 2011 > @@ -590,7 +590,7 @@ > ViewShare, > MEM_TOP_DOWN, > PAGE_READONLY); > - DPRINT1("NLS Tables at: %p\n", TableBase); > + DPRINT("NLS Tables at: %p\n", TableBase); > if (!NT_SUCCESS(Status)) > { > /* Cleanup and exit */ > @@ -602,7 +602,7 @@ > // Allocate the PEB > // > Status = MiCreatePebOrTeb(Process, sizeof(PEB), (PULONG_PTR)&Peb); > - DPRINT1("PEB at: %p\n", Peb); > + DPRINT("PEB at: %p\n", Peb); > if (!NT_SUCCESS(Status)) > { > /* Cleanup and exit */ > > Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… > > ============================================================================== > --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] > Thu Sep 8 08:28:41 2011 > @@ -105,7 +105,7 @@ > PROCESS_ALL_ACCESS, > &ObjectAttributes, > &ClientId); > - DPRINT1("CSR Process: %p Handle: %p\n", pProcessData, > pProcessData->Process); > + DPRINT("CSR Process: %p Handle: %p\n", pProcessData, > pProcessData->Process); > if (!NT_SUCCESS(Status)) > { > ProcessData[hash] = pProcessData->next; > > 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] Thu > Sep 8 08:28:41 2011 > @@ -278,8 +278,8 @@ > /* Check if we have a process */ > if (CsrProcess) > { > - /* Map the sectio into this process */ > - DPRINT1("CSR Process Handle: %p. CSR Process: %p\n", > CsrProcess->Process, CsrProcess); > + /* Map the section into this process */ > + DPRINT("CSR Process Handle: %p. CSR Process: %p\n", > CsrProcess->Process, CsrProcess); > Status = NtMapViewOfSection(CsrSrvSharedSection, > CsrProcess->Process, > &CsrSrvSharedSectionBase, > @@ -520,7 +520,7 @@ > Status = CsrSrvAttachSharedSection(ProcessData, ConnectInfo); > if (NT_SUCCESS(Status)) > { > - DPRINT1("Connection ok\n"); > + DPRINT("Connection ok\n"); > AllowConnection = TRUE; > } > else > > >

2 7

Re: [ros-dev] [ros-diffs] [tfaber] 53688: [NTOSKRNL][RTL][DOC] - Fix incorrect loop boundaries in the ARM version of MmCreateProcessAddressSpace. Spotted by Vincenzo Cotugno and cppcheck - Correct outdated wineimport.cmd UR...
by Alex Ionescu 11 Sep '11

11 Sep '11

Sorry but these kinds of fixes are not "readability fixes", in fact they make things more obtuse. (*MdlPages << PAGE_SHIFT)) could be interpreted as *(MdlPages << PAGE_SHIFT). while ((*MdlPages) << PAGE_SHIFT) Makes it clear what is happening. In general, all operations affecting the contents of a *dereference should be in parens. Best regards, Alex Ionescu On Sun, Sep 11, 2011 at 7:47 AM, <tfaber(a)svn.reactos.org> wrote: > - ((*MdlPages) << PAGE_SHIFT)); > + (*MdlPages << PAGE_SHIFT)); >

1 0

PVS-Studio analysis of ReactOS code: error explanations in English
by Minas Abrahamyan 11 Sep '11

11 Sep '11

Hi all, Andrey Karpov of "SiProVer" Ltd (www.viva64.com/ ), the authors of PVS-Studio, a statical source code analyzer/checker wrote (in Russian, this translation is conducted by me): "Have checked source code of ReactOS with PVS-Studio, I fulfilled three wishes of mine at once: Firstly, for a long time I wanted to write an article about ordinary project. It is not so interesting to check source code of such projects as Chromium, It is of too high quality and resources are spending for keeping this level of quality, resources which are unavailable to ordinary projects. Secondly, ReactOS appears to be a good example of project, for which high need of statical analysis of source code can be shown, especially as project being developed with distributed team of developers with diversely different experience. Thirdly, I got confirmation of PVS-Studio getting better and better and more useful all along the way..." Full text of original Russian article is here: http://habrahabr.ru/blogs/os/127493/ titled on Russian as "PVS-Studio: analysing ReactOS operating system source code". Evgeniy Ryzhkov of "SiProVer" adds: "Soon we will translate and publish article on English. But if you have questions now - we are ready for discussion. If some of English-speaking comrades of ReactOS would like to work with errors list, generated with PVS-Studio we have prepared for them translation of errors explanations, here it is: http://www.viva64.com/external-pictures/txt/PVS-Studio-vs-ReactOS-en-unicod… ". Original article refers to long list of generated errors with manually added explanations for errors found by their static checker, so this is translated version of that list. --- Looking backward to few applied patches, it turns out that not all of them were absolutely useful, some patches were reversed, etc. But nevertheless, I think it makes sense to use this tool. They promised to donate some version of PVS-Studio to project, and it is to ROS developers to decide is it worth of taking. What I would suggest: anybody working with some module or part of code can take corresponding part of messages (or in future, possibly check with tool only these parts of interest) and work with them. Also Karpov gave good advise to check newly written code, since it is still of interest to developer: write and time for time test with it. P.S. Disclaimer: I am not in any connection with "SiProVer" Regards, M.A.

1 0

Re: [ros-dev] [ros-diffs] [akhaldi] 53653: [SHELL32] * Reintegrate the c++ shell32 branch. Exemplary team-work.. kudos ! * Better code quality, more tests run with less failures... and more. * Dedicated to everyone who help...
by Ged Murphy 09 Sep '11

09 Sep '11

Nice work guys. It was great to watch you pull this together as a team. Hopefully there's more to come :) -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of akhaldi(a)svn.reactos.org Sent: 09 September 2011 11:55 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [akhaldi] 53653: [SHELL32] * Reintegrate the c++ shell32 branch. Exemplary team-work.. kudos ! * Better code quality, more tests run with less failures... and more. * Dedicated to everyone who help... Author: akhaldi Date: Fri Sep 9 10:55:09 2011 New Revision: 53653 URL: http://svn.reactos.org/svn/reactos?rev=53653&view=rev Log: [SHELL32] * Reintegrate the c++ shell32 branch. Exemplary team-work.. kudos ! * Better code quality, more tests run with less failures... and more. * Dedicated to everyone who helped ;)

1 0

Re: [ros-dev] [ros-diffs] [fireball] 53596: [NTOS/CONFIG] - Remove unnecessary assignments. Spotted by PVS and Dmitry Chapyshev. This may change the behaviour of that codepath, so test results are going to be observed.
by Alex Ionescu 05 Sep '11

05 Sep '11

Uhhhh... Am I really the *only* one who sees a problem here? ChildList = &Kcb->ValueCache; - ChildList = (PCACHED_CHILD_LIST)&KeyNode->ValueList; Best regards, Alex Ionescu On Mon, Sep 5, 2011 at 10:54 AM, <fireball(a)svn.reactos.org> wrote: > Author: fireball > Date: Mon Sep 5 09:54:20 2011 > New Revision: 53596 > > URL: http://svn.reactos.org/svn/reactos?rev=53596&view=rev > Log: > [NTOS/CONFIG] > - Remove unnecessary assignments. Spotted by PVS and Dmitry Chapyshev. This > may change the behaviour of that codepath, so test results are going to be > observed. > > Modified: > trunk/reactos/ntoskrnl/config/cmvalche.c > > Modified: trunk/reactos/ntoskrnl/config/cmvalche.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… > > ============================================================================== > --- trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] Mon Sep 5 > 09:54:20 2011 > @@ -49,7 +49,6 @@ > PHHIVE Hive; > PCACHED_CHILD_LIST ChildList; > HCELL_INDEX CellToRelease; > - PCM_KEY_NODE KeyNode; > > /* Set defaults */ > *ValueListToRelease = HCELL_NIL; > @@ -58,8 +57,6 @@ > /* Get the hive and value cache */ > Hive = Kcb->KeyHive; > ChildList = &Kcb->ValueCache; > - KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); > - ChildList = (PCACHED_CHILD_LIST)&KeyNode->ValueList; > > /* Check if the value is cached */ > if (CmpIsValueCached(ChildList->ValueList)) > @@ -212,7 +209,6 @@ > BOOLEAN IndexIsCached; > ULONG i = 0; > HCELL_INDEX Cell = HCELL_NIL; > - PCM_KEY_NODE KeyNode; > > /* Set defaults */ > *CellToRelease = HCELL_NIL; > @@ -221,8 +217,6 @@ > /* Get the hive and child list */ > Hive = Kcb->KeyHive; > ChildList = &Kcb->ValueCache; > - KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); > - ChildList = (PCACHED_CHILD_LIST)&KeyNode->ValueList; > > /* Check if the child list has any entries */ > if (ChildList->Count != 0) > > >

3 8

Re: [ros-dev] [ros-diffs] [fireball] 53599: [NTOS] - Fix IoCheckEaBufferValidity (IntEaLength must be signed, otherwise loop exiting condition may not trigger). - SEH-protect ObQueryNameString (by Dmitry Chapyshev's request).
by Alex Ionescu 05 Sep '11

05 Sep '11

Good to know we are now changing good, working code, on people's "request". Best regards, Alex Ionescu On Mon, Sep 5, 2011 at 4:05 PM, <fireball(a)svn.reactos.org> wrote: > Author: fireball > Date: Mon Sep 5 15:05:56 2011 > New Revision: 53599 > > URL: http://svn.reactos.org/svn/reactos?rev=53599&view=rev > Log: > [NTOS] > - Fix IoCheckEaBufferValidity (IntEaLength must be signed, otherwise loop > exiting condition may not trigger). > - SEH-protect ObQueryNameString (by Dmitry Chapyshev's request). > > Modified: > trunk/reactos/ntoskrnl/io/iomgr/util.c > trunk/reactos/ntoskrnl/ob/obname.c > > Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… > > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] Mon Sep 5 15:05:56 > 2011 > @@ -166,7 +166,8 @@ > OUT PULONG ErrorOffset) > { > PFILE_FULL_EA_INFORMATION EaBufferEnd; > - ULONG NextEaBufferOffset, IntEaLength; > + ULONG NextEaBufferOffset; > + LONG IntEaLength; > > PAGED_CODE(); > > > Modified: trunk/reactos/ntoskrnl/ob/obname.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=5… > > ============================================================================== > --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Mon Sep 5 15:05:56 > 2011 > @@ -986,6 +986,7 @@ > ULONG NameSize; > PWCH ObjectName; > BOOLEAN ObjectIsNamed; > + NTSTATUS Status = STATUS_SUCCESS; > > /* Get the Kernel Meta-Structures */ > ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); > @@ -994,28 +995,57 @@ > /* Check if a Query Name Procedure is available */ > if (ObjectHeader->Type->TypeInfo.QueryNameProcedure) > { > - /* Call the procedure */ > + /* Call the procedure inside SEH */ > ObjectIsNamed = ((LocalInfo) && (LocalInfo->Name.Length > 0)); > - return ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, > + > + _SEH2_TRY > + { > + Status = > ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, > > ObjectIsNamed, > > ObjectNameInfo, > Length, > > ReturnLength, > KernelMode); > + } > + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > + { > + /* Return the exception code */ > + Status = _SEH2_GetExceptionCode(); > + } > + _SEH2_END; > + > + return Status; > } > > /* Check if the object doesn't even have a name */ > if (!(LocalInfo) || !(LocalInfo->Name.Buffer)) > { > - /* We're returning the name structure */ > - *ReturnLength = sizeof(OBJECT_NAME_INFORMATION); > - > - /* Check if we were given enough space */ > - if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; > - > - /* Return an empty buffer */ > - RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); > - return STATUS_SUCCESS; > + Status = STATUS_SUCCESS; > + > + _SEH2_TRY > + { > + /* We're returning the name structure */ > + *ReturnLength = sizeof(OBJECT_NAME_INFORMATION); > + > + /* Check if we were given enough space */ > + if (*ReturnLength > Length) > + { > + Status = STATUS_INFO_LENGTH_MISMATCH; > + } > + else > + { > + /* Return an empty buffer */ > + RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); > + } > + } > + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > + { > + /* Return the exception code */ > + Status = _SEH2_GetExceptionCode(); > + } > + _SEH2_END; > + > + return Status; > } > > /* > @@ -1025,126 +1055,136 @@ > * enough right at the beginning, not work our way through > * and find out at the end > */ > - if (Object == ObpRootDirectoryObject) > - { > - /* Size of the '\' string */ > - NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR); > - } > - else > - { > - /* Get the Object Directory and add name of Object */ > - ParentDirectory = LocalInfo->Directory; > - NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR) + > LocalInfo->Name.Length; > - > - /* Loop inside the directory to get the top-most one (meaning > root) */ > - while ((ParentDirectory != ObpRootDirectoryObject) && > (ParentDirectory)) > - { > - /* Get the Name Information */ > - LocalInfo = OBJECT_HEADER_TO_NAME_INFO( > - OBJECT_TO_OBJECT_HEADER(ParentDirectory)); > - > - /* Add the size of the Directory Name */ > - if (LocalInfo && LocalInfo->Directory) > - { > - /* Size of the '\' string + Directory Name */ > - NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + > - LocalInfo->Name.Length; > - > - /* Move to next parent Directory */ > - ParentDirectory = LocalInfo->Directory; > - } > - else > - { > - /* Directory with no name. We append "...\" */ > - NameSize += sizeof(L"...") + > sizeof(OBJ_NAME_PATH_SEPARATOR); > - break; > - } > - } > - } > - > - /* Finally, add the name of the structure and the null char */ > - *ReturnLength = NameSize + > - sizeof(OBJECT_NAME_INFORMATION) + > - sizeof(UNICODE_NULL); > - > - /* Check if we were given enough space */ > - if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; > - > - /* > - * Now we will actually create the name. We work backwards because > - * it's easier to start off from the Name we have and walk up the > - * parent directories. We use the same logic as Name Length > calculation. > - */ > - LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); > - ObjectName = (PWCH)((ULONG_PTR)ObjectNameInfo + *ReturnLength); > - *--ObjectName = UNICODE_NULL; > - > - /* Check if the object is actually the Root directory */ > - if (Object == ObpRootDirectoryObject) > - { > - /* This is already the Root Directory, return "\\" */ > - *--ObjectName = OBJ_NAME_PATH_SEPARATOR; > - ObjectNameInfo->Name.Length = (USHORT)NameSize; > - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + > - > sizeof(UNICODE_NULL)); > - ObjectNameInfo->Name.Buffer = ObjectName; > - return STATUS_SUCCESS; > - } > - else > - { > - /* Start by adding the Object's Name */ > - ObjectName = (PWCH)((ULONG_PTR)ObjectName - > - LocalInfo->Name.Length); > - RtlCopyMemory(ObjectName, > - LocalInfo->Name.Buffer, > - LocalInfo->Name.Length); > - > - /* Now parse the Parent directories until we reach the top */ > - ParentDirectory = LocalInfo->Directory; > - while ((ParentDirectory != ObpRootDirectoryObject) && > (ParentDirectory)) > - { > - /* Get the name information */ > - LocalInfo = OBJECT_HEADER_TO_NAME_INFO( > - OBJECT_TO_OBJECT_HEADER(ParentDirectory)); > - > - /* Add the "\" */ > + _SEH2_TRY > + { > + if (Object == ObpRootDirectoryObject) > + { > + /* Size of the '\' string */ > + NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR); > + } > + else > + { > + /* Get the Object Directory and add name of Object */ > + ParentDirectory = LocalInfo->Directory; > + NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR) + > LocalInfo->Name.Length; > + > + /* Loop inside the directory to get the top-most one (meaning > root) */ > + while ((ParentDirectory != ObpRootDirectoryObject) && > (ParentDirectory)) > + { > + /* Get the Name Information */ > + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( > + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); > + > + /* Add the size of the Directory Name */ > + if (LocalInfo && LocalInfo->Directory) > + { > + /* Size of the '\' string + Directory Name */ > + NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + > + LocalInfo->Name.Length; > + > + /* Move to next parent Directory */ > + ParentDirectory = LocalInfo->Directory; > + } > + else > + { > + /* Directory with no name. We append "...\" */ > + NameSize += sizeof(L"...") + > sizeof(OBJ_NAME_PATH_SEPARATOR); > + break; > + } > + } > + } > + > + /* Finally, add the name of the structure and the null char */ > + *ReturnLength = NameSize + > + sizeof(OBJECT_NAME_INFORMATION) + > + sizeof(UNICODE_NULL); > + > + /* Check if we were given enough space */ > + if (*ReturnLength > Length) _SEH2_YIELD(return > STATUS_INFO_LENGTH_MISMATCH); > + > + /* > + * Now we will actually create the name. We work backwards because > + * it's easier to start off from the Name we have and walk up the > + * parent directories. We use the same logic as Name Length > calculation. > + */ > + LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); > + ObjectName = (PWCH)((ULONG_PTR)ObjectNameInfo + *ReturnLength); > + *--ObjectName = UNICODE_NULL; > + > + /* Check if the object is actually the Root directory */ > + if (Object == ObpRootDirectoryObject) > + { > + /* This is already the Root Directory, return "\\" */ > + *--ObjectName = OBJ_NAME_PATH_SEPARATOR; > + ObjectNameInfo->Name.Length = (USHORT)NameSize; > + ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + > + > sizeof(UNICODE_NULL)); > + ObjectNameInfo->Name.Buffer = ObjectName; > + _SEH2_YIELD(return STATUS_SUCCESS); > + } > + else > + { > + /* Start by adding the Object's Name */ > + ObjectName = (PWCH)((ULONG_PTR)ObjectName - > + LocalInfo->Name.Length); > + RtlCopyMemory(ObjectName, > + LocalInfo->Name.Buffer, > + LocalInfo->Name.Length); > + > + /* Now parse the Parent directories until we reach the top */ > + ParentDirectory = LocalInfo->Directory; > + while ((ParentDirectory != ObpRootDirectoryObject) && > (ParentDirectory)) > + { > + /* Get the name information */ > + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( > + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); > + > + /* Add the "\" */ > + *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; > + > + /* Add the Parent Directory's Name */ > + if (LocalInfo && LocalInfo->Name.Buffer) > + { > + /* Add the name */ > + ObjectName = (PWCH)((ULONG_PTR)ObjectName - > + > LocalInfo->Name.Length); > + RtlCopyMemory(ObjectName, > + LocalInfo->Name.Buffer, > + LocalInfo->Name.Length); > + > + /* Move to next parent */ > + ParentDirectory = LocalInfo->Directory; > + } > + else > + { > + /* Directory without a name, we add "..." */ > + ObjectName = (PWCH)((ULONG_PTR)ObjectName - > + sizeof(L"...") + > + sizeof(UNICODE_NULL)); > + RtlCopyMemory(ObjectName, > + L"...", > + sizeof(L"...") + sizeof(UNICODE_NULL)); > + break; > + } > + } > + > + /* Add Root Directory Name */ > *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; > - > - /* Add the Parent Directory's Name */ > - if (LocalInfo && LocalInfo->Name.Buffer) > - { > - /* Add the name */ > - ObjectName = (PWCH)((ULONG_PTR)ObjectName - > - LocalInfo->Name.Length); > - RtlCopyMemory(ObjectName, > - LocalInfo->Name.Buffer, > - LocalInfo->Name.Length); > - > - /* Move to next parent */ > - ParentDirectory = LocalInfo->Directory; > - } > - else > - { > - /* Directory without a name, we add "..." */ > - ObjectName = (PWCH)((ULONG_PTR)ObjectName - > - sizeof(L"...") + > sizeof(UNICODE_NULL)); > - RtlCopyMemory(ObjectName, > - L"...", > - sizeof(L"...") + sizeof(UNICODE_NULL)); > - break; > - } > - } > - > - /* Add Root Directory Name */ > - *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; > - ObjectNameInfo->Name.Length = (USHORT)NameSize; > - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + > - > sizeof(UNICODE_NULL)); > - ObjectNameInfo->Name.Buffer = ObjectName; > - } > + ObjectNameInfo->Name.Length = (USHORT)NameSize; > + ObjectNameInfo->Name.MaximumLength = > + (USHORT)(NameSize + sizeof(UNICODE_NULL)); > + ObjectNameInfo->Name.Buffer = ObjectName; > + } > + } > + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) > + { > + /* Return the exception code */ > + Status = _SEH2_GetExceptionCode(); > + } > + _SEH2_END; > > /* Return success */ > - return STATUS_SUCCESS; > + return Status; > } > > VOID > > >

2 1

Re: [ros-dev] [ros-diffs] [tkreuzer] 53600: [HAL] - Use functions instead of macros for irq<->vector<->irql translation, this will be neccessary, once apic support is there - Disable mp hal in rbuild for now, its broken anyway
by Alex Ionescu 05 Sep '11

05 Sep '11

There are already hal private dispatch table functions to deal with this. Please see older HAL commits and the changes in ke/i386/interrupt.c & friends. Best regards, Alex Ionescu On Mon, Sep 5, 2011 at 4:20 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Mon Sep 5 15:20:07 2011 > New Revision: 53600 > > URL: http://svn.reactos.org/svn/reactos?rev=53600&view=rev > Log: > [HAL] > - Use functions instead of macros for irq<->vector<->irql translation, this > will be neccessary, once apic support is there > - Disable mp hal in rbuild for now, its broken anyway > > Modified: > trunk/reactos/hal/halx86/directory.rbuild > trunk/reactos/hal/halx86/include/hal.h > trunk/reactos/hal/halx86/include/halirq.h > trunk/reactos/hal/halx86/up/pic.c > > Modified: trunk/reactos/hal/halx86/directory.rbuild > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… > > ============================================================================== > --- trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] Mon Sep 5 > 15:20:07 2011 > @@ -13,9 +13,9 @@ > <xi:include href="hal.rbuild" /> > <xi:include href="halacpi.rbuild" /> > <xi:include href="halxbox.rbuild" /> > - <if property="BUILD_MP" value="1"> > +  > </if> > > <if property="ARCH" value="amd64"> > > Modified: trunk/reactos/hal/halx86/include/hal.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… > > ============================================================================== > --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Mon Sep 5 15:20:07 > 2011 > @@ -55,13 +55,11 @@ > #define TAG_BUS_HANDLER 'BusH' > > /* Internal HAL Headers */ > -#include "apic.h" > #include "bus.h" > #include "halirq.h" > #include "haldma.h" > #include "halp.h" > #include "mps.h" > -#include "ioapic.h" > #include "halacpi.h" > > /* EOF */ > > Modified: trunk/reactos/hal/halx86/include/halirq.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halirq.… > > ============================================================================== > --- trunk/reactos/hal/halx86/include/halirq.h [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/include/halirq.h [iso-8859-1] Mon Sep 5 > 15:20:07 2011 > @@ -4,29 +4,19 @@ > > #pragma once > > -#ifdef CONFIG_SMP > +UCHAR > +FASTCALL > +HalpIrqToVector(UCHAR Irq); > > -#define FIRST_DEVICE_VECTOR (0x30) > -#define FIRST_SYSTEM_VECTOR (0xef) > +KIRQL > +FASTCALL > +HalpVectorToIrql(UCHAR Vector); > > -#define IRQ_BASE FIRST_DEVICE_VECTOR > -#define NR_IRQS (FIRST_SYSTEM_VECTOR - > FIRST_DEVICE_VECTOR) > +UCHAR > +FASTCALL > +HalpVectorToIrq(UCHAR Vector); > > -/* > - * FIXME: > - * This does not work if we have more than 24 IRQs (ie. more than one > I/O APIC) > - */ > -#define VECTOR2IRQ(vector) (23 - (vector - IRQ_BASE) / 8) > -#define VECTOR2IRQL(vector) (PROFILE_LEVEL - VECTOR2IRQ(vector)) > -#define IRQ2VECTOR(irq) (((23 - (irq)) * 8) + > FIRST_DEVICE_VECTOR) > +#define VECTOR2IRQ(vector) HalpVectorToIrq(vector) > +#define VECTOR2IRQL(vector) HalpVectorToIrql(vector) > +#define IRQ2VECTOR(irq) HalpIrqToVector(irq) > > -#else > - > -#define IRQ_BASE (0x30) > -#define NR_IRQS (16) > - > -#define VECTOR2IRQ(vector) ((vector) - IRQ_BASE) > -#define VECTOR2IRQL(vector) (PROFILE_LEVEL - VECTOR2IRQ(vector)) > -#define IRQ2VECTOR(irq) ((irq) + IRQ_BASE) > - > -#endif > > Modified: trunk/reactos/hal/halx86/up/pic.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=53… > > ============================================================================== > --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Mon Sep 5 15:20:07 2011 > @@ -512,6 +512,27 @@ > __writeeflags(EFlags); > } > > +UCHAR > +FASTCALL > +HalpIrqToVector(UCHAR Irq) > +{ > + return (PRIMARY_VECTOR_BASE + Irq); > +} > + > +UCHAR > +FASTCALL > +HalpVectorToIrq(UCHAR Vector) > +{ > + return (Vector - PRIMARY_VECTOR_BASE); > +} > + > +KIRQL > +FASTCALL > +HalpVectorToIrql(UCHAR Vector) > +{ > + return (PROFILE_LEVEL - (Vector - PRIMARY_VECTOR_BASE)); > +} > + > /* IRQL MANAGEMENT > ************************************************************/ > > /* > > >

1 0

Re: [ros-dev] [ros-diffs] [dchapyshev] 53519: - Fix multiple typos and bugs, found by PVS-Studio
by Alex Ionescu 05 Sep '11

05 Sep '11

A lot of these are in 3rdparty/wine DLLs. Were these bugs reported to the appropriate projects? Best regards, Alex Ionescu On Thu, Sep 1, 2011 at 4:30 PM, <dchapyshev(a)svn.reactos.org> wrote: > Author: dchapyshev > Date: Thu Sep 1 15:30:19 2011 > New Revision: 53519 > > URL: http://svn.reactos.org/svn/reactos?rev=53519&view=rev > Log: > - Fix multiple typos and bugs, found by PVS-Studio > > Modified: > trunk/reactos/base/applications/sndrec32/sndrec32.cpp > trunk/reactos/base/system/smss/client.c > trunk/reactos/dll/cpl/desk/screensaver.c > trunk/reactos/dll/win32/browseui/bandsite.cpp > trunk/reactos/dll/win32/glu32/libnurbs/internals/mapdesc.cc > trunk/reactos/dll/win32/oleaut32/typelib2.c > trunk/reactos/dll/win32/rsaenh/sha2.c > trunk/reactos/dll/win32/shell32/pidl.c > trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp > trunk/reactos/ntoskrnl/config/cmcontrl.c > trunk/reactos/subsystems/win32/win32k/eng/gradient.c > trunk/reactos/subsystems/win32/win32k/objects/bitblt.c > > Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… > > ============================================================================== > --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] > (original) > +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Thu > Sep 1 15:30:19 2011 > @@ -766,7 +766,7 @@ > isnew = TRUE; > display_dur = TRUE; > > - ZeroMemory( file_path, MAX_PATH ); > + ZeroMemory( file_path, MAX_PATH * sizeof(TCHAR) ); > > EnableWindow( slider, FALSE ); > > > Modified: trunk/reactos/base/system/smss/client.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/client.c?… > > ============================================================================== > --- trunk/reactos/base/system/smss/client.c [iso-8859-1] (original) > +++ trunk/reactos/base/system/smss/client.c [iso-8859-1] Thu Sep 1 > 15:30:19 2011 > @@ -441,7 +441,7 @@ > */ > RtlCopyMemory > (SmpClientDirectory.CandidateClient->ProgramName, > ProgramName, > - SM_SB_NAME_MAX_LENGTH); > + SM_SB_NAME_MAX_LENGTH * > sizeof(WCHAR)); > } > } else { > DPRINT1("SM: %s: CandidateClient %p pending!\n", > __FUNCTION__, > > Modified: trunk/reactos/dll/cpl/desk/screensaver.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… > > ============================================================================== > --- trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] (original) > +++ trunk/reactos/dll/cpl/desk/screensaver.c [iso-8859-1] Thu Sep 1 > 15:30:19 2011 > @@ -450,7 +450,7 @@ > lpBackSlash = _tcsrchr(szSearchPath, _T('\\')); > if (lpBackSlash != NULL) > { > - lpBackSlash = '\0'; > + *lpBackSlash = '\0'; > SearchScreenSavers(hwndScreenSavers, szSearchPath, pData); > } > } > > Modified: trunk/reactos/dll/win32/browseui/bandsite.cpp > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… > > ============================================================================== > --- trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] Thu Sep 1 > 15:30:19 2011 > @@ -719,7 +719,7 @@ > if (fRebarWindow == NULL) > return E_FAIL; > > - if (IsEqualIID(pguidCmdGroup, IID_IDeskBand)) > + if (IsEqualIID(*pguidCmdGroup, IID_IDeskBand)) > { > switch (nCmdID) > { > > Modified: trunk/reactos/dll/win32/glu32/libnurbs/internals/mapdesc.cc > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libnurbs/i… > > ============================================================================== > --- trunk/reactos/dll/win32/glu32/libnurbs/internals/mapdesc.cc > [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/glu32/libnurbs/internals/mapdesc.cc > [iso-8859-1] Thu Sep 1 15:30:19 2011 > @@ -90,7 +90,7 @@ > } > > void > -Mapdesc::identify( REAL dest[MAXCOORDS][MAXCOORDS] ) > +Mapdesc::identify( REAL (&dest)[MAXCOORDS][MAXCOORDS] ) > { > memset( dest, 0, sizeof( dest ) ); > for( int i=0; i != hcoords; i++ ) > > Modified: trunk/reactos/dll/win32/oleaut32/typelib2.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… > > ============================================================================== > --- trunk/reactos/dll/win32/oleaut32/typelib2.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/oleaut32/typelib2.c [iso-8859-1] Thu Sep 1 > 15:30:19 2011 > @@ -317,7 +317,7 @@ > while (offset != -1) { > guidentry = (MSFT_GuidEntry > *)&This->typelib_segment_data[MSFT_SEG_GUID][offset]; > > - if (IsEqualGUID(guidentry, guid)) return offset; > + if (IsEqualGUID(*guidentry, guid)) return offset; > > offset = guidentry->next_hash; > } > > Modified: trunk/reactos/dll/win32/rsaenh/sha2.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/sha2.c?re… > > ============================================================================== > --- trunk/reactos/dll/win32/rsaenh/sha2.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/rsaenh/sha2.c [iso-8859-1] Thu Sep 1 15:30:19 > 2011 > @@ -563,7 +563,7 @@ > } > > /* Clean up state data: */ > - MEMSET_BZERO(context, sizeof(context)); > + MEMSET_BZERO(context, sizeof(*context)); > usedspace = 0; > } > > @@ -584,7 +584,7 @@ > } > *buffer = 0; > } else { > - MEMSET_BZERO(context, sizeof(context)); > + MEMSET_BZERO(context, sizeof(*context)); > } > MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH); > return buffer; > @@ -893,7 +893,7 @@ > } > > /* Zero out state data */ > - MEMSET_BZERO(context, sizeof(context)); > + MEMSET_BZERO(context, sizeof(*context)); > } > > char *SHA512_End(SHA512_CTX* context, char buffer[]) { > @@ -913,7 +913,7 @@ > } > *buffer = 0; > } else { > - MEMSET_BZERO(context, sizeof(context)); > + MEMSET_BZERO(context, sizeof(*context)); > } > MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH); > return buffer; > @@ -968,7 +968,7 @@ > } > > /* Zero out state data */ > - MEMSET_BZERO(context, sizeof(context)); > + MEMSET_BZERO(context, sizeof(*context)); > } > > char *SHA384_End(SHA384_CTX* context, char buffer[]) { > @@ -988,7 +988,7 @@ > } > *buffer = 0; > } else { > - MEMSET_BZERO(context, sizeof(context)); > + MEMSET_BZERO(context, sizeof(*context)); > } > MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH); > return buffer; > > Modified: trunk/reactos/dll/win32/shell32/pidl.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… > > ============================================================================== > --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Thu Sep 1 15:30:19 > 2011 > @@ -1157,7 +1157,7 @@ > if (len < sizeof(WIN32_FIND_DATAW)) > return E_INVALIDARG; > > - ZeroMemory(pfd, sizeof (WIN32_FIND_DATAA)); > + ZeroMemory(pfd, sizeof (WIN32_FIND_DATAW)); > _ILGetFileDateTime( pidl, &(pfd->ftLastWriteTime)); > pfd->dwFileAttributes = _ILGetFileAttributes(pidl, NULL, 0); > pfd->nFileSizeLow = _ILGetFileSize ( pidl, NULL, 0); > > Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… > > ============================================================================== > --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] > (original) > +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Thu > Sep 1 15:30:19 2011 > @@ -1607,7 +1607,7 @@ > { 0xc2, 0x82, 0x042, 0x8a, 0x4a, 0x0a } }; > static const UCHAR cmd_wdma_modes[] = { 0x87, 0x32, 0x3f }; > static const UCHAR cmd_pio_modes[] = { 0xa9, 0x57, 0x44, 0x32, > 0x3f }; > - ULONG treg = 0x54 + (dev < 3) ? (dev << 1) : 7; > + ULONG treg = 0x54 + ((dev < 3) ? (dev << 1) : 7); > > udmamode = min(udmamode, 5); > /* enable UDMA mode */ > > Modified: trunk/reactos/ntoskrnl/config/cmcontrl.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcontrl.c… > > ============================================================================== > --- trunk/reactos/ntoskrnl/config/cmcontrl.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/config/cmcontrl.c [iso-8859-1] Thu Sep 1 > 15:30:19 2011 > @@ -118,7 +118,7 @@ > if (!SystemHiveData) return; > > /* Initialize the Hive View List and the security cache */ > - RtlZeroMemory(SystemHive, sizeof(SystemHive)); > + RtlZeroMemory(SystemHive, sizeof(*SystemHive)); > CmpInitHiveViewList((PCMHIVE)SystemHive); > CmpInitSecurityCache((PCMHIVE)SystemHive); > > > Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… > > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] Thu > Sep 1 15:30:19 2011 > @@ -298,7 +298,7 @@ > #define SMALLER(a,b) (a->y < b->y) || (a->y == b->y && a->x < b->x) > #define SWAP(a,b,c) c = a;\ > a = b;\ > - a = c > + b = c > #define NLINES 3 > BOOL FASTCALL > IntEngGradientFillTriangle( > > Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… > > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Thu > Sep 1 15:30:19 2011 > @@ -667,7 +667,7 @@ > MaskPoint.y = YOriginMask; > IntLPtoDP(DCMask, &MaskPoint, 1); > MaskPoint.x += DCMask->ptlDCOrig.x; > - MaskPoint.y += DCMask->ptlDCOrig.x; > + MaskPoint.y += DCMask->ptlDCOrig.y; > } > > /* Perform the bitblt operation */ > > >

4 5

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-dev