Ros-diffs June 2012

ros-diffs@reactos.org

11 participants
120 discussions

[arty] 56716: [CMD] Fix first argument of the target program so that paths with spaces aren't reparsed by the c runtime as multiple arguments.
by arty＠svn.reactos.org 09 Jun '12

09 Jun '12

Author: arty Date: Sat Jun 9 02:55:15 2012 New Revision: 56716 URL: http://svn.reactos.org/svn/reactos?rev=56716&view=rev Log: [CMD] Fix first argument of the target program so that paths with spaces aren't reparsed by the c runtime as multiple arguments. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Jun 9 02:55:15 2012 @@ -396,7 +396,10 @@ STARTUPINFO stui; /* build command line for CreateProcess(): FullName + " " + rest */ - _tcscpy(szFullCmdLine, szFullName); + BOOL quoted = !!_tcschr(First, ' '); + _tcscpy(szFullCmdLine, quoted ? _T("\"") : _T("")); + _tcsncat(szFullCmdLine, First, CMDLINE_LENGTH - _tcslen(szFullCmdLine)); + _tcsncat(szFullCmdLine, quoted ? _T("\"") : _T(""), CMDLINE_LENGTH - _tcslen(szFullCmdLine)); if (*rest) {

1 0

[jimtabor] 56715: - Fix configure warnings.
by jimtabor＠svn.reactos.org 09 Jun '12

09 Jun '12

Author: jimtabor Date: Sat Jun 9 02:17:39 2012 New Revision: 56715 URL: http://svn.reactos.org/svn/reactos?rev=56715&view=rev Log: - Fix configure warnings. Added: trunk/rosapps/demos/CMakeLists.txt - copied unchanged from r56703, trunk/rosapps/demos/CMakelists.txt trunk/rosapps/drivers/CMakeLists.txt - copied unchanged from r56703, trunk/rosapps/drivers/CMakelists.txt trunk/rosapps/drivers/green/CMakeLists.txt - copied unchanged from r56703, trunk/rosapps/drivers/green/CMakelists.txt Removed: trunk/rosapps/demos/CMakelists.txt trunk/rosapps/drivers/CMakelists.txt trunk/rosapps/drivers/green/CMakelists.txt Removed: trunk/rosapps/demos/CMakelists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/CMakelists.txt?rev=5… ============================================================================== --- trunk/rosapps/demos/CMakelists.txt [iso-8859-1] (original) +++ trunk/rosapps/demos/CMakelists.txt (removed) @@ -1,1 +1,0 @@ -add_subdirectory(maze) Removed: trunk/rosapps/drivers/CMakelists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/CMakelists.txt?rev… ============================================================================== --- trunk/rosapps/drivers/CMakelists.txt [iso-8859-1] (original) +++ trunk/rosapps/drivers/CMakelists.txt (removed) @@ -1,1 +1,0 @@ -add_subdirectory(green) Removed: trunk/rosapps/drivers/green/CMakelists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/CMakelists.t… ============================================================================== --- trunk/rosapps/drivers/green/CMakelists.txt [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/CMakelists.txt (removed) @@ -1,19 +1,0 @@ - -set_rc_compiler() - -add_library(green SHARED - createclose.c - dispatch.c - green.c - keyboard.c - misc.c - pnp.c - power.c - screen.c - green.rc) - -add_pch(green green.h) - -set_module_type(green kernelmodedriver) -add_importlibs(green ntoskrnl hal) -add_cd_file(TARGET green DESTINATION reactos/system32/drivers NO_CAB FOR all)

1 0

[jimtabor] 56714: [Win32k] - Fix attach thread input based on which thread is foreground. Tested with wine Msg test_SetFocus, CursorIcon test_SetCursor and test_ShowCursor, still needs more testing...
by jimtabor＠svn.reactos.org 08 Jun '12

08 Jun '12

