Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[pschweitzer] 49617: [NTOSKRNL] Use appropriated macros

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Nov 19 06:34:14 2010 New Revision: 49617 URL: http://svn.reactos.org/svn/reactos?rev=49617&view=rev Log: [NTOSKRNL] Use appropriated macros Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Fri Nov 19 06:34:14 2010 @@ -264,19 +264,14 @@ if (KeFeatureBits & KF_FXSR) { /* Get the current thread NPX state */ - FxSaveArea = (PVOID) - ((ULONG_PTR)KeGetCurrentThread()->InitialStack - - NPX_FRAME_LENGTH); + FxSaveArea = KiGetThreadNpxArea(KeGetCurrentThread()); /* Clear initial MXCsr mask */ FxSaveArea->U.FxArea.MXCsrMask = 0; /* Save the current NPX State */ -#ifdef __GNUC__ - asm volatile("fxsave %0\n\t" : "=m" (*FxSaveArea)); -#else - __asm fxsave [FxSaveArea] -#endif + Ke386SaveFpuState(FxSaveArea); + /* Check if the current mask doesn't match the reserved bits */ if (FxSaveArea->U.FxArea.MXCsrMask != 0) {

13 years, 11 months

[pschweitzer] 49616: [FORMATTING] No code change

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Nov 19 06:28:20 2010 New Revision: 49616 URL: http://svn.reactos.org/svn/reactos?rev=49616&view=rev Log: [FORMATTING] No code change Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Fri Nov 19 06:28:20 2010 @@ -65,7 +65,7 @@ PKTRAP_FRAME TrapFrame; PKSTART_FRAME StartFrame; PKUINIT_FRAME InitFrame; - + /* Get the start and trap frames */ InitFrame = KeGetCurrentThread()->KernelStack; StartFrame = &InitFrame->StartFrame; @@ -73,13 +73,13 @@ /* Lower to APC level */ KfLowerIrql(APC_LEVEL); - + /* Call the system routine */ StartFrame->SystemRoutine(StartFrame->StartRoutine, StartFrame->StartContext); - + /* If we returned, we better be a user thread */ if (!StartFrame->UserThread) DbgBreakPoint(); - + /* Exit to user-mode */ KiServiceExit2(TrapFrame); } @@ -275,7 +275,7 @@ YieldProcessor(); YieldProcessor(); _disable(); - + /* Now loop forever */ while (TRUE) { @@ -286,31 +286,31 @@ { /* Quiesce the DPC software interrupt */ HalClearSoftwareInterrupt(DISPATCH_LEVEL); - + /* Handle it */ KiRetireDpcList(Prcb); } - + /* Check if a new thread is scheduled for execution */ if (Prcb->NextThread) { /* Enable interupts */ _enable(); - + /* Capture current thread data */ OldThread = Prcb->CurrentThread; NewThread = Prcb->NextThread; - + /* Set new thread data */ Prcb->NextThread = NULL; Prcb->CurrentThread = NewThread; - + /* The thread is now running */ NewThread->State = Running; - + /* Switch away from the idle thread */ KiSwapContext(APC_LEVEL, OldThread); - + /* We are back in the idle thread -- disable interrupts again */ _enable(); YieldProcessor(); @@ -335,7 +335,7 @@ PKGDTENTRY GdtEntry; PKTHREAD NewThread; PKUINIT_FRAME InitFrame; - + /* We are on the new thread stack now */ NewThread = Pcr->PrcbData.CurrentThread; @@ -354,17 +354,17 @@ /* Switch address space and flush TLB */ __writecr3(NewProcess->DirectoryTableBase[0]); } - + /* Clear GS */ Ke386SetGs(0); - + /* Set the TEB */ Pcr->NtTib.Self = (PVOID)NewThread->Teb; GdtEntry = &Pcr->GDT[KGDT_R3_TEB / sizeof(KGDTENTRY)]; GdtEntry->BaseLow = (USHORT)((ULONG_PTR)NewThread->Teb & 0xFFFF); GdtEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)NewThread->Teb >> 16); GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)NewThread->Teb >> 24); - + /* Set new TSS fields */ InitFrame = (PKUINIT_FRAME)NewThread->InitialStack - 1; Pcr->TSS->Esp0 = (ULONG_PTR)&InitFrame->TrapFrame; @@ -373,7 +373,7 @@ Pcr->TSS->Esp0 -= (FIELD_OFFSET(KTRAP_FRAME, V86Gs) - FIELD_OFFSET(KTRAP_FRAME, HardwareSegSs)); } Pcr->TSS->IoMapBase = NewProcess->IopmOffset; - + /* Increase thread context switches */ NewThread->ContextSwitches++; @@ -390,7 +390,7 @@ (ULONG_PTR)OldThread->InitialStack, 0); } - + /* Kernel APCs may be pending */ if (NewThread->ApcState.KernelApcPending) { @@ -402,7 +402,7 @@ return TRUE; } } - + /* Return */ return FALSE; } @@ -432,13 +432,13 @@ /* Get thread pointers */ OldThread = (PKTHREAD)(OldThreadAndApcFlag & ~3); NewThread = Pcr->PrcbData.CurrentThread; - + /* Get the old thread and set its kernel stack */ OldThread->KernelStack = SwitchFrame; /* ISRs can change FPU state, so disable interrupts while checking */ _disable(); - + /* Get current and new CR0 and check if they've changed */ Cr0 = __readcr0(); NewCr0 = NewThread->NpxState | @@ -459,10 +459,10 @@ PKPRCB Prcb = &Pcr->PrcbData; PVOID OldHandler; PKTHREAD NewThread, OldThread; - + /* Disable interrupts */ _disable(); - + /* Check for pending timers, pending DPCs, or pending ready threads */ if ((Prcb->DpcData[0].DpcQueueDepth) || (Prcb->TimerRequest) || @@ -471,17 +471,17 @@ /* Switch to safe execution context */ OldHandler = Pcr->NtTib.ExceptionList; Pcr->NtTib.ExceptionList = EXCEPTION_CHAIN_END; - + /* Retire DPCs while under the DPC stack */ KiRetireDpcListInDpcStack(Prcb, Prcb->DpcStack); - + /* Restore context */ Pcr->NtTib.ExceptionList = OldHandler; } - + /* Re-enable interrupts */ _enable(); - + /* Check for quantum end */ if (Prcb->QuantumEnd) { @@ -494,18 +494,18 @@ /* Capture current thread data */ OldThread = Prcb->CurrentThread; NewThread = Prcb->NextThread; - + /* Set new thread data */ Prcb->NextThread = NULL; Prcb->CurrentThread = NewThread; - + /* The thread is now running */ NewThread->State = Running; OldThread->WaitReason = WrDispatchInt; - + /* Make the old thread ready */ KxQueueReadyThread(OldThread, Prcb); - + /* Swap to the new thread */ KiSwapContext(APC_LEVEL, OldThread); }

