Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 66241: [NtUser] - This should fix dialog breakage due to r66237.
by jimtabor＠svn.reactos.org 13 Feb '15

13 Feb '15

Author: jimtabor Date: Fri Feb 13 01:03:38 2015 New Revision: 66241 URL: http://svn.reactos.org/svn/reactos?rev=66241&view=rev Log: [NtUser] - This should fix dialog breakage due to r66237. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Fri Feb 13 01:03:38 2015 @@ -379,13 +379,13 @@ * be destroying. */ // Rule #1 - if ( ti->MessageQueue->spwndActive == Window || // Fixes CORE-106 RegSrv32 exit and return focus to CMD. + if ( ti->MessageQueue->spwndActive == Window || // Fixes CORE-106 RegSvr32 exit and return focus to CMD. (ti->MessageQueue->spwndActive == NULL && ti->MessageQueue == IntGetFocusMessageQueue()) ) { co_WinPosActivateOtherWindow(Window); } - /* Fixes dialog test test_focus breakage due to r66237 and CMD properties closing and returning focus to CMD */ + /* Fixes CMD properties closing and returning focus to CMD */ if (ti->MessageQueue->spwndFocus == Window) { if ((Window->style & (WS_CHILD | WS_POPUP)) == WS_CHILD) @@ -559,6 +559,13 @@ if (Window->head.h == ThreadData->rpdesk->rpwinstaParent->ShellListView) ThreadData->rpdesk->rpwinstaParent->ShellListView = NULL; } + + /* Fixes dialog test_focus breakage due to r66237. */ + if (ThreadData->MessageQueue->spwndFocus == Window) + ThreadData->MessageQueue->spwndFocus = NULL; + + if (ThreadData->MessageQueue->spwndActive == Window) + ThreadData->MessageQueue->spwndActive = NULL; if (ThreadData->MessageQueue->spwndCapture == Window) {

1 0

[hbelusca] 66240: [WINLOGON] - Implement KillComProcesses that just kills with force and without any notification back to winlogon, any remaining app that is still alive even if we asked before to ...
by hbelusca＠svn.reactos.org 12 Feb '15

12 Feb '15