Author: jimtabor Date: Fri Jun 8 21:19:31 2012 New Revision: 56714 URL: http://svn.reactos.org/svn/reactos?rev=56714&view=rev Log: [Win32k] - Fix attach thread input based on which thread is foreground. Tested with wine Msg test_SetFocus, CursorIcon test_SetCursor and test_ShowCursor, still needs more testing. See bug 7098 and bug 7107, used the test cases and it works with Qemu. Modified: trunk/reactos/win32ss/user/ntuser/input.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Fri Jun 8 21:19:31 2012 @@ -397,6 +397,7 @@ BOOL FASTCALL UserAttachThreadInput(PTHREADINFO ptiFrom, PTHREADINFO ptiTo, BOOL fAttach) { + MSG msg; PATTACHINFO pai; /* Can not be the same thread. */ @@ -424,9 +425,16 @@ ptiFrom->pqAttach = ptiFrom->MessageQueue; ptiFrom->MessageQueue = ptiTo->MessageQueue; // FIXME: conditions? + if (ptiFrom->pqAttach == gpqForeground) + { ptiFrom->MessageQueue->spwndActive = ptiFrom->pqAttach->spwndActive; ptiFrom->MessageQueue->spwndFocus = ptiFrom->pqAttach->spwndFocus; ptiFrom->MessageQueue->CursorObject = ptiFrom->pqAttach->CursorObject; + ptiFrom->MessageQueue->CaptureWindow = ptiFrom->pqAttach->CaptureWindow; + ptiFrom->MessageQueue->spwndCapture = ptiFrom->pqAttach->spwndCapture; + ptiFrom->MessageQueue->QF_flags ^= ((ptiFrom->MessageQueue->QF_flags ^ ptiFrom->pqAttach->QF_flags) & QF_CAPTURELOCKED); + ptiFrom->MessageQueue->CaretInfo = ptiFrom->pqAttach->CaretInfo; + } } else /* If clear, unlink and free it. */ { @@ -464,6 +472,14 @@ ATM which one? */ RtlCopyMemory(ptiTo->MessageQueue->afKeyState, gafAsyncKeyState, sizeof(gafAsyncKeyState)); + + /* Generate mouse move message */ + msg.message = WM_MOUSEMOVE; + msg.wParam = UserGetMouseButtonsState(); + msg.lParam = MAKELPARAM(gpsi->ptCursor.x, gpsi->ptCursor.y); + msg.pt = gpsi->ptCursor; + co_MsqInsertMouseMessage(&msg, 0, 0, TRUE); + return TRUE; }

1 0

[spetreolle] 56713: [HIDCLASS] Add missing dependency.
by spetreolle＠svn.reactos.org 08 Jun '12

08 Jun '12

Author: spetreolle Date: Fri Jun 8 18:49:43 2012 New Revision: 56713 URL: http://svn.reactos.org/svn/reactos?rev=56713&view=rev Log: [HIDCLASS] Add missing dependency. Modified: trunk/reactos/drivers/hid/hidclass/CMakeLists.txt Modified: trunk/reactos/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/CMake… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Fri Jun 8 18:49:43 2012 @@ -16,6 +16,6 @@ add_importlibs(hidclass ntoskrnl hidparse hal) - +add_dependencies(hidclass bugcodes) add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all)

1 0

[spetreolle] 56712: [ROSTESTS] Fix oleaut32_winetest dependencies.
by spetreolle＠svn.reactos.org 08 Jun '12

08 Jun '12

Author: spetreolle Date: Fri Jun 8 18:08:11 2012 New Revision: 56712 URL: http://svn.reactos.org/svn/reactos?rev=56712&view=rev Log: [ROSTESTS] Fix oleaut32_winetest dependencies. Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeL… ============================================================================== --- trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Fri Jun 8 18:08:11 2012 @@ -29,13 +29,13 @@ target_link_libraries(oleaut32_winetest uuid wine) set_module_type(oleaut32_winetest win32cui) add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) + SET(tmarshal.rc_DEPS +${REACTOS_BINARY_DIR}/include/psdk/stdole2.tlb ${CMAKE_CURRENT_BINARY_DIR}/test_reg.tlb ${CMAKE_CURRENT_BINARY_DIR}/test_tlb.tlb ${CMAKE_CURRENT_BINARY_DIR}/tmarshal.tlb) -#doesn't work, only includes test_reg.tlb -#set_source_files_properties(tmarshal.rc PROPERTIES OBJECT_DEPENDS ${tmarshal.rc_DEPS}) -add_custom_target(oleaut32_typelibs ALL DEPENDS ${tmarshal.rc_DEPS}) +set_source_files_properties(tmarshal.rc PROPERTIES OBJECT_DEPENDS "${tmarshal.rc_DEPS}") -add_dependencies(oleaut32_winetest oleaut32_typelibs oleaut32_idlheaders stdole2) +add_dependencies(oleaut32_winetest stdole2 oleaut32_typelibs oleaut32_idlheaders ) add_cd_file(TARGET oleaut32_winetest DESTINATION reactos/bin FOR all)