13 years, 11 months

[jgardou] 49615: [CMAKE] - use correct link script file for freeldr and setupldr - use correct definition file for advapi32 - don't specify name to add_bootcd_target if not needed - portcls is not ...

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Nov 18 21:32:10 2010 New Revision: 49615 URL: http://svn.reactos.org/svn/reactos?rev=49615&view=rev Log: [CMAKE] - use correct link script file for freeldr and setupldr - use correct definition file for advapi32 - don't specify name to add_bootcd_target if not needed - portcls is not a kernel mode driver - Disable stcall fixup, except for mesa32 which requires it - remove an useless file from minihal, add a forgotten one to freeldr Modified: branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/hal/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Thu Nov 18 21:32:10 2010 @@ -60,6 +60,7 @@ freeldr/freeldr/disk/disk.c freeldr/freeldr/disk/partition.c freeldr/freeldr/disk/ramdisk.c + freeldr/freeldr/disk/scsiport.c freeldr/freeldr/fs/ext2.c freeldr/freeldr/fs/fat.c freeldr/freeldr/fs/fs.c @@ -178,7 +179,7 @@ ${FREELDR_SOURCE}) if(NOT MSVC) -set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds" SUFFIX ".sys") +set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/freeldr_i386.lnk" SUFFIX ".sys") set_image_base(freeldr 0x8000) else() set_target_properties(freeldr PROPERTIES LINK_FLAGS "/DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" SUFFIX ".sys") @@ -211,14 +212,14 @@ add_library(setupldr SHARED ${SETUPLDR_SOURCE}) if(NOT MSVC) -set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") +set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/freeldr_i386.lnk" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") set_image_base(setupldr 0x8000) else() set_target_properties(setupldr PROPERTIES LINK_FLAGS "/SECTION:.text,ERWP,ALIGN=0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") endif() set_subsystem(setupldr native) -set_entrypoint(freeldr mainCRTStartup) +set_entrypoint(setupldr mainCRTStartup) if(ARCH MATCHES i386) target_link_libraries(setupldr mini_hal) Modified: branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/mesa… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] Thu Nov 18 21:32:10 2010 @@ -14,6 +14,10 @@ else() add_definitions(-DGL_NO_STDCALL) endif(ARCH MATCHES i386) + +if(NOT MSVC) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--enable-stdcall-fixup") +endif() include_directories( BEFORE include Modified: branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Thu Nov 18 21:32:10 2010 @@ -43,7 +43,7 @@ token/token.c advapi32_stubs.c advapi32.rc - advapi32.def) + ${CMAKE_CURRENT_BINARY_DIR}/advapi32.def) if(NOT MSVC) set_source_files_properties(advapi32.def PROPERTIES EXTERNAL_OBJECT TRUE) Modified: branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/i80… ============================================================================== --- branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] Thu Nov 18 21:32:10 2010 @@ -1,3 +1,5 @@ + +set_rc_compiler() add_library(i8042prt SHARED createclose.c @@ -15,5 +17,5 @@ set_module_type(i8042prt kernelmodedriver) add_importlibs(i8042prt ntoskrnl hal) -add_minicd_target(i8042prt reactos i8042prt.sys) +add_minicd_target(i8042prt reactos) add_livecd_target(i8042prt reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Thu Nov 18 21:32:10 2010 @@ -59,7 +59,10 @@ set_target_properties(portcls PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") endif(MSVC) -set_module_type(portcls kernelmodedriver) +set_entrypoint(portcls 0) +set_image_base(portcls 0x00010000) +set_subsystem(portcls native) +set_target_properties(portcls PROPERTIES SUFFIX ".sys") add_importlibs(portcls ntoskrnl ks drmk hal stdc++ gcc msvcrt) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=496… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Thu Nov 18 21:32:10 2010 @@ -11,6 +11,7 @@ set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") # -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") # Compiler Core add_definitions(-pipe -fms-extensions) @@ -112,7 +113,7 @@ set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") endif() if(${TYPE} MATCHES kernelmodedriver) - set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols" SUFFIX ".sys") + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") set_entrypoint(${MODULE} DriverEntry@8) set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Thu Nov 18 21:32:10 2010 @@ -72,7 +72,6 @@ halx86/generic/legacy/bus/cmosbus.c halx86/generic/legacy/bus/isabus.c halx86/generic/legacy/bus/pcibus.c - halx86/generic/legacy/bus/pcidata.c halx86/generic/legacy/bus/sysbus.c halx86/generic/legacy/bussupp.c halx86/generic/beep.c Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Thu Nov 18 21:32:10 2010 @@ -38,10 +38,10 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries") if(ARCH MATCHES i386) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,--disable-auto-import") +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") #-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds elseif(ARCH MATCHES amd64) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,--disable-auto-import") +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") endif(ARCH MATCHES i386) # adjust the default behaviour of the FIND_XXX() commands:

