Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[cgutman] 53911: [I8042PRT] - Enable all interrupts at the same time to avoid a condition where the controller stops responding to KBD_READ_MODE on some systems - See bug #6271 for details

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Sep 30 23:01:45 2011 New Revision: 53911 URL: http://svn.reactos.org/svn/reactos?rev=53911&view=rev Log: [I8042PRT] - Enable all interrupts at the same time to avoid a condition where the controller stops responding to KBD_READ_MODE on some systems - See bug #6271 for details Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Fri Sep 30 23:01:45 2011 @@ -381,16 +381,6 @@ if (!i8042ChangeMode(DeviceExtension, FlagsToDisable, FlagsToEnable)) return STATUS_UNSUCCESSFUL; - /* Reset the mouse (if any) to start the detection */ - if (DeviceExtension->Flags & MOUSE_PRESENT) - { - KIRQL Irql; - - Irql = KeAcquireInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt); - i8042IsrWritePort(DeviceExtension, MOU_CMD_RESET, CTRL_WRITE_MOUSE); - KeReleaseInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt, Irql); - } - return STATUS_SUCCESS; } @@ -401,6 +391,7 @@ NTSTATUS Status; UCHAR FlagsToDisable = 0; UCHAR FlagsToEnable = 0; + KIRQL Irql; if (DeviceExtension->DataPort == 0) { @@ -434,6 +425,25 @@ INFO_(I8042PRT, "Keyboard present: %s\n", DeviceExtension->Flags & KEYBOARD_PRESENT ? "YES" : "NO"); INFO_(I8042PRT, "Mouse present : %s\n", DeviceExtension->Flags & MOUSE_PRESENT ? "YES" : "NO"); + + TRACE_(I8042PRT, "Enabling i8042 interrupts\n"); + if (DeviceExtension->Flags & KEYBOARD_PRESENT) + { + FlagsToDisable |= CCB_KBD_DISAB; + FlagsToEnable |= CCB_KBD_INT_ENAB; + } + if (DeviceExtension->Flags & MOUSE_PRESENT) + { + FlagsToDisable |= CCB_MOUSE_DISAB; + FlagsToEnable |= CCB_MOUSE_INT_ENAB; + } + + Status = EnableInterrupts(DeviceExtension, FlagsToDisable, FlagsToEnable); + if (!NT_SUCCESS(Status)) + { + DeviceExtension->Flags &= ~(KEYBOARD_PRESENT | MOUSE_PRESENT); + return Status; + } } /* Connect interrupts */ @@ -447,8 +457,6 @@ if (NT_SUCCESS(Status)) { DeviceExtension->Flags |= KEYBOARD_INITIALIZED; - FlagsToDisable |= CCB_KBD_DISAB; - FlagsToEnable |= CCB_KBD_INT_ENAB; } } @@ -462,15 +470,13 @@ if (NT_SUCCESS(Status)) { DeviceExtension->Flags |= MOUSE_INITIALIZED; - FlagsToDisable |= CCB_MOUSE_DISAB; - FlagsToEnable |= CCB_MOUSE_INT_ENAB; - } - } - - if (FlagsToEnable) - Status = EnableInterrupts(DeviceExtension, FlagsToDisable, FlagsToEnable); - else - Status = STATUS_SUCCESS; + } + + /* Start the mouse */ + Irql = KeAcquireInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt); + i8042IsrWritePort(DeviceExtension, MOU_CMD_RESET, CTRL_WRITE_MOUSE); + KeReleaseInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt, Irql); + } return Status; }

12 years, 11 months

[dgorbachev] 53910: [FREELDR] Fill .bss with 0s at startup. Bug #6523.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Sep 30 22:15:08 2011 New Revision: 53910 URL: http://svn.reactos.org/svn/reactos?rev=53910&view=rev Log: [FREELDR] Fill .bss with 0s at startup. Bug #6523. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S [iso-8859-1] Fri Sep 30 22:15:08 2011 @@ -58,6 +58,14 @@ mov byte ptr [_FrldrBootPartition], dh call _EnableA20 + + /* Clean out bss */ + xor eax, eax + mov edi, offset __bss_start__ + mov ecx, offset __bss_end__ + 3 + sub ecx, edi + shr ecx, 2 + rep stosd /* GO! */ push eax

12 years, 11 months

[fireball] 53909: [NTOS/MM] - Implement MiInitializePfnAndMakePteValid() which is basically MiInitializePfn() combined with making PTE valid and some other changes. - Don't initialize PTE and pass ...

by fireball＠svn.reactos.org