1 0

[tkreuzer] 56711: [PSDK] Fix WS2TCPIP_INLINE in ws2tcpip.h as well
by tkreuzer＠svn.reactos.org 08 Jun '12

08 Jun '12

Author: tkreuzer Date: Fri Jun 8 13:13:31 2012 New Revision: 56711 URL: http://svn.reactos.org/svn/reactos?rev=56711&view=rev Log: [PSDK] Fix WS2TCPIP_INLINE in ws2tcpip.h as well Modified: trunk/reactos/include/psdk/ws2tcpip.h Modified: trunk/reactos/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2tcpip.h?re… ============================================================================== --- trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] Fri Jun 8 13:13:31 2012 @@ -24,7 +24,7 @@ #ifdef _MSC_VER #define WS2TCPIP_INLINE __inline #else -#define WS2TCPIP_INLINE static inline +#define WS2TCPIP_INLINE extern inline #endif /* getaddrinfo error codes */ @@ -758,7 +758,7 @@ { DWORD bytes; - return WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, + return WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, pISB, sizeof(*pISB), &bytes, NULL, NULL); } @@ -771,8 +771,8 @@ { DWORD bytes; - return WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_CHANGE, - NULL, 0, NULL, 0, &bytes, + return WSAIoctl(s, SIO_IDEAL_SEND_BACKLOG_CHANGE, + NULL, 0, NULL, 0, &bytes, lpOverlapped, lpCompletionRoutine); }

1 0

[tkreuzer] 56710: [PSDK] - Add missing C definition of InlineIsEqualGUID in guiddef.h - Use portable TYPE_ALIGNMENT instead of __builtin_alignof in mstcpip.h - Remove definition of DL_EUI48 from ne...
by tkreuzer＠svn.reactos.org 08 Jun '12

08 Jun '12