13 years, 11 months

[tkreuzer] 49614: [NTOSKRNL] - Initialize the Zero variable - Don't corrupt the Color value in case we didn't have any page on MmZeroedPageListHead. - Fixes boot.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 18 19:20:38 2010 New Revision: 49614 URL: http://svn.reactos.org/svn/reactos?rev=49614&view=rev Log: [NTOSKRNL] - Initialize the Zero variable - Don't corrupt the Color value in case we didn't have any page on MmZeroedPageListHead. - Fixes boot. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c 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] Thu Nov 18 19:20:38 2010 @@ -407,7 +407,7 @@ { PFN_NUMBER PageIndex; PMMPFN Pfn1; - BOOLEAN Zero; + BOOLEAN Zero = FALSE; /* Make sure PFN lock is held and we have pages */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -421,7 +421,6 @@ /* Check the zero list */ ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); PageIndex = MmZeroedPageListHead.Flink; - Color = PageIndex & MmSecondaryColorMask; if (PageIndex == LIST_HEAD) { /* This means there's no zero pages, we have to look for free ones */ @@ -444,6 +443,10 @@ } } } + else + { + Color = PageIndex & MmSecondaryColorMask; + } } /* Sanity checks */

13 years, 11 months

[jimtabor] 49613: [Win32k] - Fix style, use client style.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Nov 18 16:26:54 2010 New Revision: 49613 URL: http://svn.reactos.org/svn/reactos?rev=49613&view=rev Log: [Win32k] - Fix style, use client style. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Nov 18 16:26:54 2010 @@ -1898,7 +1898,6 @@ { PWND Window = NULL, ParentWindow = NULL, OwnerWindow; HWND hWnd, hWndParent, hWndOwner, hwndInsertAfter; - DWORD dwStyle; PWINSTATION_OBJECT WinSta; PCLS Class = NULL; SIZE Size; @@ -1987,8 +1986,6 @@ UserRefObjectCo(Window, &Ref); ObDereferenceObject(WinSta); - dwStyle = Window->style; - //// Check for a hook to eliminate overhead. //// if ( ISITHOOKED(WH_CBT) || (pti->rpdesk->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_CBT)) ) { @@ -1998,7 +1995,7 @@ /* Fill the new CREATESTRUCTW */ RtlCopyMemory(pCsw, Cs, sizeof(CREATESTRUCTW)); - pCsw->style = dwStyle; /* HCBT_CREATEWND needs the real window style */ + pCsw->style = Window->style; /* HCBT_CREATEWND needs the real window style */ // Based on the assumption this is from "unicode source" user32, ReactOS, answer is yes. if (!IS_ATOM(ClassName->Buffer)) @@ -2077,7 +2074,7 @@ Size.cx = Cs->cx; Size.cy = Cs->cy; - if ((dwStyle & WS_THICKFRAME) || !(dwStyle & (WS_POPUP | WS_CHILD))) + if ((Cs->style & WS_THICKFRAME) || !(Cs->style & (WS_POPUP | WS_CHILD))) { POINT MaxSize, MaxPos, MinTrack, MaxTrack; @@ -2105,7 +2102,7 @@ if (NULL != ParentWindow) { /* link the window into the siblings list */ - if ((dwStyle & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD) + if ((Cs->style & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD) IntLinkHwnd(Window, HWND_BOTTOM); else IntLinkHwnd(Window, hwndInsertAfter);