Author: fireball Date: Fri Sep 30 21:45:25 2011 New Revision: 53909 URL: http://svn.reactos.org/svn/reactos?rev=53909&view=rev Log: [NTOS/MM] - Implement MiInitializePfnAndMakePteValid() which is basically MiInitializePfn() combined with making PTE valid and some other changes. - Don't initialize PTE and pass valid PTE for initialization to MiInitializePfn() when allocating a page in special pool, this is wrong. Instead call a function designed to do this - MiInitializePfnAndMakePteValid(). It performs correct checks and PFN reference counting. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/special.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Sep 30 21:45:25 2011 @@ -1152,6 +1152,14 @@ VOID NTAPI +MiInitializePfnAndMakePteValid( + IN PFN_NUMBER PageFrameIndex, + IN PMMPTE PointerPte, + IN MMPTE TempPte +); + +VOID +NTAPI MiInitializePfnForOtherProcess( IN PFN_NUMBER PageFrameIndex, IN PMMPTE PointerPte, Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Fri Sep 30 21:45:25 2011 @@ -776,6 +776,64 @@ Pfn1->u2.ShareCount++; } +VOID +NTAPI +MiInitializePfnAndMakePteValid(IN PFN_NUMBER PageFrameIndex, + IN PMMPTE PointerPte, + IN MMPTE TempPte) +{ + PMMPFN Pfn1; + NTSTATUS Status; + PMMPTE PointerPtePte; + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + + /* PTE must be invalid */ + ASSERT(PointerPte->u.Hard.Valid == 0); + + /* Setup the PTE */ + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); + Pfn1->PteAddress = PointerPte; + Pfn1->OriginalPte = DemandZeroPte; + + /* Otherwise this is a fresh page -- set it up */ + ASSERT(Pfn1->u3.e2.ReferenceCount == 0); + Pfn1->u3.e2.ReferenceCount++; + Pfn1->u2.ShareCount++; + Pfn1->u3.e1.PageLocation = ActiveAndValid; + ASSERT(Pfn1->u3.e1.Rom == 0); + Pfn1->u3.e1.Modified = 1; + + /* Get the page table for the PTE */ + PointerPtePte = MiAddressToPte(PointerPte); + if (PointerPtePte->u.Hard.Valid == 0) + { + /* Make sure the PDE gets paged in properly */ + Status = MiCheckPdeForPagedPool(PointerPte); + if (!NT_SUCCESS(Status)) + { + /* Crash */ + KeBugCheckEx(MEMORY_MANAGEMENT, + 0x61940, + (ULONG_PTR)PointerPte, + (ULONG_PTR)PointerPtePte->u.Long, + (ULONG_PTR)MiPteToAddress(PointerPte)); + } + } + + /* Get the PFN for the page table */ + PageFrameIndex = PFN_FROM_PTE(PointerPtePte); + ASSERT(PageFrameIndex != 0); + Pfn1->u4.PteFrame = PageFrameIndex; + + /* Increase its share count so we don't get rid of it */ + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); + Pfn1->u2.ShareCount++; + + /* Write valid PTE */ + MI_WRITE_VALID_PTE(PointerPte, TempPte); +} + + PFN_NUMBER NTAPI MiAllocatePfn(IN PMMPTE PointerPte, Modified: trunk/reactos/ntoskrnl/mm/ARM3/special.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/special.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] Fri Sep 30 21:45:25 2011 @@ -234,8 +234,7 @@ /* Initialize PFN and make it valid */ TempPte.u.Hard.PageFrameNumber = PageFrameNumber; - MI_WRITE_VALID_PTE(PointerPte, TempPte); - MiInitializePfn(PageFrameNumber, PointerPte, TRUE); + MiInitializePfnAndMakePteValid(PageFrameNumber, PointerPte, TempPte); /* Release the PFN database lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, Irql);

12 years, 11 months

[tkreuzer] 53908: [FREELDR] Remove DTEs for ntbootdd.sys and freeldr.sys after they are not used any longer. freeldr one will even point to invalid stack data. It only works currently, because the ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 30 21:13:49 2011 New Revision: 53908 URL: http://svn.reactos.org/svn/reactos?rev=53908&view=rev Log: [FREELDR] Remove DTEs for ntbootdd.sys and freeldr.sys after they are not used any longer. freeldr one will even point to invalid stack data. It only works currently, because the LoadOrderListHead is reset later. More fixes are coming. Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Fri Sep 30 21:13:49 2011 @@ -1659,12 +1659,6 @@ FunctionTable[i] = (ULONG)((ULONG_PTR)ExportTable[i].Function - (ULONG_PTR)&ImageDosHeader); } - /* Add freeldr.sys to list of loaded executables */ - Status = WinLdrAllocateDataTableEntry(&LoaderBlock, "scsiport.sys", - "FREELDR.SYS", &ImageDosHeader, &FreeldrDTE); - if (!Status) - return EIO; - /* Create full ntbootdd.sys path */ MachDiskGetBootPath(NtBootDdPath, sizeof(NtBootDdPath)); strcat(NtBootDdPath, "\\NTBOOTDD.SYS"); @@ -1677,12 +1671,28 @@ return ESUCCESS; } - /* Fix imports */ + /* Allocate a DTE for ntbootdd */ Status = WinLdrAllocateDataTableEntry(&LoaderBlock, "ntbootdd.sys", "NTBOOTDD.SYS", ImageBase, &BootDdDTE); if (!Status) return EIO; + + /* Add freeldr.sys to list of loaded executables, it repaces scsiport.sys */ + Status = WinLdrAllocateDataTableEntry(&LoaderBlock, "scsiport.sys", + "FREELDR.SYS", &ImageDosHeader, &FreeldrDTE); + if (!Status) + { + RemoveEntryList(&BootDdDTE->InLoadOrderLinks); + return EIO; + } + + /* Fix imports */ Status = WinLdrScanImportDescriptorTable(&LoaderBlock, "", BootDdDTE); + + /* Now unlinkt the DTEs, they won't be valid later */ + RemoveEntryList(&BootDdDTE->InLoadOrderLinks); + RemoveEntryList(&FreeldrDTE->InLoadOrderLinks); + if (!Status) return EIO;

12 years, 11 months

[dgorbachev] 53907: [NTOSKRNL] Use inline asm in KiIsNpxErrataPresent(). C code can be optimized in a wrong way.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Sep 30 21:03:29 2011 New Revision: 53907 URL: http://svn.reactos.org/svn/reactos?rev=53907&view=rev Log: [NTOSKRNL] Use inline asm in KiIsNpxErrataPresent(). C code can be optimized in a wrong way. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Fri Sep 30 21:03:29 2011 @@ -1254,9 +1254,9 @@ INIT_FUNCTION KiIsNpxErrataPresent(VOID) { - BOOLEAN ErrataPresent; + static double Value1 = 4195835.0, Value2 = 3145727.0; + INT ErrataPresent; ULONG Cr0; - volatile double Value1, Value2; /* Disable interrupts */ _disable(); @@ -1269,9 +1269,30 @@ Ke386FnInit(); /* Multiply the magic values and divide, we should get the result back */ - Value1 = 4195835.0; - Value2 = 3145727.0; - ErrataPresent = (Value1 * Value2 / 3145727.0) != 4195835.0; +#ifdef __GNUC__ + __asm__ __volatile__ + ( + "fldl %1\n\t" + "fdivl %2\n\t" + "fmull %2\n\t" + "fldl %1\n\t" + "fsubp\n\t" + "fistpl %0\n\t" + : "=m" (ErrataPresent) + : "m" (Value1), + "m" (Value2) + ); +#else + __asm + { + fld Value1 + fdiv Value2 + fmul Value2 + fld Value1 + fsubp + fistp ErrataPresent + }; +#endif /* Restore CR0 */ __writecr0(Cr0); @@ -1280,7 +1301,7 @@ _enable(); /* Return if there's an errata */ - return ErrataPresent; + return ErrataPresent != 0; } VOID