Author: tkreuzer Date: Fri Jun 8 13:10:52 2012 New Revision: 56710 URL: http://svn.reactos.org/svn/reactos?rev=56710&view=rev Log: [PSDK] - Add missing C definition of InlineIsEqualGUID in guiddef.h - Use portable TYPE_ALIGNMENT instead of __builtin_alignof in mstcpip.h - Remove definition of DL_EUI48 from netiodef.h, since it's already definied as a forward declaration in mstcpip.h - Make WS2TCPIP_INLINE extern inline instead of static inline to fix warnings about usage in non static inline functions Modified: trunk/reactos/include/psdk/guiddef.h trunk/reactos/include/psdk/mstcpip.h trunk/reactos/include/psdk/netiodef.h trunk/reactos/include/psdk/ws2ipdef.h Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Fri Jun 8 13:10:52 2012 @@ -119,10 +119,17 @@ ((unsigned long *) &rguid1)[2] == ((unsigned long *) &rguid2)[2] && ((unsigned long *) &rguid1)[3] == ((unsigned long *) &rguid2)[3]); } +#define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID))) -#define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID))) #else /* defined(__cplusplus) && !defined(CINTERFACE) */ + +#define InlineIsEqualGUID(rguid1, rguid2) \ + (((unsigned long *)rguid1)[0] == ((unsigned long *)rguid2)[0] && \ + ((unsigned long *)rguid1)[1] == ((unsigned long *)rguid2)[1] && \ + ((unsigned long *)rguid1)[2] == ((unsigned long *)rguid2)[2] && \ + ((unsigned long *)rguid1)[3] == ((unsigned long *)rguid2)[3]) #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) + #endif /* defined(__cplusplus) && !defined(CINTERFACE) */ #if defined(__cplusplus) && !defined(CINTERFACE) Modified: trunk/reactos/include/psdk/mstcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mstcpip.h?rev… ============================================================================== --- trunk/reactos/include/psdk/mstcpip.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mstcpip.h [iso-8859-1] Fri Jun 8 13:10:52 2012 @@ -470,7 +470,7 @@ } #define INET_IS_ALIGNED(Pointer, Type) \ - (((ULONG_PTR)Pointer & (__builtin_alignof(Type)-1)) == 0) + (((ULONG_PTR)Pointer & (TYPE_ALIGNMENT(Type)-1)) == 0) MSTCPIP_INLINE SCOPE_LEVEL Modified: trunk/reactos/include/psdk/netiodef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netiodef.h?re… ============================================================================== --- trunk/reactos/include/psdk/netiodef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netiodef.h [iso-8859-1] Fri Jun 8 13:10:52 2012 @@ -140,7 +140,7 @@ #define icmp4_cksum Header.Checksum #define icmp4_un_data32 Data32 #define icmp4_un_data16 Data16 -#define icmp4_un_data8 Data8 +#define icmp4_un_data8 Data8 #define icmp4_dataun Data #define icmp4_data32 icmp4_dataun.icmp4_un_data32 #define icmp4_data16 icmp4_dataun.icmp4_un_data16 @@ -404,7 +404,6 @@ DL_EI48 Ei48; }; }; -typedef union _DL_EUI48 DL_EUI48, *PDL_EUI48; C_ASSERT(DL_ADDRESS_LENGTH_MAXIMUM >= sizeof(DL_EUI48)); @@ -1197,7 +1196,7 @@ typedef struct _NPI_MODULEID { USHORT Length; NPI_MODULEID_TYPE Type; -#ifdef __midl +#ifdef __midl [switch_type(NPI_MODULEID_TYPE), switch_is(Type)] #endif union { Modified: trunk/reactos/include/psdk/ws2ipdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2ipdef.h?re… ============================================================================== --- trunk/reactos/include/psdk/ws2ipdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ws2ipdef.h [iso-8859-1] Fri Jun 8 13:10:52 2012 @@ -13,7 +13,7 @@ #ifdef _MSC_VER #define WS2TCPIP_INLINE __inline #else -#define WS2TCPIP_INLINE static inline +#define WS2TCPIP_INLINE extern inline #endif #include <in6addr.h> @@ -355,21 +355,21 @@ WS2TCPIP_INLINE BOOLEAN IN6_IS_ADDR_ANYCAST(CONST IN6_ADDR *a) { - return (IN6_IS_ADDR_SUBNET_RESERVED_ANYCAST(a) || + return (IN6_IS_ADDR_SUBNET_RESERVED_ANYCAST(a) || IN6_IS_ADDR_SUBNET_ROUTER_ANYCAST(a)); } WS2TCPIP_INLINE BOOLEAN IN6_IS_ADDR_LINKLOCAL(CONST IN6_ADDR *a) { - return (BOOLEAN)((a->s6_bytes[0] == 0xfe) && + return (BOOLEAN)((a->s6_bytes[0] == 0xfe) && ((a->s6_bytes[1] & 0xc0) == 0x80)); } WS2TCPIP_INLINE BOOLEAN IN6_IS_ADDR_SITELOCAL(CONST IN6_ADDR *a) { - return (BOOLEAN)((a->s6_bytes[0] == 0xfe) && + return (BOOLEAN)((a->s6_bytes[0] == 0xfe) && ((a->s6_bytes[1] & 0xc0) == 0xc0)); } @@ -451,13 +451,13 @@ ((a->s6_bytes[1] & 0xf) == 0xe)); } -WS2TCPIP_INLINE +WS2TCPIP_INLINE VOID IN6_SET_ADDR_UNSPECIFIED(PIN6_ADDR a) { memset(a->s6_bytes, 0, sizeof(IN6_ADDR)); } -WS2TCPIP_INLINE +WS2TCPIP_INLINE VOID IN6_SET_ADDR_LOOPBACK(PIN6_ADDR a) { memset(a->s6_bytes, 0, sizeof(IN6_ADDR)); @@ -520,7 +520,7 @@ typedef enum _MULTICAST_MODE_TYPE { MCAST_INCLUDE = 0, - MCAST_EXCLUDE + MCAST_EXCLUDE } MULTICAST_MODE_TYPE; typedef struct ip_mreq {

1 0

[arty] 56709: [CMD] Terminate lines that show environment results from the SET command.
by arty＠svn.reactos.org 07 Jun '12

07 Jun '12