Author: hbelusca Date: Thu Feb 12 23:35:58 2015 New Revision: 66240 URL: http://svn.reactos.org/svn/reactos?rev=66240&view=rev Log: [WINLOGON] - Implement KillComProcesses that just kills with force and without any notification back to winlogon, any remaining app that is still alive even if we asked before to kill apps (it's just the aim of this function, not more). - Fix internal flags according to WinDbg sessions with Win2k3 + tracing checked build winlogon (testing logoff/shutdown/reboot from winlogon itself and when using the "shutdown" command). - FIXME: Manage EWX_FORCE flag in winlogon... [WINSRV] Fix a DPRINT. [WIN32K] - Introduce a NotifyLogon function to manage winlogon notifications (when we shutdown and "end" shutdown steps, or cancel it). - Fix some flags settings. Part 11/X CORE-8322 ------- This is a test: !error !rot13 !reebe !ebg13 !error !rot13 !reebe !ebg13 Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/include/reactos/winlogon.h trunk/reactos/win32ss/user/ntuser/shutdown.c trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Thu Feb 12 23:35:58 2015 @@ -29,8 +29,12 @@ #define HK_CTRL_ALT_DEL 0 #define HK_CTRL_SHIFT_ESC 1 -#define EWX_ACTION_MASK 0xffffffeb -#define EWX_FLAGS_MASK 0x00000014 +// #define EWX_FLAGS_MASK 0x00000014 +// #define EWX_ACTION_MASK ~EWX_FLAGS_MASK + +// FIXME: At the moment we use this value (select the lowbyte flags and some highbytes ones). +// It should be set such that it makes winlogon accepting only valid flags. +#define EWX_ACTION_MASK 0x5C0F typedef struct tagLOGOFF_SHUTDOWN_DATA { @@ -510,8 +514,12 @@ return 0; } - uFlags = EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) | - ((LSData->Flags & EWX_ACTION_MASK) == EWX_LOGOFF ? EWX_INTERNAL_FLAG_LOGOFF : 0); + // FIXME: To be really fixed: need to check what needs to be kept and what needs to be removed there. + // + // uFlags = EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) | + // ((LSData->Flags & EWX_ACTION_MASK) == EWX_LOGOFF ? EWX_CALLER_WINLOGON_LOGOFF : 0); + + uFlags = EWX_CALLER_WINLOGON | (LSData->Flags & 0x0F); ERR("In LogoffShutdownThread with uFlags == 0x%x; exit_in_progress == %s\n", uFlags, ExitReactOSInProgress ? "true" : "false"); @@ -526,15 +534,42 @@ return 0; } - /* FIXME: Call ExitWindowsEx() to terminate COM processes only at logoff! */ - ERR("Should terminate COM processes only at logoff!\n"); - if (LSData->Session->UserToken) RevertToSelf(); return 1; } +static +DWORD +WINAPI +KillComProcesses( + LPVOID Parameter) +{ + PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA)Parameter; + + ERR("In KillComProcesses\n"); + + if (LSData->Session->UserToken != NULL && + !ImpersonateLoggedOnUser(LSData->Session->UserToken)) + { + ERR("ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + return 0; + } + + /* Attempt to kill remaining processes. No notifications needed. */ + if (!ExitWindowsEx(EWX_CALLER_WINLOGON | EWX_NONOTIFY | EWX_FORCE | EWX_LOGOFF, 0)) + { + ERR("Unable to kill COM apps, error %lu\n", GetLastError()); + RevertToSelf(); + return 0; + } + + if (LSData->Session->UserToken) + RevertToSelf(); + + return 1; +} static NTSTATUS @@ -694,8 +729,38 @@ return Status; } + /* Run logoff thread */ hThread = CreateThread(psa, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); + + if (!hThread) + { + ERR("Unable to create logoff thread, error %lu\n", GetLastError()); + DestroyLogoffSecurityAttributes(psa); + HeapFree(GetProcessHeap(), 0, LSData); + return STATUS_UNSUCCESSFUL; + } + WaitForSingleObject(hThread, INFINITE); + if (!GetExitCodeThread(hThread, &exitCode)) + { + ERR("Unable to get exit code of logoff thread (error %lu)\n", GetLastError()); + CloseHandle(hThread); + DestroyLogoffSecurityAttributes(psa); + HeapFree(GetProcessHeap(), 0, LSData); + return STATUS_UNSUCCESSFUL; + } + CloseHandle(hThread); + if (exitCode == 0) + { + ERR("Logoff thread returned failure\n"); + DestroyLogoffSecurityAttributes(psa); + HeapFree(GetProcessHeap(), 0, LSData); + return STATUS_UNSUCCESSFUL; + } + + + /* Kill remaining COM apps. Only at logoff! */ + hThread = CreateThread(psa, 0, KillComProcesses, (LPVOID)LSData, 0, NULL); /* We're done with the SECURITY_DESCRIPTOR */ DestroyLogoffSecurityAttributes(psa); @@ -703,7 +768,7 @@ if (!hThread) { - ERR("Unable to create logoff thread, error %lu\n", GetLastError()); + ERR("Unable to create kill COM apps thread, error %lu\n", GetLastError()); HeapFree(GetProcessHeap(), 0, LSData); return STATUS_UNSUCCESSFUL; } @@ -711,16 +776,17 @@ HeapFree(GetProcessHeap(), 0, LSData); if (!GetExitCodeThread(hThread, &exitCode)) { - ERR("Unable to get exit code of logoff thread (error %lu)\n", GetLastError()); + ERR("Unable to get exit code of kill COM apps thread (error %lu)\n", GetLastError()); CloseHandle(hThread); return STATUS_UNSUCCESSFUL; } CloseHandle(hThread); if (exitCode == 0) { - ERR("Logoff thread returned failure\n"); + ERR("Kill COM apps thread returned failure\n"); return STATUS_UNSUCCESSFUL; } + UnloadUserProfile(Session->UserToken, Session->hProfileInfo); CloseHandle(Session->UserToken); @@ -804,6 +870,11 @@ else LSData->Flags = EWX_SHUTDOWN; LSData->Session = Session; + + // FIXME: We may need to specify this flag to really force application kill + // (we are shutting down ReactOS, not just logging off so no hangs, etc... + // should be allowed). + // LSData->Flags |= EWX_FORCE; /* Run shutdown thread */ hThread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); @@ -1305,6 +1376,12 @@ } /* Check parameters */ + if (Action & EWX_FORCE) + { + // FIXME! + ERR("FIXME: EWX_FORCE present for Winlogon, what to do?\n"); + Action &= ~EWX_FORCE; + } switch (Action) { case EWX_LOGOFF: @@ -1342,7 +1419,7 @@ // if you try now a shut down, it won't work because winlogon thinks it is // still in the middle of a shutdown. // Maybe we also need to reset ExitReactOSInProgress somewhere else?? - if (ExitReactOSInProgress && (lParam & EWX_INTERNAL_FLAG) == 0) + if (ExitReactOSInProgress && (lParam & EWX_CALLER_WINLOGON) == 0) { break; } Modified: trunk/reactos/include/reactos/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winlogon.h… ============================================================================== --- trunk/reactos/include/reactos/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winlogon.h [iso-8859-1] Thu Feb 12 23:35:58 2015 @@ -2,17 +2,28 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: include/reactos/winlogon.h - * PURPOSE: Private interface between CSRSS and WinLogon + * PURPOSE: Private interface between Win32 and Winlogon * PROGRAMMER: Ge van Geldorp (gvg(a)reactos.com) */ #ifndef REACTOS_WINLOGON_H_INCLUDED #define REACTOS_WINLOGON_H_INCLUDED -#define EWX_INTERNAL_FLAG 0x10000 -#define EWX_INTERNAL_KILL_USER_APPS (EWX_INTERNAL_FLAG | 0x100) -#define EWX_INTERNAL_KILL_ALL_APPS (EWX_INTERNAL_FLAG | 0x200) -#define EWX_INTERNAL_FLAG_LOGOFF 0x1000 +#define EWX_SHUTDOWN_CANCELED 0x0080 + +#define EWX_CALLER_SYSTEM 0x0100 +#define EWX_CALLER_WINLOGON 0x0200 + +#define EWX_CALLER_WINLOGON_LOGOFF 0x1000 // WARNING!! Broken flag. + +// All the range 0x0400 to 0x1000 is reserved for Winlogon. + +// Flag 0x2000 appears to be a flag set when we call InitiateSystemShutdown* APIs (Winlogon shutdown APIs). + +// 0x4000 is also reserved. + +#define EWX_NOTIFY 0x8000 +#define EWX_NONOTIFY 0x10000 #endif /* REACTOS_WINLOGON_H_INCLUDED */ Modified: trunk/reactos/win32ss/user/ntuser/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/shutdo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] Thu Feb 12 23:35:58 2015 @@ -7,7 +7,12 @@ */ #include <win32k.h> +#include <winlogon.h> + DBG_DEFAULT_CHANNEL(UserShutdown); + +/* Our local copy of shutdown flags */ +static ULONG gdwShutdownFlags = 0; /* * Based on CSRSS and described in pages 1115 - 1118 "Windows Internals, Fifth Edition". @@ -150,6 +155,51 @@ return Result; } +BOOL +NotifyLogon(IN HWND hWndSta, + IN PLUID CallerLuid, + IN ULONG Flags, + IN NTSTATUS ShutdownStatus) +{ + // LUID SystemLuid = SYSTEM_LUID; + ULONG Notif, Param; + + ERR("NotifyLogon(0x%lx, 0x%lx)\n", Flags, ShutdownStatus); + + /* If no Winlogon notifications are needed, just return */ + if (Flags & EWX_NONOTIFY) + return FALSE; + + /* In case we cancelled the shutdown...*/ + if (Flags & EWX_SHUTDOWN_CANCELED) + { + /* ... send a LN_LOGOFF_CANCELED to Winlogon with the real cancel status... */ + Notif = LN_LOGOFF_CANCELED; + Param = ShutdownStatus; + } + else + { + /* ... otherwise it's a real logoff. Send the shutdown flags in that case. */ + Notif = LN_LOGOFF; + Param = Flags; + } + + // FIXME: At the moment, always send the notifications... In real world some checks are done. + // if (hwndSAS && ( (Flags & EWX_SHUTDOWN) || RtlEqualLuid(CallerLuid, &SystemLuid)) ) + if (hwndSAS) + { + ERR("\tSending %s message to Winlogon\n", Notif == LN_LOGOFF ? "LN_LOGOFF" : "LN_LOGOFF_CANCELED"); + UserPostMessage(hwndSAS, WM_LOGONNOTIFY, Notif, (LPARAM)Param); + return TRUE; + } + else + { + ERR("hwndSAS == NULL\n"); + } + + return FALSE; +} + NTSTATUS UserInitiateShutdown(IN PETHREAD Thread, IN OUT PULONG pFlags) @@ -157,7 +207,7 @@ NTSTATUS Status; ULONG Flags = *pFlags; LUID CallerLuid; - // LUID SystemLuid = SYSTEM_LUID; + LUID SystemLuid = SYSTEM_LUID; static PRIVILEGE_SET ShutdownPrivilege = { 1, PRIVILEGE_SET_ALL_NECESSARY, @@ -168,9 +218,6 @@ ERR("UserInitiateShutdown\n"); - if(hwndSAS == NULL) - return STATUS_NOT_FOUND; - /* Get the caller's LUID */ Status = GetProcessLuid(Thread, &CallerLuid); if (!NT_SUCCESS(Status)) @@ -179,8 +226,16 @@ return Status; } - // FIXME: Check if this is the System LUID, and adjust flags if needed. - // if (RtlEqualLuid(&CallerLuid, &SystemLuid)) { Flags = ...; } + /* + * Check if this is the System LUID, and adjust flags if needed. + * In particular, be sure there is no EWX_CALLER_SYSTEM flag + * spuriously set (could be the sign of malicous app!). + */ + if (RtlEqualLuid(&CallerLuid, &SystemLuid)) + Flags |= EWX_CALLER_SYSTEM; + else + Flags &= ~EWX_CALLER_SYSTEM; + *pFlags = Flags; /* Retrieve the Win32 process info */ @@ -191,7 +246,12 @@ /* If the caller is not Winlogon, do some security checks */ if (PsGetThreadProcessId(Thread) != gpidLogon) { - // FIXME: Play again with flags... + /* + * Here also, be sure there is no EWX_CALLER_WINLOGON flag + * spuriously set (could be the sign of malicous app!). + */ + Flags &= ~EWX_CALLER_WINLOGON; + *pFlags = Flags; /* Check whether the current process is attached to a window station */ @@ -224,24 +284,27 @@ } } - /* If the caller is not Winlogon, notify it to perform the real shutdown */ + /* If the caller is not Winlogon, possibly notify it to perform the real shutdown */ if (PsGetThreadProcessId(Thread) != gpidLogon) { // FIXME: HACK!! Do more checks!! ERR("UserInitiateShutdown -- Notify Winlogon for shutdown\n"); - UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_LOGOFF, (LPARAM)Flags); + NotifyLogon(hwndSAS, &CallerLuid, Flags, STATUS_SUCCESS); return STATUS_PENDING; } // If we reach this point, that means it's Winlogon that triggered the shutdown. - ERR("UserInitiateShutdown -- Winlogon shuts down\n"); + ERR("UserInitiateShutdown -- Winlogon is doing a shutdown\n"); /* - * FIXME: - * Update and save the shutdown flags globally for renotifying Winlogon - * if needed, when calling EndShutdown. + * Update and save the shutdown flags globally for renotifying + * Winlogon if needed, when calling EndShutdown. */ + Flags |= EWX_CALLER_WINLOGON; // Winlogon is doing a shutdown, be sure the internal flag is set. *pFlags = Flags; + + /* Save the shutdown flags now */ + gdwShutdownFlags = Flags; return STATUS_SUCCESS; } @@ -250,9 +313,45 @@ UserEndShutdown(IN PETHREAD Thread, IN NTSTATUS ShutdownStatus) { + NTSTATUS Status; + ULONG Flags; + LUID CallerLuid; + ERR("UserEndShutdown\n"); + + /* + * FIXME: Some cleanup should be done when shutdown succeeds, + * and some reset should be done when shutdown is cancelled. + */ STUB; - return STATUS_NOT_IMPLEMENTED; + + Status = GetProcessLuid(Thread, &CallerLuid); + if (!NT_SUCCESS(Status)) + { + ERR("GetProcessLuid failed\n"); + return Status; + } + + /* Copy the global flags because we're going to modify them for our purposes */ + Flags = gdwShutdownFlags; + + if (NT_SUCCESS(ShutdownStatus)) + { + /* Just report success, and keep the shutdown flags as they are */ + ShutdownStatus = STATUS_SUCCESS; + } + else + { + /* Report the status to Winlogon and say that we cancel the shutdown */ + Flags |= EWX_SHUTDOWN_CANCELED; + // FIXME: Should we reset gdwShutdownFlags to 0 ?? + } + + ERR("UserEndShutdown -- Notify Winlogon for end of shutdown\n"); + NotifyLogon(hwndSAS, &CallerLuid, Flags, ShutdownStatus); + + /* Always return success */ + return STATUS_SUCCESS; } /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Thu Feb 12 23:35:58 2015 @@ -493,7 +493,7 @@ { Context.ProcessId = (DWORD_PTR) ProcessData->ClientId.UniqueProcess; Context.wParam = 0; - Context.lParam = (0 != (Flags & EWX_INTERNAL_FLAG_LOGOFF) ? + Context.lParam = (0 != (Flags & EWX_CALLER_WINLOGON_LOGOFF) ? ENDSESSION_LOGOFF : 0); Context.StartTime = 0; Context.UIThread = NULL; @@ -505,7 +505,7 @@ NotifyTopLevelWindows(&Context); Context.wParam = (QUERY_RESULT_ABORT != Context.QueryResult); - Context.lParam = (0 != (Flags & EWX_INTERNAL_FLAG_LOGOFF) ? + Context.lParam = (0 != (Flags & EWX_CALLER_WINLOGON_LOGOFF) ? ENDSESSION_LOGOFF : 0); Context.SendMessageProc = SendEndSession; Context.ShowUI = DtbgIsDesktopVisible() && @@ -775,7 +775,7 @@ * Check for flags validity */ - if (Flags & EWX_INTERNAL_FLAG) + if (Flags & EWX_CALLER_WINLOGON) { /* Only Winlogon can call this */ if (ProcessId != LogonProcessId) @@ -904,7 +904,10 @@ return CsrShutdownNonCsrProcess; } - DPRINT1("Killing process with ShutdownFlags = %lu\n", CsrProcess->ShutdownFlags); + if (Flags & EWX_CALLER_SYSTEM) + DPRINT1("Killed by a SYSTEM process -- ShutdownFlags = %lu\n", CsrProcess->ShutdownFlags); + else + DPRINT1("Killing process with ShutdownFlags = %lu\n", CsrProcess->ShutdownFlags); #if 0 if (!NotifyAndTerminateProcess(CsrProcess, &ShutdownSettings, Flags))