12 years, 11 months

[ekohl] 53906: [SYSSETUP] Update the spec file to Windows XP SP2.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Sep 30 17:29:39 2011 New Revision: 53906 URL: http://svn.reactos.org/svn/reactos?rev=53906&view=rev Log: [SYSSETUP] Update the spec file to Windows XP SP2. Modified: trunk/reactos/dll/win32/syssetup/syssetup.spec Modified: trunk/reactos/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] Fri Sep 30 17:29:39 2011 @@ -1,32 +1,86 @@ -@ stub ApplyAcls +@ stub AsrAddSifEntryA @ stub AsrAddSifEntryW +@ stub AsrCreateStateFileA @ stub AsrCreateStateFileW @ stub AsrFreeContext @ stub AsrRestorePlugPlayRegistryData +@ stub AsrpGetLocalDiskInfo +@ stub AsrpGetLocalVolumeInfo +@ stub AsprRestoreNonCriticalDisksW +@ stub CdromPropPageProvider +@ stub ComputerClassInstaller +@ stub CreateLocalAdminAccount +@ stub CreateLocalAdminAccountEx +@ stub CreateLocalUserAccount +@ stub CriticalDeviceCoInstaller @ stub DevInstallW -@ stub GenerateScsiHwIdList +@ stub DeviceBayClassInstaller +@ stub DiskPropPageProvider +@ stub DoInstallComponentInfs +@ stub EisaUpHalCoInstaller +@ stub EisaUpHalPropPageProvider +@ stub GenerateName +@ stub HdcClassInstaller @ stdcall InitializeSetupActionLog(long) @ stdcall InstallLiveCD(ptr) @ stdcall InstallReactOS(ptr) +@ stub InvokeExternalApplicationEx @ stdcall KeyboardClassInstaller(long ptr ptr) -@ stub LogItem@8 -@ stub LogItem0 -@ stub LogItem1 -@ stub LogItem2 -@ stub LogItem3 -@ stub LogItemN +@ stub LegacyDriverPropPageProvider +@ stub MigrateExceptionPackages @ stdcall MouseClassInstaller(long ptr ptr) +@ stub NtApmClassInstaller +@ stub OpkCheckVersion +@ stub PS2MousePropPageProvider @ stub PnPInitializationThread +@ stub PrepareForAudit @ stub RepairStartMenuItems @ stub ReportError +@ stub RunOEMExtraTasks @ stub ScsiClassInstaller +@ stub SetAccountDomainSid +@ stub SetupAddOrRemoveTestCertificate @ stdcall SetupChangeFontSize(ptr wstr) @ stdcall SetupChangeLocale(ptr long) @ stdcall SetupChangeLocaleEx(ptr long wstr str long long) @ stub SetupCreateOptionalComponentsPage +@ stub SetupDestroyLanguageList +@ stub SetupDestroyPhoneList +@ stub SetupEnumerateRegisteredOsComponents +@ stub SetupExtendPartition +@ stub SetupGetGeoOptions +@ stub SetupGetKeyboardOptions +@ stub SetupGetLocaleOptions +@ stub SetupGetProductType +@ stub SetupGetSetupInfo +@ stub SetupGetValidEula @ stub SetupInfObjectInstallActionW -@ stub SetupSetLargeDialogFont +@ stub SetupInstallCatalog +@ stub SetupMapTapiToIso +@ stub SetupOobeBnk +@ stub SetupOobeCleanup +@ stub SetupOobeInitDebugLog +@ stub SetupOobeInitPostServices +@ stub SetupOobeInitPreServices +@ stub SetupPidGen3 +@ stub SetupQueryRegisteredOsComponent +@ stub SetupQueryRegisteredOsComponentsOrder +@ stub SetupReadPhoneList +@ stub SetupSetAdminPassword +@ stub SetupSetDisplay +@ stub SetupSetIntlOptions +@ stub SetupSetRegisteredOsComponentsOrder +@ stub SetupSetSetupInfo +@ stub SetupShellSettings +@ stub SetupStartService +@ stub SetupUnregisterOsComponent +@ stub StorageCoInstaller +@ stub SystemUpdateUserProfileDirectory @ stub TapeClassInstaller +@ stub TapePropPageProvider @ stdcall TerminateSetupActionLog() +@ stub UpdatePnpDeviceDrivers @ stub UpgradePrinters @ stub ViewSetupActionLog +@ stub pSetupDebugPrint +@ stub pSetuplogSfcError

12 years, 11 months

[gadamopoulos] 53905: [user32_apitest] - properly cleanup when tests are completed - Add some more tests for SetActiveWindow that prove that bringing owner/owned windows to front is done by SetActi...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Sep 30 15:37:13 2011 New Revision: 53905 URL: http://svn.reactos.org/svn/reactos?rev=53905&view=rev Log: [user32_apitest] - properly cleanup when tests are completed - Add some more tests for SetActiveWindow that prove that bringing owner/owned windows to front is done by SetActiveWindow and not by SetWindowPos Modified: trunk/rostests/apitests/user32/SetActiveWindow.c trunk/rostests/apitests/user32/TrackMouseEvent.c trunk/rostests/apitests/user32/helper.c trunk/rostests/apitests/user32/helper.h Modified: trunk/rostests/apitests/user32/SetActiveWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetActive… ============================================================================== --- trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] Fri Sep 30 15:37:13 2011 @@ -11,7 +11,6 @@ #include "helper.h" #include <undocuser.h> -MSG_ENTRY message_cache[100]; HWND hWnd1, hWnd2, hWnd3, hWnd4; /* FIXME: test for HWND_TOP, etc...*/ @@ -81,123 +80,223 @@ 250, 250, 200, 200, hWnd1, NULL, 0, NULL); } -/* the actual test begins here */ - -MSG_ENTRY Activate1_chain[]={{4,WM_NCACTIVATE}, - {4,WM_ACTIVATE}, - {4,WM_WINDOWPOSCHANGING,SENT,0,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {2,WM_WINDOWPOSCHANGING,SENT,4,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {1,WM_WINDOWPOSCHANGING,SENT,2,SWP_NOMOVE | SWP_NOSIZE}, - {1,WM_NCACTIVATE}, - {1,WM_ACTIVATE}, - {4,WM_KILLFOCUS}, - {1,WM_SETFOCUS}, - {0,0}}; - -MSG_ENTRY Activate2_chain[]={{1,WM_NCACTIVATE}, - {1,WM_ACTIVATE}, - {3,WM_WINDOWPOSCHANGING,SENT, 0, SWP_NOMOVE | SWP_NOSIZE}, - {3,WM_WINDOWPOSCHANGED ,SENT, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, - {3,WM_NCACTIVATE}, - {3,WM_ACTIVATE}, - {1,WM_KILLFOCUS}, - {3,WM_SETFOCUS}, - {0,0}}; - -MSG_ENTRY Activate3_chain[]={{3,WM_NCACTIVATE}, - {3,WM_ACTIVATE}, - {2,WM_WINDOWPOSCHANGING, SENT,0, SWP_NOMOVE | SWP_NOSIZE }, - {4,WM_WINDOWPOSCHANGING, SENT,2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {1,WM_WINDOWPOSCHANGING, SENT,4, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {2,WM_WINDOWPOSCHANGED, SENT,0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOCLIENTMOVE |SWP_NOCLIENTSIZE }, - {4,WM_WINDOWPOSCHANGED, SENT,2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, - {1,WM_WINDOWPOSCHANGED, SENT,4, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, - {2,WM_NCACTIVATE}, - {2,WM_ACTIVATE}, - {3,WM_KILLFOCUS}, - {2,WM_SETFOCUS}, - {0,0}}; - -MSG_ENTRY Activate4_chain[]={{2,WM_NCACTIVATE, }, - {2,WM_ACTIVATE}, - {2,WM_WINDOWPOSCHANGING, SENT ,0 ,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, - {4,WM_WINDOWPOSCHANGING, SENT, 2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE} , - {1,WM_WINDOWPOSCHANGING, SENT, 4, SWP_NOMOVE | SWP_NOSIZE}, - {1,WM_NCACTIVATE}, - {1,WM_ACTIVATE}, - {2,WM_KILLFOCUS}, - {1,WM_SETFOCUS}, - {0,0}}; - -void Test_SetActiveWindow() -{ - SetCursorPos(0,0); - - create_test_windows(); - +static void set_default_zorder() +{ + /* show the windows */ ShowWindow(hWnd1, SW_SHOW); UpdateWindow(hWnd1); - FlushMessages(); - EXPECT_NEXT(hWnd4,hWnd2); - EXPECT_NEXT(hWnd1,hWnd3); - ShowWindow(hWnd2, SW_SHOW); UpdateWindow(hWnd2); - FlushMessages(); - EXPECT_NEXT(hWnd2,hWnd4); - EXPECT_NEXT(hWnd4,hWnd1); - ShowWindow(hWnd3, SW_SHOW); UpdateWindow(hWnd3); - FlushMessages(); - EXPECT_NEXT(hWnd3,hWnd2); - EXPECT_NEXT(hWnd2,hWnd4); - EXPECT_NEXT(hWnd4,hWnd1); - ShowWindow(hWnd4, SW_SHOW); UpdateWindow(hWnd4); - FlushMessages(); - EXPECT_NEXT(hWnd4,hWnd2); - EXPECT_NEXT(hWnd2,hWnd1); - EXPECT_NEXT(hWnd1,hWnd3); - EXPECT_ACTIVE(hWnd4); - - empty_message_cache(); - + + SetWindowPos(hWnd3, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); + SetWindowPos(hWnd1, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); + SetWindowPos(hWnd2, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); + SetWindowPos(hWnd4, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); + + FlushMessages(); + empty_message_cache(); +} + +static void destroy_test_window() +{ + DestroyWindow(hWnd1); + DestroyWindow(hWnd2); + DestroyWindow(hWnd3); + DestroyWindow(hWnd4); + UnregisterClassW(L"testClass", 0); +} + +#define EXPECT_NEXT(hWnd1, hWnd2) \ + ok(get_iwnd(GetWindow(hWnd1,GW_HWNDNEXT)) == get_iwnd(hWnd2), \ + "After hwnd%d, expected hwnd%d not hwnd%d\n", \ + get_iwnd(hWnd1), get_iwnd(hWnd2),get_iwnd(GetWindow(hWnd1,GW_HWNDNEXT)) ) + +#define EXPECT_CHAIN(A,B,C,D,X) \ + EXPECT_NEXT(hWnd##A, hWnd##B); \ + EXPECT_NEXT(hWnd##B, hWnd##C); \ + EXPECT_NEXT(hWnd##C, hWnd##D); \ + EXPECT_NEXT(hWnd##D, 0); \ + EXPECT_ACTIVE(hWnd##X); + +/* the actual test begins here */ + +MSG_ENTRY Activate1_chain[]= + {{4,WM_NCACTIVATE}, + {4,WM_ACTIVATE}, + {4,WM_WINDOWPOSCHANGING,SENT,0,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {2,WM_WINDOWPOSCHANGING,SENT,4,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {1,WM_WINDOWPOSCHANGING,SENT,2,SWP_NOMOVE | SWP_NOSIZE}, + {1,WM_NCACTIVATE}, + {1,WM_ACTIVATE}, + {4,WM_KILLFOCUS}, + {1,WM_SETFOCUS}, + {0,0}}; + +MSG_ENTRY Activate2_chain[]= + {{1,WM_NCACTIVATE}, + {1,WM_ACTIVATE}, + {3,WM_WINDOWPOSCHANGING,SENT, 0, SWP_NOMOVE | SWP_NOSIZE}, + {3,WM_WINDOWPOSCHANGED ,SENT, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {3,WM_NCACTIVATE}, + {3,WM_ACTIVATE}, + {1,WM_KILLFOCUS}, + {3,WM_SETFOCUS}, + {0,0}}; + +MSG_ENTRY Activate3_chain[]= + {{3,WM_NCACTIVATE}, + {3,WM_ACTIVATE}, + {2,WM_WINDOWPOSCHANGING, SENT,0, SWP_NOMOVE | SWP_NOSIZE }, + {4,WM_WINDOWPOSCHANGING, SENT,2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {1,WM_WINDOWPOSCHANGING, SENT,4, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {2,WM_WINDOWPOSCHANGED, SENT,0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOCLIENTMOVE |SWP_NOCLIENTSIZE }, + {4,WM_WINDOWPOSCHANGED, SENT,2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT,4, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {2,WM_NCACTIVATE}, + {2,WM_ACTIVATE}, + {3,WM_KILLFOCUS}, + {2,WM_SETFOCUS}, + {0,0}}; + +MSG_ENTRY Activate4_chain[]= + {{2,WM_NCACTIVATE, }, + {2,WM_ACTIVATE}, + {2,WM_WINDOWPOSCHANGING, SENT ,0 ,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {4,WM_WINDOWPOSCHANGING, SENT, 2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE} , + {1,WM_WINDOWPOSCHANGING, SENT, 4, SWP_NOMOVE | SWP_NOSIZE}, + {1,WM_NCACTIVATE}, + {1,WM_ACTIVATE}, + {2,WM_KILLFOCUS}, + {1,WM_SETFOCUS}, + {0,0}}; + +MSG_ENTRY Activate5_chain[]= + {{1,WM_NCACTIVATE, }, + {1,WM_ACTIVATE}, + {4,WM_WINDOWPOSCHANGING, SENT, 0 ,SWP_NOMOVE | SWP_NOSIZE}, + {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {1,WM_WINDOWPOSCHANGING, SENT, 2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {4,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {4,WM_NCACTIVATE}, + {4,WM_ACTIVATE}, + {1,WM_KILLFOCUS}, + {4,WM_SETFOCUS}, + {0,0}}; + +/* + some notes about this testcase: + from the expected series of messages it is obbvious that SetActiveWindow uses SetWindowPos. + So the big question is, that if this behaviour (of changing the z order of owner and owned windows) + is implemented in SetActiveWindow or SetWindowPos. + More tests reveal that calling SetWindowPos like this, has the same effect in the zorder: + SetWindowPos(hWndX, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); + However if it is called like this it does NOT change the z-order of owner or owned windows: + SetWindowPos(hWndX, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); + So the conclusion is that SetActiveWindow calls Begin/Defer/EndDeferWindow pos + moving all affected windows in a batch move operation +*/ + +void Test_OwnerWindows() +{ + SetCursorPos(0,0); + + create_test_windows(); + set_default_zorder(); + + /* before we start testing SetActiveWindow we have to be sure they are on the ocrrect order*/ + EXPECT_CHAIN(4,2,1,3,4); + + /* move the windows on top in the following order 1 2 3 1 4 */ SetActiveWindow(hWnd1); FlushMessages(); - EXPECT_NEXT(hWnd4,hWnd2); - EXPECT_NEXT(hWnd2,hWnd1); - EXPECT_NEXT(hWnd1,hWnd3); - EXPECT_ACTIVE(hWnd1); + EXPECT_CHAIN(4,2,1,3,1); COMPARE_CACHE(Activate1_chain); SetActiveWindow(hWnd3); FlushMessages(); - EXPECT_NEXT(hWnd3,hWnd4); - EXPECT_NEXT(hWnd4,hWnd2); - EXPECT_NEXT(hWnd2,hWnd1); - EXPECT_ACTIVE(hWnd3); + EXPECT_CHAIN(3,4,2,1,3); COMPARE_CACHE(Activate2_chain); SetActiveWindow(hWnd2); FlushMessages(); - EXPECT_NEXT(hWnd2,hWnd4); - EXPECT_NEXT(hWnd4,hWnd1); - EXPECT_NEXT(hWnd1,hWnd3); - EXPECT_ACTIVE(hWnd2); + EXPECT_CHAIN(2,4,1,3,2); COMPARE_CACHE(Activate3_chain); SetActiveWindow(hWnd1); FlushMessages(); - EXPECT_NEXT(hWnd2,hWnd4); - EXPECT_NEXT(hWnd4,hWnd1); - EXPECT_NEXT(hWnd1,hWnd3); - EXPECT_ACTIVE(hWnd1); + EXPECT_CHAIN(2,4,1,3,1); COMPARE_CACHE(Activate4_chain); + + SetActiveWindow(hWnd4); + FlushMessages(); + EXPECT_CHAIN(4,2,1,3,4); + /* in this test xp and 7 give different results :/ */ + /*COMPARE_CACHE(Activate5_chain);*/ + + /* move the windows on top with the same order but now using SetWindowPos */ + /* note: the zorder of windows change in the same way they change with SetActiveWindow */ + set_default_zorder(); + + SetWindowPos(hWnd1, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); + FlushMessages(); + empty_message_cache(); + EXPECT_CHAIN(4,2,1,3,1); + + SetWindowPos(hWnd3, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); + FlushMessages(); + empty_message_cache(); + EXPECT_CHAIN(3,4,2,1,3); + + SetWindowPos(hWnd2, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); + FlushMessages(); + empty_message_cache(); + EXPECT_CHAIN(2,4,1,3,2); + + SetWindowPos(hWnd1, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); + FlushMessages(); + empty_message_cache(); + EXPECT_CHAIN(2,4,1,3,1); + + SetWindowPos(hWnd4, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW); + FlushMessages(); + empty_message_cache(); + EXPECT_CHAIN(4,2,1,3,4); + + /* now do the same thing one more time with SWP_NOACTIVATE */ + set_default_zorder(); + + SetWindowPos(hWnd1, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); + FlushMessages(); + empty_message_cache(); + EXPECT_CHAIN(1,4,2,3,4); + + SetWindowPos(hWnd3, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); + FlushMessages(); + empty_message_cache(); + EXPECT_CHAIN(3,1,4,2,4); + + SetWindowPos(hWnd2, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); + FlushMessages(); + empty_message_cache(); + EXPECT_CHAIN(2,3,1,4,4); + + SetWindowPos(hWnd1, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); + FlushMessages(); + empty_message_cache(); + EXPECT_CHAIN(1,2,3,4,4); + + SetWindowPos(hWnd4, 0, 0,0,0,0, SWP_NOSENDCHANGING|SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE|SWP_SHOWWINDOW|SWP_NOACTIVATE); + FlushMessages(); + EXPECT_CHAIN(4,1,2,3,4); + + destroy_test_window(); } START_TEST(SetActiveWindow) { - Test_SetActiveWindow(); -} + Test_OwnerWindows(); +} Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/TrackMous… ============================================================================== --- trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] Fri Sep 30 15:37:13 2011 @@ -104,15 +104,12 @@ static void create_test_windows() { - WNDCLASSEXW wcex; - hMouseHookLL = SetWindowsHookExW(WH_MOUSE_LL, MouseLLHookProc, GetModuleHandleW( NULL ), 0); hMouseHook = SetWindowsHookExW(WH_MOUSE, MouseHookProc, GetModuleHandleW( NULL ), GetCurrentThreadId()); ok(hMouseHook!=NULL,"failed to set hook\n"); ok(hMouseHookLL!=NULL,"failed to set hook\n"); RegisterSimpleClass(TmeTestProc, L"testClass"); - RegisterClassExW(&wcex); hWnd1 = CreateWindowW(L"testClass", L"test", WS_OVERLAPPEDWINDOW, 100, 100, 500, 500, NULL, NULL, 0, NULL); @@ -128,6 +125,14 @@ ShowWindow(hWnd3, SW_SHOWNORMAL); UpdateWindow(hWnd3); //SetWindowPos (hWnd3, HWND_TOP, 0,0,0,0, SWP_NOMOVE|SWP_NOREDRAW); +} + +static void destroy_test_window() +{ + DestroyWindow(hWnd1); + UnregisterClassW(L"testClass", 0); + UnhookWindowsHookEx(hMouseHookLL); + UnhookWindowsHookEx(hMouseHook); } static void TmeStartTracking(HWND hwnd, DWORD Flags) @@ -161,8 +166,6 @@ #define MOVE_CURSOR(x,y) mouse_event(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE , \ x*(65535/GetSystemMetrics(SM_CXVIRTUALSCREEN)), \ y*(65535/GetSystemMetrics(SM_CYVIRTUALSCREEN)) , 0,0); - -MSG_ENTRY empty_chain[]= {{0,0}}; /* the mouse moves over hwnd2 */ MSG_ENTRY mousemove2_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, @@ -427,6 +430,8 @@ FlushMessages(); COMPARE_CACHE(empty_chain); + + destroy_test_window(); } START_TEST(TrackMouseEvent) Modified: trunk/rostests/apitests/user32/helper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.c?… ============================================================================== --- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.c [iso-8859-1] Fri Sep 30 15:37:13 2011 @@ -14,6 +14,8 @@ MSG_ENTRY last_post_message; MSG_ENTRY message_cache[100]; static int message_cache_size = 0; + +MSG_ENTRY empty_chain[]= {{0,0}}; static char* get_msg_name(UINT msg) { @@ -41,6 +43,8 @@ case WM_SETCURSOR: return "WM_SETCURSOR"; case WM_MOUSEMOVE: return "WM_MOUSEMOVE"; case WM_SYSTIMER: return "WM_SYSTIMER"; + case WM_GETMINMAXINFO: return "WM_GETMINMAXINFO"; + case WM_NCCALCSIZE: return "WM_NCCALCSIZE"; default: return NULL; } } Modified: trunk/rostests/apitests/user32/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.h?… ============================================================================== --- trunk/rostests/apitests/user32/helper.h [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.h [iso-8859-1] Fri Sep 30 15:37:13 2011 @@ -15,6 +15,9 @@ int param1; int param2; } MSG_ENTRY; + + +extern MSG_ENTRY empty_chain[]; void record_message(int iwnd, UINT message, MSG_TYPE type, int param1,int param2); void compare_cache(const char* file, int line, MSG_ENTRY *msg_chain); @@ -44,7 +47,6 @@ #define COMPARE_CACHE(...) compare_cache(__FILE__, __LINE__, ##__VA_ARGS__) #define TRACE_CACHE() trace_cache(__FILE__, __LINE__) -#define EXPECT_NEXT(hWnd1, hWnd2) ok(GetWindow(hWnd1,GW_HWNDNEXT) == hWnd2, "Expected %p after %p, not %p\n",hWnd2,hWnd1,GetWindow(hWnd1,GW_HWNDNEXT) ) #define EXPECT_ACTIVE(hwnd) ok(GetActiveWindow() == hwnd, "Expected %p to be the active window, not %p\n",hwnd,GetActiveWindow()) #define EXPECT_QUEUE_STATUS(expected, notexpected) \

12 years, 11 months

[cmihail] 53904: [SHELL32] - Fix build.

by cmihail＠svn.reactos.org

Author: cmihail Date: Fri Sep 30 09:44:51 2011 New Revision: 53904 URL: http://svn.reactos.org/svn/reactos?rev=53904&view=rev Log: [SHELL32] - Fix build. Modified: trunk/reactos/dll/win32/shell32/shellole.cpp Modified: trunk/reactos/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] Fri Sep 30 09:44:51 2011 @@ -20,7 +20,6 @@ */ #include <precomp.h> -#include <PropIdl.h> WINE_DEFAULT_DEBUG_CHANNEL(shell);

12 years, 11 months

[cmihail] 53903: [SHELL32] - Implement SHPropStgCreate, SHPropStgReadMultiple, SHPropStgWriteMultiple based on wine - This should fix the shellole tests

by cmihail＠svn.reactos.org

Author: cmihail Date: Fri Sep 30 09:38:43 2011 New Revision: 53903 URL: http://svn.reactos.org/svn/reactos?rev=53903&view=rev Log: [SHELL32] - Implement SHPropStgCreate, SHPropStgReadMultiple, SHPropStgWriteMultiple based on wine - This should fix the shellole tests Modified: trunk/reactos/dll/win32/shell32/shellole.cpp Modified: trunk/reactos/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] Fri Sep 30 09:38:43 2011 @@ -20,6 +20,7 @@ */ #include <precomp.h> +#include <PropIdl.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -588,7 +589,49 @@ const CLSID *pclsid, DWORD grfFlags, DWORD grfMode, DWORD dwDisposition, IPropertyStorage **ppstg, UINT *puCodePage) { - return E_NOTIMPL; + PROPSPEC prop; + PROPVARIANT ret; + HRESULT hres; + + TRACE("%p %s %s %x %x %x %p %p\n", psstg, debugstr_guid(&fmtid), debugstr_guid(pclsid), + grfFlags, grfMode, dwDisposition, ppstg, puCodePage); + + hres = psstg->Open(fmtid, grfMode, ppstg); + + switch (dwDisposition) + { + case CREATE_ALWAYS: + if (SUCCEEDED(hres)) + { + reinterpret_cast<IPropertyStorage*>(*ppstg)->Release(); + hres = psstg->Delete(fmtid); + if(FAILED(hres)) + return hres; + hres = E_FAIL; + } + + case OPEN_ALWAYS: + case CREATE_NEW: + if (FAILED(hres)) + hres = psstg->Create(fmtid, pclsid, grfFlags, grfMode, ppstg); + + case OPEN_EXISTING: + if (FAILED(hres)) + return hres; + + if (puCodePage) + { + prop.ulKind = PRSPEC_PROPID; + prop.propid = PID_CODEPAGE; + hres = reinterpret_cast<IPropertyStorage*>(*ppstg)->ReadMultiple(1, &prop, &ret); + if (FAILED(hres) || ret.vt!=VT_I2) + *puCodePage = 0; + else + *puCodePage = ret.iVal; + } + } + + return S_OK; } /************************************************************************* @@ -597,7 +640,36 @@ EXTERN_C HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar) { - return E_NOTIMPL; + STATPROPSETSTG stat; + HRESULT hres; + + FIXME("%p %u %u %p %p\n", pps, uCodePage, cpspec, rgpspec, rgvar); + + memset(rgvar, 0, cpspec*sizeof(PROPVARIANT)); + hres = pps->ReadMultiple(cpspec, rgpspec, rgvar); + if (FAILED(hres)) + return hres; + + if (!uCodePage) + { + PROPSPEC prop; + PROPVARIANT ret; + + prop.ulKind = PRSPEC_PROPID; + prop.propid = PID_CODEPAGE; + hres = pps->ReadMultiple(1, &prop, &ret); + if(FAILED(hres) || ret.vt!=VT_I2) + return S_OK; + + uCodePage = ret.iVal; + } + + hres = pps->Stat(&stat); + if (FAILED(hres)) + return S_OK; + + /* TODO: do something with codepage and stat */ + return S_OK; } /************************************************************************* @@ -606,5 +678,38 @@ EXTERN_C HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, ULONG cpspec, const PROPSPEC *rgpspec, PROPVARIANT *rgvar, PROPID propidNameFirst) { - return E_NOTIMPL; -} + STATPROPSETSTG stat; + UINT codepage; + HRESULT hres; + + FIXME("%p %p %u %p %p %d\n", pps, uCodePage, cpspec, rgpspec, rgvar, propidNameFirst); + + hres = pps->Stat(&stat); + if (FAILED(hres)) + return hres; + + if (uCodePage && *uCodePage) + codepage = *uCodePage; + else + { + PROPSPEC prop; + PROPVARIANT ret; + + prop.ulKind = PRSPEC_PROPID; + prop.propid = PID_CODEPAGE; + hres = pps->ReadMultiple(1, &prop, &ret); + if (FAILED(hres)) + return hres; + if (ret.vt!=VT_I2 || !ret.iVal) + return E_FAIL; + + codepage = ret.iVal; + if (uCodePage) + *uCodePage = codepage; + } + + /* TODO: do something with codepage and stat */ + + hres = pps->WriteMultiple(cpspec, rgpspec, rgvar, propidNameFirst); + return hres; +}

12 years, 11 months

[tkreuzer] 53902: [NTOSKRNL] - implement helper functions MiIsMemoryTypeFree and MiIsMemoryTypeInvisible - use symbolic names instead of hex values - Don't ASSERT on mising large page support, just...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 30 09:30:52 2011 New Revision: 53902 URL: http://svn.reactos.org/svn/reactos?rev=53902&view=rev Log: [NTOSKRNL] - implement helper functions MiIsMemoryTypeFree and MiIsMemoryTypeInvisible - use symbolic names instead of hex values - Don't ASSERT on mising large page support, just warn - add some more mm macros for amd64 Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/mm/ARM3/largepag.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Fri Sep 30 09:30:52 2011 @@ -93,6 +93,9 @@ /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) +#define PFN_FROM_PDE(v) ((v)->u.Hard.PageFrameNumber) +#define PFN_FROM_PPE(v) ((v)->u.Hard.PageFrameNumber) +#define PFN_FROM_PXE(v) ((v)->u.Hard.PageFrameNumber) // FIXME, only copied from x86 #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) @@ -192,15 +195,35 @@ /* Convert a PTE into a corresponding address */ PVOID FORCEINLINE -MiPteToAddress(PMMPTE Pte) -{ - /* Use signed math */ - LONG64 Temp = (LONG64)Pte; - Temp <<= 25; - Temp >>= 16; - return (PVOID)Temp; -} -#define MiPdeToAddress MiPteToAddress +MiPteToAddress(PMMPTE PointerPte) +{ + /* Use signed math */ + return (PVOID)(((LONG64)PointerPte << 25) >> 16); +} + +PVOID +FORCEINLINE +MiPdeToAddress(PMMPTE PointerPde) +{ + /* Use signed math */ + return (PVOID)(((LONG64)PointerPde << 34) >> 16); +} + +PVOID +FORCEINLINE +MiPpeToAddress(PMMPTE PointerPpe) +{ + /* Use signed math */ + return (PVOID)(((LONG64)PointerPpe << 43) >> 16); +} + +PVOID +FORCEINLINE +MiPxeToAddress(PMMPTE PointerPxe) +{ + /* Use signed math */ + return (PVOID)(((LONG64)PointerPxe << 52) >> 16); +} BOOLEAN FORCEINLINE Modified: trunk/reactos/ntoskrnl/mm/ARM3/largepag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/largepag.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/largepag.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/largepag.c [iso-8859-1] Fri Sep 30 09:30:52 2011 @@ -34,8 +34,8 @@ MiInitializeLargePageSupport(VOID) { #if _MI_PAGING_LEVELS > 2 - DPRINT1("PAE/x64 Not Implemented\n"); - ASSERT(FALSE); + DPRINT1("MiInitializeLargePageSupport: PAE/x64 Not Implemented\n"); + //ASSERT(FALSE); #else /* Initialize the large-page hyperspace PTE used for initial mapping */ MiLargePageHyperPte = MiReserveSystemPtes(1, SystemPteSpace); Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Sep 30 09:30:52 2011 @@ -538,6 +538,27 @@ extern PVOID MiSessionPoolStart; // 0xBD000000 extern PVOID MiSessionViewStart; // 0xBE000000 +BOOLEAN +FORCEINLINE +MiIsMemoryTypeFree(TYPE_OF_MEMORY MemoryType) +{ + return ((MemoryType == LoaderFree) || + (MemoryType == LoaderLoadedProgram) || + (MemoryType == LoaderFirmwareTemporary) || + (MemoryType == LoaderOsloaderStack)); +} + +BOOLEAN +FORCEINLINE +MiIsMemoryTypeInvisible(TYPE_OF_MEMORY MemoryType) +{ + return ((MemoryType == LoaderFirmwarePermanent) || + (MemoryType == LoaderSpecialMemory) || + (MemoryType == LoaderHALCachedMemory) || + (MemoryType == LoaderBBTMemory)); +} + + // // Figures out the hardware bits for a PTE // Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Fri Sep 30 09:30:52 2011 @@ -572,15 +572,16 @@ for (i = 0; i < MmSecondaryColors; i++) { /* Set both free and zero lists for each color */ - MmFreePagesByColor[ZeroedPageList][i].Flink = 0xFFFFFFFF; - MmFreePagesByColor[ZeroedPageList][i].Blink = (PVOID)0xFFFFFFFF; + MmFreePagesByColor[ZeroedPageList][i].Flink = LIST_HEAD; + MmFreePagesByColor[ZeroedPageList][i].Blink = (PVOID)LIST_HEAD; MmFreePagesByColor[ZeroedPageList][i].Count = 0; - MmFreePagesByColor[FreePageList][i].Flink = 0xFFFFFFFF; - MmFreePagesByColor[FreePageList][i].Blink = (PVOID)0xFFFFFFFF; + MmFreePagesByColor[FreePageList][i].Flink = LIST_HEAD; + MmFreePagesByColor[FreePageList][i].Blink = (PVOID)LIST_HEAD; MmFreePagesByColor[FreePageList][i].Count = 0; } } +#ifndef _M_AMD64 BOOLEAN NTAPI INIT_FUNCTION @@ -1059,6 +1060,7 @@ /* Finally add the pages for the PFN database itself */ MiBuildPfnDatabaseSelf(); } +#endif /* !_M_AMD64 */ VOID NTAPI @@ -1287,7 +1289,7 @@ PFN_NUMBER PageFrameIndex; /* HAL Heap address -- should be on a PDE boundary */ - BaseAddress = (PVOID)0xFFC00000; + BaseAddress = (PVOID)MM_HAL_VA_START; ASSERT(MiAddressToPteOffset(BaseAddress) == 0); /* Check how many PDEs the heap has */

12 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2011