Author: arty Date: Thu Jun 7 22:41:22 2012 New Revision: 56709 URL: http://svn.reactos.org/svn/reactos?rev=56709&view=rev Log: [CMD] Terminate lines that show environment results from the SET command. Modified: trunk/reactos/base/shell/cmd/set.c Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/set.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/set.c [iso-8859-1] Thu Jun 7 22:41:22 2012 @@ -96,6 +96,7 @@ if (*lpOutput != _T('=')) ConOutPuts(lpOutput); lpOutput += _tcslen(lpOutput) + 1; + ConOutPuts(_T("\r\n")); } FreeEnvironmentStrings (lpEnv); } @@ -184,6 +185,7 @@ if (!_tcsnicmp(lpOutput, param, p - param)) { ConOutPuts(lpOutput); + ConOutPuts(_T("\r\n")); bFound = TRUE; } lpOutput += _tcslen(lpOutput) + 1;

1 0

[jimtabor] 56707: [Win32SS] - Fix crash and pass all wine CursorIcon test_SetCursor and test_ShowCursor.
by jimtabor＠svn.reactos.org 07 Jun '12

07 Jun '12

Author: jimtabor Date: Thu Jun 7 12:05:17 2012 New Revision: 56707 URL: http://svn.reactos.org/svn/reactos?rev=56707&view=rev Log: [Win32SS] - Fix crash and pass all wine CursorIcon test_SetCursor and test_ShowCursor. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/misc.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/user/user32/windows/cursoricon.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Thu Jun 7 12:05:17 2012 @@ -2184,7 +2184,8 @@ THREADSTATE_GETMESSAGETIME, THREADSTATE_GETINPUTSTATE, THREADSTATE_UPTIMELASTREAD, - THREADSTATE_FOREGROUNDTHREAD + THREADSTATE_FOREGROUNDTHREAD, + THREADSTATE_GETCURSOR }; DWORD_PTR Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Thu Jun 7 12:05:17 2012 @@ -418,13 +418,15 @@ pai->pti1 = ptiFrom; pai->pti2 = ptiTo; gpai = pai; - ERR("Attach Allocated! ptiFrom 0x%p ptiTo 0x%p\n",ptiFrom,ptiTo); - + TRACE("Attach Allocated! ptiFrom 0x%p ptiTo 0x%p\n",ptiFrom,ptiTo); + + ptiTo->MessageQueue->iCursorLevel -= ptiFrom->iCursorLevel; ptiFrom->pqAttach = ptiFrom->MessageQueue; ptiFrom->MessageQueue = ptiTo->MessageQueue; // FIXME: conditions? ptiFrom->MessageQueue->spwndActive = ptiFrom->pqAttach->spwndActive; ptiFrom->MessageQueue->spwndFocus = ptiFrom->pqAttach->spwndFocus; + ptiFrom->MessageQueue->CursorObject = ptiFrom->pqAttach->CursorObject; } else /* If clear, unlink and free it. */ { @@ -447,13 +449,15 @@ if (paiprev) paiprev->paiNext = pai->paiNext; ExFreePoolWithTag(pai, USERTAG_ATTACHINFO); - ERR("Attach Free! ptiFrom 0x%p ptiTo 0x%p\n",ptiFrom,ptiTo); + TRACE("Attach Free! ptiFrom 0x%p ptiTo 0x%p\n",ptiFrom,ptiTo); ptiFrom->MessageQueue = ptiFrom->pqAttach; // FIXME: conditions? + ptiFrom->MessageQueue->CursorObject = NULL; ptiFrom->MessageQueue->spwndActive = NULL; ptiFrom->MessageQueue->spwndFocus = NULL; ptiFrom->pqAttach = NULL; + ptiTo->MessageQueue->iCursorLevel -= ptiFrom->iCursorLevel; } /* Note that key state, which can be ascertained by calls to the GetKeyState or GetKeyboardState function, is reset after a call to AttachThreadInput. Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Thu Jun 7 12:05:17 2012 @@ -462,9 +462,19 @@ } } + if (ptiCurrent->pqAttach && ptiCurrent->MessageQueue) + { + PTHREADINFO ptiTo; + ptiTo = PsGetThreadWin32Thread(ptiCurrent->MessageQueue->Thread); + TRACE_CH(UserThread,"Attached Thread is getting switched!\n"); + UserAttachThreadInput( ptiCurrent, ptiTo, FALSE); + } + /* Free the message queue */ if(ptiCurrent->MessageQueue) - MsqDestroyMessageQueue(ptiCurrent->MessageQueue); + { + MsqDestroyMessageQueue(ptiCurrent->MessageQueue); + } /* Find the THREADINFO in the PROCESSINFO's list */ ppti = &ppiCurrent->ptiList; Modified: trunk/reactos/win32ss/user/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc.c [iso-8859-1] Thu Jun 7 12:05:17 2012 @@ -225,6 +225,10 @@ case THREADSTATE_FOREGROUNDTHREAD: ret = (gpqForeground == GetW32ThreadInfo()->MessageQueue); break; + case THREADSTATE_GETCURSOR: + ret = (DWORD_PTR) (GetW32ThreadInfo()->MessageQueue->CursorObject ? + UserHMGetHandle(GetW32ThreadInfo()->MessageQueue->CursorObject) : 0); + break; } TRACE("Leave NtUserGetThreadState, ret=%i\n", ret); Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Thu Jun 7 12:05:17 2012 @@ -46,8 +46,7 @@ if ((pWndTop->style & WS_DISABLED)) return NULL; if (!IntPtInWindow(pWndTop, x, y)) return NULL; - if (x - pWndTop->rcClient.left < pWndTop->rcClient.right && - y - pWndTop->rcClient.top < pWndTop->rcClient.bottom ) + if (RECTL_bPointInRect(&pWndTop->rcClient, x, y)) { for (pWnd = pWndTop->spwndChild; pWnd != NULL; @@ -130,7 +129,7 @@ MessageQueue->CursorObject = NewCursor; /* If cursor is not visible we have nothing to do */ - if (MessageQueue->ShowingCursor < 0) + if (MessageQueue->iCursorLevel < 0) return OldCursor; /* Update cursor if this message queue controls it */ @@ -179,15 +178,16 @@ MessageQueue = pti->MessageQueue; /* Update counter */ - MessageQueue->ShowingCursor += bShow ? 1 : -1; + MessageQueue->iCursorLevel += bShow ? 1 : -1; + pti->iCursorLevel += bShow ? 1 : -1; /* Check for trivial cases */ - if ((bShow && MessageQueue->ShowingCursor != 0) || - (!bShow && MessageQueue->ShowingCursor != -1)) + if ((bShow && MessageQueue->iCursorLevel != 0) || + (!bShow && MessageQueue->iCursorLevel != -1)) { /* Note: w don't update global info here because it is used only internally to check if cursor is visible */ - return MessageQueue->ShowingCursor; + return MessageQueue->iCursorLevel; } /* Check if cursor is above window owned by this MessageQueue */ @@ -208,10 +208,10 @@ } /* Update global info */ - IntGetSysCursorInfo()->ShowingCursor = MessageQueue->ShowingCursor; - } - - return MessageQueue->ShowingCursor; + IntGetSysCursorInfo()->ShowingCursor = MessageQueue->iCursorLevel; + } + + return MessageQueue->iCursorLevel; } DWORD FASTCALL @@ -382,6 +382,10 @@ { PTHREADINFO pti; + if (Queue->QF_flags & QF_INDESTROY) + { + ERR("This Message Queue is in Destroy!\n"); + } pti = Queue->Thread->Tcb.Win32Thread; pti->pcti->fsWakeBits |= MessageBits; pti->pcti->fsChangeBits |= MessageBits; @@ -482,6 +486,7 @@ PDESKTOP pDesk; PWND pwnd, pwndDesktop; HDC hdcScreen; + PUSER_MESSAGE_QUEUE MessageQueue; PSYSTEM_CURSORINFO CurInfo; KeQueryTickCount(&LargeTickCount); @@ -541,14 +546,20 @@ /* Check if we found a window */ if (Msg->hwnd != NULL && pwnd != NULL) { + MessageQueue = pwnd->head.pti->MessageQueue; + + if ( pwnd->head.pti->TIF_flags & TIF_INCLEANUP || MessageQueue->QF_flags & QF_INDESTROY) + { + ERR("Mouse is over the Window Thread is Dead!\n"); + return; + } + if (Msg->message == WM_MOUSEMOVE) { - PUSER_MESSAGE_QUEUE MessageQueue = pwnd->head.pti->MessageQueue; - - /* Check if cursor should be visible */ + /* Check if cursor should be visible */ if(hdcScreen && MessageQueue->CursorObject && - MessageQueue->ShowingCursor >= 0) + MessageQueue->iCursorLevel >= 0) { /* Check if shape has changed */ if(CurInfo->CurrentCursorObject != MessageQueue->CursorObject) @@ -569,7 +580,7 @@ GreMovePointer(hdcScreen, -1, -1); /* Update global cursor info */ - CurInfo->ShowingCursor = MessageQueue->ShowingCursor; + CurInfo->ShowingCursor = MessageQueue->iCursorLevel; CurInfo->CurrentCursorObject = MessageQueue->CursorObject; gpqCursor = MessageQueue; @@ -579,7 +590,7 @@ else { TRACE("Posting mouse message to hwnd=0x%x!\n", UserHMGetHandle(pwnd)); - MsqPostMessage(pwnd->head.pti->MessageQueue, Msg, TRUE, QS_MOUSEBUTTON); + MsqPostMessage(MessageQueue, Msg, TRUE, QS_MOUSEBUTTON); } } else if (hdcScreen) @@ -1532,7 +1543,7 @@ /* Activate the window if needed */ - if (msg->hwnd != UserGetForegroundWindow()) + if (pwndMsg != pti->MessageQueue->spwndActive) //msg->hwnd != UserGetForegroundWindow()) { PWND pwndTop = pwndMsg; while (pwndTop) @@ -1559,7 +1570,7 @@ /* fall through */ case MA_ACTIVATE: case 0: - if(!co_IntMouseActivateWindow(pwndMsg)) eatMsg = TRUE; + if (!co_IntMouseActivateWindow( pwndTop )) eatMsg = TRUE; break; default: ERR( "unknown WM_MOUSEACTIVATE code %d\n", ret ); @@ -1865,7 +1876,7 @@ MessageQueue->LastMsgRead = LargeTickCount.u.LowPart; MessageQueue->spwndFocus = NULL; MessageQueue->NewMessagesHandle = NULL; - MessageQueue->ShowingCursor = 0; + MessageQueue->iCursorLevel = 0; MessageQueue->CursorObject = NULL; RtlCopyMemory(MessageQueue->afKeyState, gafAsyncKeyState, sizeof(gafAsyncKeyState)); Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Thu Jun 7 12:05:17 2012 @@ -92,6 +92,7 @@ PTHRDCARETINFO CaretInfo; /* Message Queue Flags */ DWORD QF_flags; + DWORD cThreads; // Shared message queue counter. /* Queue state tracking */ // Send list QS_SENDMESSAGE @@ -108,7 +109,7 @@ BYTE afKeyState[256 * 2 / 8]; // 2 bits per key /* Showing cursor counter (value>=0 - cursor visible, value<0 - cursor hidden) */ - INT ShowingCursor; + INT iCursorLevel; /* Cursor object */ PCURICON_OBJECT CursorObject; Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Thu Jun 7 12:05:17 2012 @@ -97,6 +97,7 @@ HANDLE hEventQueueClient; PKEVENT pEventQueueServer; LIST_ENTRY PtiLink; + INT iCursorLevel; POINT ptLast; LIST_ENTRY aphkStart[NB_HOOKS]; Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Thu Jun 7 12:05:17 2012 @@ -1253,12 +1253,7 @@ */ HCURSOR WINAPI GetCursor(void) { - CURSORINFO ci; - ci.cbSize = sizeof(CURSORINFO); - if(NtUserGetCursorInfo(&ci)) - return ci.hCursor; - else - return (HCURSOR)0; + return (HCURSOR)NtUserGetThreadState(THREADSTATE_GETCURSOR); }

1 0

[ekohl] 56706: [NTOSKRNL] Stop parsing keys and return STATUS_KEY_DELETED if the parent key was marked as deleted. This fixes two winetests.
by ekohl＠svn.reactos.org 07 Jun '12

07 Jun '12

Author: ekohl Date: Thu Jun 7 11:55:31 2012 New Revision: 56706 URL: http://svn.reactos.org/svn/reactos?rev=56706&view=rev Log: [NTOSKRNL] Stop parsing keys and return STATUS_KEY_DELETED if the parent key was marked as deleted. This fixes two winetests. Modified: trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Thu Jun 7 11:55:31 2012 @@ -1073,6 +1073,10 @@ /* Grab the KCB */ Kcb = ((PCM_KEY_BODY)ParseObject)->KeyControlBlock; + + /* Fail if the key was marked as deleted */ + if (Kcb->Delete) + return STATUS_KEY_DELETED; /* Lookup in the cache */ Status = CmpBuildHashStackAndLookupCache(ParseObject,

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2012