1 0

[jimtabor] 66239: [NtUser] - Fix dialog breakage due to r66237.
by jimtabor＠svn.reactos.org 12 Feb '15

12 Feb '15

Author: jimtabor Date: Thu Feb 12 23:10:10 2015 New Revision: 66239 URL: http://svn.reactos.org/svn/reactos?rev=66239&view=rev Log: [NtUser] - Fix dialog breakage due to r66237. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu Feb 12 23:10:10 2015 @@ -379,17 +379,29 @@ * be destroying. */ // Rule #1 - if ( ti->MessageQueue->spwndActive == Window || + if ( ti->MessageQueue->spwndActive == Window || // Fixes CORE-106 RegSrv32 exit and return focus to CMD. (ti->MessageQueue->spwndActive == NULL && ti->MessageQueue == IntGetFocusMessageQueue()) ) { co_WinPosActivateOtherWindow(Window); } + /* Fixes dialog test test_focus breakage due to r66237 and CMD properties closing and returning focus to CMD */ + if (ti->MessageQueue->spwndFocus == Window) + { + if ((Window->style & (WS_CHILD | WS_POPUP)) == WS_CHILD) + { + co_UserSetFocus(Window->spwndParent); + } + else + { + co_UserSetFocus(NULL); + } + } + if (ti->MessageQueue->CaretInfo->hWnd == UserHMGetHandle(Window)) { co_IntDestroyCaret(ti); } - } /* @@ -2566,10 +2578,12 @@ co_IntShellHookNotify(HSHELL_WINDOWDESTROYED, (WPARAM) hWnd, 0); } + /* Hide the window */ if (Window->style & WS_VISIBLE) { if (Window->style & WS_CHILD) { + /* Only child windows receive WM_SHOWWINDOW in DestroyWindow() */ co_WinPosShowWindow(Window, SW_HIDE); } else @@ -3846,7 +3860,6 @@ END_CLEANUP; } - /* * @implemented */ @@ -3884,7 +3897,6 @@ UserLeave(); END_CLEANUP; } - /* * @implemented

