Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[akhaldi] 49937: [CMAKE] - Improve some modules. - Convert notifyhook def into a spec, and add the import lib target. - Get rid of the import libs that we already generate (the rest are still just ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 3 19:20:45 2010 New Revision: 49937 URL: http://svn.reactos.org/svn/reactos?rev=49937&view=rev Log: [CMAKE] - Improve some modules. - Convert notifyhook def into a spec, and add the import lib target. - Get rid of the import libs that we already generate (the rest are still just temporary) Added: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.spec - copied, changed from r49933, branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def Removed: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def branches/cmake-bringup/importlibs/libadvapi32.a branches/cmake-bringup/importlibs/libbattc.a branches/cmake-bringup/importlibs/libbootvid.a branches/cmake-bringup/importlibs/libcabinet.a branches/cmake-bringup/importlibs/libclass2.a branches/cmake-bringup/importlibs/libcomctl32.a branches/cmake-bringup/importlibs/libcrypt32.a branches/cmake-bringup/importlibs/libcryptui.a branches/cmake-bringup/importlibs/libcsrsrv.a branches/cmake-bringup/importlibs/libd3d9.a branches/cmake-bringup/importlibs/libd3dx9_24.a branches/cmake-bringup/importlibs/libd3dx9_36.a branches/cmake-bringup/importlibs/libdbghelp.a branches/cmake-bringup/importlibs/libdevmgr.a branches/cmake-bringup/importlibs/libdhcpcsvc.a branches/cmake-bringup/importlibs/libdrmk.a branches/cmake-bringup/importlibs/libdxgthk.a branches/cmake-bringup/importlibs/libfmifs.a branches/cmake-bringup/importlibs/libftfd.a branches/cmake-bringup/importlibs/libgdi32.a branches/cmake-bringup/importlibs/libgdiplus.a branches/cmake-bringup/importlibs/libhal.a branches/cmake-bringup/importlibs/libimm32.a branches/cmake-bringup/importlibs/libkdcom.a branches/cmake-bringup/importlibs/libkernel32.a branches/cmake-bringup/importlibs/libks.a branches/cmake-bringup/importlibs/libloadperf.a branches/cmake-bringup/importlibs/liblsasrv.a branches/cmake-bringup/importlibs/libmlang.a branches/cmake-bringup/importlibs/libmpr.a branches/cmake-bringup/importlibs/libmsi.a branches/cmake-bringup/importlibs/libmsimg32.a branches/cmake-bringup/importlibs/libmsvcrt.a branches/cmake-bringup/importlibs/libnetapi32.a branches/cmake-bringup/importlibs/libnotifyhook.a branches/cmake-bringup/importlibs/libntdll.a branches/cmake-bringup/importlibs/libntoskrnl.a branches/cmake-bringup/importlibs/libole32.a branches/cmake-bringup/importlibs/liboleaut32.a branches/cmake-bringup/importlibs/libpciidex.a branches/cmake-bringup/importlibs/libriched20.a branches/cmake-bringup/importlibs/librpcrt4.a branches/cmake-bringup/importlibs/librsaenh.a branches/cmake-bringup/importlibs/libsamlib.a branches/cmake-bringup/importlibs/libscsiport.a branches/cmake-bringup/importlibs/libsetupapi.a branches/cmake-bringup/importlibs/libshdocvw.a branches/cmake-bringup/importlibs/libshell32.a branches/cmake-bringup/importlibs/libshlwapi.a branches/cmake-bringup/importlibs/libsmdll.a branches/cmake-bringup/importlibs/libsnmpapi.a branches/cmake-bringup/importlibs/libspoolss.a branches/cmake-bringup/importlibs/liburlmon.a branches/cmake-bringup/importlibs/libuser32.a branches/cmake-bringup/importlibs/libuserenv.a branches/cmake-bringup/importlibs/libvideoprt.a branches/cmake-bringup/importlibs/libwin32k.a branches/cmake-bringup/importlibs/libwindowscodecs.a branches/cmake-bringup/importlibs/libwined3d.a branches/cmake-bringup/importlibs/libwinspool.a branches/cmake-bringup/importlibs/libwintrust.a branches/cmake-bringup/importlibs/libwmilib.a branches/cmake-bringup/importlibs/libws2_32.a branches/cmake-bringup/importlibs/libws2help.a Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -66,23 +66,12 @@ wine mingw_wmain mingw_common - uuid - -ladvapi32 - -lgdi32 - -luser32 - -lws2_32 - -lmsimg32 - -lcomctl32 - -lole32 - -loleaut32 - -lshell32 - -lnotifyhook - -lmsvcrt - -lkernel32 - -lntdll) + uuid) + +add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 notifyhook msvcrt kernel32 ntdll) set_image_base(explorer 0x00400000) add_dependencies(explorer psdk buildno_header) add_cab_target(explorer 4) -add_cab(${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml 4) +add_cab(${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml 4) Modified: branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -1,13 +1,18 @@ add_definitions(-D_NOTIFYHOOK_IMPL) -add_library(notifyhook SHARED +spec2def(notifyhook.dll notifyhook.spec) + +list(APPEND SOURCE notifyhook.c notifyhook.rc - notifyhook.def) + ${CMAKE_CURRENT_BINARY_DIR}/notifyhook.def) + +add_library(notifyhook SHARED ${SOURCE}) set_module_type(notifyhook win32dll) add_importlibs(notifyhook user32 msvcrt kernel32) +add_importlib_target(notifyhook.spec) add_cab_target(notifyhook 1) Removed: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def (removed) @@ -1,6 +1,0 @@ -LIBRARY notifyhook.dll -EXPORTS -DeinstallNotifyHook -GetWindowModulePath -GetWindowModulePathCopyData -InstallNotifyHook Copied: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.spec (from r49933, branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def) URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.spec [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -1,6 +1,4 @@ -LIBRARY notifyhook.dll -EXPORTS -DeinstallNotifyHook -GetWindowModulePath -GetWindowModulePathCopyData -InstallNotifyHook +@ cdecl DeinstallNotifyHook() +@ cdecl GetWindowModulePath(ptr) +@ cdecl GetWindowModulePathCopyData(ptr ptr ptr long) +@ cdecl InstallNotifyHook() Modified: branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… ============================================================================== --- branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -60,15 +60,19 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D_SHELL32_) -add_definitions(-DCOM_NO_WINDOWS_H) -add_definitions(-D_WINE) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/lib/recyclebin) -include_directories(${REACTOS_SOURCE_DIR}) +add_definitions( + -D_SHELL32_ + -DCOM_NO_WINDOWS_H + -D_WINE) + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/recyclebin + ${REACTOS_SOURCE_DIR}) add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32_precomp.h.gch ${SOURCE}) set_module_type(shell32 win32dll) @@ -94,7 +98,5 @@ msvcrt ntdll) - add_cab_target(shell32 1) add_importlib_target(shell32.spec) - Removed: branches/cmake-bringup/importlibs/libadvapi32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libadv… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libbattc.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libbat… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libbootvid.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libboo… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libcabinet.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcab… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libclass2.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcla… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libcomctl32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcom… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libcrypt32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcry… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libcryptui.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcry… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libcsrsrv.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcsr… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libd3d9.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3d… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libd3dx9_24.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3d… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libd3dx9_36.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3d… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libdbghelp.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdbg… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libdevmgr.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdev… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libdhcpcsvc.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdhc… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libdrmk.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdrm… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libdxgthk.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdxg… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libfmifs.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libfmi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libftfd.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libftf… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libgdi32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libgdi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libgdiplus.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libgdi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libhal.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libhal… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libimm32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libimm… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libkdcom.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libkdc… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libkernel32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libker… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libks.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libks.… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libloadperf.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libloa… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/liblsasrv.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/liblsa… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libmlang.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmla… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libmpr.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmpr… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libmsi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmsi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libmsimg32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmsi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libmsvcrt.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmsv… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libnetapi32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libnet… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libnotifyhook.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libnot… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libntdll.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libntd… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libntoskrnl.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libnto… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libole32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libole… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/liboleaut32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libole… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libpciidex.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libpci… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libriched20.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libric… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/librpcrt4.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/librpc… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/librsaenh.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/librsa… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libsamlib.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsam… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libscsiport.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libscs… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libsetupapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libset… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libshdocvw.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshd… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libshell32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshe… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libshlwapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshl… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libsmdll.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsmd… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libsnmpapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsnm… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libspoolss.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libspo… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/liburlmon.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/liburl… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libuser32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libuse… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libuserenv.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libuse… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libvideoprt.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libvid… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwin32k.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwindowscodecs.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwined3d.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwinspool.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwintrust.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libwmilib.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwmi… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libws2_32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libws2… ============================================================================== Binary file - no diff available. Removed: branches/cmake-bringup/importlibs/libws2help.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libws2… ============================================================================== Binary file - no diff available.

13 years, 9 months

[jimtabor] 49936: [Win32k] - More fixes to In Send message support. One more case fixed in looping back.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 3 18:13:28 2010 New Revision: 49936 URL: http://svn.reactos.org/svn/reactos?rev=49936&view=rev Log: [Win32k] - More fixes to In Send message support. One more case fixed in looping back. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c 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] Fri Dec 3 18:13:28 2010 @@ -532,7 +532,8 @@ /* free the message */ ExFreePoolWithTag(Message, TAG_USRMSG); - pti->pcti->CTI_flags &= ~CTI_INSENDMESSAGE; + /* do not hangup on the user if this is reentering */ + if (!SaveMsg) pti->pcti->CTI_flags &= ~CTI_INSENDMESSAGE; pti->pusmCurrent = SaveMsg; return(TRUE);

13 years, 9 months

[jimtabor] 49935: [Win32k] - More fixes to In Send and Reply message support.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 3 18:02:02 2010 New Revision: 49935 URL: http://svn.reactos.org/svn/reactos?rev=49935&view=rev Log: [Win32k] - More fixes to In Send and Reply message support. Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.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] Fri Dec 3 18:02:02 2010 @@ -38,6 +38,7 @@ LRESULT* Result; LRESULT lResult; struct _USER_MESSAGE_QUEUE* SenderQueue; + struct _USER_MESSAGE_QUEUE* CallBackSenderQueue; SENDASYNCPROC CompletionCallback; ULONG_PTR CompletionCallbackContext; /* entry in the dispatching list of the sender's message queue */ Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Fri Dec 3 18:02:02 2010 @@ -75,6 +75,7 @@ PCLIENTINFO pClientInfo; FLONG TIF_flags; PUNICODE_STRING pstrAppName; + struct _USER_SENT_MESSAGE *pusmCurrent; LONG timeLast; ULONG_PTR idLast; INT exitCode; 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] Fri Dec 3 18:02:02 2010 @@ -1383,7 +1383,8 @@ Message->Result = 0; Message->lResult = 0; Message->QS_Flags = 0; - Message->SenderQueue = NULL; // mjmartin, you are right! This is null. Win32Thread->MessageQueue; + Message->SenderQueue = NULL; // mjmartin, you are right! This is null. + Message->CallBackSenderQueue = Win32Thread->MessageQueue; IntReferenceMessageQueue(Window->head.pti->MessageQueue); Message->CompletionCallback = CompletionCallback; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Fri Dec 3 18:02:02 2010 @@ -102,18 +102,13 @@ break; case THREADSTATE_INSENDMESSAGE: { - PUSER_SENT_MESSAGE Message; - PLIST_ENTRY Entry; - PUSER_MESSAGE_QUEUE MessageQueue = - ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue; + PUSER_SENT_MESSAGE Message = + ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->pusmCurrent; DPRINT1("THREADSTATE_INSENDMESSAGE\n"); ret = ISMEX_NOSEND; - if (!IsListEmpty(&MessageQueue->SentMessagesListHead)) + if (Message) { - Entry = MessageQueue->SentMessagesListHead.Flink; - Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); - if (Message->SenderQueue) ret = ISMEX_SEND; else 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] Fri Dec 3 18:02:02 2010 @@ -418,7 +418,7 @@ BOOLEAN FASTCALL co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue) { - PUSER_SENT_MESSAGE Message; + PUSER_SENT_MESSAGE SaveMsg, Message; PLIST_ENTRY Entry; LRESULT Result; PTHREADINFO pti; @@ -433,9 +433,14 @@ Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); pti = MessageQueue->Thread->Tcb.Win32Thread; + + SaveMsg = pti->pusmCurrent; + pti->pusmCurrent = Message; + // Processing a message sent to it from another thread. - if ( MessageQueue != Message->SenderQueue ) // most likely, but, to be sure. - { + if ( ( Message->SenderQueue && MessageQueue != Message->SenderQueue) || + ( Message->CallBackSenderQueue && MessageQueue != Message->CallBackSenderQueue )) + { // most likely, but, to be sure. pti->pcti->CTI_flags |= CTI_INSENDMESSAGE; // Let the user know... } @@ -528,6 +533,7 @@ ExFreePoolWithTag(Message, TAG_USRMSG); pti->pcti->CTI_flags &= ~CTI_INSENDMESSAGE; + pti->pusmCurrent = SaveMsg; return(TRUE); } @@ -659,6 +665,7 @@ Message->lResult = 0; Message->QS_Flags = 0; Message->SenderQueue = ThreadQueue; + Message->CallBackSenderQueue = NULL; IntReferenceMessageQueue(ThreadQueue); Message->CompletionCallback = NULL; Message->CompletionCallbackContext = 0; @@ -1606,34 +1613,26 @@ return MessageQueue->ExtraInfo; } +// ReplyMessage is called by the thread receiving the window message. BOOL FASTCALL co_MsqReplyMessage( LRESULT lResult ) { PUSER_SENT_MESSAGE Message; - PLIST_ENTRY Entry; PTHREADINFO pti; - PUSER_MESSAGE_QUEUE MessageQueue; pti = PsGetCurrentThreadWin32Thread(); - MessageQueue = pti->MessageQueue; - - if(!MessageQueue) return FALSE; - - if (IsListEmpty(&MessageQueue->SentMessagesListHead)) - { - return(FALSE); - } - // Do we loop through all msgs or just set the first one? - Entry = MessageQueue->SentMessagesListHead.Flink; - Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); + Message = pti->pusmCurrent; + + if(!Message) return FALSE; if (Message->QS_Flags & QS_SMRESULT) return FALSE; + // SendMessageXxx || Callback msg and not a notify msg if (Message->SenderQueue || Message->CompletionCallback) { Message->lResult = lResult; Message->QS_Flags |= QS_SMRESULT; - MsqWakeQueue(MessageQueue, 0, TRUE); // Wake it up!? Bits? + // See co_MsqDispatchOneSentMessage, change bits already accounted for and cleared and this msg is going away.. } return TRUE; }

13 years, 9 months

[tkreuzer] 49934: [CMAKE] define inline to __inline for host tools on MSVC builds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 3 17:51:03 2010 New Revision: 49934 URL: http://svn.reactos.org/svn/reactos?rev=49934&view=rev Log: [CMAKE] define inline to __inline for host tools on MSVC builds Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:51:03 2010 @@ -8,6 +8,9 @@ if(NOT CMAKE_CROSSCOMPILING) add_definitions(-DTARGET_i386) +if(MSVC) +add_definitions(-Dinline=__inline) +endif() include_directories( ${REACTOS_SOURCE_DIR}/tools/unicode

13 years, 9 months

[tkreuzer] 49933: [CMAKE] include debug.h explicitly from reactos folder, to avoid including the wine one. Fixes ws2_32

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 3 17:48:03 2010 New Revision: 49933 URL: http://svn.reactos.org/svn/reactos?rev=49933&view=rev Log: [CMAKE] include debug.h explicitly from reactos folder, to avoid including the wine one. Fixes ws2_32 Modified: branches/cmake-bringup/include/reactos/stubs.h Modified: branches/cmake-bringup/include/reactos/stubs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/s… ============================================================================== --- branches/cmake-bringup/include/reactos/stubs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/stubs.h [iso-8859-1] Fri Dec 3 17:48:03 2010 @@ -5,7 +5,7 @@ #include "wine/config.h" #include "wine/exception.h" -#include <debug.h> +#include <reactos/debug.h> #define __wine_spec_unimplemented_stub(module, function) \ { \

13 years, 9 months

[akhaldi] 49932: [CMAKE] - Improve more modules.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 3 17:41:29 2010 New Revision: 49932 URL: http://svn.reactos.org/svn/reactos?rev=49932&view=rev Log: [CMAKE] - Improve more modules. Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt branches/cmake-bringup/drivers/wmi/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -102,8 +102,8 @@ add_subdirectory(mssip32) #add_subdirectory(mstask) add_subdirectory(msvcrt) -add_subdirectory(msvcrt20) -add_subdirectory(msvcrt40) +#add_subdirectory(msvcrt20) FIX spec2def +#add_subdirectory(msvcrt40) FIX spec2def add_subdirectory(msvfw32) add_subdirectory(msvidc32) add_subdirectory(mswsock) @@ -212,7 +212,7 @@ add_subdirectory(wlanapi) add_subdirectory(wldap32) add_subdirectory(wmi) -add_subdirectory(ws2_32) +#add_subdirectory(ws2_32) SPEC add_subdirectory(ws2_32_new) add_subdirectory(ws2help) add_subdirectory(wshirda) Modified: branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/battery/b… ============================================================================== --- branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -12,4 +12,4 @@ add_importlibs(battc ntoskrnl hal) add_cab_target(battc 2) -add_importlib_target(battc.spec) +add_importlib_target(battc.spec batc.sys) Modified: branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/directx/d… ============================================================================== --- branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/directx/dxgthk/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -11,6 +11,6 @@ set_module_type(dxgthk kernelmodedriver) add_importlibs(dxgthk win32k) -add_importlib_target(dxgthk.spec) +add_importlib_target(dxgthk.spec dxgthk.sys) add_cab_target(dxgthk 2) Modified: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -5,7 +5,7 @@ -DBUILDING_KS -D_COMDDK_) -add_library(ks SHARED +list(APPEND SOURCE api.c allocators.c bag.c @@ -30,16 +30,18 @@ ks.rc ${CMAKE_CURRENT_BINARY_DIR}/ks.def) +add_library(ks SHARED ${SOURCE}) + set_target_properties(ks PROPERTIES SUFFIX ".sys") + set_entrypoint(ks 0) set_subsystem(ks native) set_image_base(ks 0x00010000) -target_link_libraries(ks - ${PSEH_LIB}) +target_link_libraries(ks ${PSEH_LIB}) add_importlibs(ks ntoskrnl hal msvcrt) add_dependencies(ks psdk bugcodes) add_cab_target(ks 2) -add_importlib_target(ks.spec) +add_importlib_target(ks.spec ks.sys) Modified: branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/n… ============================================================================== --- branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -43,4 +43,4 @@ add_pch(ndis ${CMAKE_CURRENT_SOURCE_DIR}/include/ndissys.h ${SOURCE}) add_cab_target(ndis 2) -add_importlib_target(ndis.spec) +add_importlib_target(ndis.spec ndis.sys) Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -3,14 +3,17 @@ spec2def(class2.sys class2.spec) -add_library(class2 SHARED +list(APPEND SOURCE class2.c class2.rc ${CMAKE_CURRENT_BINARY_DIR}/class2.def) +add_library(class2 SHARED ${SOURCE}) + set_module_type(class2 kernelmodedriver) + add_importlibs(class2 scsiport ntoskrnl hal) +add_importlib_target(class2.spec class2.sys) add_minicd_target(class2 reactos class2.sys) add_livecd_target(class2 reactos/system32/drivers) -add_importlib_target(class2.spec) Modified: branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -1,7 +1,7 @@ spec2def(pciidex.sys pciidex.spec) -add_library(pciidex SHARED +list(APPEND SOURCE fdo.c miniport.c misc.c @@ -10,8 +10,10 @@ pciidex.rc ${CMAKE_CURRENT_BINARY_DIR}/pciidex.def) +add_library(pciidex SHARED ${SOURCE}) + set_module_type(pciidex kernelmodedriver) add_importlibs(pciidex ntoskrnl) add_cab_target(pciidex 2) -add_importlib_target(pciidex.spec) +add_importlib_target(pciidex.spec pciidex.sys) Modified: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s… ============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -1,17 +1,18 @@ spec2def(scsiport.sys scsiport.spec) -add_library(scsiport SHARED - scsiport.c - stubs.c - scsiport.rc - ) - -target_link_libraries(scsiport ${CMAKE_CURRENT_SOURCE_DIR}/scsiport_i386.def) +list(APPEND SOURCE + scsiport.c + stubs.c + scsiport.rc + ${CMAKE_CURRENT_BINARY_DIR}/scsiport.def) + +add_library(scsiport SHARED ${SOURCE}) set_module_type(scsiport kernelmodedriver) + add_importlibs(scsiport ntoskrnl hal) +add_importlib_target(scsiport.spec scsiport.sys) add_minicd_target(scsiport reactos scsiport.sys) add_livecd_target(scsiport reactos/system32/drivers) -add_importlib_target(scsiport.spec) Modified: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vid… ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -30,4 +30,4 @@ add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) add_cab_target(videoprt 2) -add_importlib_target(videoprt.spec) +add_importlib_target(videoprt.spec videoprt.sys) Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -12,6 +12,6 @@ set_module_type(drmk kernelmodedriver) add_importlibs(drmk ntoskrnl) -add_importlib_target(drmk.spec) +add_importlib_target(drmk.spec drmk.sys) add_cab_target(drmk 2) Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -11,6 +11,6 @@ set_module_type(wmilib kernelmodedriver) add_importlibs(wmilib ntoskrnl) -add_importlib_target(wmilib.spec) +add_importlib_target(wmilib.spec wmilib.sys) add_cab_target(wmilib 2) Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Fri Dec 3 17:41:29 2010 @@ -192,5 +192,5 @@ add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) add_dependencies(win32k gendib_generated subsystem_napi) add_cab_target(win32k 1) -add_importlib_target(win32k.spec) +add_importlib_target(win32k.spec win32k.sys)

13 years, 9 months

[janderwald] 49931: [AUDIO-BRINGUP] - Pass audio device id to wdmaud.drv callback functions - Extend VALIDATE_MMSYS_PARAMETER macro - Handle case when the caller does not pass handle of mixer, but ...

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Dec 3 16:49:33 2010 New Revision: 49931 URL: http://svn.reactos.org/svn/reactos?rev=49931&view=rev Log: [AUDIO-BRINGUP] - Pass audio device id to wdmaud.drv callback functions - Extend VALIDATE_MMSYS_PARAMETER macro - Handle case when the caller does not pass handle of mixer, but a device id - Pass device id to mmixer library - Remove dead code - MS sndvol32.exe now gets further, but crashes in user32 IntCallMessageProc Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h branches/audio-bringup/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Fri Dec 3 16:49:33 2010 @@ -384,7 +384,7 @@ MMRESULT WdmAudGetMixerCapabilties( - IN ULONG DeviceId, + IN ULONG DeviceId, LPMIXERCAPSW Capabilities) { if (MMixerGetCapabilities(&MixerContext, DeviceId, Capabilities) == MM_STATUS_SUCCESS) @@ -396,10 +396,11 @@ MMRESULT WdmAudGetLineInfo( IN HANDLE hMixer, + IN DWORD MixerId, IN LPMIXERLINEW MixLine, IN ULONG Flags) { - if (MMixerGetLineInfo(&MixerContext, hMixer, Flags, MixLine) == MM_STATUS_SUCCESS) + if (MMixerGetLineInfo(&MixerContext, hMixer, MixerId, Flags, MixLine) == MM_STATUS_SUCCESS) return MMSYSERR_NOERROR; return MMSYSERR_ERROR; @@ -408,10 +409,11 @@ MMRESULT WdmAudGetLineControls( IN HANDLE hMixer, + IN DWORD MixerId, IN LPMIXERLINECONTROLSW MixControls, IN ULONG Flags) { - if (MMixerGetLineControls(&MixerContext, hMixer, Flags, MixControls) == MM_STATUS_SUCCESS) + if (MMixerGetLineControls(&MixerContext, hMixer, MixerId, Flags, MixControls) == MM_STATUS_SUCCESS) return MMSYSERR_NOERROR; return MMSYSERR_ERROR; @@ -420,10 +422,11 @@ MMRESULT WdmAudSetControlDetails( IN HANDLE hMixer, + IN DWORD MixerId, IN LPMIXERCONTROLDETAILS MixDetails, IN ULONG Flags) { - if (MMixerSetControlDetails(&MixerContext, hMixer, Flags, MixDetails) == MM_STATUS_SUCCESS) + if (MMixerSetControlDetails(&MixerContext, hMixer, MixerId, Flags, MixDetails) == MM_STATUS_SUCCESS) return MMSYSERR_NOERROR; return MMSYSERR_ERROR; @@ -433,10 +436,11 @@ MMRESULT WdmAudGetControlDetails( IN HANDLE hMixer, + IN DWORD MixerId, IN LPMIXERCONTROLDETAILS MixDetails, IN ULONG Flags) { - if (MMixerGetControlDetails(&MixerContext, hMixer, Flags, MixDetails) == MM_STATUS_SUCCESS) + if (MMixerGetControlDetails(&MixerContext, hMixer, MixerId, Flags, MixDetails) == MM_STATUS_SUCCESS) return MMSYSERR_NOERROR; return MMSYSERR_ERROR; @@ -610,6 +614,7 @@ MMRESULT WdmAudQueryMixerInfoByMMixer( IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN DWORD MixerId, IN UINT uMsg, IN LPVOID Parameter, IN DWORD Flags) @@ -617,6 +622,7 @@ LPMIXERLINEW MixLine; LPMIXERLINECONTROLSW MixControls; LPMIXERCONTROLDETAILS MixDetails; + HANDLE hMixer = NULL; MixLine = (LPMIXERLINEW)Parameter; MixControls = (LPMIXERLINECONTROLSW)Parameter; @@ -624,19 +630,23 @@ /* FIXME param checks */ + if (SoundDeviceInstance) + { + hMixer = SoundDeviceInstance->Handle; + } + switch(uMsg) { case MXDM_GETLINEINFO: - return WdmAudGetLineInfo(SoundDeviceInstance->Handle, MixLine, Flags); + return WdmAudGetLineInfo(hMixer, MixerId, MixLine, Flags); case MXDM_GETLINECONTROLS: - return WdmAudGetLineControls(SoundDeviceInstance->Handle, MixControls, Flags); + return WdmAudGetLineControls(hMixer, MixerId, MixControls, Flags); case MXDM_SETCONTROLDETAILS: - return WdmAudSetControlDetails(SoundDeviceInstance->Handle, MixDetails, Flags); - break; + return WdmAudSetControlDetails(hMixer, MixerId, MixDetails, Flags); case MXDM_GETCONTROLDETAILS: - return WdmAudGetControlDetails(SoundDeviceInstance->Handle, MixDetails, Flags); - break; + return WdmAudGetControlDetails(hMixer, MixerId, MixDetails, Flags); default: + DPRINT1("MixerId %lu, uMsg %lu, Parameter %p, Flags %lu\n", MixerId, uMsg, Parameter, Flags); SND_ASSERT(0); return MMSYSERR_NOTSUPPORTED; } Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Fri Dec 3 16:49:33 2010 @@ -69,24 +69,28 @@ MMRESULT WdmAudGetLineInfo( IN HANDLE hMixer, + IN DWORD MixerId, IN LPMIXERLINEW MixLine, IN ULONG Flags); MMRESULT WdmAudGetLineControls( IN HANDLE hMixer, + IN DWORD MixerId, IN LPMIXERLINECONTROLSW MixControls, IN ULONG Flags); MMRESULT WdmAudSetControlDetails( IN HANDLE hMixer, + IN DWORD MixerId, IN LPMIXERCONTROLDETAILS MixDetails, IN ULONG Flags); MMRESULT WdmAudGetControlDetails( IN HANDLE hMixer, + IN DWORD MixerId, IN LPMIXERCONTROLDETAILS MixDetails, IN ULONG Flags); @@ -115,6 +119,7 @@ MMRESULT WdmAudQueryMixerInfoByMMixer( IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN DWORD MixerId, IN UINT uMsg, IN LPVOID Parameter, IN DWORD Flags); @@ -146,87 +151,4 @@ MMRESULT WdmAudCleanupByMMixer(); -/* legacy.c */ - -MMRESULT -WdmAudCleanupByLegacy(); - -MMRESULT -WdmAudGetCapabilitiesByLegacy( - IN PSOUND_DEVICE SoundDevice, - IN DWORD DeviceId, - OUT PVOID Capabilities, - IN DWORD CapabilitiesSize); - -MMRESULT -WdmAudOpenSoundDeviceByLegacy(); - -MMRESULT -WdmAudCloseSoundDeviceByLegacy( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN PVOID Handle); - -MMRESULT -WdmAudGetDeviceInterfaceStringByLegacy( - IN MMDEVICE_TYPE DeviceType, - IN DWORD DeviceId, - IN LPWSTR Interface, - IN DWORD InterfaceLength, - OUT DWORD * InterfaceSize); - -MMRESULT -WdmAudSetMixerDeviceFormatByLegacy( - IN PSOUND_DEVICE_INSTANCE Instance, - IN DWORD DeviceId, - IN PWAVEFORMATEX WaveFormat, - IN DWORD WaveFormatSize); - -MMRESULT -WdmAudQueryMixerInfoByLegacy( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN UINT uMsg, - IN LPVOID Parameter, - IN DWORD Flags); - -MMRESULT -WdmAudSetWaveDeviceFormatByLegacy( - IN PSOUND_DEVICE_INSTANCE Instance, - IN DWORD DeviceId, - IN PWAVEFORMATEX WaveFormat, - IN DWORD WaveFormatSize); - -MMRESULT -WdmAudSetWaveStateByLegacy( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN BOOL bStart); - -MMRESULT -WdmAudResetStreamByLegacy( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN MMDEVICE_TYPE DeviceType, - IN BOOLEAN bStartReset); - -MMRESULT -WdmAudGetWavePositionByLegacy( - IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, - IN MMTIME* Time); - -MMRESULT -WriteFileEx_Committer2( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID OffsetPtr, - IN DWORD Length, - IN PSOUND_OVERLAPPED Overlap, - IN LPOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine); - -MMRESULT -WdmAudGetNumWdmDevsByLegacy( - IN MMDEVICE_TYPE DeviceType, - OUT DWORD* DeviceCount); - -DWORD -WINAPI -MixerEventThreadRoutine( - LPVOID Parameter); - #endif Modified: branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/reactos/l… ============================================================================== --- branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Fri Dec 3 16:49:33 2010 @@ -135,7 +135,7 @@ { \ if ( ! (parameter_condition) ) \ { \ - SND_ERR(L"FAILED parameter check: %hS\n", #parameter_condition); \ + SND_ERR(L"FAILED parameter check: %hS at File %S Line %lu\n", #parameter_condition, __FILE__, __LINE__); \ return MMSYSERR_INVALPARAM; \ } \ } @@ -199,10 +199,10 @@ typedef MMRESULT (*MMMIXERQUERY_FUNC) ( IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN DWORD DeviceId, IN UINT uMsg, IN LPVOID Parameter, IN DWORD Flags); - typedef MMRESULT (*MMWAVEQUERYFORMATSUPPORT_FUNC)( IN struct _SOUND_DEVICE* Device, Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Fri Dec 3 16:49:33 2010 @@ -20,6 +20,7 @@ MMRESULT MmeGetLineInfo( + IN UINT DeviceId, IN UINT Message, IN DWORD_PTR PrivateHandle, IN DWORD_PTR Parameter1, @@ -31,6 +32,21 @@ PMMFUNCTION_TABLE FunctionTable; //SND_TRACE(L"Getting mixer info %u\n", Message); + + if ( PrivateHandle == 0 ) + { + Result = GetSoundDevice(MIXER_DEVICE_TYPE, DeviceId, &SoundDevice); + + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + Result = FunctionTable->QueryMixerInfo(NULL, DeviceId, Message, (LPVOID)Parameter1, Parameter2); + return Result; + } VALIDATE_MMSYS_PARAMETER( PrivateHandle ); SoundDeviceInstance = (PSOUND_DEVICE_INSTANCE) PrivateHandle; @@ -46,7 +62,7 @@ if ( ! FunctionTable->QueryMixerInfo ) return MMSYSERR_NOTSUPPORTED; - Result = FunctionTable->QueryMixerInfo(SoundDeviceInstance, Message, (LPVOID)Parameter1, Parameter2); + Result = FunctionTable->QueryMixerInfo(SoundDeviceInstance, DeviceId, Message, (LPVOID)Parameter1, Parameter2); return Result; } @@ -100,7 +116,7 @@ (LPWAVEOPENDESC) Parameter1, /* unused */ Parameter2, (DWORD*) PrivateHandle); - + VALIDATE_MMSYS_PARAMETER(*(DWORD_PTR*)PrivateHandle); break; } @@ -113,7 +129,8 @@ case MXDM_GETCONTROLDETAILS : { - Result = MmeGetLineInfo(Message, + Result = MmeGetLineInfo(DeviceId, + Message, PrivateHandle, Parameter1, Parameter2); @@ -123,7 +140,8 @@ case MXDM_SETCONTROLDETAILS : { - Result = MmeGetLineInfo(Message, + Result = MmeGetLineInfo(DeviceId, + Message, PrivateHandle, Parameter1, Parameter2); @@ -133,7 +151,8 @@ case MXDM_GETLINECONTROLS : { - Result = MmeGetLineInfo(Message, + Result = MmeGetLineInfo(DeviceId, + Message, PrivateHandle, Parameter1, Parameter2); @@ -143,7 +162,8 @@ case MXDM_GETLINEINFO : { - Result = MmeGetLineInfo(Message, + Result = MmeGetLineInfo(DeviceId, + Message, PrivateHandle, Parameter1, Parameter2); Modified: branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Fri Dec 3 16:49:33 2010 @@ -89,7 +89,7 @@ if (Status != MM_STATUS_SUCCESS) { /* invalid context passed */ - DPRINT1("invalid context\n"); + DPRINT1("invalid context\n"); return Status; } @@ -98,7 +98,7 @@ if (!MixerInfo) { /* invalid mixer id */ - DPRINT1("invalid mixer id %lu\n", MixerId); + DPRINT1("invalid mixer id %lu\n", MixerId); return MM_STATUS_INVALID_PARAMETER; } @@ -115,8 +115,9 @@ MIXER_STATUS MMixerGetLineInfo( IN PMIXER_CONTEXT MixerContext, - IN HANDLE MixerHandle, - IN ULONG Flags, + IN HANDLE MixerHandle, + IN ULONG MixerId, + IN ULONG Flags, OUT LPMIXERLINEW MixerLine) { MIXER_STATUS Status; @@ -130,6 +131,17 @@ { /* invalid context passed */ return Status; + } + if ((Flags & (MIXER_OBJECTF_MIXER | MIXER_OBJECTF_HMIXER)) == MIXER_OBJECTF_MIXER) + { + /* caller passed mixer id */ + MixerHandle = (HANDLE)MMixerGetMixerInfoByIndex(MixerContext, MixerId); + + if (!MixerHandle) + { + /* invalid parameter */ + return MM_STATUS_INVALID_PARAMETER; + } } /* clear hmixer from flags */ @@ -220,6 +232,7 @@ MMixerGetLineControls( IN PMIXER_CONTEXT MixerContext, IN HANDLE MixerHandle, + IN ULONG MixerId, IN ULONG Flags, OUT LPMIXERLINECONTROLSW MixerLineControls) { @@ -236,6 +249,18 @@ { /* invalid context passed */ return Status; + } + + if ((Flags & (MIXER_OBJECTF_MIXER | MIXER_OBJECTF_HMIXER)) == MIXER_OBJECTF_MIXER) + { + /* caller passed mixer id */ + MixerHandle = (HANDLE)MMixerGetMixerInfoByIndex(MixerContext, MixerId); + + if (!MixerHandle) + { + /* invalid parameter */ + return MM_STATUS_INVALID_PARAMETER; + } } Flags &= ~MIXER_OBJECTF_HMIXER; @@ -312,6 +337,7 @@ MMixerSetControlDetails( IN PMIXER_CONTEXT MixerContext, IN HANDLE MixerHandle, + IN ULONG MixerId, IN ULONG Flags, OUT LPMIXERCONTROLDETAILS MixerControlDetails) { @@ -328,6 +354,18 @@ { /* invalid context passed */ return Status; + } + + if ((Flags & (MIXER_OBJECTF_MIXER | MIXER_OBJECTF_HMIXER)) == MIXER_OBJECTF_MIXER) + { + /* caller passed mixer id */ + MixerHandle = (HANDLE)MMixerGetMixerInfoByIndex(MixerContext, MixerId); + + if (!MixerHandle) + { + /* invalid parameter */ + return MM_STATUS_INVALID_PARAMETER; + } } /* get mixer info */ @@ -362,6 +400,7 @@ MMixerGetControlDetails( IN PMIXER_CONTEXT MixerContext, IN HANDLE MixerHandle, + IN ULONG MixerId, IN ULONG Flags, OUT LPMIXERCONTROLDETAILS MixerControlDetails) { @@ -378,6 +417,18 @@ { /* invalid context passed */ return Status; + } + + if ((Flags & (MIXER_OBJECTF_MIXER | MIXER_OBJECTF_HMIXER)) == MIXER_OBJECTF_MIXER) + { + /* caller passed mixer id */ + MixerHandle = (HANDLE)MMixerGetMixerInfoByIndex(MixerContext, MixerId); + + if (!MixerHandle) + { + /* invalid parameter */ + return MM_STATUS_INVALID_PARAMETER; + } } /* get mixer info */ Modified: branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] Fri Dec 3 16:49:33 2010 @@ -149,7 +149,8 @@ MIXER_STATUS MMixerGetLineInfo( IN PMIXER_CONTEXT MixerContext, - IN HANDLE MixerHandle, + IN HANDLE MixerHandle, + IN ULONG MixerId, IN ULONG Flags, OUT LPMIXERLINEW MixerLine); @@ -157,6 +158,7 @@ MMixerGetLineControls( IN PMIXER_CONTEXT MixerContext, IN HANDLE MixerHandle, + IN ULONG MixerId, IN ULONG Flags, OUT LPMIXERLINECONTROLSW MixerLineControls); @@ -164,6 +166,7 @@ MMixerSetControlDetails( IN PMIXER_CONTEXT MixerContext, IN HANDLE MixerHandle, + IN ULONG MixerId, IN ULONG Flags, OUT LPMIXERCONTROLDETAILS MixerControlDetails); @@ -171,6 +174,7 @@ MMixerGetControlDetails( IN PMIXER_CONTEXT MixerContext, IN HANDLE MixerHandle, + IN ULONG MixerId, IN ULONG Flags, OUT LPMIXERCONTROLDETAILS MixerControlDetails);

13 years, 9 months

[akhaldi] 49930: [CMAKE] - Add dllname optional parameter to the import lib creation macro. - Use it in the kernel.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 3 16:17:41 2010 New Revision: 49930 URL: http://svn.reactos.org/svn/reactos?rev=49930&view=rev Log: [CMAKE] - Add dllname optional parameter to the import lib creation macro. - Use it in the kernel. Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=499… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Dec 3 16:17:41 2010 @@ -196,9 +196,16 @@ macro(add_importlib_target _spec_file) get_filename_component(_name ${_spec_file} NAME_WE) + + if (${ARGC} GREATER 1) + set(DLLNAME_OPTION "-n=${ARGV1}") + else() + set(DLLNAME_OPTION "") + endif() + add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - COMMAND native-spec2def -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def ${DLLNAME_OPTION} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) add_custom_target( Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Fri Dec 3 16:17:41 2010 @@ -435,4 +435,4 @@ add_minicd_target(ntoskrnl reactos ntoskrnl.exe) add_livecd_target(ntoskrnl reactos/system32) -add_importlib_target(ntoskrnl.spec) +add_importlib_target(ntoskrnl.spec ntoskrnl.exe)

13 years, 9 months

[jimtabor] 49929: [Win32k|User32] - Fixed SendNotifyMessage, thanks to Michael Martin callback changes. Fixed DispatchMessage when dealing with thread errors. Fixed all but one of the Get/PeekMessa...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 3 15:34:06 2010 New Revision: 49929 URL: http://svn.reactos.org/svn/reactos?rev=49929&view=rev Log: [Win32k|User32] - Fixed SendNotifyMessage, thanks to Michael Martin callback changes. Fixed DispatchMessage when dealing with thread errors. Fixed all but one of the Get/PeekMessage wine tests. Fixed attaching threads to process information. Plus other fixes. - Implemented support for QS bits, ReplyMessage (not fully correct), and others. - Tested everything here, please post regressions so I can add more applications to the test list. This patch is synced with 49720 and 49772. After that there are graphic issues. - Credits goes to wine for helping with diagnosing issues in the ReactOS message system. Modified: trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Fri Dec 3 15:34:06 2010 @@ -3182,7 +3182,7 @@ SetCapture(mt.OwnerWnd); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, mt.OwnerWnd); - ERR("MenuTrackMenu 1\n"); + FIXME("MenuTrackMenu 1\n"); while (! fEndMenu) { PVOID menu = ValidateHandle(mt.CurrentMenu, VALIDATE_TYPE_MENU); @@ -3210,6 +3210,7 @@ } WaitMessage(); } + //FIXME("MenuTrackMenu loop 1\n"); } /* check if EndMenu() tried to cancel us, by posting this message */ @@ -3417,6 +3418,7 @@ { PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); DispatchMessageW( &msg ); + //FIXME("MenuTrackMenu loop 2\n"); continue; } @@ -3427,8 +3429,9 @@ if (fRemove && !(mt.TrackFlags & TF_SKIPREMOVE) ) PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); else mt.TrackFlags &= ~TF_SKIPREMOVE; - } - ERR("MenuTrackMenu 2\n"); + //FIXME("MenuTrackMenu loop 3\n"); + } + FIXME("MenuTrackMenu 2\n"); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, NULL); SetCapture(NULL); /* release the capture */ Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Fri Dec 3 15:34:06 2010 @@ -1097,7 +1097,6 @@ InSendMessage(VOID) { PCLIENTTHREADINFO pcti = GetWin32ClientInfo()->pClientThreadInfo; -// FIXME("ISM %x\n",pcti); if ( pcti ) { if (pcti->CTI_flags & CTI_INSENDMESSAGE) @@ -1118,7 +1117,6 @@ LPVOID lpReserved) { PCLIENTTHREADINFO pcti = GetWin32ClientInfo()->pClientThreadInfo; -// FIXME("ISMEX %x\n",pcti); if (pcti && !(pcti->CTI_flags & CTI_INSENDMESSAGE)) return ISMEX_NOSEND; else @@ -1442,6 +1440,12 @@ Class = DesktopPtrToUser(Wnd->pcls); WndProc = NULL; + + if ( Wnd->head.pti != GetW32ThreadInfo()) + { // Must be inside the same thread! + SetLastError( ERROR_MESSAGE_SYNC_ONLY ); + return 0; + } /* This is the message exchange for user32. If there's a need to monitor messages, do it here! @@ -1586,11 +1590,16 @@ MSG UnicodeMsg; PWND Wnd; + if ( lpmsg->message & ~WM_MAXIMUM ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (lpmsg->hwnd != NULL) { Wnd = ValidateHwnd(lpmsg->hwnd); - if (!Wnd || Wnd->head.pti != GetW32ThreadInfo()) - return 0; + if (!Wnd) return 0; } else Wnd = NULL; @@ -1602,7 +1611,7 @@ if ( lpmsg->message == WM_SYSTIMER ) return NtUserDispatchMessage( (PMSG)lpmsg ); - _SEH2_TRY // wine does this. + _SEH2_TRY // wine does this. Hint: Prevents call to another thread.... { Ret = WndProc(lpmsg->hwnd, lpmsg->message, @@ -1613,7 +1622,6 @@ { } _SEH2_END; - } else if (Wnd != NULL) { @@ -1654,11 +1662,16 @@ LRESULT Ret = 0; PWND Wnd; + if ( lpmsg->message & ~WM_MAXIMUM ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (lpmsg->hwnd != NULL) { Wnd = ValidateHwnd(lpmsg->hwnd); - if (!Wnd || Wnd->head.pti != GetW32ThreadInfo()) - return 0; + if (!Wnd) return 0; } else Wnd = NULL; @@ -1795,6 +1808,42 @@ return Res; } +BOOL WINAPI +PeekMessageWorker(PNTUSERGETMESSAGEINFO pInfo, + HWND hWnd, + UINT wMsgFilterMin, + UINT wMsgFilterMax, + UINT wRemoveMsg) +{ + PCLIENTINFO pci; + PCLIENTTHREADINFO pcti; + pci = GetWin32ClientInfo(); + pcti = pci->pClientThreadInfo; + + if (!hWnd && pci && pcti) + { + pci->cSpins++; + + if ((pci->cSpins >= 100) && (pci->dwTIFlags & TIF_SPINNING)) + { // Yield after 100 spin cycles and ready to swap vinyl. + if (!(pci->dwTIFlags & TIF_WAITFORINPUTIDLE)) + { // Not waiting for idle event. + if (!pcti->fsChangeBits && !pcti->fsWakeBits) + { // No messages are available. + if ((GetTickCount() - pcti->tickLastMsgChecked) > 1000) + { // Up the msg read count if over 1 sec. + NtUserGetThreadState(THREADSTATE_UPTIMELASTREAD); + } + pci->cSpins = 0; + ZwYieldExecution(); + FIXME("seeSpins!\n"); + return FALSE; + } + } + } + } + return NtUserPeekMessage(pInfo, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); +} /* * @implemented @@ -1812,7 +1861,7 @@ PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); MsgConversionCleanup(lpMsg, TRUE, FALSE, NULL); - Res = NtUserPeekMessage(&Info, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); + Res = PeekMessageWorker(&Info, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); if (-1 == (int) Res || !Res) { return FALSE; @@ -1865,7 +1914,7 @@ PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); MsgConversionCleanup(lpMsg, FALSE, FALSE, NULL); - Res = NtUserPeekMessage(&Info, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); + Res = PeekMessageWorker(&Info, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg); if (-1 == (int) Res || !Res) { return FALSE; @@ -2567,7 +2616,8 @@ WINAPI RealGetQueueStatus(UINT flags) { - if (flags & ~(QS_SMRESULT|QS_ALLPOSTMESSAGE|QS_ALLINPUT)) + #define QS_TEMPALLINPUT 255 // ATM, do not support QS_RAWINPUT + if (flags & ~(QS_SMRESULT|QS_ALLPOSTMESSAGE|QS_TEMPALLINPUT)) { SetLastError( ERROR_INVALID_FLAGS ); return 0; @@ -2802,6 +2852,8 @@ LPHANDLE RealHandles; HANDLE MessageQueueHandle; DWORD Result; + PCLIENTINFO pci; + PCLIENTTHREADINFO pcti; if (dwFlags & ~(MWMO_WAITALL | MWMO_ALERTABLE | MWMO_INPUTAVAILABLE)) { @@ -2809,14 +2861,21 @@ return WAIT_FAILED; } -/* - if (dwFlags & MWMO_INPUTAVAILABLE) + pci = GetWin32ClientInfo(); + if (!pci) return WAIT_FAILED; + + pcti = pci->pClientThreadInfo; + if (pcti && ( !nCount || !(dwFlags & MWMO_WAITALL) )) { - RealGetQueueStatus(dwWakeMask); + if ( (pcti->fsChangeBits & LOWORD(dwWakeMask)) || + ( (dwFlags & MWMO_INPUTAVAILABLE) && (pcti->fsWakeBits & LOWORD(dwWakeMask)) ) ) + { + //FIXME("Chg 0x%x Wake 0x%x Mask 0x%x nCnt %d\n",pcti->fsChangeBits, pcti->fsWakeBits, dwWakeMask, nCount); + return nCount; + } } - */ - - MessageQueueHandle = NtUserMsqSetWakeMask(dwWakeMask); + + MessageQueueHandle = NtUserMsqSetWakeMask(MAKELONG(dwWakeMask, dwFlags)); if (MessageQueueHandle == NULL) { SetLastError(0); /* ? */ @@ -2840,7 +2899,7 @@ HeapFree(GetProcessHeap(), 0, RealHandles); NtUserMsqClearWakeMask(); - + //FIXME("Result 0X%x\n",Result); return Result; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri Dec 3 15:34:06 2010 @@ -2104,7 +2104,8 @@ THREADSTATE_PROGMANWINDOW, THREADSTATE_TASKMANWINDOW, THREADSTATE_GETMESSAGETIME, - THREADSTATE_GETINPUTSTATE + THREADSTATE_GETINPUTSTATE, + THREADSTATE_UPTIMELASTREAD }; DWORD_PTR 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] Fri Dec 3 15:34:06 2010 @@ -8,10 +8,23 @@ #define MSQ_ISEVENT 2 #define MSQ_SENTNOWAIT 0x80000000 +#define QSIDCOUNTS 6 + +typedef enum _QS_ROS_TYPES +{ + QSRosKey = 0, + QSRosMouseMove, + QSRosMouseButton, + QSRosPostMessage, + QSRosSendMessage, + QSRosHotKey, +}QS_ROS_TYPES,*PQS_ROS_TYPES; + typedef struct _USER_MESSAGE { LIST_ENTRY ListEntry; MSG Msg; + DWORD QS_Flags; } USER_MESSAGE, *PUSER_MESSAGE; struct _USER_MESSAGE_QUEUE; @@ -20,8 +33,10 @@ { LIST_ENTRY ListEntry; MSG Msg; + DWORD QS_Flags; // Original QS bits used to create this message. PKEVENT CompletionEvent; LRESULT* Result; + LRESULT lResult; struct _USER_MESSAGE_QUEUE* SenderQueue; SENDASYNCPROC CompletionCallback; ULONG_PTR CompletionCallbackContext; @@ -31,16 +46,6 @@ BOOL HasPackedLParam; } USER_SENT_MESSAGE, *PUSER_SENT_MESSAGE; -typedef struct _USER_SENT_MESSAGE_NOTIFY -{ - SENDASYNCPROC CompletionCallback; - ULONG_PTR CompletionCallbackContext; - LRESULT Result; - HWND hWnd; - UINT Msg; - LIST_ENTRY ListEntry; -} USER_SENT_MESSAGE_NOTIFY, *PUSER_SENT_MESSAGE_NOTIFY; - typedef struct _USER_MESSAGE_QUEUE { /* Reference counter, only access this variable with interlocked functions! */ @@ -52,8 +57,6 @@ LIST_ENTRY SentMessagesListHead; /* Queue of messages posted to the queue. */ LIST_ENTRY PostedMessagesListHead; - /* Queue of sent-message notifies for the queue. */ - LIST_ENTRY NotifyMessagesListHead; /* Queue for hardware messages for the queue. */ LIST_ENTRY HardwareMessagesListHead; /* Lock for the hardware message list. */ @@ -76,8 +79,6 @@ ULONG LastMsgRead; /* Current window with focus (ie. receives keyboard input) for this queue. */ HWND FocusWindow; - /* Count of paints pending. */ - ULONG PaintCount; /* Current active window for this queue. */ HWND ActiveWindow; /* Current capture window for this queue. */ @@ -92,9 +93,11 @@ PTHRDCARETINFO CaretInfo; /* queue state tracking */ - WORD WakeMask; - WORD QueueBits; - WORD ChangedBits; + // Send list QS_SENDMESSAGE + // Post list QS_POSTMESSAGE|QS_HOTKEY|QS_PAINT|QS_TIMER|QS_KEY + // Hard list QS_MOUSE|QS_KEY only + // Accounting of queue bit sets, the rest are flags. QS_TIMER QS_PAINT counts are handled in thread information. + DWORD nCntsQBits[QSIDCOUNTS]; // QS_KEY QS_MOUSEMOVE QS_MOUSEBUTTON QS_POSTMESSAGE QS_SENDMESSAGE QS_HOTKEY /* extra message information */ LPARAM ExtraInfo; @@ -130,6 +133,7 @@ IN PWND Window, IN UINT MsgFilterLow, IN UINT MsgFilterHigh, + IN UINT QSflags, OUT PMSG Message); BOOL APIENTRY co_MsqPeekHardwareMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, @@ -137,6 +141,7 @@ IN PWND Window, IN UINT MsgFilterLow, IN UINT MsgFilterHigh, + IN UINT QSflags, OUT MSG* pMsg); BOOL APIENTRY co_MsqPeekMouseMove(IN PUSER_MESSAGE_QUEUE MessageQueue, @@ -220,7 +225,6 @@ __inline BOOL MsqIsSignaled( PUSER_MESSAGE_QUEUE queue ); __inline VOID MsqSetQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); -__inline VOID MsqClearQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); BOOL APIENTRY IntInitMessagePumpHook(); BOOL APIENTRY IntUninitMessagePumpHook(); #define MAKE_LONG(x, y) ((((y) & 0xFFFF) << 16) | ((x) & 0xFFFF)) @@ -285,5 +289,9 @@ VOID FASTCALL IdlePing(VOID); VOID FASTCALL IdlePong(VOID); +BOOL FASTCALL co_MsqReplyMessage(LRESULT); +UINT FASTCALL GetWakeMask(UINT, UINT); +VOID FASTCALL MsqWakeQueue(PUSER_MESSAGE_QUEUE,DWORD,BOOL); +VOID FASTCALL ClearMsgBitsMask(PUSER_MESSAGE_QUEUE,UINT); /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Fri Dec 3 15:34:06 2010 @@ -161,6 +161,7 @@ struct _DESKTOP* rpdeskStartup; PCLS pclsPrivateList; PCLS pclsPublicList; + INT cThreads; DWORD dwhmodLibLoadedMask; HANDLE ahmodLibLoaded[CLIBS]; struct _WINSTATION_OBJECT *prpwinsta; Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Fri Dec 3 15:34:06 2010 @@ -268,6 +268,9 @@ Win32Thread->TIF_flags &= ~TIF_INCLEANUP; co_IntDestroyCaret(Win32Thread); Win32Thread->ppi = PsGetCurrentProcessWin32Process(); + Win32Thread->ptiSibling = Win32Thread->ppi->ptiList; + Win32Thread->ppi->ptiList = Win32Thread; + Win32Thread->ppi->cThreads++; if (Win32Thread->rpdesk && !Win32Thread->pDeskInfo) { Win32Thread->pDeskInfo = Win32Thread->rpdesk->pDeskInfo; @@ -298,16 +301,39 @@ else { DPRINT1("No TEB for this Thread!\n"); + // System thread running! Now SendMessage should be okay. + Win32Thread->pcti = &Win32Thread->cti; } Win32Thread->pEThread = Thread; } else { + PTHREADINFO pti; PSINGLE_LIST_ENTRY e; DPRINT("Destroying W32 thread TID:%d at IRQ level: %lu\n", Thread->Cid.UniqueThread, KeGetCurrentIrql()); Win32Thread->TIF_flags |= TIF_INCLEANUP; + pti = Win32Thread->ppi->ptiList; + if (pti == Win32Thread) + { + Win32Thread->ppi->ptiList = Win32Thread->ptiSibling; + Win32Thread->ppi->cThreads--; + } + else + { + do + { + if (pti->ptiSibling == Win32Thread) + { + pti->ptiSibling = Win32Thread->ptiSibling; + Win32Thread->ppi->cThreads--; + break; + } + pti = pti->ptiSibling; + } + while (pti); + } DceFreeThreadDCE(Win32Thread); HOOK_DestroyThreadHooks(Thread); EVENT_DestroyThreadEvents(Thread); @@ -332,9 +358,7 @@ e = PopEntryList(&Win32Thread->ReferencesList); } - IntSetThreadDesktop(NULL, - TRUE); - + IntSetThreadDesktop(NULL, TRUE); PsSetThreadWin32Thread(Thread, NULL); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Fri Dec 3 15:34:06 2010 @@ -1926,7 +1926,7 @@ RtlZeroMemory(&ctiSave, sizeof(CLIENTTHREADINFO)); - if (W32Thread->pcti && OldDesktop) + if (W32Thread->pcti && OldDesktop && NtCurrentTeb()) { RtlCopyMemory(&ctiSave, W32Thread->pcti, sizeof(CLIENTTHREADINFO)); DPRINT("Free ClientThreadInfo\n"); @@ -1934,7 +1934,7 @@ W32Thread->pcti = NULL; } - if (!W32Thread->pcti && DesktopObject) + if (!W32Thread->pcti && DesktopObject && NtCurrentTeb()) { DPRINT("Allocate ClientThreadInfo\n"); W32Thread->pcti = DesktopHeapAlloc( DesktopObject, 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] Fri Dec 3 15:34:06 2010 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window classes - * FILE: subsys/win32k/ntuser/class.c + * FILE: subsystems/win32/win32k/ntuser/input.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISION HISTORY: * 06-06-2001 CSH Created @@ -205,13 +205,6 @@ IO_STATUS_BLOCK Iosb; NTSTATUS Status; MOUSE_ATTRIBUTES MouseAttr; - - Status = Win32kInitWin32Thread(PsGetCurrentThread()); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Win32K: Failed making keyboard thread a win32 thread.\n"); - return; //(Status); - } KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); @@ -1399,8 +1392,9 @@ FocusMessageQueue->Desktop->pDeskInfo->LastInputWasKbd = TRUE; Msg.pt = gpsi->ptCursor; - - MsqPostMessage(FocusMessageQueue, &Msg, FALSE, QS_KEY); + // Post to hardware queue, based on the first part of wine "some GetMessage tests" + // in test_PeekMessage() + MsqPostMessage(FocusMessageQueue, &Msg, TRUE, QS_KEY); } else { 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] Fri Dec 3 15:34:06 2010 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Messages -* FILE: subsys/win32k/ntuser/message.c +* FILE: subsystems/win32/win32k/ntuser/message.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISION HISTORY: * 06-06-2001 CSH Created @@ -342,12 +342,17 @@ pti = PsGetCurrentThreadWin32Thread(); - if ( pti && pti->pDeskInfo && pti == ptiForeground ) + if ( pti ) { - if ( pti->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE) || - pti->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE) ) + pti->pClientInfo->cSpins = 0; // Reset spins. + + if ( pti->pDeskInfo && pti == ptiForeground ) { - co_HOOK_CallHooks(WH_FOREGROUNDIDLE,HC_ACTION,0,0); + if ( pti->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE) || + pti->pDeskInfo->fsHooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE) ) + { + co_HOOK_CallHooks(WH_FOREGROUNDIDLE,HC_ACTION,0,0); + } } } @@ -369,6 +374,25 @@ { KeClearEvent(ppi->InputIdleEvent); } +} + +UINT FASTCALL +GetWakeMask(UINT first, UINT last ) +{ + UINT mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ + + if (first || last) + { + if ((first <= WM_KEYLAST) && (last >= WM_KEYFIRST)) mask |= QS_KEY; + if ( ((first <= WM_MOUSELAST) && (last >= WM_MOUSEFIRST)) || + ((first <= WM_NCMOUSELAST) && (last >= WM_NCMOUSEFIRST)) ) mask |= QS_MOUSE; + if ((first <= WM_TIMER) && (last >= WM_TIMER)) mask |= QS_TIMER; + if ((first <= WM_SYSTIMER) && (last >= WM_SYSTIMER)) mask |= QS_TIMER; + if ((first <= WM_PAINT) && (last >= WM_PAINT)) mask |= QS_PAINT; + } + else mask = QS_ALLINPUT; + + return mask; } static VOID FASTCALL @@ -423,6 +447,12 @@ } pti = PsGetCurrentThreadWin32Thread(); + + if ( Window->head.pti != pti) + { + SetLastWin32Error( ERROR_MESSAGE_SYNC_ONLY ); + return 0; + } if (((pMsg->message == WM_SYSTIMER) || (pMsg->message == WM_TIMER)) && @@ -503,24 +533,34 @@ } /* -* Internal version of PeekMessage() doing all the work -*/ + * Internal version of PeekMessage() doing all the work + */ BOOL FASTCALL co_IntPeekMessage( PMSG Msg, PWND Window, UINT MsgFilterMin, UINT MsgFilterMax, - UINT RemoveMsg ) + UINT RemoveMsg, + BOOL bGMSG ) { PTHREADINFO pti; + PCLIENTINFO pci; LARGE_INTEGER LargeTickCount; PUSER_MESSAGE_QUEUE ThreadQueue; BOOL RemoveMessages; + UINT ProcessMask; + BOOL Hit = FALSE; pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; + pci = pti->pClientInfo; RemoveMessages = RemoveMsg & PM_REMOVE; + ProcessMask = HIWORD(RemoveMsg); + + /* Hint, "If wMsgFilterMin and wMsgFilterMax are both zero, PeekMessage returns + all available messages (that is, no range filtering is performed)". */ + if (!ProcessMask) ProcessMask = (QS_ALLPOSTMESSAGE|QS_ALLINPUT); IdlePong(); @@ -528,16 +568,49 @@ { KeQueryTickCount(&LargeTickCount); ThreadQueue->LastMsgRead = LargeTickCount.u.LowPart; + pti->pcti->tickLastMsgChecked = LargeTickCount.u.LowPart; /* Dispatch sent messages here. */ - while (co_MsqDispatchOneSentMessage(ThreadQueue)) ; + while ( co_MsqDispatchOneSentMessage(ThreadQueue) ) + { + /* if some PM_QS* flags were specified, only handle sent messages from now on */ + if (HIWORD(RemoveMsg) && !bGMSG) Hit = TRUE; // wine does this; ProcessMask = QS_SENDMESSAGE; + } + if (Hit) return FALSE; + + /* Clear changed bits so we can wait on them if we don't find a message */ + if (ProcessMask & QS_POSTMESSAGE) + { + pti->pcti->fsChangeBits &= ~(QS_POSTMESSAGE | QS_HOTKEY | QS_TIMER); + if (MsgFilterMin == 0 && MsgFilterMax == 0) // wine hack does this; ~0U) + { + pti->pcti->fsChangeBits &= ~QS_ALLPOSTMESSAGE; + } + } + + if (ProcessMask & QS_INPUT) + { + pti->pcti->fsChangeBits &= ~QS_INPUT; + } + + /* Now check for normal messages. */ + if ((ProcessMask & QS_POSTMESSAGE) && + MsqPeekMessage( ThreadQueue, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + ProcessMask, + Msg )) + { + return TRUE; + } /* Now look for a quit message. */ - if (ThreadQueue->QuitPosted) { /* According to the PSDK, WM_QUIT messages are always returned, regardless - of the filter specified */ + of the filter specified */ Msg->hwnd = NULL; Msg->message = WM_QUIT; Msg->wParam = ThreadQueue->QuitExitCode; @@ -545,49 +618,48 @@ if (RemoveMessages) { ThreadQueue->QuitPosted = FALSE; + ClearMsgBitsMask(ThreadQueue, QS_POSTMESSAGE); + pti->pcti->fsWakeBits &= ~QS_ALLPOSTMESSAGE; + pti->pcti->fsChangeBits &= ~QS_ALLPOSTMESSAGE; } - return TRUE; } - /* Now check for normal messages. */ - if (MsqPeekMessage( ThreadQueue, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - Msg )) + /* Check for hardware events. */ + if ((ProcessMask & QS_MOUSE) && + co_MsqPeekMouseMove( ThreadQueue, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + Msg )) { return TRUE; } - /* Check for hardware events. */ - if(co_MsqPeekMouseMove(ThreadQueue, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - Msg )) + if ((ProcessMask & QS_INPUT) && + co_MsqPeekHardwareMessage( ThreadQueue, + RemoveMessages, + Window, + MsgFilterMin, + MsgFilterMax, + ProcessMask, + Msg)) { return TRUE; } - if(co_MsqPeekHardwareMessage(ThreadQueue, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - Msg)) - { - return TRUE; - } - /* Check for sent messages again. */ - while (co_MsqDispatchOneSentMessage(ThreadQueue)) - ; + while ( co_MsqDispatchOneSentMessage(ThreadQueue) ) + { + if (HIWORD(RemoveMsg) && !bGMSG) Hit = TRUE; + } + if (Hit) return FALSE; /* Check for paint messages. */ - if( IntGetPaintMessage( Window, + if ((ProcessMask & QS_PAINT) && + pti->cPaintsReady && + IntGetPaintMessage( Window, MsgFilterMin, MsgFilterMax, pti, @@ -597,7 +669,11 @@ return TRUE; } - if (PostTimerMessages(Window)) + /* This is correct, check for the current threads timers waiting to be + posted to this threads message queue. If any we loop again. + */ + if ((ProcessMask & QS_TIMER) && + PostTimerMessages(Window)) { continue; } @@ -718,11 +794,12 @@ do { - if ( co_IntPeekMessage( &Msg, - Window, - MsgFilterMin, - MsgFilterMax, - PM_NOREMOVE)) + if ( co_IntPeekMessage( &Msg, // Dont reenter! + Window, + MsgFilterMin, + MsgFilterMax, + MAKELONG( PM_NOREMOVE, GetWakeMask( MsgFilterMin, MsgFilterMax)), + TRUE ) ) // act like GetMessage. { return TRUE; } @@ -754,6 +831,7 @@ BOOL bGMSG ) { PWND Window; + PTHREADINFO pti; BOOL Present = FALSE; if ( hWnd == HWND_TOPMOST || hWnd == HWND_BROADCAST ) @@ -781,13 +859,19 @@ MsgFilterMax = 0; } + if (bGMSG) + { + RemoveMsg |= ((GetWakeMask( MsgFilterMin, MsgFilterMax ))<< 16); + } + do { Present = co_IntPeekMessage( pMsg, Window, MsgFilterMin, MsgFilterMax, - RemoveMsg ); + RemoveMsg, + bGMSG ); if (Present) { // The WH_GETMESSAGE hook enables an application to monitor messages about to @@ -796,13 +880,19 @@ co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)pMsg); if ( bGMSG ) - return (WM_QUIT != pMsg->message); + { + Present = (WM_QUIT != pMsg->message); + break; + } } if ( bGMSG ) { if ( !co_IntWaitMessage(Window, MsgFilterMin, MsgFilterMax) ) - return -1; + { + Present = -1; + break; + } } else { @@ -821,6 +911,14 @@ } while( bGMSG && !Present ); + pti = PsGetCurrentThreadWin32Thread(); + // Been spinning, time to swap vinyl... + if (pti->pClientInfo->cSpins >= 100) + { + // Clear the spin cycle to fix the mix. + pti->pClientInfo->cSpins = 0; + //if (!(pti->TIF_flags & TIF_SPINNING)) FIXME need to swap vinyl.. + } return Present; } @@ -947,7 +1045,7 @@ MsqPostQuitMessage(Window->head.pti->MessageQueue, wParam); } else - { + { Message.hwnd = Wnd; Message.message = Msg; Message.wParam = wParam; @@ -1283,7 +1381,9 @@ Message->Msg.lParam = lParamPacked; Message->CompletionEvent = NULL; Message->Result = 0; - Message->SenderQueue = NULL; //Win32Thread->MessageQueue; + Message->lResult = 0; + Message->QS_Flags = 0; + Message->SenderQueue = NULL; // mjmartin, you are right! This is null. Win32Thread->MessageQueue; IntReferenceMessageQueue(Window->head.pti->MessageQueue); Message->CompletionCallback = CompletionCallback; @@ -1291,6 +1391,9 @@ Message->HookMessage = MSQ_NORMAL | MSQ_SENTNOWAIT; Message->HasPackedLParam = (lParamBufferSize > 0); + Message->QS_Flags = QS_SENDMESSAGE; + MsqWakeQueue(Window->head.pti->MessageQueue, QS_SENDMESSAGE, FALSE); + InsertTailList(&Window->head.pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); IntDereferenceMessageQueue(Window->head.pti->MessageQueue); @@ -1468,7 +1571,7 @@ WPARAM wParam, LPARAM lParam ) { - BOOL Result = TRUE; + BOOL Ret = TRUE; if (FindMsgMemory(Msg) != 0) { @@ -1491,37 +1594,28 @@ UserSendNotifyMessage(DesktopWindow->head.h, Msg, wParam, lParam); for (i = 0; List[i]; i++) { - UserSendNotifyMessage(List[i], Msg, wParam, lParam); + Ret = UserSendNotifyMessage(List[i], Msg, wParam, lParam); + if (!Ret) + { + DPRINT1("SendNotifyMessage: Failed in Broadcast!\n"); + break; + } } ExFreePool(List); } } else { - ULONG_PTR PResult; - PTHREADINFO pti; - PWND Window; - - if ( !(Window = UserGetWindowObject(hWnd)) ) return FALSE; - - pti = PsGetCurrentThreadWin32Thread(); - - if (Window->head.pti->MessageQueue != pti->MessageQueue) - { // Send message w/o waiting for it. - Result = UserPostMessage(hWnd, Msg, wParam, lParam); - } - else - { // Handle message and callback. - Result = co_IntSendMessageTimeoutSingle( hWnd, - Msg, - wParam, - lParam, - SMTO_NORMAL, - 0, - &PResult ); - } - } - return Result; + ULONG_PTR lResult = 0; + Ret = co_IntSendMessageWithCallBack( hWnd, + Msg, + wParam, + lParam, + NULL, + 0, + &lResult); + } + return Ret; } @@ -1537,15 +1631,13 @@ // wine: Changes &= (QS_ALLINPUT|QS_ALLPOSTMESSAGE|QS_SMRESULT); - Result = MAKELONG(Queue->ChangedBits & Changes, Queue->QueueBits & Changes); - - if (pti->pcti) - { - pti->pcti->fsChangeBits = Queue->ChangedBits; - pti->pcti->fsChangeBits &= ~Changes; - } - - Queue->ChangedBits &= ~Changes; + /* High word, types of messages currently in the queue. + Low word, types of messages that have been added to the queue and that + are still in the queue + */ + Result = MAKELONG(pti->pcti->fsChangeBits & Changes, pti->pcti->fsWakeBits & Changes); + + pti->pcti->fsChangeBits &= ~Changes; return Result; } @@ -1684,9 +1776,9 @@ BOOL ret; UserEnterExclusive(); - + DPRINT("NtUserWaitMessage Enter\n"); ret = co_IntWaitMessage(NULL, 0, 0); - + DPRINT("NtUserWaitMessage Leave\n"); UserLeave(); return ret; @@ -2338,6 +2430,13 @@ if (dwMilliseconds != INFINITE) Timeout.QuadPart = (LONGLONG) dwMilliseconds * (LONGLONG) -10000; + W32Process->W32PF_flags |= W32PF_WAITFORINPUTIDLE; + for (pti = W32Process->ptiList; pti; pti = pti->ptiSibling) + { + pti->TIF_flags |= TIF_WAITFORINPUTIDLE; + pti->pClientInfo->dwTIFlags = pti->TIF_flags; + } + DPRINT("WFII: ppi 0x%x\n",W32Process); DPRINT("WFII: waiting for %p\n", Handles[1] ); do @@ -2368,7 +2467,7 @@ case STATUS_WAIT_2: { MSG Msg; - co_IntPeekMessage( &Msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE ); + co_IntGetPeekMessage( &Msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE, FALSE); DPRINT1("WFII: WAIT 2\n"); } break; @@ -2387,6 +2486,12 @@ while (TRUE); WaitExit: + for (pti = W32Process->ptiList; pti; pti = pti->ptiSibling) + { + pti->TIF_flags &= ~TIF_WAITFORINPUTIDLE; + pti->pClientInfo->dwTIFlags = pti->TIF_flags; + } + W32Process->W32PF_flags &= ~W32PF_WAITFORINPUTIDLE; ObDereferenceObject(Process); UserLeave(); return Status; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Fri Dec 3 15:34:06 2010 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Misc User funcs - * FILE: subsystem/win32/win32k/ntuser/misc.c + * FILE: subsystems/win32/win32k/ntuser/misc.c * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) * REVISION HISTORY: * 2003/05/22 Created @@ -102,6 +102,8 @@ break; case THREADSTATE_INSENDMESSAGE: { + PUSER_SENT_MESSAGE Message; + PLIST_ENTRY Entry; PUSER_MESSAGE_QUEUE MessageQueue = ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue; DPRINT1("THREADSTATE_INSENDMESSAGE\n"); @@ -109,19 +111,37 @@ ret = ISMEX_NOSEND; if (!IsListEmpty(&MessageQueue->SentMessagesListHead)) { - ret = ISMEX_SEND; + Entry = MessageQueue->SentMessagesListHead.Flink; + Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); + + if (Message->SenderQueue) + ret = ISMEX_SEND; + else + { + if (Message->CompletionCallback) + ret = ISMEX_CALLBACK; + else + ret = ISMEX_NOTIFY; + } + /* if ReplyMessage */ + if (Message->QS_Flags & QS_SMRESULT) ret |= ISMEX_REPLIED; } - else if (!IsListEmpty(&MessageQueue->NotifyMessagesListHead)) - { - /* FIXME Need to set message flag when in callback mode with notify */ - ret = ISMEX_NOTIFY; - } - /* FIXME Need to set message flag if replied to or ReplyMessage */ + break; } - case THREADSTATE_GETMESSAGETIME: - /* FIXME Needs more work! */ + case THREADSTATE_GETMESSAGETIME: ret = ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->timeLast; + break; + + case THREADSTATE_UPTIMELASTREAD: + { + PTHREADINFO pti; + LARGE_INTEGER LargeTickCount; + pti = PsGetCurrentThreadWin32Thread(); + KeQueryTickCount(&LargeTickCount); + pti->MessageQueue->LastMsgRead = LargeTickCount.u.LowPart; + pti->pcti->tickLastMsgChecked = LargeTickCount.u.LowPart; + } break; case THREADSTATE_GETINPUTSTATE: 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] Fri Dec 3 15:34:06 2010 @@ -1,21 +1,3 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -41,74 +23,6 @@ /* FUNCTIONS *****************************************************************/ -HANDLE FASTCALL -IntMsqSetWakeMask(DWORD WakeMask) -{ - PTHREADINFO Win32Thread; - PUSER_MESSAGE_QUEUE MessageQueue; - HANDLE MessageEventHandle; - - Win32Thread = PsGetCurrentThreadWin32Thread(); - if (Win32Thread == NULL || Win32Thread->MessageQueue == NULL) - return 0; - - MessageQueue = Win32Thread->MessageQueue; - MessageQueue->WakeMask = WakeMask; - MessageEventHandle = MessageQueue->NewMessagesHandle; - - if (Win32Thread->pcti) - Win32Thread->pcti->fsWakeMask = WakeMask; - - IdlePing(); - - return MessageEventHandle; -} - -BOOL FASTCALL -IntMsqClearWakeMask(VOID) -{ - PTHREADINFO Win32Thread; - PUSER_MESSAGE_QUEUE MessageQueue; - - Win32Thread = PsGetCurrentThreadWin32Thread(); - if (Win32Thread == NULL || Win32Thread->MessageQueue == NULL) - return FALSE; - - MessageQueue = Win32Thread->MessageQueue; -// HACK!!!!!!! Newbies that wrote this should hold your head down in shame! (jt) - MessageQueue->WakeMask = ~0; - - if (Win32Thread->pcti) - Win32Thread->pcti->fsWakeMask = 0; - - IdlePong(); - - return TRUE; -} - -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++; - MsqWakeQueue(Queue, QS_PAINT); -} - -VOID FASTCALL -MsqDecPaintCountQueue(PUSER_MESSAGE_QUEUE Queue) -{ - Queue->PaintCount--; -} - - INIT_FUNCTION NTSTATUS NTAPI @@ -125,12 +39,153 @@ return(STATUS_SUCCESS); } +HANDLE FASTCALL +IntMsqSetWakeMask(DWORD WakeMask) +{ + PTHREADINFO Win32Thread; + PUSER_MESSAGE_QUEUE MessageQueue; + HANDLE MessageEventHandle; + DWORD dwFlags = HIWORD(WakeMask); + + Win32Thread = PsGetCurrentThreadWin32Thread(); + if (Win32Thread == NULL || Win32Thread->MessageQueue == NULL) + return 0; + + MessageQueue = Win32Thread->MessageQueue; +// Win32Thread->pEventQueueServer; IntMsqSetWakeMask returns Win32Thread->hEventQueueClient + MessageEventHandle = MessageQueue->NewMessagesHandle; + + if (Win32Thread->pcti) + { + if ( (Win32Thread->pcti->fsChangeBits & LOWORD(WakeMask)) || + ( (dwFlags & MWMO_INPUTAVAILABLE) && (Win32Thread->pcti->fsWakeBits & LOWORD(WakeMask)) ) ) + { + DPRINT1("Chg 0x%x Wake 0x%x Mask 0x%x\n",Win32Thread->pcti->fsChangeBits, Win32Thread->pcti->fsWakeBits, WakeMask); + KeSetEvent(MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); // Wake it up! + return MessageEventHandle; + } + } + + IdlePing(); + + return MessageEventHandle; +} + +BOOL FASTCALL +IntMsqClearWakeMask(VOID) +{ + PTHREADINFO Win32Thread; + + Win32Thread = PsGetCurrentThreadWin32Thread(); + if (Win32Thread == NULL || Win32Thread->MessageQueue == NULL) + return FALSE; + // Very hacky, but that is what they do. + Win32Thread->pcti->fsWakeBits = 0; + + IdlePong(); + + return TRUE; +} + +/* + Due to the uncertainty of knowing what was set in our multilevel message queue, + and even if the bits are all cleared. The same as cTimers/cPaintsReady. + I think this is the best solution... (jt) */ +VOID FASTCALL +MsqWakeQueue(PUSER_MESSAGE_QUEUE Queue, DWORD MessageBits, BOOL KeyEvent) +{ + PTHREADINFO pti; + + pti = Queue->Thread->Tcb.Win32Thread; + pti->pcti->fsWakeBits |= MessageBits; + pti->pcti->fsChangeBits |= MessageBits; + + // Start bit accounting to help clear the main set of bits. + if (MessageBits & QS_KEY) Queue->nCntsQBits[QSRosKey]++; + if (MessageBits & QS_MOUSEMOVE) Queue->nCntsQBits[QSRosMouseMove]++; + if (MessageBits & QS_MOUSEBUTTON) Queue->nCntsQBits[QSRosMouseButton]++; + if (MessageBits & QS_POSTMESSAGE) Queue->nCntsQBits[QSRosPostMessage]++; + if (MessageBits & QS_SENDMESSAGE) Queue->nCntsQBits[QSRosSendMessage]++; + if (MessageBits & QS_HOTKEY) Queue->nCntsQBits[QSRosHotKey]++; + + if (KeyEvent) + KeSetEvent(Queue->NewMessages, IO_NO_INCREMENT, FALSE); +} + +VOID FASTCALL +ClearMsgBitsMask(PUSER_MESSAGE_QUEUE Queue, UINT MessageBits) +{ + PTHREADINFO pti; + UINT ClrMask = 0; + + pti = Queue->Thread->Tcb.Win32Thread; + + if (MessageBits & QS_KEY) + { + if (--Queue->nCntsQBits[QSRosKey] == 0) ClrMask |= QS_KEY; + } + if (MessageBits & QS_MOUSEMOVE) // ReactOS hard coded. + { // Account for tracking mouse moves.. + if (--Queue->nCntsQBits[QSRosMouseMove] == 0) ClrMask |= QS_MOUSEMOVE; + // Handle mouse move bits here. + if (Queue->MouseMoved) ClrMask |= QS_MOUSEMOVE; + } + if (MessageBits & QS_MOUSEBUTTON) + { + if (--Queue->nCntsQBits[QSRosMouseButton] == 0) ClrMask |= QS_MOUSEBUTTON; + } + if (MessageBits & QS_POSTMESSAGE) + { + if (--Queue->nCntsQBits[QSRosPostMessage] == 0) ClrMask |= QS_POSTMESSAGE; + } + if (MessageBits & QS_TIMER) // ReactOS hard coded. + { // Handle timer bits here. + if ( pti->cTimersReady ) + { + if (--pti->cTimersReady == 0) ClrMask |= QS_TIMER; + } + } + if (MessageBits & QS_PAINT) // ReactOS hard coded. + { // Handle paint bits here. + if ( pti->cPaintsReady ) + { + if (--pti->cPaintsReady == 0) ClrMask |= QS_PAINT; + } + } + if (MessageBits & QS_SENDMESSAGE) + { + if (--Queue->nCntsQBits[QSRosSendMessage] == 0) ClrMask |= QS_SENDMESSAGE; + } + if (MessageBits & QS_HOTKEY) + { + if (--Queue->nCntsQBits[QSRosHotKey] == 0) ClrMask |= QS_HOTKEY; + } + + pti->pcti->fsWakeBits &= ~ClrMask; + pti->pcti->fsChangeBits &= ~ClrMask; +} + +VOID FASTCALL +MsqIncPaintCountQueue(PUSER_MESSAGE_QUEUE Queue) +{ + PTHREADINFO pti; + pti = Queue->Thread->Tcb.Win32Thread; + pti->cPaintsReady++; + MsqWakeQueue(Queue, QS_PAINT, TRUE); +} + +VOID FASTCALL +MsqDecPaintCountQueue(PUSER_MESSAGE_QUEUE Queue) +{ + ClearMsgBitsMask(Queue, QS_PAINT); +} + VOID FASTCALL MsqPostMouseMove(PUSER_MESSAGE_QUEUE MessageQueue, MSG* Msg) { MessageQueue->MouseMoveMsg = *Msg; MessageQueue->MouseMoved = TRUE; - MsqWakeQueue(MessageQueue, QS_MOUSEMOVE); + MsqWakeQueue(MessageQueue, QS_MOUSEMOVE, TRUE); } VOID FASTCALL @@ -366,6 +421,7 @@ PUSER_SENT_MESSAGE Message; PLIST_ENTRY Entry; LRESULT Result; + PTHREADINFO pti; if (IsListEmpty(&MessageQueue->SentMessagesListHead)) { @@ -375,11 +431,20 @@ /* remove it from the list of pending messages */ Entry = RemoveHeadList(&MessageQueue->SentMessagesListHead); Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); + + pti = MessageQueue->Thread->Tcb.Win32Thread; + // Processing a message sent to it from another thread. + if ( MessageQueue != Message->SenderQueue ) // most likely, but, to be sure. + { + pti->pcti->CTI_flags |= CTI_INSENDMESSAGE; // Let the user know... + } /* insert it to the list of messages that are currently dispatched by this message queue */ InsertTailList(&MessageQueue->LocalDispatchingMessagesHead, &Message->ListEntry); + + ClearMsgBitsMask(MessageQueue, Message->QS_Flags); if (Message->HookMessage == MSQ_ISHOOK) { // Direct Hook Call processor @@ -419,6 +484,11 @@ /* still keep the sender's message queue locked, so the sender can't exit the MsqSendMessage() function (if timed out) */ + if (Message->QS_Flags & QS_SMRESULT) + { + Result = Message->lResult; + } + /* Let the sender know the result. */ if (Message->Result != NULL) { @@ -456,6 +526,9 @@ /* free the message */ ExFreePoolWithTag(Message, TAG_USRMSG); + + pti->pcti->CTI_flags &= ~CTI_INSENDMESSAGE; + return(TRUE); } @@ -483,6 +556,7 @@ if (PostedMessage->Msg.hwnd == Window->head.h) { RemoveEntryList(&PostedMessage->ListEntry); + ClearMsgBitsMask(MessageQueue, PostedMessage->QS_Flags); MsqDestroyMessage(PostedMessage); CurrentEntry = MessageQueue->PostedMessagesListHead.Flink; } @@ -504,6 +578,7 @@ DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); RemoveEntryList(&SentMessage->ListEntry); + ClearMsgBitsMask(MessageQueue, SentMessage->QS_Flags); /* remove the message from the dispatching list if neede */ if ((!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) @@ -581,6 +656,8 @@ Message->Msg.lParam = lParam; Message->CompletionEvent = &CompletionEvent; Message->Result = &Result; + Message->lResult = 0; + Message->QS_Flags = 0; Message->SenderQueue = ThreadQueue; IntReferenceMessageQueue(ThreadQueue); Message->CompletionCallback = NULL; @@ -596,7 +673,8 @@ /* queue it in the destination's message queue */ InsertTailList(&MessageQueue->SentMessagesListHead, &Message->ListEntry); - MsqWakeQueue(MessageQueue, QS_SENDMESSAGE); + Message->QS_Flags = QS_SENDMESSAGE; + MsqWakeQueue(MessageQueue, QS_SENDMESSAGE, TRUE); /* we can't access the Message anymore since it could have already been deleted! */ @@ -746,7 +824,9 @@ InsertTailList(&MessageQueue->HardwareMessagesListHead, &Message->ListEntry); } - MsqWakeQueue(MessageQueue, MessageBits); + + Message->QS_Flags = MessageBits; + MsqWakeQueue(MessageQueue, MessageBits, (MessageBits & QS_TIMER ? FALSE : TRUE)); } VOID FASTCALL @@ -754,7 +834,7 @@ { MessageQueue->QuitPosted = TRUE; MessageQueue->QuitExitCode = ExitCode; - MsqWakeQueue(MessageQueue, QS_POSTMESSAGE); + MsqWakeQueue(MessageQueue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE, TRUE); } /*********************************************************************** @@ -1122,9 +1202,29 @@ *pMsg = msg; if(Remove) + { + ClearMsgBitsMask(MessageQueue, QS_MOUSEMOVE); MessageQueue->MouseMoved = FALSE; + } return AcceptMessage; +} + +/* check whether a message filter contains at least one potential hardware message */ +static INT FASTCALL +filter_contains_hw_range( UINT first, UINT last ) +{ + /* hardware message ranges are (in numerical order): + * WM_NCMOUSEFIRST .. WM_NCMOUSELAST + * WM_KEYFIRST .. WM_KEYLAST + * WM_MOUSEFIRST .. WM_MOUSELAST + */ + if (!last) --last; + if (last < WM_NCMOUSEFIRST) return 0; + if (first > WM_NCMOUSELAST && last < WM_KEYFIRST) return 0; + if (first > WM_KEYLAST && last < WM_MOUSEFIRST) return 0; + if (first > WM_MOUSELAST) return 0; + return 1; } BOOL APIENTRY @@ -1133,6 +1233,7 @@ IN PWND Window, IN UINT MsgFilterLow, IN UINT MsgFilterHigh, + IN UINT QSflags, OUT MSG* pMsg) { @@ -1141,33 +1242,45 @@ PLIST_ENTRY ListHead, CurrentEntry = NULL; MSG msg; + if (!filter_contains_hw_range( MsgFilterLow, MsgFilterHigh )) return FALSE; + ListHead = &MessageQueue->HardwareMessagesListHead; CurrentEntry = ListHead->Flink; - while(CurrentEntry != ListHead) + if (IsListEmpty(CurrentEntry)) return FALSE; + + CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, + ListEntry); + do { + if (IsListEmpty(CurrentEntry)) break; + if (!CurrentMessage) break; + CurrentEntry = CurrentMessage->ListEntry.Flink; + + if ( (( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && (CurrentMessage->QS_Flags & QSflags)) || + ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) + { + msg = CurrentMessage->Msg; + + AcceptMessage = co_IntProcessHardwareMessage(&msg, &Remove, MsgFilterLow, MsgFilterHigh); + + if (Remove) + { + RemoveEntryList(&CurrentMessage->ListEntry); + ClearMsgBitsMask(MessageQueue, CurrentMessage->QS_Flags); + MsqDestroyMessage(CurrentMessage); + } + + if (AcceptMessage) + { + *pMsg = msg; + return TRUE; + } + } CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); - - msg = CurrentMessage->Msg; - - AcceptMessage = co_IntProcessHardwareMessage(&msg, &Remove, MsgFilterLow, MsgFilterHigh); - - CurrentEntry = CurrentMessage->ListEntry.Flink; - - if (Remove) - { - RemoveEntryList(&CurrentMessage->ListEntry); - MsqDestroyMessage(CurrentMessage); - } - - if(AcceptMessage) - { - *pMsg = msg; - return TRUE; - } - } + while(CurrentEntry != ListHead); return FALSE; } @@ -1178,6 +1291,7 @@ IN PWND Window, IN UINT MsgFilterLow, IN UINT MsgFilterHigh, + IN UINT QSflags, OUT PMSG Message) { PLIST_ENTRY CurrentEntry; @@ -1186,29 +1300,35 @@ CurrentEntry = MessageQueue->PostedMessagesListHead.Flink; ListHead = &MessageQueue->PostedMessagesListHead; - while (CurrentEntry != ListHead) - { - CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, + + if (IsListEmpty(CurrentEntry)) return FALSE; + + CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); - if ( ( !Window || - PtrToInt(Window) == 1 || - Window->head.h == CurrentMessage->Msg.hwnd ) && - ( (MsgFilterLow == 0 && MsgFilterHigh == 0) || - ( MsgFilterLow <= CurrentMessage->Msg.message && - MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) - { - *Message= CurrentMessage->Msg; + do + { + if (IsListEmpty(CurrentEntry)) break; + if (!CurrentMessage) break; + CurrentEntry = CurrentEntry->Flink; + + if ( ( !Window || Window == HWND_BOTTOM || Window->head.h == CurrentMessage->Msg.hwnd ) && + ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || + ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) + { + *Message = CurrentMessage->Msg; if (Remove) { RemoveEntryList(&CurrentMessage->ListEntry); + ClearMsgBitsMask(MessageQueue, CurrentMessage->QS_Flags); MsqDestroyMessage(CurrentMessage); } - return(TRUE); } - CurrentEntry = CurrentEntry->Flink; - } + CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, + ListEntry); + } + while (CurrentEntry != ListHead); return(FALSE); } @@ -1257,9 +1377,6 @@ KeQueryTickCount(&LargeTickCount); MessageQueue->LastMsgRead = LargeTickCount.u.LowPart; MessageQueue->FocusWindow = NULL; - MessageQueue->PaintCount = 0; -// HACK!!!!!!! Newbies that wrote this should hold your head down in shame! (jt) - MessageQueue->WakeMask = ~0; MessageQueue->NewMessagesHandle = NULL; Status = ZwCreateEvent(&MessageQueue->NewMessagesHandle, EVENT_ALL_ACCESS, @@ -1288,6 +1405,10 @@ PLIST_ENTRY CurrentEntry; PUSER_MESSAGE CurrentMessage; PUSER_SENT_MESSAGE CurrentSentMessage; + PTHREADINFO pti; + + pti = MessageQueue->Thread->Tcb.Win32Thread; + /* cleanup posted messages */ while (!IsListEmpty(&MessageQueue->PostedMessagesListHead)) @@ -1391,6 +1512,16 @@ locked later */ } + // Clear it all out. + pti->pcti->fsWakeBits = 0; + pti->pcti->fsChangeBits = 0; + + MessageQueue->nCntsQBits[QSRosKey] = 0; + MessageQueue->nCntsQBits[QSRosMouseMove] = 0; + MessageQueue->nCntsQBits[QSRosMouseButton] = 0; + MessageQueue->nCntsQBits[QSRosPostMessage] = 0; + MessageQueue->nCntsQBits[QSRosSendMessage] = 0; + MessageQueue->nCntsQBits[QSRosHotKey] = 0; } PUSER_MESSAGE_QUEUE FASTCALL @@ -1473,6 +1604,38 @@ } return MessageQueue->ExtraInfo; +} + +BOOL FASTCALL +co_MsqReplyMessage( LRESULT lResult ) +{ + PUSER_SENT_MESSAGE Message; + PLIST_ENTRY Entry; + PTHREADINFO pti; + PUSER_MESSAGE_QUEUE MessageQueue; + + pti = PsGetCurrentThreadWin32Thread(); + MessageQueue = pti->MessageQueue; + + if(!MessageQueue) return FALSE; + + if (IsListEmpty(&MessageQueue->SentMessagesListHead)) + { + return(FALSE); + } + // Do we loop through all msgs or just set the first one? + Entry = MessageQueue->SentMessagesListHead.Flink; + Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); + + if (Message->QS_Flags & QS_SMRESULT) return FALSE; + + if (Message->SenderQueue || Message->CompletionCallback) + { + Message->lResult = lResult; + Message->QS_Flags |= QS_SMRESULT; + MsqWakeQueue(MessageQueue, 0, TRUE); // Wake it up!? Bits? + } + return TRUE; } HWND FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Fri Dec 3 15:34:06 2010 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window painting function - * FILE: subsys/win32k/ntuser/painting.c + * FILE: subsystems/win32/win32k/ntuser/painting.c * PROGRAMER: Filip Navara (xnavara(a)volny.cz) * REVISION HISTORY: * 06/06/2001 Created (?) @@ -660,9 +660,7 @@ MSG *Message, BOOL Remove) { - PUSER_MESSAGE_QUEUE MessageQueue = (PUSER_MESSAGE_QUEUE)Thread->MessageQueue; - - if (!MessageQueue->PaintCount) + if (!Thread->cPaintsReady) return FALSE; if ((MsgFilterMin != 0 || MsgFilterMax != 0) && @@ -673,9 +671,9 @@ if (Message->hwnd == NULL) { - DPRINT1("PAINTING BUG: Thread marked as containing dirty windows, but no dirty windows found!\n"); + DPRINT1("PAINTING BUG: Thread marked as containing dirty windows, but no dirty windows found! Counts %d\n",Thread->cPaintsReady); /* Hack to stop spamming the debuglog ! */ - MessageQueue->PaintCount = 0; + Thread->cPaintsReady = 0; return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Fri Dec 3 15:34:06 2010 @@ -333,6 +333,8 @@ _SEH2_END; RETURN(Ret); } + case ONEPARAM_ROUTINE_REPLYMESSAGE: + RETURN (co_MsqReplyMessage((LRESULT) Param)); } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Fri Dec 3 15:34:06 2010 @@ -361,7 +361,7 @@ MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_TIMER); pTmr->flags &= ~TMRF_READY; - ThreadQueue->WakeMask = ~QS_TIMER; + pti->cTimersReady++; Hit = TRUE; break; }

13 years, 9 months

[greatlrd] 49928: DdHmgCreate(VOID) Bugfix the delay value DdHmgLock Cleanup it a bit, not fixed all bug yet

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Dec 3 15:24:15 2010 New Revision: 49928 URL: http://svn.reactos.org/svn/reactos?rev=49928&view=rev Log: DdHmgCreate(VOID) Bugfix the delay value DdHmgLock Cleanup it a bit, not fixed all bug yet Modified: branches/reactx/reactos/drivers/directx/dxg/ddhmg.c branches/reactx/reactos/drivers/directx/dxg/historic.c branches/reactx/reactos/drivers/directx/dxg/main.c Modified: branches/reactx/reactos/drivers/directx/dxg/ddhmg.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] Fri Dec 3 15:24:15 2010 @@ -10,6 +10,10 @@ #include <dxg_int.h> +#define GET_DHMG_INDEX(xxhandle) ((DWORD)(DWORD_PTR)xxhandle & 0x1FFFFF) +#define GET_DHMG_ENTRY(index) (PDD_ENTRY)((PBYTE)gpentDdHmgr + (sizeof(DD_ENTRY) * index)) + + /* The DdHmgr manger stuff */ ULONG gcSizeDdHmgr = 64 * sizeof(DD_ENTRY); PDD_ENTRY gpentDdHmgr = NULL; @@ -19,15 +23,6 @@ HANDLE ghFreeDdHmgr = 0; HSEMAPHORE ghsemHmgr = NULL; - -BOOL -FASTCALL -VerifyObjectOwner(PDD_ENTRY pEntry) -{ - DWORD Pid = (DWORD)(DWORD_PTR)PsGetCurrentProcessId() & 0xFFFFFFFC; - DWORD check = pEntry->ObjectOwner.ulObj & 0xFFFFFFFE; - return ( (check == Pid) || (!check)); -} /*++ * @name DdHmgCreate @@ -61,6 +56,7 @@ if (gpLockShortDelay) { gpLockShortDelay->HighPart = -1; + gpLockShortDelay->LowPart = -100000; return TRUE; } @@ -144,32 +140,26 @@ FASTCALL DdHmgLock(HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned) { + DWORD Index = GET_DHMG_INDEX(DdHandle); + PDD_ENTRY pEntry = NULL; + PDD_ENTRY Object = NULL; - DWORD Index = (DWORD)(DWORD_PTR)DdHandle & 0x1FFFFF; - PDD_ENTRY pEntry = NULL; - PVOID Object = NULL; - - if ( !LockOwned ) + if ( LockOwned ) { EngAcquireSemaphore(ghsemHmgr); } if ( Index < gcMaxDdHmgr ) { - pEntry = (PDD_ENTRY)((PBYTE)gpentDdHmgr + (sizeof(DD_ENTRY) * Index)); - if ( VerifyObjectOwner(pEntry) ) + pEntry = GET_DHMG_ENTRY(Index); + + if ( (pEntry->Objt == ObjectType ) && + (pEntry->FullUnique == (((DWORD)DdHandle >> 21) & 0x7FF) ) && + (pEntry->pobj->cExclusiveLock == 0) && + (pEntry->pobj->Tid == PsGetCurrentThread()) ) { - /* FIXME - if ( (pEntry->Objt == ObjectType ) && - (pEntry->FullUnique == (((DWORD)DdHandle >> 21) & 0x7FF) ) && - (pEntry->pobj->cExclusiveLock == 0) && - (pEntry->pobj->Tid == PsGetCurrentThread())) - { - InterlockedIncrement(&pEntry->pobj->cExclusiveLock); - pEntry->pobj->Tid = PsGetCurrentThread(); - Object = pEntry->pobj; - } - */ + // FIXME InterlockedIncrement(&pEntry->pobj->cExclusiveLock); + Object = pEntry; } } @@ -180,3 +170,4 @@ return Object; } + Modified: branches/reactx/reactos/drivers/directx/dxg/historic.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/historic.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/directx/dxg/historic.c [iso-8859-1] Fri Dec 3 15:24:15 2010 @@ -7,6 +7,7 @@ * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) * REVISION HISTORY: * 15/10-2007 Magnus Olsen + * 20/11-2010 Magnus Olsen All function match windows7 */ #include <dxg_int.h> @@ -39,7 +40,7 @@ * Always returns DDHAL_DRIVER_NOTHANDLED * * @remarks. -* This function is no longer used in Windows NT 2000/XP/2003 +* This function is no longer used in Windows NT 2000/XP/2003/2008/7 * *--*/ DWORD @@ -74,7 +75,7 @@ * Always returns DDERR_UNSUPPORTED * * @remarks. -* This function is no longer used in Windows NT 2000/XP/2003 +* This function is no longer used in Windows NT 2000/XP/2003/2008/7 * *--*/ DWORD Modified: branches/reactx/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/main.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/directx/dxg/main.c [iso-8859-1] Fri Dec 3 15:24:15 2010 @@ -11,6 +11,8 @@ #include <dxg_int.h> #include "dxg_driver.h" + +#define DXG_DRIVER_VERSION 0x80000 LONG gcDummyPageRefCnt = 0; HSEMAPHORE ghsemDummyPage = NULL; @@ -28,7 +30,7 @@ DriverEntry(IN PVOID Context1, IN PVOID Context2) { - return 0; + return STATUS_SUCCESS; } NTSTATUS @@ -59,7 +61,7 @@ /* * Setup internal driver functions list we got from dxg driver functions list */ - pDxgDrv->iDriverVersion = 0x80000; /* Note 12/1-2004 : DirectX 8 ? */ + pDxgDrv->iDriverVersion = DXG_DRIVER_VERSION; pDxgDrv->c = gcDxgFuncs; pDxgDrv->pdrvfn = gaDxgFuncs; @@ -133,6 +135,6 @@ ghsemDummyPage = 0; } - return 0; + return STATUS_SUCCESS; }

13 years, 9 months

← Newer
1
...
29
30
31
32
33
34
35
36
37
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 December 2010