13 years, 11 months

[jimtabor] 49612: [Win32k] - Test for hooks before setting up for a hook call. This eliminates overhead.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Nov 18 16:17:59 2010 New Revision: 49612 URL: http://svn.reactos.org/svn/reactos?rev=49612&view=rev Log: [Win32k] - Test for hooks before setting up for a hook call. This eliminates overhead. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Nov 18 16:17:59 2010 @@ -14,7 +14,6 @@ #define NDEBUG #include <debug.h> - /* dialog resources appear to pass this in 16 bits, handle them properly */ #define CW_USEDEFAULT16 (0x8000) @@ -402,6 +401,9 @@ DestroyTimersForWindow(ThreadData, Window); + /* Unregister hot keys */ + UnregisterWindowHotKeys (Window); + /* flush the message queue */ MsqRemoveWindowMessagesFromQueue(Window); @@ -420,9 +422,6 @@ if (Window->head.h == ThreadData->rpdesk->rpwinstaParent->ShellListView) ThreadData->rpdesk->rpwinstaParent->ShellListView = NULL; } - - /* Unregister hot keys */ - UnregisterWindowHotKeys (Window); /* FIXME: do we need to fake QS_MOUSEMOVE wakebit? */ @@ -1909,7 +1908,7 @@ USER_REFERENCE_ENTRY ParentRef, Ref; PTHREADINFO pti; DWORD dwShowMode = SW_SHOW; - CREATESTRUCTW *pCsw; + CREATESTRUCTW *pCsw = NULL; PVOID pszClass = NULL, pszName = NULL; DECLARE_RETURN(PWND); @@ -1983,100 +1982,94 @@ } hWnd = UserHMGetHandle(Window); + hwndInsertAfter = HWND_TOP; UserRefObjectCo(Window, &Ref); ObDereferenceObject(WinSta); - //// Call the WH_CBT hook //// - - // Allocate the calling structures Justin Case this goes Global. - pCsw = ExAllocatePoolWithTag(NonPagedPool, sizeof(CREATESTRUCTW), TAG_HOOK); - pCbtCreate = ExAllocatePoolWithTag(NonPagedPool, sizeof(CBT_CREATEWNDW), TAG_HOOK); - - /* Fill the new CREATESTRUCTW */ - pCsw->lpCreateParams = Cs->lpCreateParams; - pCsw->hInstance = Cs->hInstance; - pCsw->hMenu = Cs->hMenu; - pCsw->hwndParent = Cs->hwndParent; - pCsw->cx = Cs->cx; - pCsw->cy = Cs->cy; - pCsw->x = Cs->x; - pCsw->y = Cs->y; - pCsw->dwExStyle = Cs->dwExStyle; - dwStyle = Cs->style; // Save it anyway. - pCsw->style = Window->style; /* HCBT_CREATEWND needs the real window style */ - pCsw->lpszName = Cs->lpszName; - pCsw->lpszClass = Cs->lpszClass; - - // Based on the assumption this is from "unicode source" user32, ReactOS, answer is yes. - if (!IS_ATOM(ClassName->Buffer)) - { - if (Window->state & WNDS_ANSICREATOR) - { - ANSI_STRING AnsiString; - AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(ClassName)+sizeof(CHAR); - pszClass = UserHeapAlloc(AnsiString.MaximumLength); - RtlZeroMemory(pszClass, AnsiString.MaximumLength); - AnsiString.Buffer = (PCHAR)pszClass; - RtlUnicodeStringToAnsiString(&AnsiString, ClassName, FALSE); - } - else - { - UNICODE_STRING UnicodeString; - UnicodeString.MaximumLength = ClassName->Length + sizeof(UNICODE_NULL); - pszClass = UserHeapAlloc(UnicodeString.MaximumLength); - RtlZeroMemory(pszClass, UnicodeString.MaximumLength); - UnicodeString.Buffer = (PWSTR)pszClass; - RtlCopyUnicodeString(&UnicodeString, ClassName); - } - if (pszClass) pCsw->lpszClass = UserHeapAddressToUser(pszClass); - } - if (WindowName->Length) - { - UNICODE_STRING Name; - Name.Buffer = WindowName->Buffer; - Name.Length = WindowName->Length; - Name.MaximumLength = WindowName->MaximumLength; - - if (Window->state & WNDS_ANSICREATOR) - { - ANSI_STRING AnsiString; - AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(&Name)+sizeof(CHAR); - pszName = UserHeapAlloc(AnsiString.MaximumLength); - RtlZeroMemory(pszName, AnsiString.MaximumLength); - AnsiString.Buffer = (PCHAR)pszName; - RtlUnicodeStringToAnsiString(&AnsiString, &Name, FALSE); - } - else - { - UNICODE_STRING UnicodeString; - UnicodeString.MaximumLength = Name.Length + sizeof(UNICODE_NULL); - pszName = UserHeapAlloc(UnicodeString.MaximumLength); - RtlZeroMemory(pszName, UnicodeString.MaximumLength); - UnicodeString.Buffer = (PWSTR)pszName; - RtlCopyUnicodeString(&UnicodeString, &Name); - } - if (pszName) pCsw->lpszName = UserHeapAddressToUser(pszName); - } - - pCbtCreate->lpcs = pCsw; - pCbtCreate->hwndInsertAfter = HWND_TOP; - - Result = co_HOOK_CallHooks(WH_CBT, HCBT_CREATEWND, (WPARAM) hWnd, (LPARAM) pCbtCreate); - if (Result != 0) - { - DPRINT1("WH_CBT HCBT_CREATEWND hook failed! 0x%x\n", Result); - RETURN( (PWND) NULL); - } - // Write back changes. - Cs->cx = pCsw->cx; - Cs->cy = pCsw->cy; - Cs->x = pCsw->x; - Cs->y = pCsw->y; - hwndInsertAfter = pCbtCreate->hwndInsertAfter; + dwStyle = Window->style; + + //// Check for a hook to eliminate overhead. //// + if ( ISITHOOKED(WH_CBT) || (pti->rpdesk->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_CBT)) ) + { + // Allocate the calling structures Justin Case this goes Global. + pCsw = ExAllocatePoolWithTag(NonPagedPool, sizeof(CREATESTRUCTW), TAG_HOOK); + pCbtCreate = ExAllocatePoolWithTag(NonPagedPool, sizeof(CBT_CREATEWNDW), TAG_HOOK); + + /* Fill the new CREATESTRUCTW */ + RtlCopyMemory(pCsw, Cs, sizeof(CREATESTRUCTW)); + pCsw->style = dwStyle; /* HCBT_CREATEWND needs the real window style */ + + // Based on the assumption this is from "unicode source" user32, ReactOS, answer is yes. + if (!IS_ATOM(ClassName->Buffer)) + { + if (Window->state & WNDS_ANSICREATOR) + { + ANSI_STRING AnsiString; + AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(ClassName)+sizeof(CHAR); + pszClass = UserHeapAlloc(AnsiString.MaximumLength); + RtlZeroMemory(pszClass, AnsiString.MaximumLength); + AnsiString.Buffer = (PCHAR)pszClass; + RtlUnicodeStringToAnsiString(&AnsiString, ClassName, FALSE); + } + else + { + UNICODE_STRING UnicodeString; + UnicodeString.MaximumLength = ClassName->Length + sizeof(UNICODE_NULL); + pszClass = UserHeapAlloc(UnicodeString.MaximumLength); + RtlZeroMemory(pszClass, UnicodeString.MaximumLength); + UnicodeString.Buffer = (PWSTR)pszClass; + RtlCopyUnicodeString(&UnicodeString, ClassName); + } + if (pszClass) pCsw->lpszClass = UserHeapAddressToUser(pszClass); + } + if (WindowName->Length) + { + UNICODE_STRING Name; + Name.Buffer = WindowName->Buffer; + Name.Length = WindowName->Length; + Name.MaximumLength = WindowName->MaximumLength; + + if (Window->state & WNDS_ANSICREATOR) + { + ANSI_STRING AnsiString; + AnsiString.MaximumLength = RtlUnicodeStringToAnsiSize(&Name)+sizeof(CHAR); + pszName = UserHeapAlloc(AnsiString.MaximumLength); + RtlZeroMemory(pszName, AnsiString.MaximumLength); + AnsiString.Buffer = (PCHAR)pszName; + RtlUnicodeStringToAnsiString(&AnsiString, &Name, FALSE); + } + else + { + UNICODE_STRING UnicodeString; + UnicodeString.MaximumLength = Name.Length + sizeof(UNICODE_NULL); + pszName = UserHeapAlloc(UnicodeString.MaximumLength); + RtlZeroMemory(pszName, UnicodeString.MaximumLength); + UnicodeString.Buffer = (PWSTR)pszName; + RtlCopyUnicodeString(&UnicodeString, &Name); + } + if (pszName) pCsw->lpszName = UserHeapAddressToUser(pszName); + } + + pCbtCreate->lpcs = pCsw; + pCbtCreate->hwndInsertAfter = hwndInsertAfter; + + //// Call the WH_CBT hook //// + Result = co_HOOK_CallHooks(WH_CBT, HCBT_CREATEWND, (WPARAM) hWnd, (LPARAM) pCbtCreate); + if (Result != 0) + { + DPRINT1("WH_CBT HCBT_CREATEWND hook failed! 0x%x\n", Result); + RETURN( (PWND) NULL); + } + // Write back changes. + Cs->cx = pCsw->cx; + Cs->cy = pCsw->cy; + Cs->x = pCsw->x; + Cs->y = pCsw->y; + hwndInsertAfter = pCbtCreate->hwndInsertAfter; + } /* NCCREATE and WM_NCCALCSIZE need the original values */ - Cs->style = dwStyle; Cs->lpszName = (LPCWSTR) WindowName; Cs->lpszClass = (LPCWSTR) ClassName; @@ -2115,7 +2108,7 @@ if ((dwStyle & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD) IntLinkHwnd(Window, HWND_BOTTOM); else - IntLinkHwnd(Window, HWND_TOP); + IntLinkHwnd(Window, hwndInsertAfter); } /* Send the NCCREATE message */ @@ -2219,6 +2212,7 @@ CLEANUP: if (!_ret_) { + DPRINT("co_UserCreateWindowEx(): Error Created window!\n"); /* If the window was created, the class will be dereferenced by co_UserDestroyWindow */ if (Window) co_UserDestroyWindow(Window);