1 0

[jimtabor] 66238: [NtUser] - Fix wine msg.c:test_quit_message tests.
by jimtabor＠svn.reactos.org 12 Feb '15

12 Feb '15

Author: jimtabor Date: Thu Feb 12 21:33:43 2015 New Revision: 66238 URL: http://svn.reactos.org/svn/reactos?rev=66238&view=rev Log: [NtUser] - Fix wine msg.c:test_quit_message tests. Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Feb 12 21:33:43 2015 @@ -848,8 +848,8 @@ return TRUE; } - /* Now look for a quit message. */ - if (pti->QuitPosted) + /* Only check for quit messages if not posted messages pending. */ + if (ProcessMask & QS_POSTMESSAGE && pti->QuitPosted) { /* According to the PSDK, WM_QUIT messages are always returned, regardless of the filter specified */ @@ -1222,14 +1222,7 @@ Message.lParam = lParam; } - if (WM_QUIT == Msg) - { - MsqPostQuitMessage(pti, wParam); - } - else - { - MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, ExtraInfo); - } + MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, ExtraInfo); } return TRUE; } 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 Feb 12 21:33:43 2015 @@ -932,6 +932,11 @@ ListEntry); if (PostedMessage->Msg.hwnd == Window->head.h) { + if (PostedMessage->Msg.message == WM_QUIT && pti->QuitPosted == 0) + { + pti->QuitPosted = 1; + pti->exitCode = PostedMessage->Msg.wParam; + } RemoveEntryList(&PostedMessage->ListEntry); ClearMsgBitsMask(pti, PostedMessage->QS_Flags); MsqDestroyMessage(PostedMessage);

1 0

[jimtabor] 66237: [NtUser] - Reorder Destroy and Free window, getting close to how wine does it. Still more work is needed.
by jimtabor＠svn.reactos.org 12 Feb '15

12 Feb '15

Author: jimtabor Date: Thu Feb 12 21:28:39 2015 New Revision: 66237 URL: http://svn.reactos.org/svn/reactos?rev=66237&view=rev Log: [NtUser] - Reorder Destroy and Free window, getting close to how wine does it. Still more work is needed. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu Feb 12 21:28:39 2015 @@ -367,36 +367,30 @@ */ static void IntSendDestroyMsg(HWND hWnd) { - + PTHREADINFO ti; PWND Window; -#if 0 /* FIXME */ - - GUITHREADINFO info; - - if (GetGUIThreadInfo(GetCurrentThreadId(), &info)) - { - if (hWnd == info.hwndCaret) - { - DestroyCaret(); - } - } -#endif - + + ti = PsGetCurrentThreadWin32Thread(); Window = UserGetWindowObject(hWnd); + if (Window) { -// USER_REFERENCE_ENTRY Ref; -// UserRefObjectCo(Window, &Ref); - - if (!Window->spwndOwner && !IntGetParent(Window)) - { - co_IntShellHookNotify(HSHELL_WINDOWDESTROYED, (WPARAM) hWnd, 0); - } - -// UserDerefObjectCo(Window); - } - - /* The window could already be destroyed here */ + /* Look whether the focus is within the tree of windows we will + * be destroying. + */ + // Rule #1 + if ( ti->MessageQueue->spwndActive == Window || + (ti->MessageQueue->spwndActive == NULL && ti->MessageQueue == IntGetFocusMessageQueue()) ) + { + co_WinPosActivateOtherWindow(Window); + } + + if (ti->MessageQueue->CaretInfo->hWnd == UserHMGetHandle(Window)) + { + co_IntDestroyCaret(ti); + } + + } /* * Send the WM_DESTROY to the window. @@ -485,7 +479,6 @@ Window->style &= ~WS_VISIBLE; Window->head.pti->cVisWindows--; - IntNotifyWinEvent(EVENT_OBJECT_DESTROY, Window, OBJID_WINDOW, CHILDID_SELF, 0); /* remove the window already at this point from the thread window list so we don't get into trouble when destroying the thread windows while we're still @@ -494,7 +487,7 @@ BelongsToThreadData = IntWndBelongsToThread(Window, ThreadData); - IntDeRegisterShellHookWindow(Window->head.h); + IntDeRegisterShellHookWindow(UserHMGetHandle(Window)); /* free child windows */ Children = IntWinListChildren(Window); @@ -528,13 +521,13 @@ RDW_VALIDATE | RDW_NOFRAME | RDW_NOERASE | RDW_NOINTERNALPAINT | RDW_NOCHILDREN); if(BelongsToThreadData) - co_IntSendMessage(Window->head.h, WM_NCDESTROY, 0, 0); + co_IntSendMessage(UserHMGetHandle(Window), WM_NCDESTROY, 0, 0); } DestroyTimersForWindow(ThreadData, Window); /* Unregister hot keys */ - UnregisterWindowHotKeys (Window); + UnregisterWindowHotKeys(Window); /* flush the message queue */ MsqRemoveWindowMessagesFromQueue(Window); @@ -555,19 +548,10 @@ ThreadData->rpdesk->rpwinstaParent->ShellListView = NULL; } - /* FIXME: do we need to fake QS_MOUSEMOVE wakebit? */ - -#if 0 /* FIXME */ - - WinPosCheckInternalPos(Window->head.h); - if (Window->head.h == GetCapture()) - { - ReleaseCapture(); - } - - /* free resources associated with the window */ - TIMER_RemoveWindowTimers(Window->head.h); -#endif + if (ThreadData->MessageQueue->spwndCapture == Window) + { + IntReleaseCapture(); + } if ( ((Window->style & (WS_CHILD|WS_POPUP)) != WS_CHILD) && Window->IDMenu && @@ -585,11 +569,6 @@ } DceFreeWindowDCE(Window); /* Always do this to catch orphaned DCs */ -#if 0 /* FIXME */ - - WINPROC_FreeProc(Window->winproc, WIN_PROC_WINDOW); - CLASS_RemoveWindow(Window->Class); -#endif IntUnlinkWindow(Window); @@ -601,7 +580,7 @@ } UserReferenceObject(Window); - UserDeleteObject(Window->head.h, TYPE_WINDOW); + UserDeleteObject(UserHMGetHandle(Window), TYPE_WINDOW); IntDestroyScrollBars(Window); @@ -2582,15 +2561,20 @@ IntSendParentNotify(Window, WM_DESTROY); } - /* Look whether the focus is within the tree of windows we will - * be destroying. - */ - if (!co_WinPosShowWindow(Window, SW_HIDE)) - { // Rule #1. - if ( ti->MessageQueue->spwndActive == Window || - (ti->MessageQueue->spwndActive == NULL && ti->MessageQueue == IntGetFocusMessageQueue()) ) - { - co_WinPosActivateOtherWindow(Window); + if (!Window->spwndOwner && !IntGetParent(Window)) + { + co_IntShellHookNotify(HSHELL_WINDOWDESTROYED, (WPARAM) hWnd, 0); + } + + if (Window->style & WS_VISIBLE) + { + if (Window->style & WS_CHILD) + { + co_WinPosShowWindow(Window, SW_HIDE); + } + else + { + co_WinPosSetWindowPos(Window, 0, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_HIDEWINDOW ); } } @@ -2604,7 +2588,7 @@ pwndTemp->spwndLastActive = Window->spwndOwner; } - if (Window->spwndParent && IntIsWindow(Window->head.h)) + if (Window->spwndParent && IntIsWindow(UserHMGetHandle(Window))) { if ((Window->style & (WS_POPUP | WS_CHILD)) == WS_CHILD) { @@ -2640,7 +2624,7 @@ IntEngWindowChanged(Window, WOC_DELETE); - if (!IntIsWindow(Window->head.h)) + if (!IntIsWindow(UserHMGetHandle(Window))) { return TRUE; } @@ -2705,11 +2689,13 @@ msg.pt = gpsi->ptCursor; co_MsqInsertMouseMessage(&msg, 0, 0, TRUE); + IntNotifyWinEvent(EVENT_OBJECT_DESTROY, Window, OBJID_WINDOW, CHILDID_SELF, 0); + /* Send destroy messages */ - IntSendDestroyMsg(Window->head.h); - - if (!IntIsWindow(Window->head.h)) + IntSendDestroyMsg(UserHMGetHandle(Window)); + + if (!IntIsWindow(UserHMGetHandle(Window))) { return TRUE; }

1 0

[tkreuzer] 66236: [WIN32K] Initialize EBRUSHOBJ.psoMask in EBRUSHOBJ_vInit. Should fix CORE-9165
by tkreuzer＠svn.reactos.org 12 Feb '15

12 Feb '15

Author: tkreuzer Date: Thu Feb 12 09:18:20 2015 New Revision: 66236 URL: http://svn.reactos.org/svn/reactos?rev=66236&view=rev Log: [WIN32K] Initialize EBRUSHOBJ.psoMask in EBRUSHOBJ_vInit. Should fix CORE-9165 Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Thu Feb 12 09:18:20 2015 @@ -64,6 +64,7 @@ pebo->pbrush = pbrush; pebo->pengbrush = NULL; pebo->flattrs = pbrush->flAttrs; + pebo->psoMask = NULL; /* Initialize 1 bpp fore and back colors */ pebo->crCurrentBack = crBackgroundClr;

1 0

[tfaber] 66235: [NTOS:MM] - Set aside some additional system PTEs if special pool is enabled CORE-8680
by tfaber＠svn.reactos.org 12 Feb '15