13 years, 11 months

[spetreolle] 49611: [CMAKE] Add dplayx and ksproxy.ax to bootcd.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Thu Nov 18 15:41:39 2010 New Revision: 49611 URL: http://svn.reactos.org/svn/reactos?rev=49611&view=rev Log: [CMAKE] Add dplayx and ksproxy.ax to bootcd. Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMake… ============================================================================== --- branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Thu Nov 18 15:41:39 2010 @@ -14,7 +14,7 @@ add_subdirectory(dsound) #add_subdirectory(dsound_new) #disabled in trunk add_subdirectory(dxdiagn) -#add_subdirectory(ksproxy)# undefined reference to `operator new(unsigned int)' +add_subdirectory(ksproxy) add_subdirectory(ksuser) add_subdirectory(msdmo) #add_subdirectory(msdvbnp) #disabled in trunk Modified: branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dplay… ============================================================================== --- branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt [iso-8859-1] Thu Nov 18 15:41:39 2010 @@ -35,4 +35,5 @@ msvcrt kernel32 ntdll) - + +add_cab_target(dplayx 1) Modified: branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Thu Nov 18 15:41:39 2010 @@ -1,6 +1,10 @@ -set_cpp() +spec2def(ksproxy.ax ksproxy.spec) -spec2def(ksproxy.ax ksproxy.spec) +add_definitions(-D_DLL -D__USE_CRTIMP) + include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) + add_definitions( + -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ + -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) add_library(ksproxy SHARED allocator.cpp @@ -28,13 +32,18 @@ if(MSVC) set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "/GR-") else() - set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") + #FIXME : can't build if this is enabled, check if this is needed + #set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") endif(MSVC) -target_link_libraries(ksproxy strmiids) - +target_link_libraries(ksproxy + stlport -lsupc++ -lgcc + strmiids) + add_importlibs(ksproxy + mingw32 + coldname advapi32 ole32 setupapi @@ -44,3 +53,5 @@ ntdll) add_dependencies(ksproxy psdk buildno_header) + +add_cab_target(ksproxy 1)

13 years, 11 months

[gadamopoulos] 49610: [win32k] - Some more cleanup

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Nov 18 13:57:21 2010 New Revision: 49610 URL: http://svn.reactos.org/svn/reactos?rev=49610&view=rev Log: [win32k] - Some more cleanup Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Thu Nov 18 13:57:21 2010 @@ -121,13 +121,19 @@ VOID FASTCALL MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode); BOOLEAN APIENTRY -co_MsqFindMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, - IN BOOLEAN Hardware, - IN BOOLEAN Remove, - IN PWND Window, - IN UINT MsgFilterLow, - IN UINT MsgFilterHigh, - OUT PMSG Message); +MsqPeekMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, + IN BOOLEAN Remove, + IN PWND Window, + IN UINT MsgFilterLow, + IN UINT MsgFilterHigh, + OUT PMSG Message); +BOOL APIENTRY +co_MsqPeekHardwareMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, + IN BOOL Remove, + IN PWND Window, + IN UINT MsgFilterLow, + IN UINT MsgFilterHigh, + OUT MSG* pMsg); BOOLEAN FASTCALL MsqInitializeMessageQueue(struct _ETHREAD *Thread, PUSER_MESSAGE_QUEUE MessageQueue); VOID FASTCALL @@ -196,7 +202,7 @@ VOID FASTCALL MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam); VOID FASTCALL -MsqInsertMouseMessage(MSG* Msg); +co_MsqInsertMouseMessage(MSG* Msg); BOOL FASTCALL MsqIsClkLck(LPMSG Msg, BOOL Remove); BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Thu Nov 18 13:57:21 2010 @@ -217,7 +217,7 @@ Msg.wParam = CurInfo->ButtonsDown; Msg.lParam = MAKELPARAM(x, y); Msg.pt = pt; - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } /* Store the new cursor position */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu Nov 18 13:57:21 2010 @@ -1156,7 +1156,7 @@ Msg.message = SwapBtnMsg[0][SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_LEFTUP) { @@ -1164,7 +1164,7 @@ Msg.message = SwapBtnMsg[1][SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN) { @@ -1172,7 +1172,7 @@ Msg.message = WM_MBUTTONDOWN; CurInfo->ButtonsDown |= MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP) { @@ -1180,7 +1180,7 @@ Msg.message = WM_MBUTTONUP; CurInfo->ButtonsDown &= ~MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN) { @@ -1188,7 +1188,7 @@ Msg.message = SwapBtnMsg[0][!SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP) { @@ -1196,7 +1196,7 @@ Msg.message = SwapBtnMsg[1][!SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } if((mi->dwFlags & (MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)) && @@ -1214,14 +1214,14 @@ gQueueKeyStateTable[VK_XBUTTON1] |= 0xc0; CurInfo->ButtonsDown |= MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } if(mi->mouseData & XBUTTON2) { gQueueKeyStateTable[VK_XBUTTON2] |= 0xc0; CurInfo->ButtonsDown |= MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } } else if(mi->dwFlags & MOUSEEVENTF_XUP) @@ -1232,21 +1232,21 @@ gQueueKeyStateTable[VK_XBUTTON1] &= ~0x80; CurInfo->ButtonsDown &= ~MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } if(mi->mouseData & XBUTTON2) { gQueueKeyStateTable[VK_XBUTTON2] &= ~0x80; CurInfo->ButtonsDown &= ~MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } } if(mi->dwFlags & MOUSEEVENTF_WHEEL) { Msg.message = WM_MOUSEWHEEL; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, mi->mouseData); - MsqInsertMouseMessage(&Msg); + co_MsqInsertMouseMessage(&Msg); } return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Thu Nov 18 13:57:21 2010 @@ -932,25 +932,23 @@ } /* Now check for normal messages. */ - if (co_MsqFindMessage( ThreadQueue, - FALSE, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - Msg )) + if (MsqPeekMessage( ThreadQueue, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + Msg )) { return TRUE; } /* Check for hardware events. */ - if(co_MsqFindMessage( ThreadQueue, - TRUE, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - Msg )) + if(co_MsqPeekHardwareMessage( ThreadQueue, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + Msg)) { if(!ProcessHardwareMessage(Msg, RemoveMessages)) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Thu Nov 18 13:57:21 2010 @@ -98,13 +98,19 @@ } VOID FASTCALL +MsqWakeQueue(PUSER_MESSAGE_QUEUE Queue, DWORD MessageBits) +{ + Queue->QueueBits |= MessageBits; + Queue->ChangedBits |= MessageBits; + if (Queue->WakeMask & MessageBits) + KeSetEvent(Queue->NewMessages, IO_NO_INCREMENT, FALSE); +} + +VOID FASTCALL MsqIncPaintCountQueue(PUSER_MESSAGE_QUEUE Queue) { Queue->PaintCount++; - Queue->QueueBits |= QS_PAINT; - Queue->ChangedBits |= QS_PAINT; - if (Queue->WakeMask & QS_PAINT) - KeSetEvent(Queue->NewMessages, IO_NO_INCREMENT, FALSE); + MsqWakeQueue(Queue, QS_PAINT); } VOID FASTCALL @@ -137,7 +143,7 @@ } VOID FASTCALL -MsqInsertMouseMessage(MSG* Msg) +co_MsqInsertMouseMessage(MSG* Msg) { LARGE_INTEGER LargeTickCount; KIRQL OldIrql; @@ -425,17 +431,11 @@ /* save the pointer to the WM_MOUSEMOVE message in the new queue */ CaptureWindow->head.pti->MessageQueue->MouseMoveMsg = Message; - CaptureWindow->head.pti->MessageQueue->QueueBits |= QS_MOUSEMOVE; - CaptureWindow->head.pti->MessageQueue->ChangedBits |= QS_MOUSEMOVE; - if (CaptureWindow->head.pti->MessageQueue->WakeMask & QS_MOUSEMOVE) - KeSetEvent(CaptureWindow->head.pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + MsqWakeQueue(CaptureWindow->head.pti->MessageQueue, QS_MOUSEMOVE); } else { - CaptureWindow->head.pti->MessageQueue->QueueBits |= QS_MOUSEBUTTON; - CaptureWindow->head.pti->MessageQueue->ChangedBits |= QS_MOUSEBUTTON; - if (CaptureWindow->head.pti->MessageQueue->WakeMask & QS_MOUSEBUTTON) - KeSetEvent(CaptureWindow->head.pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + MsqWakeQueue(CaptureWindow->head.pti->MessageQueue, QS_MOUSEBUTTON); } IntUnLockHardwareMessageQueue(CaptureWindow->head.pti->MessageQueue); @@ -533,9 +533,12 @@ } BOOL APIENTRY -co_MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, PWND Window, - UINT FilterLow, UINT FilterHigh, BOOL Remove, - PMSG Message) +co_MsqPeekHardwareMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, + IN BOOL Remove, + IN PWND Window, + IN UINT FilterLow, + IN UINT FilterHigh, + OUT PMSG Message) { KIRQL OldIrql; POINT ScreenPoint; @@ -852,9 +855,6 @@ UserDereferenceObject(Window); ObDereferenceObject (Thread); - // InsertHeadList(&pThread->MessageQueue->PostedMessagesListHead, - // &Message->ListEntry); - // KeSetEvent(pThread->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); } PUSER_MESSAGE FASTCALL @@ -1097,10 +1097,7 @@ { InsertTailList(&MessageQueue->NotifyMessagesListHead, &NotifyMessage->ListEntry); - MessageQueue->QueueBits |= QS_SENDMESSAGE; - MessageQueue->ChangedBits |= QS_SENDMESSAGE; - if (MessageQueue->WakeMask & QS_SENDMESSAGE) - KeSetEvent(MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + MsqWakeQueue(MessageQueue, QS_SENDMESSAGE); } NTSTATUS FASTCALL @@ -1155,10 +1152,7 @@ /* queue it in the destination's message queue */ InsertTailList(&MessageQueue->SentMessagesListHead, &Message->ListEntry); - MessageQueue->QueueBits |= QS_SENDMESSAGE; - MessageQueue->ChangedBits |= QS_SENDMESSAGE; - if (MessageQueue->WakeMask & QS_SENDMESSAGE) - KeSetEvent(MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + MsqWakeQueue(MessageQueue, QS_SENDMESSAGE); /* we can't access the Message anymore since it could have already been deleted! */ @@ -1308,10 +1302,7 @@ InsertTailList(&MessageQueue->HardwareMessagesListHead, &Message->ListEntry); } - MessageQueue->QueueBits |= MessageBits; - MessageQueue->ChangedBits |= MessageBits; - if (MessageQueue->WakeMask & MessageBits) - KeSetEvent(MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + MsqWakeQueue(MessageQueue, MessageBits); } VOID FASTCALL @@ -1319,15 +1310,11 @@ { MessageQueue->QuitPosted = TRUE; MessageQueue->QuitExitCode = ExitCode; - MessageQueue->QueueBits |= QS_POSTMESSAGE; - MessageQueue->ChangedBits |= QS_POSTMESSAGE; - if (MessageQueue->WakeMask & QS_POSTMESSAGE) - KeSetEvent(MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + MsqWakeQueue(MessageQueue, QS_POSTMESSAGE); } BOOLEAN APIENTRY -co_MsqFindMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, - IN BOOLEAN Hardware, +MsqPeekMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, IN BOOLEAN Remove, IN PWND Window, IN UINT MsgFilterLow, @@ -1337,17 +1324,7 @@ PLIST_ENTRY CurrentEntry; PUSER_MESSAGE CurrentMessage; PLIST_ENTRY ListHead; - - if (Hardware) - { - return(co_MsqPeekHardwareMessage( MessageQueue, - Window, - MsgFilterLow, - MsgFilterHigh, - Remove, - Message)); - } - + CurrentEntry = MessageQueue->PostedMessagesListHead.Flink; ListHead = &MessageQueue->PostedMessagesListHead; while (CurrentEntry != ListHead) @@ -1361,15 +1338,11 @@ ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { + *Message= CurrentMessage->Msg; + if (Remove) { - RemoveEntryList(&CurrentMessage->ListEntry); - } - - *Message= CurrentMessage->Msg; - - if (Remove) - { + RemoveEntryList(&CurrentMessage->ListEntry); MsqDestroyMessage(CurrentMessage); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Nov 18 13:57:21 2010 @@ -2567,7 +2567,7 @@ msg.wParam = IntGetSysCursorInfo()->ButtonsDown; msg.lParam = MAKELPARAM(gpsi->ptCursor.x, gpsi->ptCursor.y); msg.pt = gpsi->ptCursor; - MsqInsertMouseMessage(&msg); + co_MsqInsertMouseMessage(&msg); if (!IntIsWindow(Window->head.h)) {

13 years, 11 months

[tkreuzer] 49609: [NTOSKRNL] Fix a bug.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Nov 18 03:14:47 2010 New Revision: 49609 URL: http://svn.reactos.org/svn/reactos?rev=49609&view=rev Log: [NTOSKRNL] Fix a bug. Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Thu Nov 18 03:14:47 2010 @@ -398,7 +398,7 @@ if (!NewThread->SpecialApcDisable) { /* Request APC delivery */ - if (!SwitchFrame->ApcBypassDisable) HalRequestSoftwareInterrupt(APC_LEVEL); + if (SwitchFrame->ApcBypassDisable) HalRequestSoftwareInterrupt(APC_LEVEL); return TRUE; } }

13 years, 11 months

[spetreolle] 49608: [CMAKE] Fix crt parallel build.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Tue Nov 16 17:44:24 2010 New Revision: 49608 URL: http://svn.reactos.org/svn/reactos?rev=49608&view=rev Log: [CMAKE] Fix crt parallel build. Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Tue Nov 16 17:44:24 2010 @@ -413,7 +413,7 @@ set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) -add_dependencies(crt psdk) +add_dependencies(crt psdk buildno_header ks386) list(APPEND LIBCNTPR_SOURCE except/${ARCH}/chkstk_asm.s

13 years, 11 months

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

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 November 2010