12 Feb '15

Author: tfaber Date: Thu Feb 12 09:14:52 2015 New Revision: 66235 URL: http://svn.reactos.org/svn/reactos?rev=66235&view=rev Log: [NTOS:MM] - Set aside some additional system PTEs if special pool is enabled CORE-8680 Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Thu Feb 12 09:14:52 2015 @@ -2181,6 +2181,13 @@ // MmNumberOfSystemPtes <<= 1; } + if (MmSpecialPoolTag != 0 && MmSpecialPoolTag != -1) + { + // + // Add some extra PTEs for special pool + // + MmNumberOfSystemPtes += 0x6000; + } } DPRINT("System PTE count has been tuned to %lu (%lu bytes)\n",

1 0

[jimtabor] 66234: [NtUser] - Fix the results from the new API CreateWindowEx tests. Message sequence and isolating each job Destroy and Free perform will come later. Refer to CORE-8703. This may no...
by jimtabor＠svn.reactos.org 12 Feb '15

12 Feb '15

Author: jimtabor Date: Thu Feb 12 00:17:41 2015 New Revision: 66234 URL: http://svn.reactos.org/svn/reactos?rev=66234&view=rev Log: [NtUser] - Fix the results from the new API CreateWindowEx tests. Message sequence and isolating each job Destroy and Free perform will come later. Refer to CORE-8703. This may not fix the crash while in wine test User32:msg.c. - Dedicated to Thomas Faber. - Fix build window list using threads. The link list works okay for locking but for tracking thread windows, use the snapshot method. Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/window.h Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Feb 12 00:17:41 2015 @@ -640,6 +640,14 @@ if (wparam) UserDerefObjectCo(Window); return lRes; } + case WM_ASYNC_DESTROYWINDOW: + { + ERR("WM_ASYNC_DESTROYWINDOW\n"); + if (pWnd->style & WS_CHILD) + return co_UserFreeWindow(pWnd, PsGetCurrentProcessWin32Process(), PsGetCurrentThreadWin32Thread(), TRUE); + else + co_UserDestroyWindow(pWnd); + } } return 0; } 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 Feb 12 00:17:41 2015 @@ -112,7 +112,8 @@ { WM_ASYNC_SHOWWINDOW = 0x80000000, WM_ASYNC_SETWINDOWPOS, - WM_ASYNC_SETACTIVEWINDOW + WM_ASYNC_SETACTIVEWINDOW, + WM_ASYNC_DESTROYWINDOW }; BOOL FASTCALL MsqIsHung(PTHREADINFO pti); Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu Feb 12 00:17:41 2015 @@ -408,32 +408,24 @@ * This WM_DESTROY message can trigger re-entrant calls to DestroyWindow * make sure that the window still exists when we come back. */ -#if 0 /* FIXME */ - - if (IsWindow(Wnd)) + + if (IntIsWindow(hWnd)) { HWND* pWndArray; int i; - if (!(pWndArray = WIN_ListChildren( hwnd ))) - return; - - /* start from the end (FIXME: is this needed?) */ + if (!(pWndArray = IntWinListChildren( Window ))) return; + for (i = 0; pWndArray[i]; i++) - ; - - while (--i >= 0) - { - if (IsWindow( pWndArray[i] )) - WIN_SendDestroyMsg( pWndArray[i] ); - } - HeapFree(GetProcessHeap(), 0, pWndArray); + { + if (IntIsWindow( pWndArray[i] )) IntSendDestroyMsg( pWndArray[i] ); + } + ExFreePoolWithTag(pWndArray, USERTAG_WINDOWLIST); } else { TRACE("destroyed itself while in WM_DESTROY!\n"); } -#endif } static VOID @@ -471,10 +463,10 @@ * done in CreateWindow is undone here and not in DestroyWindow:-P */ -static LRESULT co_UserFreeWindow(PWND Window, - PPROCESSINFO ProcessData, - PTHREADINFO ThreadData, - BOOLEAN SendMessages) +LRESULT co_UserFreeWindow(PWND Window, + PPROCESSINFO ProcessData, + PTHREADINFO ThreadData, + BOOLEAN SendMessages) { HWND *Children; HWND *ChildHandle; @@ -504,12 +496,6 @@ IntDeRegisterShellHookWindow(Window->head.h); - if(SendMessages) - { - /* Send destroy messages */ - IntSendDestroyMsg(Window->head.h); - } - /* free child windows */ Children = IntWinListChildren(Window); if (Children) @@ -521,7 +507,7 @@ if(!IntWndBelongsToThread(Child, ThreadData)) { /* send WM_DESTROY messages to windows not belonging to the same thread */ - IntSendDestroyMsg(Child->head.h); + co_IntSendMessage( UserHMGetHandle(Child), WM_ASYNC_DESTROYWINDOW, 0, 0 ); } else co_UserFreeWindow(Child, ProcessData, ThreadData, SendMessages); @@ -1415,8 +1401,8 @@ { PETHREAD Thread; PTHREADINFO W32Thread; - PLIST_ENTRY Current; PWND Window; + HWND *List = NULL; Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); if (!NT_SUCCESS(Status)) @@ -1431,35 +1417,42 @@ return ERROR_INVALID_PARAMETER; } - Current = W32Thread->WindowListHead.Flink; - while (Current != &(W32Thread->WindowListHead)) - { - Window = CONTAINING_RECORD(Current, WND, ThreadListEntry); - ASSERT(Window); - - if (dwCount < *pBufSize && pWnd) - { - _SEH2_TRY + // Do not use Thread link list due to co_UserFreeWindow!!! + // Current = W32Thread->WindowListHead.Flink; + // Fixes Api:CreateWindowEx tests!!! + List = IntWinListChildren(UserGetDesktopWindow()); + if (List) + { + int i; + for (i = 0; List[i]; i++) + { + Window = ValidateHwndNoErr(List[i]); + if (Window && Window->head.pti == W32Thread) { - ProbeForWrite(pWnd, sizeof(HWND), 1); - *pWnd = Window->head.h; - pWnd++; + if (dwCount < *pBufSize && pWnd) + { + _SEH2_TRY + { + ProbeForWrite(pWnd, sizeof(HWND), 1); + *pWnd = Window->head.h; + pWnd++; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) + { + ERR("Failure to build window list!\n"); + SetLastNtError(Status); + break; + } + } + dwCount++; } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - if (!NT_SUCCESS(Status)) - { - ERR("Failure to build window list!\n"); - SetLastNtError(Status); - break; - } - } - dwCount++; - Current = Window->ThreadListEntry.Flink; - } + } + } ObDereferenceObject(Thread); } @@ -2711,6 +2704,10 @@ msg.lParam = MAKELPARAM(gpsi->ptCursor.x, gpsi->ptCursor.y); msg.pt = gpsi->ptCursor; co_MsqInsertMouseMessage(&msg, 0, 0, TRUE); + + /* Send destroy messages */ + + IntSendDestroyMsg(Window->head.h); if (!IntIsWindow(Window->head.h)) { Modified: trunk/reactos/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] Thu Feb 12 00:17:41 2015 @@ -63,5 +63,6 @@ PWND FASTCALL IntGetNonChildAncestor(PWND); LONG FASTCALL co_UserSetWindowLong(HWND,DWORD,LONG,BOOL); HWND FASTCALL IntGetWindow(HWND,UINT); +LRESULT co_UserFreeWindow(PWND,PPROCESSINFO,PTHREADINFO,BOOLEAN); /* EOF */

1 0

[jimtabor] 66233: [ApiTest] - Add Thomas Faber API test from CORE-8703.
by jimtabor＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: jimtabor Date: Wed Feb 11 23:53:08 2015 New Revision: 66233 URL: http://svn.reactos.org/svn/reactos?rev=66233&view=rev Log: [ApiTest] - Add Thomas Faber API test from CORE-8703. Added: trunk/rostests/apitests/user32/CreateWindowEx.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/helper.c trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Wed Feb 11 23:53:08 2015 @@ -3,6 +3,7 @@ AttachThreadInput.c helper.c CreateIconFromResourceEx.c + CreateWindowEx.c DeferWindowPos.c DestroyCursorIcon.c DrawIconEx.c Added: trunk/rostests/apitests/user32/CreateWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateWin… ============================================================================== --- trunk/rostests/apitests/user32/CreateWindowEx.c (added) +++ trunk/rostests/apitests/user32/CreateWindowEx.c [iso-8859-1] Wed Feb 11 23:53:08 2015 @@ -0,0 +1,189 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CreateWindow stuff + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#include <winuser.h> +#include "helper.h" + +static HWND hWndList[5 + 1]; +static const int hWndCount = sizeof(hWndList) / sizeof(hWndList[0]) - 1; +static DWORD dwThreadId; + +#define ok_hwnd(val, exp) do \ + { \ + HWND _val = (val), _exp = (exp); \ + int _ival = get_iwnd(_val, FALSE); \ + int _iexp = get_iwnd(_exp, FALSE); \ + ok(_val == _exp, #val " = %p (%d), expected %p (%d)\n", _val, _ival, _exp, _iexp); \ + } while (0) + +static +int +get_iwnd( + _In_ HWND hWnd, + _In_ BOOL set) +{ + int i; + if (!hWnd) + return 0; + for (i = 1; i <= hWndCount; i++) + { + if (hWndList[i] == hWnd) + return i; + } + if (!set) + return 0; + for (i = 1; i <= hWndCount; i++) + { + if (hWndList[i] == NULL) + { + hWndList[i] = hWnd; + return i; + } + } + ok(0, "Too many windows!\n"); + return 0; +} + +static +BOOL +CALLBACK +EnumProc( + _In_ HWND hWnd, + _In_ LPARAM lParam) +{ + HWND hLookingFor = (HWND)lParam; + return hWnd != hLookingFor; +} + +static +LRESULT +CALLBACK +WndProc( + _In_ HWND hWnd, + _In_ UINT message, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + HWND hTest; + int iwnd = get_iwnd(hWnd, TRUE); + + ok(GetCurrentThreadId() == dwThreadId, "Thread 0x%lx instead of 0x%lx\n", GetCurrentThreadId(), dwThreadId); + if (message > WM_USER || IsDWmMsg(message) || IseKeyMsg(message)) + return DefWindowProcW(hWnd, message, wParam, lParam); + + RECOND_MESSAGE(iwnd, message, SENT, wParam, lParam); + + switch(message) + { + case WM_DESTROY: + if (GetParent(hWnd)) + { + /* child window */ + ok(EnumThreadWindows(dwThreadId, EnumProc, (LPARAM)hWnd), "Child window %p (%d) enumerated\n", hWnd, iwnd); + ok(!EnumChildWindows(GetParent(hWnd), EnumProc, (LPARAM)hWnd), "Child window %p (%d) not enumerated\n", hWnd, iwnd); + ok(!EnumThreadWindows(dwThreadId, EnumProc, (LPARAM)GetParent(hWnd)), "Parent window of %p (%d) not enumerated\n", hWnd, iwnd); + } + else + { + /* top-level window */ + ok(!EnumThreadWindows(dwThreadId, EnumProc, (LPARAM)hWnd), "Window %p (%d) not enumerated in WM_DESTROY\n", hWnd, iwnd); + } + if (hWnd == hWndList[3]) + { + hTest = SetParent(hWndList[4], hWndList[2]); + ok_hwnd(hTest, hWndList[1]); + hTest = SetParent(hWndList[5], hWndList[1]); + ok_hwnd(hTest, hWndList[2]); + + ok_hwnd(GetParent(hWndList[1]), NULL); + ok_hwnd(GetParent(hWndList[2]), NULL); + ok_hwnd(GetParent(hWndList[3]), hWndList[1]); + ok_hwnd(GetParent(hWndList[4]), hWndList[2]); + ok_hwnd(GetParent(hWndList[5]), hWndList[1]); + } + break; + } + + return DefWindowProcW(hWnd, message, wParam, lParam); +} + + +START_TEST(CreateWindowEx) +{ + HWND hWnd; + MSG msg; + + SetCursorPos(0,0); + + dwThreadId = GetCurrentThreadId(); + hWndList[0] = INVALID_HANDLE_VALUE; + RegisterSimpleClass(WndProc, L"CreateTest"); + + hWnd = CreateWindowExW(0, L"CreateTest", NULL, 0, 10, 10, 20, 20, NULL, NULL, 0, NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + ok(hWnd == hWndList[1], "Got %p, expected %p\n", hWnd, hWndList[1]); + + hWnd = CreateWindowExW(0, L"CreateTest", NULL, 0, 40, 10, 20, 20, NULL, NULL, 0, NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + ok(hWnd == hWndList[2], "Got %p, expected %p\n", hWnd, hWndList[2]); + + hWnd = CreateWindowExW(0, L"CreateTest", NULL, WS_CHILD, 60, 10, 20, 20, hWndList[1], NULL, 0, NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + ok(hWnd == hWndList[3], "Got %p, expected %p\n", hWnd, hWndList[3]); + + hWnd = CreateWindowExW(0, L"CreateTest", NULL, WS_CHILD, 80, 10, 20, 20, hWndList[1], NULL, 0, NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + ok(hWnd == hWndList[4], "Got %p, expected %p\n", hWnd, hWndList[4]); + + hWnd = CreateWindowExW(0, L"CreateTest", NULL, WS_CHILD, 60, 10, 20, 20, hWndList[2], NULL, 0, NULL); + ok(hWnd != NULL, "CreateWindow failed\n"); + ok(hWnd == hWndList[5], "Got %p, expected %p\n", hWnd, hWndList[5]); + +trace("\n"); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + int iwnd = get_iwnd(msg.hwnd, FALSE); + if(!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + RECOND_MESSAGE(iwnd, msg.message, POST, 0, 0); + DispatchMessageA( &msg ); + } +trace("\n"); + TRACE_CACHE(); +trace("\n"); + + ok_hwnd(GetParent(hWndList[1]), NULL); + ok_hwnd(GetParent(hWndList[2]), NULL); + ok_hwnd(GetParent(hWndList[3]), hWndList[1]); + ok_hwnd(GetParent(hWndList[4]), hWndList[1]); + ok_hwnd(GetParent(hWndList[5]), hWndList[2]); + + DestroyWindow(hWndList[1]); + ok(!IsWindow(hWndList[1]), "\n"); + ok( IsWindow(hWndList[2]), "\n"); + ok(!IsWindow(hWndList[3]), "\n"); + ok( IsWindow(hWndList[4]), "\n"); + ok(!IsWindow(hWndList[5]), "\n"); + + ok_hwnd(GetParent(hWndList[1]), NULL); + ok_hwnd(GetParent(hWndList[2]), NULL); + ok_hwnd(GetParent(hWndList[3]), NULL); + ok_hwnd(GetParent(hWndList[4]), hWndList[2]); + ok_hwnd(GetParent(hWndList[5]), NULL); + +trace("\n"); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + int iwnd = get_iwnd(msg.hwnd, FALSE); + if(!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + RECOND_MESSAGE(iwnd, msg.message, POST, 0, 0); + DispatchMessageA( &msg ); + } +trace("\n"); + TRACE_CACHE(); + } Propchange: trunk/rostests/apitests/user32/CreateWindowEx.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/user32/CreateWindowEx.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rostests/apitests/user32/helper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.c?… ============================================================================== --- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.c [iso-8859-1] Wed Feb 11 23:53:08 2015 @@ -23,6 +23,12 @@ { switch(msg) { + case WM_CREATE: return "WM_CREATE"; + case WM_NCCREATE: return "WM_NCCREATE"; + case WM_PARENTNOTIFY: return "WM_PARENTNOTIFY"; + case WM_DESTROY: return "WM_DESTROY"; + case WM_NCDESTROY: return "WM_NCDESTROY"; + case WM_CHILDACTIVATE: return "WM_CHILDACTIVATE"; case WM_NCACTIVATE: return "WM_NCACTIVATE"; case WM_ACTIVATE: return "WM_ACTIVATE"; case WM_ACTIVATEAPP: return "WM_ACTIVATEAPP"; Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Wed Feb 11 23:53:08 2015 @@ -5,6 +5,7 @@ extern void func_AttachThreadInput(void); extern void func_CreateIconFromResourceEx(void); +extern void func_CreateWindowEx(void); extern void func_DeferWindowPos(void); extern void func_DestroyCursorIcon(void); extern void func_DrawIconEx(void); @@ -33,6 +34,7 @@ { { "AttachThreadInput", func_AttachThreadInput }, { "CreateIconFromResourceEx", func_CreateIconFromResourceEx }, + { "CreateWindowEx", func_CreateWindowEx }, { "DeferWindowPos", func_DeferWindowPos }, { "DestroyCursorIcon", func_DestroyCursorIcon }, { "DrawIconEx", func_DrawIconEx },

1 0

[tkreuzer] 66232: [MESA] Partly sync find_value() with MESA 10.4.4. Fixes endless loop when GoogleEarth is started. GoogleEarth now loads and displays the earth, but it doesn't handle any input and...
by tkreuzer＠svn.reactos.org 11 Feb '15

11 Feb '15

Author: tkreuzer Date: Wed Feb 11 21:36:01 2015 New Revision: 66232 URL: http://svn.reactos.org/svn/reactos?rev=66232&view=rev Log: [MESA] Partly sync find_value() with MESA 10.4.4. Fixes endless loop when GoogleEarth is started. GoogleEarth now loads and displays the earth, but it doesn't handle any input and makes the entire GUI hang. Modified: trunk/reactos/dll/opengl/mesa/main/get.c Modified: trunk/reactos/dll/opengl/mesa/main/get.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/get.c… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/get.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/get.c [iso-8859-1] Wed Feb 11 21:36:01 2015 @@ -1132,10 +1132,20 @@ mask = Elements(table) - 1; hash = (pname * prime_factor); while (1) { - d = &values[table[hash & mask]]; - + int idx = table[hash & mask]; + + /* If the enum isn't valid, the hash walk ends with index 0, + * pointing to the first entry of values[] which doesn't hold + * any valid enum. */ + if (unlikely(idx == 0)) { + _mesa_error(ctx, GL_INVALID_ENUM, "%s(pname=%s)", func, + _mesa_lookup_enum_by_nr(pname)); + return &error_value; + } + + d = &values[idx]; if (likely(d->pname == pname)) - break; + break; hash += prime_step; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs