Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 54640: [PORTCLS] - Add support for IDrmPort, IDrmPort2 - more debug traces
by janderwald＠svn.reactos.org 11 Dec '11

11 Dec '11

Author: janderwald Date: Sun Dec 11 10:51:37 2011 New Revision: 54640 URL: http://svn.reactos.org/svn/reactos?rev=54640&view=rev Log: [PORTCLS] - Add support for IDrmPort, IDrmPort2 - more debug traces Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -58,6 +58,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + if (IsEqualGUIDAligned(refiid, IID_IUnregisterPhysicalConnection) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { @@ -65,6 +67,12 @@ PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; + } + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CUnregisterPhysicalConnection::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); } return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -73,6 +73,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + DPRINT("CInterruptSync::QueryInterface: this %p\n", this); if (IsEqualGUIDAligned(refiid, IID_IInterruptSync) || @@ -83,7 +85,13 @@ return STATUS_SUCCESS; } - DPRINT("CInterruptSync::QueryInterface: this %p UNKNOWN interface requested\n", this); + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CInterruptSync::QueryInterface: no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); + } + return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -137,22 +137,27 @@ PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; } + else if (IsEqualGUIDAligned(refiid, IID_IPortEvents)) + { + *Output = PVOID(PPORTEVENTS(this)); + PUNKNOWN(*Output)->AddRef(); + return STATUS_SUCCESS; + } else if (IsEqualGUIDAligned(refiid, IID_ISubdevice)) { *Output = PVOID(PSUBDEVICE(this)); PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; } - else if (IsEqualGUIDAligned(refiid, IID_IPortEvents)) - { - *Output = PVOID(PPORTEVENTS(this)); - PUNKNOWN(*Output)->AddRef(); - return STATUS_SUCCESS; - } else if (IsEqualGUIDAligned(refiid, IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); } + else if (IsEqualGUIDAligned(refiid, IID_IDrmPort) || + IsEqualGUIDAligned(refiid, IID_IDrmPort2)) + { + return NewIDrmPort((PDRMPORT2*)Output); + } else if (IsEqualGUIDAligned(refiid, IID_IUnregisterSubdevice)) { return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); @@ -164,7 +169,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("IPortTopology_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("IPortTopology_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -179,7 +179,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -32,7 +32,7 @@ Status = pUnknown->QueryInterface(IID_IAdapterPowerManagement, (PVOID*)&pPower); if (!NT_SUCCESS(Status)) { - DPRINT("PcRegisterAdapterPowerManagement no IAdapterPowerManagement interface %x\n", Status); + DPRINT1("PcRegisterAdapterPowerManagement no IAdapterPowerManagement interface %x\n", Status); DeviceExt->AdapterPowerManagement = NULL; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -54,6 +54,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + DPRINT("CRegistryKey::QueryInterface entered\n"); if (IsEqualGUIDAligned(refiid, IID_IRegistryKey) || IsEqualGUIDAligned(refiid, IID_IUnknown)) @@ -63,7 +65,12 @@ return STATUS_SUCCESS; } - DPRINT("IRegistryKey_QueryInterface: This %p\n", this); + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CRegistryKey::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); + } + return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -69,7 +69,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("IResourceList_QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("IResourceList_QueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -91,7 +91,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("CServiceGroup::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("CServiceGroup::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -47,12 +47,20 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + if (IsEqualGUIDAligned(refiid, IID_IUnregisterSubdevice) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { *Output = PVOID(PUNREGISTERSUBDEVICE(this)); PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; + } + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); } return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -60,6 +60,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + if (IsEqualGUIDAligned(refiid, IID_IPortClsVersion) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { @@ -67,6 +69,13 @@ PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; } + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CPortClsVersion::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); + } + return STATUS_UNSUCCESSFUL; }

1 0

[spetreolle] 54639: [WIN32K] Fix MSVC build.
by spetreolle＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: spetreolle Date: Sat Dec 10 21:30:17 2011 New Revision: 54639 URL: http://svn.reactos.org/svn/reactos?rev=54639&view=rev Log: [WIN32K] Fix MSVC build. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c 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] Sat Dec 10 21:30:17 2011 @@ -622,7 +622,7 @@ } } return 0; -} +} LRESULT FASTCALL IntDispatchMessage(PMSG pMsg) @@ -632,6 +632,7 @@ LRESULT retval = 0; PTHREADINFO pti; PWND Window = NULL; + HRGN hrgn; if (pMsg->hwnd) { @@ -705,7 +706,7 @@ { Window->state2 &= ~WNDS2_WMPAINTSENT; /* send a WM_NCPAINT and WM_ERASEBKGND if the non-client area is still invalid */ - HRGN hrgn = IntSysCreateRectRgn( 0, 0, 0, 0 ); + hrgn = IntSysCreateRectRgn( 0, 0, 0, 0 ); co_UserGetUpdateRgn( Window, hrgn, TRUE ); GreDeleteObject(hrgn); } @@ -1447,7 +1448,7 @@ &Result)) { Result = ((ULONG_PTR)-1); - } + } return Result; } /* MSDN: @@ -1528,7 +1529,7 @@ { ERR("SMWCB: Internal Message!\n"); Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam ); - if (uResult) *uResult = Result; + if (uResult) *uResult = Result; RETURN( TRUE); } @@ -1616,7 +1617,7 @@ /* This HACK function posts a message if the destination's message queue belongs to another thread, otherwise it sends the message. It does not support broadcast - messages! + messages! */ LRESULT FASTCALL co_IntPostOrSendMessage( HWND hWnd,

1 0

[jimtabor] 54638: - missed this file.
by jimtabor＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: jimtabor Date: Sat Dec 10 07:46:10 2011 New Revision: 54638 URL: http://svn.reactos.org/svn/reactos?rev=54638&view=rev Log: - missed this file. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat Dec 10 07:46:10 2011 @@ -745,7 +745,7 @@ LRESULT DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { - WINDOWPLACEMENT wp; +// WINDOWPLACEMENT wp; POINT Pt; LRESULT lResult; @@ -763,30 +763,24 @@ case SC_SIZE: DefWndDoSizeMove(hWnd, wParam); break; - case SC_MINIMIZE: - wp.length = sizeof(WINDOWPLACEMENT); - if(GetWindowPlacement(hWnd, &wp)) - { - wp.showCmd = SW_MINIMIZE; - SetWindowPlacement(hWnd, &wp); - } + case SC_MINIMIZE: + if (hWnd == GetActiveWindow()) + ShowOwnedPopups(hWnd,FALSE); + ShowWindow( hWnd, SW_MINIMIZE ); break; - case SC_MAXIMIZE: - wp.length = sizeof(WINDOWPLACEMENT); - if(GetWindowPlacement(hWnd, &wp)) - { - wp.showCmd = SW_MAXIMIZE; - SetWindowPlacement(hWnd, &wp); - } + + case SC_MAXIMIZE: + if (IsIconic(hWnd) && hWnd == GetActiveWindow()) + ShowOwnedPopups(hWnd,TRUE); + ShowWindow( hWnd, SW_MAXIMIZE ); break; - case SC_RESTORE: - wp.length = sizeof(WINDOWPLACEMENT); - if(GetWindowPlacement(hWnd, &wp)) - { - wp.showCmd = SW_RESTORE; - SetWindowPlacement(hWnd, &wp); - } + + case SC_RESTORE: + if (IsIconic(hWnd) && hWnd == GetActiveWindow()) + ShowOwnedPopups(hWnd,TRUE); + ShowWindow( hWnd, SW_RESTORE ); break; + case SC_CLOSE: return SendMessageW(hWnd, WM_CLOSE, 0, 0); // case SC_DEFAULT:

1 0

[jimtabor] 54637: [Win32k|User32] - Fix Get/SetWindowPlacement and everything related. Which exposed the scroll bar over write issue, it's not refreshing the client window when it is maximized. Nex...
by jimtabor＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: jimtabor Date: Sat Dec 10 07:41:56 2011 New Revision: 54637 URL: http://svn.reactos.org/svn/reactos?rev=54637&view=rev Log: [Win32k|User32] - Fix Get/SetWindowPlacement and everything related. Which exposed the scroll bar over write issue, it's not refreshing the client window when it is maximized. Next thing to fix. - Fix ShowWindowAsync, now restore and minimize all works. This is based on wine but in reality it's based on Windows queuing event messages used in server side internal calls. Also this patch includes the server side hooking points. - Removed one ugly API. - Fixes bug 6239, 6739 and client window restore from maximize and the incremental crawling down issue when parent window is minimized then restored. Modified: trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/dll/win32/user32/windows/winpos.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db trunk/reactos/subsystems/win32/win32k/w32ksvc.h Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -557,8 +557,6 @@ BYTE bScan, DWORD dwFlags, ULONG_PTR dwExtraInfo) - - { INPUT Input; Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -959,6 +959,13 @@ PWND Wnd = ValidateHwnd(hWnd); if (!Wnd) return FALSE; + if (Wnd->style & WS_MINIMIZED) + { + lpRect->left = lpRect->top = 0; + lpRect->right = GetSystemMetrics(SM_CXMINIMIZED); + lpRect->bottom = GetSystemMetrics(SM_CYMINIMIZED); + return TRUE; + } if ( hWnd != GetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) { /* lpRect->left = lpRect->top = 0; Modified: trunk/reactos/dll/win32/user32/windows/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -68,26 +68,110 @@ if (!SetActiveWindow( hwndTo )) SetActiveWindow(0); } - +#define EMPTYPOINT(pt) ((pt).x == -1 && (pt).y == -1) UINT WINAPI -WinPosGetMinMaxInfo(HWND hWnd, POINT* MaxSize, POINT* MaxPos, - POINT* MinTrack, POINT* MaxTrack) -{ - MINMAXINFO MinMax; - - if(NtUserGetMinMaxInfo(hWnd, &MinMax, TRUE)) - { - MinMax.ptMaxTrackSize.x = max(MinMax.ptMaxTrackSize.x, - MinMax.ptMinTrackSize.x); - MinMax.ptMaxTrackSize.y = max(MinMax.ptMaxTrackSize.y, - MinMax.ptMinTrackSize.y); - - if (MaxSize) *MaxSize = MinMax.ptMaxSize; - if (MaxPos) *MaxPos = MinMax.ptMaxPosition; - if (MinTrack) *MinTrack = MinMax.ptMinTrackSize; - if (MaxTrack) *MaxTrack = MinMax.ptMaxTrackSize; - } +WinPosGetMinMaxInfo(HWND hwnd, POINT* maxSize, POINT* maxPos, + POINT* minTrack, POINT* maxTrack) +{ + MINMAXINFO MinMax; + HMONITOR monitor; + INT xinc, yinc; + LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG adjustedStyle; + LONG exstyle = GetWindowLongW( hwnd, GWL_EXSTYLE ); + RECT rc; + WND *win; + + /* Compute default values */ + + GetWindowRect(hwnd, &rc); + MinMax.ptReserved.x = rc.left; + MinMax.ptReserved.y = rc.top; + + if ((style & WS_CAPTION) == WS_CAPTION) + adjustedStyle = style & ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ + else + adjustedStyle = style; + + GetClientRect(GetAncestor(hwnd,GA_PARENT), &rc); + AdjustWindowRectEx(&rc, adjustedStyle, ((style & WS_POPUP) && GetMenu(hwnd)), exstyle); + + xinc = -rc.left; + yinc = -rc.top; + + MinMax.ptMaxSize.x = rc.right - rc.left; + MinMax.ptMaxSize.y = rc.bottom - rc.top; + if (style & (WS_DLGFRAME | WS_BORDER)) + { + MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK); + MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); + } + else + { + MinMax.ptMinTrackSize.x = 2 * xinc; + MinMax.ptMinTrackSize.y = 2 * yinc; + } + MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); + MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); + MinMax.ptMaxPosition.x = -xinc; + MinMax.ptMaxPosition.y = -yinc; + + if ((win = ValidateHwnd( hwnd )) )//&& win != WND_DESKTOP && win != WND_OTHER_PROCESS) + { + if (!EMPTYPOINT(win->InternalPos.MaxPos)) MinMax.ptMaxPosition = win->InternalPos.MaxPos; + } + + SendMessageW( hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax ); + + /* if the app didn't change the values, adapt them for the current monitor */ + + if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) + { + RECT rc_work; + MONITORINFO mon_info; + + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + + rc_work = mon_info.rcMonitor; + + if (style & WS_MAXIMIZEBOX) + { + if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) + rc_work = mon_info.rcWork; + } + + if (MinMax.ptMaxSize.x == GetSystemMetrics(SM_CXSCREEN) + 2 * xinc && + MinMax.ptMaxSize.y == GetSystemMetrics(SM_CYSCREEN) + 2 * yinc) + { + MinMax.ptMaxSize.x = (rc_work.right - rc_work.left) + 2 * xinc; + MinMax.ptMaxSize.y = (rc_work.bottom - rc_work.top) + 2 * yinc; + } + if (MinMax.ptMaxPosition.x == -xinc && MinMax.ptMaxPosition.y == -yinc) + { + MinMax.ptMaxPosition.x = rc_work.left - xinc; + MinMax.ptMaxPosition.y = rc_work.top - yinc; + } + } + + /* Some sanity checks */ + + TRACE("%d %d / %d %d / %d %d / %d %d\n", + MinMax.ptMaxSize.x, MinMax.ptMaxSize.y, + MinMax.ptMaxPosition.x, MinMax.ptMaxPosition.y, + MinMax.ptMaxTrackSize.x, MinMax.ptMaxTrackSize.y, + MinMax.ptMinTrackSize.x, MinMax.ptMinTrackSize.y); + MinMax.ptMaxTrackSize.x = max( MinMax.ptMaxTrackSize.x, + MinMax.ptMinTrackSize.x ); + MinMax.ptMaxTrackSize.y = max( MinMax.ptMaxTrackSize.y, + MinMax.ptMinTrackSize.y ); + + if (maxSize) *maxSize = MinMax.ptMaxSize; + if (maxPos) *maxPos = MinMax.ptMaxPosition; + if (minTrack) *minTrack = MinMax.ptMinTrackSize; + if (maxTrack) *maxTrack = MinMax.ptMaxTrackSize; + return 0; //FIXME: what does it return? } 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] Sat Dec 10 07:41:56 2011 @@ -132,6 +132,7 @@ WCHAR szDesktopName[1]; } DESKTOPINFO, *PDESKTOPINFO; +#define CTI_THREADSYSLOCK 0x0001 #define CTI_INSENDMESSAGE 0x0002 typedef struct _CLIENTTHREADINFO @@ -566,6 +567,9 @@ #define WS_EX2_HASOVERLAY 0X00000200 #define WS_EX2_CONSOLEWINDOW 0X00000400 #define WS_EX2_CHILDNOACTIVATE 0X00000800 + +#define WPF_MININIT 0x0008 +#define WPF_MAXINIT 0x0010 typedef struct _WND { @@ -622,10 +626,10 @@ RECT NormalRect; POINT IconPos; POINT MaxPos; + UINT flags; // WPF_ flags. } InternalPos; UINT Unicode : 1; // !(WNDS_ANSICREATOR|WNDS_ANSIWINDOWPROC) ? - /* Indicates whether the window is derived from a system class */ UINT InternalPosInitialized : 1; UINT HideFocus : 1; // WS_EX_UISTATEFOCUSRECTHIDDEN ? UINT HideAccel : 1; // WS_EX_UISTATEKBACCELHIDDEN ? @@ -3213,8 +3217,8 @@ typedef struct tagKMDDELPARAM { - UINT_PTR uiLo; - UINT_PTR uiHi; + UINT_PTR uiLo; + UINT_PTR uiHi; } KMDDELPARAM, *PKMDDELPARAM; @@ -3257,13 +3261,6 @@ HMENU hMenu, UINT fByPos, UINT gmdiFlags); - -BOOL -NTAPI -NtUserGetMinMaxInfo( - HWND hwnd, - MINMAXINFO *MinMaxInfo, - BOOL SendMessage); BOOL NTAPI 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] Sat Dec 10 07:41:56 2011 @@ -141,6 +141,13 @@ #define QF_TRACKMOUSEFIRING 0x00080000 #define QF_CAPTURELOCKED 0x00100000 #define QF_ACTIVEWNDTRACKING 0x00200000 + +/* internal messages codes */ +enum internal_event_message +{ + WM_ASYNC_SHOWWINDOW = 0x80000000, + WM_ASYNC_SETWINDOWPOS +}; BOOL FASTCALL MsqIsHung(PUSER_MESSAGE_QUEUE MessageQueue); VOID CALLBACK HungAppSysTimerProc(HWND,UINT,UINT_PTR,DWORD); Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -54,4 +54,3 @@ void FASTCALL co_WinPosSendSizeMove(PWND Window); PWND FASTCALL co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest); VOID FASTCALL co_WinPosActivateOtherWindow(PWND Window); -VOID FASTCALL WinPosInitInternalPos(PWND WindowObject, POINT *pt, RECTL *RestoreRect); 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] Sat Dec 10 07:41:56 2011 @@ -99,6 +99,7 @@ if (message >= 8*sizeof(message_pointer_flags)) return FALSE; return (message_pointer_flags[message / 32] & SET(message)) != 0; } +#undef SET #define MMS_SIZE_WPARAM -1 #define MMS_SIZE_WPARAMWCHAR -2 @@ -590,6 +591,39 @@ co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); } +static LRESULT handle_internal_message( PWND pWnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + LRESULT lRes; + + if (!pWnd || + pWnd == IntGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP + pWnd == IntGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + return 0; + + ERR("Internal Event Msg %p\n",msg); + + switch(msg) + { + case WM_ASYNC_SHOWWINDOW: + return co_WinPosShowWindow( pWnd, wparam ); + case WM_ASYNC_SETWINDOWPOS: + { + PWINDOWPOS winpos = (PWINDOWPOS)lparam; + if (!winpos) return 0; + lRes = co_WinPosSetWindowPos( pWnd, + winpos->hwndInsertAfter, + winpos->x, + winpos->y, + winpos->cx, + winpos->cy, + winpos->flags); + ExFreePoolWithTag(winpos, USERTAG_SWP); + return lRes; + } + } + return 0; +} + LRESULT FASTCALL IntDispatchMessage(PMSG pMsg) { @@ -648,6 +682,13 @@ // Need a window! if ( !Window ) return 0; + if (pMsg->message == WM_PAINT) Window->state |= WNDS_PAINTNOTPROCESSED; + + if ( Window->state & WNDS_SERVERSIDEWINDOWPROC ) + { + TRACE("Dispatch: Server Side Window Procedure\n"); + } + /* Since we are doing a callback on the same thread right away, there is no need to copy the lparam to kernel mode and then back to usermode. We just pretend it isn't a pointer */ @@ -662,6 +703,7 @@ if (pMsg->message == WM_PAINT) { + Window->state2 &= ~WNDS2_WMPAINTSENT; /* send a WM_NCPAINT and WM_ERASEBKGND if the non-client area is still invalid */ HRGN hrgn = IntSysCreateRectRgn( 0, 0, 0, 0 ); co_UserGetUpdateRgn( Window, hrgn, TRUE ); @@ -1096,7 +1138,7 @@ PWND DesktopWindow; ULONG i; - DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + DesktopWindow = UserGetDesktopWindow(); List = IntWinListChildren(DesktopWindow); if (List != NULL) @@ -1104,6 +1146,13 @@ UserPostMessage(DesktopWindow->head.h, Msg, wParam, lParam); for (i = 0; List[i]; i++) { + PWND pwnd = UserGetWindowObject(List[i]); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || // Also need pwnd->pcls->atomClassName == gaOleMainThreadWndClass + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + UserPostMessage(List[i], Msg, wParam, lParam); } ExFreePoolWithTag(List, USERTAG_WINDOWLIST); @@ -1144,7 +1193,6 @@ } return TRUE; } - LRESULT FASTCALL co_IntSendMessage( HWND hWnd, @@ -1175,7 +1223,7 @@ INT lParamBufferSize; LPARAM lParamPacked; PTHREADINFO Win32Thread; - ULONG_PTR Result = 0; + ULONG_PTR Hi, Lo, Result = 0; DECLARE_RETURN(LRESULT); USER_REFERENCE_ENTRY Ref; @@ -1188,8 +1236,7 @@ Win32Thread = PsGetCurrentThreadWin32Thread(); - - if ( NULL != Win32Thread && + if ( Win32Thread && Window->head.pti->MessageQueue == Win32Thread->MessageQueue) { if (Win32Thread->TIF_flags & TIF_INCLEANUP) @@ -1198,23 +1245,44 @@ RETURN( FALSE); } + if (Msg & 0x80000000) + { + ERR("SMTS: Internal Message!\n"); + Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam ); + if (uResult) *uResult = Result; + RETURN( TRUE); + } + + // Only happens when calling the client! IntCallWndProc( Window, hWnd, Msg, wParam, lParam); + if ( Window->state & WNDS_SERVERSIDEWINDOWPROC ) + { + TRACE("SMT: Server Side Window Procedure\n"); + IoGetStackLimits(&Lo, &Hi); + // Handle it here. Safeguard against excessive recursions. + if (((ULONG_PTR)&uResult - Lo) < 4096 ) + { + ERR("Server Callback Exceeded Stack!\n"); + RETURN( FALSE); + } + /* Return after server side call, IntCallWndProcRet will not be called. */ + } /* See if this message type is present in the table */ MsgMemoryEntry = FindMsgMemory(Msg); if (NULL == MsgMemoryEntry) { - lParamBufferSize = -1; + lParamBufferSize = -1; } else { - lParamBufferSize = MsgMemorySize(MsgMemoryEntry, wParam, lParam); + lParamBufferSize = MsgMemorySize(MsgMemoryEntry, wParam, lParam); } if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam, FALSE))) { - ERR("Failed to pack message parameters\n"); - RETURN( FALSE); + ERR("Failed to pack message parameters\n"); + RETURN( FALSE); } Result = (ULONG_PTR)co_IntCallWindowProc( Window->lpfnWndProc, @@ -1229,13 +1297,14 @@ *uResult = Result; } - IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE))) { ERR("Failed to unpack message parameters\n"); RETURN( TRUE); } + + // Only happens when calling the client! + IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); RETURN( TRUE); } @@ -1283,7 +1352,7 @@ EngSetLastError(ERROR_TIMEOUT); RETURN( FALSE); } - else if (! NT_SUCCESS(Status)) + else if (!NT_SUCCESS(Status)) { SetLastNtError(Status); RETURN( FALSE); @@ -1309,20 +1378,23 @@ HWND *Children; HWND *Child; - if (HWND_BROADCAST != hWnd) + if (hWnd != HWND_BROADCAST && hWnd != HWND_TOPMOST) { return co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, uFlags, uTimeout, uResult); } - DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + DesktopWindow = UserGetDesktopWindow(); if (NULL == DesktopWindow) { - EngSetLastError(ERROR_INTERNAL_ERROR); - return 0; - } - - /* Send message to the desktop window too! */ - co_IntSendMessageTimeoutSingle(DesktopWindow->head.h, Msg, wParam, lParam, uFlags, uTimeout, uResult); + EngSetLastError(ERROR_INTERNAL_ERROR); + return 0; + } + + if (hWnd != HWND_TOPMOST) + { + /* Send message to the desktop window too! */ + co_IntSendMessageTimeoutSingle(DesktopWindow->head.h, Msg, wParam, lParam, uFlags, uTimeout, uResult); + } Children = IntWinListChildren(DesktopWindow); if (NULL == Children) @@ -1332,7 +1404,26 @@ for (Child = Children; NULL != *Child; Child++) { - co_IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult); + if (hWnd == HWND_TOPMOST) + { + DesktopWindow = UserGetWindowObject(*Child); + if (DesktopWindow && DesktopWindow->ExStyle & WS_EX_TOPMOST) + { + ERR("HWND_TOPMOST Found\n"); + co_IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult); + } + } + else + { + PWND pwnd = UserGetWindowObject(*Child); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + + co_IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult); + } } ExFreePool(Children); @@ -1347,13 +1438,16 @@ LPARAM lParam) { ULONG_PTR Result = 0; - co_IntSendMessageWithCallBack(hWnd, - Msg, - wParam, - lParam, - NULL, - 0, - &Result); + if (!co_IntSendMessageWithCallBack( hWnd, + Msg, + wParam, + lParam, + NULL, + 0, + &Result)) + { + Result = ((ULONG_PTR)-1); + } return Result; } /* MSDN: @@ -1430,7 +1524,20 @@ RETURN(FALSE); } + if (Msg & 0x80000000) + { + ERR("SMWCB: Internal Message!\n"); + Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam ); + if (uResult) *uResult = Result; + RETURN( TRUE); + } + IntCallWndProc( Window, hWnd, Msg, wParam, lParam); + + if ( Window->state & WNDS_SERVERSIDEWINDOWPROC ) + { + TRACE("SMWCB: Server Side Window Procedure\n"); + } Result = (ULONG_PTR)co_IntCallWindowProc( Window->lpfnWndProc, !Window->Unicode, @@ -1505,9 +1612,12 @@ END_CLEANUP; } -/* This function posts a message if the destination's message queue belongs to -another thread, otherwise it sends the message. It does not support broadcast -messages! */ + +/* + This HACK function posts a message if the destination's message queue belongs to + another thread, otherwise it sends the message. It does not support broadcast + messages! +*/ LRESULT FASTCALL co_IntPostOrSendMessage( HWND hWnd, UINT Msg, @@ -1561,7 +1671,7 @@ MSG KernelModeMsg; PMSGMEMORY MsgMemoryEntry; - if (HWND_BROADCAST != hWnd) + if (hWnd != HWND_BROADCAST && hWnd != HWND_TOPMOST) { Window = UserGetWindowObject(hWnd); if ( !Window ) @@ -1641,7 +1751,7 @@ PWND DesktopWindow; ULONG i; - DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + DesktopWindow = UserGetDesktopWindow(); List = IntWinListChildren(DesktopWindow); if (List != NULL) @@ -1649,21 +1759,22 @@ UserSendNotifyMessage(DesktopWindow->head.h, Msg, wParam, lParam); for (i = 0; List[i]; i++) { - Ret = UserSendNotifyMessage(List[i], Msg, wParam, lParam); + PWND pwnd = UserGetWindowObject(List[i]); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + + Ret = UserSendNotifyMessage(List[i], Msg, wParam, lParam); } ExFreePool(List); } } else { - ULONG_PTR lResult = 0; - Ret = co_IntSendMessageWithCallBack( hWnd, - Msg, - wParam, - lParam, - NULL, - 0, - &lResult); + Ret = co_IntSendMessageNoWait( hWnd, Msg, wParam, lParam); + if (-1 == (int) Ret || !Ret) Ret = FALSE; } return Ret; } @@ -2255,7 +2366,7 @@ ULONG i; UINT fuFlags; - pwndDesk = UserGetWindowObject(IntGetDesktopWindow()); + pwndDesk = UserGetDesktopWindow(); List = IntWinListChildren(pwndDesk); if (parm.flags & BSF_QUERY) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -1043,21 +1043,6 @@ /* * @unimplemented */ -DWORD APIENTRY -NtUserSetInternalWindowPos( - HWND hwnd, - UINT showCmd, - LPRECT rect, - LPPOINT pt) -{ - STUB - - return 0; -} - -/* - * @unimplemented - */ BOOL APIENTRY NtUserSetLayeredWindowAttributes(HWND hwnd, COLORREF crKey, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -1261,51 +1261,6 @@ Wnd->spwndPrev = Wnd->spwndNext = NULL; } - -BOOL -FASTCALL -IntGetWindowPlacement(PWND Wnd, WINDOWPLACEMENT *lpwndpl) -{ - POINT Size; - - if (!Wnd) return FALSE; - - if(lpwndpl->length != sizeof(WINDOWPLACEMENT)) - { - return FALSE; - } - - lpwndpl->flags = 0; - if (0 == (Wnd->style & WS_VISIBLE)) - { - lpwndpl->showCmd = SW_HIDE; - } - else if (0 != (Wnd->state2 & WNDS2_MAXIMIZEBUTTONDOWN) || - 0 != (Wnd->style & WS_MAXIMIZE)) - { - lpwndpl->showCmd = SW_MAXIMIZE; - } - else if (0 != (Wnd->style & WS_MINIMIZE)) - { - lpwndpl->showCmd = SW_MINIMIZE; - } - else if (0 != (Wnd->style & WS_VISIBLE)) - { - lpwndpl->showCmd = SW_SHOWNORMAL; - } - - Size.x = Wnd->rcWindow.left; - Size.y = Wnd->rcWindow.top; - WinPosInitInternalPos(Wnd, &Size, - &Wnd->rcWindow); - - lpwndpl->rcNormalPosition = Wnd->InternalPos.NormalRect; - lpwndpl->ptMinPosition = Wnd->InternalPos.IconPos; - lpwndpl->ptMaxPosition = Wnd->InternalPos.MaxPos; - - return TRUE; -} - /* FUNCTIONS *****************************************************************/ @@ -3019,80 +2974,6 @@ } -/* - * @implemented - */ -DWORD APIENTRY -NtUserGetInternalWindowPos( HWND hWnd, - LPRECT rectWnd, - LPPOINT ptIcon) -{ - PWND Window; - DWORD Ret = 0; - BOOL Hit = FALSE; - WINDOWPLACEMENT wndpl; - - UserEnterShared(); - - if (!(Window = UserGetWindowObject(hWnd))) - { - Hit = FALSE; - goto Exit; - } - - _SEH2_TRY - { - if(rectWnd) - { - ProbeForWrite(rectWnd, - sizeof(RECT), - 1); - } - if(ptIcon) - { - ProbeForWrite(ptIcon, - sizeof(POINT), - 1); - } - - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Hit = TRUE; - } - _SEH2_END; - - wndpl.length = sizeof(WINDOWPLACEMENT); - - if (IntGetWindowPlacement(Window, &wndpl) && !Hit) - { - _SEH2_TRY - { - if (rectWnd) - { - RtlCopyMemory(rectWnd, &wndpl.rcNormalPosition , sizeof(RECT)); - } - if (ptIcon) - { - RtlCopyMemory(ptIcon, &wndpl.ptMinPosition, sizeof(POINT)); - } - - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Hit = TRUE; - } - _SEH2_END; - - if (!Hit) Ret = wndpl.showCmd; - } -Exit: - UserLeave(); - return Ret; -} - DWORD APIENTRY NtUserGetListBoxInfo( @@ -3596,82 +3477,6 @@ } /* - * @implemented - */ -BOOL APIENTRY -NtUserGetWindowPlacement(HWND hWnd, - WINDOWPLACEMENT *lpwndpl) -{ - PWND Wnd; - POINT Size; - WINDOWPLACEMENT Safepl; - NTSTATUS Status; - DECLARE_RETURN(BOOL); - - TRACE("Enter NtUserGetWindowPlacement\n"); - UserEnterShared(); - - if (!(Wnd = UserGetWindowObject(hWnd))) - { - RETURN( FALSE); - } - - Status = MmCopyFromCaller(&Safepl, lpwndpl, sizeof(WINDOWPLACEMENT)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - if(Safepl.length != sizeof(WINDOWPLACEMENT)) - { - RETURN( FALSE); - } - - Safepl.flags = 0; - if (0 == (Wnd->style & WS_VISIBLE)) - { - Safepl.showCmd = SW_HIDE; - } - else if ((0 != (Wnd->state2 & WNDS2_MAXIMIZEBUTTONDOWN) || - 0 != (Wnd->style & WS_MAXIMIZE)) && - 0 == (Wnd->style & WS_MINIMIZE)) - { - Safepl.showCmd = SW_SHOWMAXIMIZED; - } - else if (0 != (Wnd->style & WS_MINIMIZE)) - { - Safepl.showCmd = SW_SHOWMINIMIZED; - } - else if (0 != (Wnd->style & WS_VISIBLE)) - { - Safepl.showCmd = SW_SHOWNORMAL; - } - - Size.x = Wnd->rcWindow.left; - Size.y = Wnd->rcWindow.top; - WinPosInitInternalPos(Wnd, &Size, - &Wnd->rcWindow); - - Safepl.rcNormalPosition = Wnd->InternalPos.NormalRect; - Safepl.ptMinPosition = Wnd->InternalPos.IconPos; - Safepl.ptMaxPosition = Wnd->InternalPos.MaxPos; - - Status = MmCopyToCaller(lpwndpl, &Safepl, sizeof(WINDOWPLACEMENT)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - - RETURN( TRUE); - -CLEANUP: - TRACE("Leave NtUserGetWindowPlacement, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - -/* QueryWindow based on KJK::Hyperion and James Tabor. 0 = QWUniqueProcessId @@ -3827,7 +3632,6 @@ END_CLEANUP; } - /* * @implemented */ @@ -3871,57 +3675,6 @@ UserLeave(); END_CLEANUP; } - -/* - * @implemented - */ -HWND APIENTRY -NtUserWindowFromPoint(LONG X, LONG Y) -{ - POINT pt; - HWND Ret; - PWND DesktopWindow = NULL, Window = NULL; - USHORT hittest; - DECLARE_RETURN(HWND); - USER_REFERENCE_ENTRY Ref; - - TRACE("Enter NtUserWindowFromPoint\n"); - UserEnterExclusive(); - - if ((DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()))) - { - //PTHREADINFO pti; - - pt.x = X; - pt.y = Y; - - //hmm... threads live on desktops thus we have a reference on the desktop and indirectly the desktop window - //its possible this referencing is useless, thou it shouldnt hurt... - UserRefObjectCo(DesktopWindow, &Ref); - - //pti = PsGetCurrentThreadWin32Thread(); - Window = co_WinPosWindowFromPoint(DesktopWindow, &pt, &hittest); - - if(Window) - { - Ret = Window->head.h; - - RETURN( Ret); - } - } - - RETURN( NULL); - -CLEANUP: - if (Window) UserDereferenceObject(Window); - if (DesktopWindow) UserDerefObjectCo(DesktopWindow); - - TRACE("Leave NtUserWindowFromPoint, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; - -} - /* * NtUserDefSetText Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -24,6 +24,9 @@ (SWP_AGG_NOPOSCHANGE | SWP_FRAMECHANGED | SWP_HIDEWINDOW | SWP_SHOWWINDOW) #define EMPTYPOINT(pt) ((pt).x == -1 && (pt).y == -1) +#define PLACE_MIN 0x0001 +#define PLACE_MAX 0x0002 +#define PLACE_RECT 0x0004 /* FUNCTIONS *****************************************************************/ @@ -125,6 +128,25 @@ if (WndTo) UserDerefObjectCo(WndTo); } +BOOL +FASTCALL +WinPosShowIconTitle( PWND pWnd, BOOL bShow ) +{ + HICON hIcon; + if (!pWnd->pcls || pWnd->fnid == FNID_DESKTOP) return FALSE; + if (!hIcon) hIcon = pWnd->pcls->hIconSm; + if (!hIcon) hIcon = pWnd->pcls->hIcon; + if (!hIcon) return FALSE; + + if ( bShow ) + { + // FIXME: Draw ICON! + } + else if (hIcon) + return FALSE; + + return FALSE; +} UINT FASTCALL @@ -163,9 +185,13 @@ USER_REFERENCE_ENTRY Ref; UserRefObjectCo(Child, &Ref); - co_WinPosSetWindowPos(Child, 0, x + (xspacing - UserGetSystemMetrics(SM_CXICON)) / 2, - y - yspacing - UserGetSystemMetrics(SM_CYICON) / 2 - , 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + co_WinPosSetWindowPos( Child, + 0, + x + (xspacing - UserGetSystemMetrics(SM_CXICON)) / 2, + y - yspacing - UserGetSystemMetrics(SM_CYICON) / 2, + 0, + 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); UserDerefObjectCo(Child); @@ -186,64 +212,320 @@ static VOID FASTCALL WinPosFindIconPos(PWND Window, POINT *Pos) { - ERR("WinPosFindIconPos FIXME!\n"); + RECT rect, rectParent; + PWND pwndChild, pwndParent; + HRGN hrgn, tmp; + int xspacing, yspacing; + + pwndParent = Window->spwndParent; + if (pwndParent == UserGetDesktopWindow()) + { + /* ReactOS doesn't support iconic minimize to desktop */ + Pos->x = Pos->y = -32000; + return; + } + + IntGetClientRect( pwndParent, &rectParent ); + if ((Pos->x >= rectParent.left) && (Pos->x + UserGetSystemMetrics(SM_CXICON) < rectParent.right) && + (Pos->y >= rectParent.top) && (Pos->y + UserGetSystemMetrics(SM_CYICON) < rectParent.bottom)) + return; /* The icon already has a suitable position */ + + xspacing = UserGetSystemMetrics(SM_CXICONSPACING); + yspacing = UserGetSystemMetrics(SM_CYICONSPACING); + + /* Check if another icon already occupies this spot */ + /* FIXME: this is completely inefficient */ + + hrgn = IntSysCreateRectRgn( 0, 0, 0, 0 ); + tmp = IntSysCreateRectRgn( 0, 0, 0, 0 ); + for (pwndChild = pwndParent->spwndChild; pwndChild; pwndChild = pwndChild->spwndNext) + { + if (pwndChild == Window) continue; + if ((pwndChild->style & (WS_VISIBLE|WS_MINIMIZE)) != (WS_VISIBLE|WS_MINIMIZE)) + continue; + if ( pwndChild->spwndParent ) + { + PWND Parent = pwndChild->spwndParent; + rect.left = rect.top = 0; + rect.right = Parent->rcWindow.right - Parent->rcWindow.left; + rect.bottom = Parent->rcWindow.bottom - Parent->rcWindow.top; + NtGdiSetRectRgn( tmp, rect.left, rect.top, rect.right, rect.bottom ); + NtGdiCombineRgn( hrgn, hrgn, tmp, RGN_OR ); + } + } + GreDeleteObject( tmp ); + + for (rect.bottom = rectParent.bottom; rect.bottom >= yspacing; rect.bottom -= yspacing) + { + for (rect.left = rectParent.left; rect.left <= rectParent.right - xspacing; rect.left += xspacing) + { + rect.right = rect.left + xspacing; + rect.top = rect.bottom - yspacing; + if (!IntRectInRegion( hrgn, &rect )) + { + /* No window was found, so it's OK for us */ + Pos->x = rect.left + (xspacing - UserGetSystemMetrics(SM_CXICON)) / 2; + Pos->y = rect.top + (yspacing - UserGetSystemMetrics(SM_CYICON)) / 2; + GreDeleteObject( hrgn ); + return; + } + } + } + GreDeleteObject( hrgn ); + Pos->x = Pos->y = 0; + return; } VOID FASTCALL -WinPosInitInternalPos(PWND Wnd, POINT *pt, RECTL *RestoreRect) -{ - PWND Parent; - UINT XInc, YInc; +WinPosInitInternalPos(PWND Wnd, RECTL *RestoreRect) +{ + POINT Size; + RECTL Rect = *RestoreRect; + + if (Wnd->spwndParent != UserGetDesktopWindow()) + { + RECTL_vOffsetRect(&Rect, + -Wnd->spwndParent->rcClient.left, + -Wnd->spwndParent->rcClient.top); + } + + Size.x = Rect.left; + Size.y = Rect.top; if (!Wnd->InternalPosInitialized) { - RECTL WorkArea; - - Parent = Wnd->spwndParent; - if(Parent) - { - if(IntIsDesktopWindow(Parent)) - UserSystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); + // FIXME: Use check point Atom.. + Wnd->InternalPos.flags = 0; + Wnd->InternalPos.MaxPos.x = Wnd->InternalPos.MaxPos.y = -1; + Wnd->InternalPos.IconPos.x = Wnd->InternalPos.IconPos.y = -1; + Wnd->InternalPos.NormalRect = Rect; + Wnd->InternalPosInitialized = TRUE; + } + + if (Wnd->style & WS_MINIMIZE) + { + Wnd->InternalPos.IconPos = Size; + Wnd->InternalPos.flags |= WPF_MININIT; + } + else if (Wnd->style & WS_MAXIMIZE) + { + Wnd->InternalPos.flags |= WPF_MAXINIT; + + if ( Wnd->spwndParent == Wnd->head.rpdesk->pDeskInfo->spwnd ) + { + if (Wnd->state & WNDS_MAXIMIZESTOMONITOR) + { + Wnd->InternalPos.flags &= ~WPF_MAXINIT; + Wnd->InternalPos.MaxPos.x = Wnd->InternalPos.MaxPos.y = -1; + } else - WorkArea = Parent->rcClient; + { + RECTL WorkArea; + PMONITOR pmonitor = IntMonitorFromRect(&Rect, MONITOR_DEFAULTTOPRIMARY ); + + // FIXME: support DPI aware, rcWorkDPI/Real etc.. + if (!(Wnd->style & WS_MAXIMIZEBOX) || (Wnd->state & WNDS_HASCAPTION) || pmonitor->cFullScreen) + WorkArea = pmonitor->rcMonitor; + else + WorkArea = pmonitor->rcWork; + + Wnd->InternalPos.MaxPos.x = Rect.left - WorkArea.left; + Wnd->InternalPos.MaxPos.y = Rect.top - WorkArea.top; + TRACE("WinPosIP 2 X %d Y %d\n",Wnd->InternalPos.MaxPos.x,Wnd->InternalPos.MaxPos.y); + } } else - UserSystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); - - Wnd->InternalPos.NormalRect = Wnd->rcWindow; - IntGetWindowBorderMeasures(Wnd, &XInc, &YInc); - Wnd->InternalPos.MaxPos.x = WorkArea.left - XInc; - Wnd->InternalPos.MaxPos.y = WorkArea.top - YInc; - Wnd->InternalPos.IconPos.x = WorkArea.left; - Wnd->InternalPos.IconPos.y = WorkArea.bottom - UserGetSystemMetrics(SM_CYMINIMIZED); - - Wnd->InternalPosInitialized = TRUE; - } - if (Wnd->style & WS_MINIMIZE) - { - Wnd->InternalPos.IconPos = *pt; - } - else if (Wnd->style & WS_MAXIMIZE) - { - Wnd->InternalPos.MaxPos = *pt; - } - else if (RestoreRect != NULL) - { - Wnd->InternalPos.NormalRect = *RestoreRect; - } + Wnd->InternalPos.MaxPos = Size; + } + else + { + Wnd->InternalPos.NormalRect = Rect; + } +} + +BOOL +FASTCALL +IntGetWindowPlacement(PWND Wnd, WINDOWPLACEMENT *lpwndpl) +{ + if (!Wnd) return FALSE; + + if(lpwndpl->length != sizeof(WINDOWPLACEMENT)) + { + return FALSE; + } + + lpwndpl->flags = 0; + + WinPosInitInternalPos(Wnd, &Wnd->rcWindow); + + lpwndpl->showCmd = SW_HIDE; + + if ( Wnd->style & WS_MINIMIZE ) + lpwndpl->showCmd = SW_SHOWMINIMIZED; + else + lpwndpl->showCmd = ( Wnd->style & WS_MAXIMIZE ) ? SW_SHOWMAXIMIZED : SW_SHOWNORMAL ; + + lpwndpl->rcNormalPosition = Wnd->InternalPos.NormalRect; + + if (Wnd->InternalPos.flags & WPF_MININIT) // Return if it was set! + { + lpwndpl->ptMinPosition.x = Wnd->InternalPos.IconPos.x; + lpwndpl->ptMinPosition.y = Wnd->InternalPos.IconPos.y; + } + else + lpwndpl->ptMinPosition.x = lpwndpl->ptMinPosition.y = -1; + + if ( Wnd->InternalPos.flags & WPF_MAXINIT && // Return if set and not maximized to monitor! + !(Wnd->state & WNDS_MAXIMIZESTOMONITOR)) + { + lpwndpl->ptMaxPosition.x = Wnd->InternalPos.MaxPos.x; + lpwndpl->ptMaxPosition.y = Wnd->InternalPos.MaxPos.y; + } + else + lpwndpl->ptMaxPosition.x = lpwndpl->ptMaxPosition.y = -1; + + if ( Wnd->spwndParent == Wnd->head.rpdesk->pDeskInfo->spwnd && + !(Wnd->ExStyle & WS_EX_TOOLWINDOW)) + { + PMONITOR pmonitor = IntMonitorFromRect(&lpwndpl->rcNormalPosition, MONITOR_DEFAULTTOPRIMARY ); + + // FIXME: support DPI aware, rcWorkDPI/Real etc.. + if (Wnd->InternalPos.flags & WPF_MININIT) + { + lpwndpl->ptMinPosition.x -= (pmonitor->rcWork.left - pmonitor->rcMonitor.left); + lpwndpl->ptMinPosition.y -= (pmonitor->rcWork.top - pmonitor->rcMonitor.top); + } + RECTL_vOffsetRect(&lpwndpl->rcNormalPosition, + pmonitor->rcMonitor.left - pmonitor->rcWork.left, + pmonitor->rcMonitor.top - pmonitor->rcWork.top); + } + + if ( Wnd->InternalPos.flags & WPF_RESTORETOMAXIMIZED || Wnd->style & WS_MAXIMIZE ) + lpwndpl->flags |= WPF_RESTORETOMAXIMIZED; + + if ( ((Wnd->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) && Wnd->InternalPos.flags & WPF_SETMINPOSITION) + lpwndpl->flags |= WPF_SETMINPOSITION; + + return TRUE; +} + +/* make sure the specified rect is visible on screen */ +static void make_rect_onscreen( RECT *rect ) +{ + PMONITOR pmonitor = IntMonitorFromRect( rect, MONITOR_DEFAULTTONEAREST ); // Wine uses this. + + // FIXME: support DPI aware, rcWorkDPI/Real etc.. + if (!pmonitor) return; + /* FIXME: map coordinates from rcWork to rcMonitor */ + if (rect->right <= pmonitor->rcWork.left) + { + rect->right += pmonitor->rcWork.left - rect->left; + rect->left = pmonitor->rcWork.left; + } + else if (rect->left >= pmonitor->rcWork.right) + { + rect->left += pmonitor->rcWork.right - rect->right; + rect->right = pmonitor->rcWork.right; + } + if (rect->bottom <= pmonitor->rcWork.top) + { + rect->bottom += pmonitor->rcWork.top - rect->top; + rect->top = pmonitor->rcWork.top; + } + else if (rect->top >= pmonitor->rcWork.bottom) + { + rect->top += pmonitor->rcWork.bottom - rect->bottom; + rect->bottom = pmonitor->rcWork.bottom; + } +} + +/* make sure the specified point is visible on screen */ +static void make_point_onscreen( POINT *pt ) +{ + RECT rect; + + RECTL_vSetRect( &rect, pt->x, pt->y, pt->x + 1, pt->y + 1 ); + make_rect_onscreen( &rect ); + pt->x = rect.left; + pt->y = rect.top; +} + +BOOL FASTCALL +IntSetWindowPlacement(PWND Wnd, WINDOWPLACEMENT *wpl, UINT Flags) +{ + BOOL sAsync; + UINT SWP_Flags; + + if ( Flags & PLACE_MIN) make_point_onscreen( &wpl->ptMinPosition ); + if ( Flags & PLACE_MAX) make_point_onscreen( &wpl->ptMaxPosition ); + if ( Flags & PLACE_RECT) make_rect_onscreen( &wpl->rcNormalPosition ); + + if (!Wnd || Wnd == Wnd->head.rpdesk->pDeskInfo->spwnd) return FALSE; + + if ( Flags & PLACE_MIN ) Wnd->InternalPos.IconPos = wpl->ptMinPosition; + if ( Flags & PLACE_MAX ) Wnd->InternalPos.MaxPos = wpl->ptMaxPosition; + if ( Flags & PLACE_RECT) Wnd->InternalPos.NormalRect = wpl->rcNormalPosition; + + SWP_Flags = SWP_NOZORDER | SWP_NOACTIVATE | ((wpl->flags & WPF_ASYNCWINDOWPLACEMENT) ? SWP_ASYNCWINDOWPOS : 0); + + if (Wnd->style & WS_MINIMIZE ) + { + if (Flags & PLACE_MIN) + { + co_WinPosSetWindowPos(Wnd, HWND_TOP, + wpl->ptMinPosition.x, wpl->ptMinPosition.y, 0, 0, + SWP_NOSIZE | SWP_Flags); + Wnd->InternalPos.flags |= WPF_MININIT; + } + } + else if (Wnd->style & WS_MAXIMIZE ) + { + if (Flags & PLACE_MAX) + { + co_WinPosSetWindowPos(Wnd, HWND_TOP, + wpl->ptMaxPosition.x, wpl->ptMaxPosition.y, 0, 0, + SWP_NOSIZE | SWP_Flags); + Wnd->InternalPos.flags |= WPF_MAXINIT; + } + } + else if (Flags & PLACE_RECT) + { + co_WinPosSetWindowPos(Wnd, HWND_TOP, + wpl->rcNormalPosition.left, wpl->rcNormalPosition.top, + wpl->rcNormalPosition.right - wpl->rcNormalPosition.left, + wpl->rcNormalPosition.bottom - wpl->rcNormalPosition.top, + SWP_Flags); + } + + sAsync = (Wnd->head.pti->MessageQueue != gptiCurrent->MessageQueue && wpl->flags & WPF_ASYNCWINDOWPLACEMENT); + + if ( sAsync ) + co_IntSendMessageNoWait( UserHMGetHandle(Wnd), WM_ASYNC_SHOWWINDOW, wpl->showCmd, 0 ); + else + co_WinPosShowWindow(Wnd, wpl->showCmd); + + if ( Wnd->style & WS_MINIMIZE && !sAsync ) + { + if ( wpl->flags & WPF_SETMINPOSITION ) + Wnd->InternalPos.flags |= WPF_SETMINPOSITION; + + if ( wpl->flags & WPF_RESTORETOMAXIMIZED ) + Wnd->InternalPos.flags |= WPF_RESTORETOMAXIMIZED; + } + return TRUE; } UINT FASTCALL co_WinPosMinMaximize(PWND Wnd, UINT ShowFlag, RECT* NewPos) { POINT Size; + WINDOWPLACEMENT wpl; UINT SwpFlags = 0; ASSERT_REFS_CO(Wnd); - Size.x = Wnd->rcWindow.left; - Size.y = Wnd->rcWindow.top; - WinPosInitInternalPos(Wnd, &Size, &Wnd->rcWindow); + wpl.length = sizeof(wpl); + IntGetWindowPlacement( Wnd, &wpl ); if (co_HOOK_CallHooks( WH_CBT, HCBT_MINMAX, (WPARAM)Wnd->head.h, ShowFlag)) { @@ -252,6 +534,8 @@ } if (Wnd->style & WS_MINIMIZE) { + if (ShowFlag == SW_MINIMIZE) return SWP_NOSIZE | SWP_NOMOVE; + if (!co_IntSendMessageNoWait(Wnd->head.h, WM_QUERYOPEN, 0, 0)) { return(SWP_NOSIZE | SWP_NOMOVE); @@ -264,18 +548,18 @@ { if (Wnd->style & WS_MAXIMIZE) { - Wnd->state2 |= WNDS2_MAXIMIZEBUTTONDOWN; + Wnd->InternalPos.flags |= WPF_RESTORETOMAXIMIZED; Wnd->style &= ~WS_MAXIMIZE; } else { - Wnd->state2 &= ~WNDS2_MAXIMIZEBUTTONDOWN; + Wnd->InternalPos.flags &= ~WPF_RESTORETOMAXIMIZED; } co_UserRedrawWindow(Wnd, NULL, 0, RDW_VALIDATE | RDW_NOERASE | RDW_NOINTERNALPAINT); Wnd->style |= WS_MINIMIZE; - WinPosFindIconPos(Wnd, &Wnd->InternalPos.IconPos); - RECTL_vSetRect(NewPos, Wnd->InternalPos.IconPos.x, Wnd->InternalPos.IconPos.y, + WinPosFindIconPos(Wnd, &wpl.ptMinPosition); + RECTL_vSetRect(NewPos, wpl.ptMinPosition.x, wpl.ptMinPosition.y, UserGetSystemMetrics(SM_CXMINIMIZED), UserGetSystemMetrics(SM_CYMINIMIZED)); SwpFlags |= SWP_NOCOPYBITS; @@ -284,17 +568,16 @@ case SW_MAXIMIZE: { - co_WinPosGetMinMaxInfo(Wnd, &Size, &Wnd->InternalPos.MaxPos, - NULL, NULL); + co_WinPosGetMinMaxInfo(Wnd, &Size, &wpl.ptMaxPosition, NULL, NULL); + TRACE("Maximize: %d,%d %dx%d\n", - Wnd->InternalPos.MaxPos.x, Wnd->InternalPos.MaxPos.y, Size.x, Size.y); + wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, Size.x, Size.y); if (Wnd->style & WS_MINIMIZE) { Wnd->style &= ~WS_MINIMIZE; } Wnd->style |= WS_MAXIMIZE; - RECTL_vSetRect(NewPos, Wnd->InternalPos.MaxPos.x, Wnd->InternalPos.MaxPos.y, - Size.x, Size.y); + RECTL_vSetRect(NewPos, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, Size.x, Size.y); break; } @@ -303,18 +586,17 @@ if (Wnd->style & WS_MINIMIZE) { Wnd->style &= ~WS_MINIMIZE; - if (Wnd->state2 & WNDS2_MAXIMIZEBUTTONDOWN) + if (Wnd->InternalPos.flags & WPF_RESTORETOMAXIMIZED) { - co_WinPosGetMinMaxInfo(Wnd, &Size, - &Wnd->InternalPos.MaxPos, NULL, NULL); + co_WinPosGetMinMaxInfo(Wnd, &Size, &wpl.ptMaxPosition, NULL, NULL); + Wnd->style |= WS_MAXIMIZE; - RECTL_vSetRect(NewPos, Wnd->InternalPos.MaxPos.x, - Wnd->InternalPos.MaxPos.y, Size.x, Size.y); + RECTL_vSetRect(NewPos, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, Size.x, Size.y); break; } else { - *NewPos = Wnd->InternalPos.NormalRect; + *NewPos = wpl.rcNormalPosition; NewPos->right -= NewPos->left; NewPos->bottom -= NewPos->top; break; @@ -327,8 +609,8 @@ return 0; } Wnd->style &= ~WS_MAXIMIZE; - Wnd->state2 &= ~WNDS2_MAXIMIZEBUTTONDOWN; - *NewPos = Wnd->InternalPos.NormalRect; + Wnd->InternalPos.flags &= ~WPF_RESTORETOMAXIMIZED; + *NewPos = wpl.rcNormalPosition; NewPos->right -= NewPos->left; NewPos->bottom -= NewPos->top; break; @@ -455,7 +737,7 @@ MinMax.ptMaxPosition.x = -xinc; MinMax.ptMaxPosition.y = -yinc; - if (!EMPTYPOINT(Window->InternalPos.MaxPos)) MinMax.ptMaxPosition = Window->InternalPos.MaxPos; + if (!EMPTYPOINT(Window->InternalPos.MaxPos)) MinMax.ptMaxPosition = Window->InternalPos.MaxPos; co_IntSendMessage(Window->head.h, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax); @@ -946,6 +1228,7 @@ if ( Window->head.h == IntGetDesktopWindow() && Window->head.pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) { + ERR("Desktop Window...\n"); return FALSE; } bPointerInWindow = IntPtInWindow(Window, gpsi->ptCursor.x, gpsi->ptCursor.y); @@ -1337,7 +1620,7 @@ ASSERT_REFS_CO(Window); *ClientRect = *WindowRect; - Result = co_IntSendMessageNoWait(Window->head.h, WM_NCCALCSIZE, FALSE, (LPARAM) ClientRect); + Result = co_IntSendMessage(Window->head.h, WM_NCCALCSIZE, FALSE, (LPARAM) ClientRect); FixClientRect(ClientRect, WindowRect); @@ -1347,7 +1630,11 @@ void FASTCALL co_WinPosSendSizeMove(PWND Wnd) { + RECTL Rect; + LPARAM lParam; WPARAM wParam = SIZE_RESTORED; + + IntGetClientRect(Wnd, &Rect); Wnd->state &= ~WNDS_SENDSIZEMOVEMSGS; if (Wnd->style & WS_MAXIMIZE) @@ -1359,14 +1646,14 @@ wParam = SIZE_MINIMIZED; } - co_IntSendMessageNoWait(Wnd->head.h, WM_SIZE, wParam, - MAKELONG(Wnd->rcClient.right - - Wnd->rcClient.left, - Wnd->rcClient.bottom - - Wnd->rcClient.top)); - co_IntSendMessageNoWait(Wnd->head.h, WM_MOVE, 0, - MAKELONG(Wnd->rcClient.left, - Wnd->rcClient.top)); + co_IntSendMessageNoWait(UserHMGetHandle(Wnd), WM_SIZE, wParam, MAKELONG(Rect.right-Rect.left, Rect.bottom-Rect.top)); + + if (Wnd->spwndParent == UserGetDesktopWindow()) // Wnd->spwndParent->fnid != FNID_DESKTOP ) + lParam = MAKELONG(Wnd->rcClient.left, Wnd->rcClient.top); + else + lParam = MAKELONG(Wnd->rcClient.left-Wnd->spwndParent->rcClient.left, Wnd->rcClient.top-Wnd->spwndParent->rcClient.top); + + co_IntSendMessageNoWait(UserHMGetHandle(Wnd), WM_MOVE, 0, lParam); IntEngWindowChanged(Wnd, WOC_RGN_CLIENT); } @@ -1454,7 +1741,7 @@ break; case SW_SHOWNOACTIVATE: - Wnd->state2 &= ~WNDS2_MAXIMIZEBUTTONDOWN; + Wnd->InternalPos.flags &= ~WPF_RESTORETOMAXIMIZED; //Swp |= SWP_NOZORDER; Swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* Fall through. */ @@ -1734,7 +2021,7 @@ return retvalue; } -BOOL FASTCALL IntEndDeferWindowPosEx( HDWP hdwp ) +BOOL FASTCALL IntEndDeferWindowPosEx( HDWP hdwp, BOOL sAsync ) { PSMWP pDWP; PCVR winpos; @@ -1764,13 +2051,30 @@ UserRefObjectCo(pwnd, &Ref); - res = co_WinPosSetWindowPos( pwnd, - winpos->pos.hwndInsertAfter, - winpos->pos.x, - winpos->pos.y, - winpos->pos.cx, - winpos->pos.cy, - winpos->pos.flags); + if ( sAsync ) + { + LRESULT lRes; + PWINDOWPOS ppos = ExAllocatePoolWithTag(PagedPool, sizeof(WINDOWPOS), USERTAG_SWP); + if ( ppos ) + { + *ppos = winpos->pos; + /* Yes it's a pointer inside Win32k! */ + lRes = co_IntSendMessageNoWait( winpos->pos.hwnd, WM_ASYNC_SETWINDOWPOS, 0, (LPARAM)ppos); + /* We handle this the same way as Event Hooks and Hooks. */ + if ( -1 == (int) lRes ) + { + ExFreePoolWithTag(ppos, USERTAG_SWP); + } + } + } + else + res = co_WinPosSetWindowPos( pwnd, + winpos->pos.hwndInsertAfter, + winpos->pos.x, + winpos->pos.y, + winpos->pos.cx, + winpos->pos.cy, + winpos->pos.flags); UserDerefObjectCo(pwnd); } @@ -1779,6 +2083,7 @@ UserDeleteObject(hdwp, otSMWP); return res; } + /* * @implemented @@ -1856,7 +2161,7 @@ BOOL Ret; TRACE("Enter NtUserEndDeferWindowPosEx\n"); UserEnterExclusive(); - Ret = IntEndDeferWindowPosEx(WinPosInfo); + Ret = IntEndDeferWindowPosEx(WinPosInfo, (BOOL)Unknown1); TRACE("Leave NtUserEndDeferWindowPosEx, ret=%i\n", Ret); UserLeave(); return Ret; @@ -1920,6 +2225,128 @@ return Ret; } +/* + * @implemented + */ +DWORD APIENTRY +NtUserGetInternalWindowPos( HWND hWnd, + LPRECT rectWnd, + LPPOINT ptIcon) +{ + PWND Window; + DWORD Ret = 0; + BOOL Hit = FALSE; + WINDOWPLACEMENT wndpl; + + UserEnterShared(); + + if (!(Window = UserGetWindowObject(hWnd))) + { + Hit = FALSE; + goto Exit; + } + + _SEH2_TRY + { + if(rectWnd) + { + ProbeForWrite(rectWnd, + sizeof(RECT), + 1); + } + if(ptIcon) + { + ProbeForWrite(ptIcon, + sizeof(POINT), + 1); + } + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Hit = TRUE; + } + _SEH2_END; + + wndpl.length = sizeof(WINDOWPLACEMENT); + + if (IntGetWindowPlacement(Window, &wndpl) && !Hit) + { + _SEH2_TRY + { + if (rectWnd) + { + RtlCopyMemory(rectWnd, &wndpl.rcNormalPosition , sizeof(RECT)); + } + if (ptIcon) + { + RtlCopyMemory(ptIcon, &wndpl.ptMinPosition, sizeof(POINT)); + } + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Hit = TRUE; + } + _SEH2_END; + + if (!Hit) Ret = wndpl.showCmd; + } +Exit: + UserLeave(); + return Ret; +} + +/* + * @implemented + */ +BOOL APIENTRY +NtUserGetWindowPlacement(HWND hWnd, + WINDOWPLACEMENT *lpwndpl) +{ + PWND Wnd; + WINDOWPLACEMENT Safepl; + NTSTATUS Status; + DECLARE_RETURN(BOOL); + + TRACE("Enter NtUserGetWindowPlacement\n"); + UserEnterShared(); + + if (!(Wnd = UserGetWindowObject(hWnd))) + { + RETURN( FALSE); + } + + Status = MmCopyFromCaller(&Safepl, lpwndpl, sizeof(WINDOWPLACEMENT)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( FALSE); + } + if(Safepl.length != sizeof(WINDOWPLACEMENT)) + { + RETURN( FALSE); + } + + IntGetWindowPlacement(Wnd, &Safepl); + + Status = MmCopyToCaller(lpwndpl, &Safepl, sizeof(WINDOWPLACEMENT)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( FALSE); + } + + RETURN( TRUE); + +CLEANUP: + TRACE("Leave NtUserGetWindowPlacement, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + DWORD APIENTRY NtUserMinMaximize( @@ -2085,8 +2512,9 @@ if (GreIsHandleValid(hRgn)) { hrgnCopy = IntSysCreateRectRgn(0, 0, 0, 0); - - NtGdiCombineRgn(hrgnCopy, hRgn, 0, RGN_COPY); + /* The coordinates of a window's window region are relative to the + upper-left corner of the window, not the client area of the window. */ + NtGdiCombineRgn( hrgnCopy, hRgn, 0, RGN_COPY); } else RETURN( 0); @@ -2095,9 +2523,6 @@ { hrgnCopy = NULL; } - - /* Delete the region passed by the caller */ - GreDeleteObject(hRgn); if (Window->hrgnClip) { @@ -2119,6 +2544,81 @@ CLEANUP: TRACE("Leave NtUserSetWindowRgn, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +/* + * @implemented + */ +DWORD APIENTRY +NtUserSetInternalWindowPos( + HWND hwnd, + UINT showCmd, + LPRECT lprect, + LPPOINT lppt) +{ + WINDOWPLACEMENT wndpl; + UINT flags; + PWND Wnd; + RECT rect; + POINT pt = {0}; + DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; + + TRACE("Enter NtUserSetWindowPlacement\n"); + UserEnterExclusive(); + + if (!(Wnd = UserGetWindowObject(hwnd)) || // FIXME: + Wnd == IntGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP + Wnd == IntGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + { + RETURN( FALSE); + } + + _SEH2_TRY + { + if (lppt) + { + ProbeForRead(lppt, sizeof(POINT), 1); + RtlCopyMemory(&pt, lppt, sizeof(POINT)); + } + if (lprect) + { + ProbeForRead(lprect, sizeof(RECT), 1); + RtlCopyMemory(&rect, lprect, sizeof(RECT)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(RETURN( FALSE)); + } + _SEH2_END + + wndpl.length = sizeof(wndpl); + wndpl.showCmd = showCmd; + wndpl.flags = flags = 0; + + if ( lppt ) + { + flags |= PLACE_MIN; + wndpl.flags |= WPF_SETMINPOSITION; + wndpl.ptMinPosition = pt; + } + if ( lprect ) + { + flags |= PLACE_RECT; + wndpl.rcNormalPosition = rect; + } + + UserRefObjectCo(Wnd, &Ref); + IntSetWindowPlacement(Wnd, &wndpl, flags); + UserDerefObjectCo(Wnd); + RETURN(TRUE); + +CLEANUP: + TRACE("Leave NtUserSetWindowPlacement, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } @@ -2132,6 +2632,7 @@ { PWND Wnd; WINDOWPLACEMENT Safepl; + UINT Flags; DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; @@ -2162,25 +2663,10 @@ RETURN( FALSE); } + Flags = PLACE_MAX | PLACE_RECT; + if (Safepl.flags & WPF_SETMINPOSITION) Flags |= PLACE_MIN; UserRefObjectCo(Wnd, &Ref); - - if ((Wnd->style & (WS_MAXIMIZE | WS_MINIMIZE)) == 0) - { - co_WinPosSetWindowPos(Wnd, NULL, - Safepl.rcNormalPosition.left, Safepl.rcNormalPosition.top, - Safepl.rcNormalPosition.right - Safepl.rcNormalPosition.left, - Safepl.rcNormalPosition.bottom - Safepl.rcNormalPosition.top, - SWP_NOZORDER | SWP_NOACTIVATE); - } - - /* FIXME - change window status */ - co_WinPosShowWindow(Wnd, Safepl.showCmd); - - Wnd->InternalPosInitialized = TRUE; - Wnd->InternalPos.NormalRect = Safepl.rcNormalPosition; - Wnd->InternalPos.IconPos = Safepl.ptMinPosition; - Wnd->InternalPos.MaxPos = Safepl.ptMaxPosition; - + IntSetWindowPlacement(Wnd, &Safepl, Flags); UserDerefObjectCo(Wnd); RETURN(TRUE); @@ -2191,17 +2677,43 @@ } /* - * @unimplemented + * @implemented */ BOOL APIENTRY NtUserShowWindowAsync(HWND hWnd, LONG nCmdShow) { -#if 0 - STUB - return 0; -#else - return NtUserShowWindow(hWnd, nCmdShow); -#endif + PWND Window; + BOOL ret; + DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; + + TRACE("Enter NtUserShowWindowAsync\n"); + UserEnterExclusive(); + + if (!(Window = UserGetWindowObject(hWnd)) || // FIXME: + Window == IntGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP + Window == IntGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + { + RETURN(FALSE); + } + + if ( nCmdShow > SW_MAX ) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + RETURN(FALSE); + } + + UserRefObjectCo(Window, &Ref); + ret = co_IntSendMessageNoWait( hWnd, WM_ASYNC_SHOWWINDOW, nCmdShow, 0 ); + UserDerefObjectCo(Window); + if (-1 == (int) ret || !ret) ret = FALSE; + + RETURN(ret); + +CLEANUP: + TRACE("Leave NtUserShowWindowAsync, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } /* @@ -2243,56 +2755,54 @@ END_CLEANUP; } -//// Ugly NtUser API //// -BOOL -APIENTRY -NtUserGetMinMaxInfo( - HWND hWnd, - MINMAXINFO *MinMaxInfo, - BOOL SendMessage) -{ - POINT Size; - PWND Window = NULL; - MINMAXINFO SafeMinMax; - NTSTATUS Status; - BOOL ret; + +/* + * @implemented + */ +HWND APIENTRY +NtUserWindowFromPoint(LONG X, LONG Y) +{ + POINT pt; + HWND Ret; + PWND DesktopWindow = NULL, Window = NULL; + USHORT hittest; + DECLARE_RETURN(HWND); USER_REFERENCE_ENTRY Ref; - TRACE("Enter NtUserGetMinMaxInfo\n"); + TRACE("Enter NtUserWindowFromPoint\n"); UserEnterExclusive(); - if(!(Window = UserGetWindowObject(hWnd))) - { - ret = FALSE; - goto cleanup; - } - - UserRefObjectCo(Window, &Ref); - - Size.x = Window->rcWindow.left; - Size.y = Window->rcWindow.top; - WinPosInitInternalPos(Window, &Size, - &Window->rcWindow); - - co_WinPosGetMinMaxInfo(Window, &SafeMinMax.ptMaxSize, &SafeMinMax.ptMaxPosition, - &SafeMinMax.ptMinTrackSize, &SafeMinMax.ptMaxTrackSize); - - Status = MmCopyToCaller(MinMaxInfo, &SafeMinMax, sizeof(MINMAXINFO)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - ret = FALSE; - goto cleanup; - } - - ret = TRUE; - -cleanup: - if (Window) UserDerefObjectCo(Window); - - TRACE("Leave NtUserGetMinMaxInfo, ret=%i\n", ret); + if ((DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()))) + { + //PTHREADINFO pti; + + pt.x = X; + pt.y = Y; + + //hmm... threads live on desktops thus we have a reference on the desktop and indirectly the desktop window + //its possible this referencing is useless, thou it shouldnt hurt... + UserRefObjectCo(DesktopWindow, &Ref); + + //pti = PsGetCurrentThreadWin32Thread(); + Window = co_WinPosWindowFromPoint(DesktopWindow, &pt, &hittest); + + if(Window) + { + Ret = Window->head.h; + + RETURN( Ret); + } + } + + RETURN( NULL); + +CLEANUP: + if (Window) UserDereferenceObject(Window); + if (DesktopWindow) UserDerefObjectCo(DesktopWindow); + + TRACE("Leave NtUserWindowFromPoint, ret=%i\n",_ret_); UserLeave(); - return ret; + END_CLEANUP; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -683,7 +683,6 @@ # NtUserBuildMenuItemList 4 NtUserGetMenuDefaultItem 3 -NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2 NtUserMenuInfo 3 NtUserMenuItemInfo 5 Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -683,7 +683,6 @@ SVC_(UserBuildMenuItemList, 4) SVC_(UserGetMenuDefaultItem, 3) -SVC_(UserGetMinMaxInfo, 3) SVC_(UserGetMonitorInfo, 2) SVC_(UserMenuInfo, 3) SVC_(UserMenuItemInfo, 5)

1 0

[jimtabor] 54636: - Fix dialog themes support for get text.
by jimtabor＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: jimtabor Date: Sat Dec 10 07:03:33 2011 New Revision: 54636 URL: http://svn.reactos.org/svn/reactos?rev=54636&view=rev Log: - Fix dialog themes support for get text. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sat Dec 10 07:03:33 2011 @@ -2148,8 +2148,10 @@ LPSTR lpString, int nMaxCount) { - if (lpString && (nMaxCount > 0)) lpString[0] = '\0'; - return (UINT)SendDlgItemMessageA( hDlg, nIDDlgItem, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + HWND hWnd = GetDlgItem(hDlg, nIDDlgItem); + if ( hWnd ) return GetWindowTextA(hWnd, lpString, nMaxCount); + if ( nMaxCount ) *lpString = 0; + return 0; } @@ -2164,8 +2166,10 @@ LPWSTR lpString, int nMaxCount) { - if (lpString && (nMaxCount > 0)) lpString[0] = '\0'; - return (UINT)SendDlgItemMessageW( hDlg, nIDDlgItem, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + HWND hWnd = GetDlgItem(hDlg, nIDDlgItem); + if ( hWnd ) return GetWindowTextW(hWnd, lpString, nMaxCount); + if ( nMaxCount ) *lpString = 0; + return 0; } /*

1 0

[jimtabor] 54635: - Fix make window active so to restore window.
by jimtabor＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: jimtabor Date: Sat Dec 10 07:00:09 2011 New Revision: 54635 URL: http://svn.reactos.org/svn/reactos?rev=54635&view=rev Log: - Fix make window active so to restore window. Modified: trunk/reactos/dll/win32/user32/controls/appswitch.c Modified: trunk/reactos/dll/win32/user32/controls/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/appswitch.c [iso-8859-1] Sat Dec 10 07:00:09 2011 @@ -52,10 +52,12 @@ { WINDOWPLACEMENT wpl; + wpl.length = sizeof(WINDOWPLACEMENT); GetWindowPlacement(hwnd, &wpl); - + + TRACE("GetWindowPlacement wpl.showCmd %d\n",wpl.showCmd); if (wpl.showCmd == SW_SHOWMINIMIZED) - ShowWindow(hwnd, SW_RESTORE); + ShowWindowAsync(hwnd, SW_RESTORE); BringWindowToTop(hwnd); // same as: SetWindowPos(hwnd,HWND_TOP,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); ? SetForegroundWindow(hwnd);

1 0

[jimtabor] 54634: [Win32k] - Fixups to set focus and show window support, added notes. Add is window visible. Fix a binary bit return, 1 is TRUE. Fix get client rectangle. Minor fixups.
by jimtabor＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: jimtabor Date: Sat Dec 10 06:08:29 2011 New Revision: 54634 URL: http://svn.reactos.org/svn/reactos?rev=54634&view=rev Log: [Win32k] - Fixups to set focus and show window support, added notes. Add is window visible. Fix a binary bit return, 1 is TRUE. Fix get client rectangle. Minor fixups. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Sat Dec 10 06:08:29 2011 @@ -8,6 +8,9 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserFocus); + +PUSER_MESSAGE_QUEUE gpqForeground = NULL; +PUSER_MESSAGE_QUEUE gpqForegroundPrev = NULL; HWND FASTCALL IntGetCaptureWindow(VOID) @@ -190,9 +193,24 @@ return NULL; } +/* + MSDN: + The system restricts which processes can set the foreground window. A process + can set the foreground window only if one of the following conditions is true: + + * The process is the foreground process. + * The process was started by the foreground process. + * The process received the last input event. + * There is no foreground process. + * The foreground process is being debugged. + * The foreground is not locked (see LockSetForegroundWindow). + * The foreground lock time-out has expired (see SPI_GETFOREGROUNDLOCKTIMEOUT in SystemParametersInfo). + * No menus are active. +*/ static BOOL FASTCALL co_IntSetForegroundAndFocusWindow(PWND Wnd, PWND FocusWindow, BOOL MouseActivate) { + CBTACTIVATESTRUCT cbt; HWND hWnd = Wnd->head.h; HWND hWndPrev = NULL; HWND hWndFocus = FocusWindow->head.h; @@ -212,7 +230,7 @@ if (0 == (Wnd->style & WS_VISIBLE) && Wnd->head.pti->pEThread->ThreadsProcess != CsrProcess) { - TRACE("Failed - Invisible\n"); + ERR("Failed - Invisible\n"); return FALSE; } @@ -229,7 +247,14 @@ return TRUE; } - /* FIXME: Call hooks. */ + /* call CBT hook chain */ + cbt.fMouse = MouseActivate; + cbt.hWndActive = hWndPrev; + if (co_HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hWnd, (LPARAM)&cbt)) + { + ERR("IntSetForegroundAndFocusWindow WH_CBT Call Hook return!\n"); + return 0; + } co_IntSendDeactivateMessages(hWndPrev, hWnd); co_IntSendKillFocusMessages(hWndFocusPrev, hWndFocus); @@ -326,12 +351,11 @@ ASSERT(ThreadQueue != 0); if (Wnd != 0) - { - if ((!(Wnd->style & WS_VISIBLE) && - Wnd->head.pti->pEThread->ThreadsProcess != CsrProcess) || - (Wnd->style & (WS_POPUP | WS_CHILD)) == WS_CHILD) - { - return ThreadQueue ? 0 : ThreadQueue->ActiveWindow; + { + if ((Wnd->style & (WS_POPUP | WS_CHILD)) == WS_CHILD) + { + /* Windows doesn't seem to return an error here */ + return ThreadQueue->ActiveWindow; } hWnd = Wnd->head.h; } @@ -350,9 +374,11 @@ ERR("SetActiveWindow WH_CBT Call Hook return!\n"); return 0; } + + co_IntSendDeactivateMessages(hWndPrev, hWnd); + ThreadQueue->ActiveWindow = hWnd; - co_IntSendDeactivateMessages(hWndPrev, hWnd); co_IntSendActivateMessages(hWndPrev, hWnd, FALSE); /* FIXME */ @@ -360,11 +386,11 @@ return hWndPrev; } -static HWND FASTCALL -co_IntSetFocusWindow(PWND Window OPTIONAL) +co_UserSetFocus(PWND Window) { HWND hWndPrev = 0; + PWND pwndTop; PTHREADINFO pti; PUSER_MESSAGE_QUEUE ThreadQueue; @@ -381,14 +407,36 @@ { if (hWndPrev == Window->head.h) { - return hWndPrev; + return hWndPrev; /* nothing to do */ + } + + /* Check if we can set the focus to this window */ + for (pwndTop = Window; pwndTop != NULL; pwndTop = pwndTop->spwndParent ) + { + if (pwndTop->style & (WS_MINIMIZED|WS_DISABLED)) return 0; + if ((pwndTop->style & (WS_POPUP|WS_CHILD)) != WS_CHILD) break; } if (co_HOOK_CallHooks( WH_CBT, HCBT_SETFOCUS, (WPARAM)Window->head.h, (LPARAM)hWndPrev)) { - ERR("SetFocusWindow 1 WH_CBT Call Hook return!\n"); + ERR("SetFocus 1 WH_CBT Call Hook return!\n"); return 0; } + + /* activate pwndTop if needed. */ + if (pwndTop->head.h != ThreadQueue->ActiveWindow) + { + co_IntSetActiveWindow(pwndTop); + /* Abort if window destroyed */ + if (Window->state2 & WNDS2_INDESTROY) return 0; + /* Do not change focus if the window is no longer active */ + if (pwndTop->head.h != ThreadQueue->ActiveWindow) + { + ERR("SetFocus Top window did not go active!\n"); + return 0; + } + } + ThreadQueue->FocusWindow = Window->head.h; TRACE("Focus: %d -> %d\n", hWndPrev, Window->head.h); @@ -409,10 +457,6 @@ return hWndPrev; } - -/* - * @implemented - */ HWND FASTCALL UserGetForegroundWindow(VOID) { @@ -421,27 +465,6 @@ ForegroundQueue = IntGetFocusMessageQueue(); return( ForegroundQueue != NULL ? ForegroundQueue->ActiveWindow : 0); } - - -/* - * @implemented - */ -HWND APIENTRY -NtUserGetForegroundWindow(VOID) -{ - DECLARE_RETURN(HWND); - - TRACE("Enter NtUserGetForegroundWindow\n"); - UserEnterExclusive(); - - RETURN( UserGetForegroundWindow()); - -CLEANUP: - TRACE("Leave NtUserGetForegroundWindow, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - HWND FASTCALL UserGetActiveWindow(VOID) { @@ -453,57 +476,6 @@ return( ThreadQueue ? ThreadQueue->ActiveWindow : 0); } - -HWND APIENTRY -NtUserSetActiveWindow(HWND hWnd) -{ - USER_REFERENCE_ENTRY Ref; - DECLARE_RETURN(HWND); - - TRACE("Enter NtUserSetActiveWindow(%x)\n", hWnd); - UserEnterExclusive(); - - if (hWnd) - { - PWND Window; - PTHREADINFO pti; - PUSER_MESSAGE_QUEUE ThreadQueue; - HWND hWndPrev; - - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN( 0); - } - - pti = PsGetCurrentThreadWin32Thread(); - ThreadQueue = pti->MessageQueue; - - if (Window->head.pti->MessageQueue != ThreadQueue) - { - EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); - RETURN( 0); - } - - UserRefObjectCo(Window, &Ref); - hWndPrev = co_IntSetActiveWindow(Window); - UserDerefObjectCo(Window); - - RETURN( hWndPrev); - } - else - { - RETURN( co_IntSetActiveWindow(0)); - } - -CLEANUP: - TRACE("Leave NtUserSetActiveWindow, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - -/* - * @implemented - */ HWND APIENTRY IntGetCapture(VOID) { @@ -521,7 +493,6 @@ TRACE("Leave IntGetCapture, ret=%i\n",_ret_); END_CLEANUP; } - HWND FASTCALL co_UserSetCapture(HWND hWnd) @@ -610,6 +581,72 @@ * @implemented */ HWND APIENTRY +NtUserGetForegroundWindow(VOID) +{ + DECLARE_RETURN(HWND); + + TRACE("Enter NtUserGetForegroundWindow\n"); + UserEnterExclusive(); + + RETURN( UserGetForegroundWindow()); + +CLEANUP: + TRACE("Leave NtUserGetForegroundWindow, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +HWND APIENTRY +NtUserSetActiveWindow(HWND hWnd) +{ + USER_REFERENCE_ENTRY Ref; + DECLARE_RETURN(HWND); + + TRACE("Enter NtUserSetActiveWindow(%x)\n", hWnd); + UserEnterExclusive(); + + if (hWnd) + { + PWND Window; + PTHREADINFO pti; + PUSER_MESSAGE_QUEUE ThreadQueue; + HWND hWndPrev; + + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN( 0); + } + + pti = PsGetCurrentThreadWin32Thread(); + ThreadQueue = pti->MessageQueue; + + if (Window->head.pti->MessageQueue != ThreadQueue) + { + EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); + RETURN( 0); + } + + UserRefObjectCo(Window, &Ref); + hWndPrev = co_IntSetActiveWindow(Window); + UserDerefObjectCo(Window); + + RETURN( hWndPrev); + } + else + { + RETURN( co_IntSetActiveWindow(0)); + } + +CLEANUP: + TRACE("Leave NtUserSetActiveWindow, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +/* + * @implemented + */ +HWND APIENTRY NtUserSetCapture(HWND hWnd) { DECLARE_RETURN(HWND); @@ -624,55 +661,6 @@ UserLeave(); END_CLEANUP; } - - - -HWND FASTCALL co_UserSetFocus(PWND Wnd OPTIONAL) -{ - if (Wnd) - { - PTHREADINFO pti; - PUSER_MESSAGE_QUEUE ThreadQueue; - HWND hWndPrev; - PWND TopWnd; - USER_REFERENCE_ENTRY Ref; - - ASSERT_REFS_CO(Wnd); - - pti = PsGetCurrentThreadWin32Thread(); - ThreadQueue = pti->MessageQueue; - - if (Wnd->style & (WS_MINIMIZE | WS_DISABLED)) - { - return( (ThreadQueue ? ThreadQueue->FocusWindow : 0)); - } - - if (Wnd->head.pti->MessageQueue != ThreadQueue) - { - EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); - return( 0); - } - - TopWnd = UserGetAncestor(Wnd, GA_ROOT); - if (TopWnd && TopWnd->head.h != UserGetActiveWindow()) - { -// PWND WndTops = UserGetWindowObject(hWndTop); - UserRefObjectCo(TopWnd, &Ref); - co_IntSetActiveWindow(TopWnd); - UserDerefObjectCo(TopWnd); - } - - hWndPrev = co_IntSetFocusWindow(Wnd); - - return( hWndPrev); - } - else - { - return( co_IntSetFocusWindow(NULL)); - } - -} - /* * @implemented Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Dec 10 06:08:29 2011 @@ -108,6 +108,25 @@ return TRUE; } +BOOL FASTCALL +IntIsWindowVisible(PWND Wnd) +{ + BOOL Ret = TRUE; + do + { + if (!(Wnd->style & WS_VISIBLE)) + { + Ret = FALSE; + break; + } + if (Wnd->spwndParent != NULL) + Wnd = Wnd->spwndParent; + else + break; + } + while (Wnd != NULL); + return Ret; +} PWND FASTCALL IntGetParent(PWND Wnd) @@ -138,7 +157,7 @@ } /* check if updating is needed */ - bIsDisabled = (pWnd->style & WS_DISABLED); + bIsDisabled = !!(pWnd->style & WS_DISABLED); Update = bIsDisabled; if (bEnable) @@ -758,8 +777,6 @@ } } - - /*! * Internal function. * Returns client window rectangle relative to the upper-left corner of client area. @@ -767,16 +784,33 @@ * \note Does not check the validity of the parameters */ VOID FASTCALL -IntGetClientRect(PWND Window, RECTL *Rect) -{ - ASSERT( Window ); +IntGetClientRect(PWND Wnd, RECTL *Rect) +{ + ASSERT( Wnd ); ASSERT( Rect ); - - Rect->left = Rect->top = 0; - Rect->right = Window->rcClient.right - Window->rcClient.left; - Rect->bottom = Window->rcClient.bottom - Window->rcClient.top; -} - + if (Wnd->style & WS_MINIMIZED) + { + Rect->left = Rect->top = 0; + Rect->right = UserGetSystemMetrics(SM_CXMINIMIZED); + Rect->bottom = UserGetSystemMetrics(SM_CYMINIMIZED); + return; + } + if ( Wnd != UserGetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) + { + *Rect = Wnd->rcClient; + RECTL_vOffsetRect(Rect, -Wnd->rcClient.left, -Wnd->rcClient.top); + } + else + { + Rect->left = Rect->top = 0; + Rect->right = Wnd->rcClient.right; + Rect->bottom = Wnd->rcClient.bottom; + /* Do this until Init bug is fixed. This sets 640x480, see InitMetrics. + Rect->right = UserGetSystemMetrics(SM_CXSCREEN); + Rect->bottom = UserGetSystemMetrics(SM_CYSCREEN); + */ + } +} PMENU_OBJECT FASTCALL IntGetSystemMenu(PWND Window, BOOL bRevert, BOOL RetMenu) @@ -1125,6 +1159,7 @@ * FIXME: a WM_MOVE is also generated (in the DefWindowProc handler * for WM_WINDOWPOSCHANGED) in Windows, should probably remove SWP_NOMOVE */ + if (WasVisible) co_WinPosShowWindow(Wnd, SW_SHOWNORMAL); return WndOldParent; } @@ -1637,13 +1672,15 @@ pWnd->spwndOwner = OwnerWindow; pWnd->fnid = 0; pWnd->hWndLastActive = hWnd; - pWnd->state2 |= WNDS2_WIN40COMPAT; + pWnd->state2 |= WNDS2_WIN40COMPAT; // FIXME!!! pWnd->pcls = Class; pWnd->hModule = Cs->hInstance; pWnd->style = Cs->style & ~WS_VISIBLE; pWnd->ExStyle = Cs->dwExStyle; pWnd->cbwndExtra = pWnd->pcls->cbwndExtra; pWnd->pActCtx = acbiBuffer; + pWnd->InternalPos.MaxPos.x = pWnd->InternalPos.MaxPos.y = -1; + pWnd->InternalPos.IconPos.x = pWnd->InternalPos.IconPos.y = -1; IntReferenceMessageQueue(pWnd->head.pti->MessageQueue); if (pWnd->spwndParent != NULL && Cs->hwndParent != 0) @@ -1759,15 +1796,22 @@ if (!(pWnd->style & WS_POPUP)) { pWnd->style |= WS_CAPTION; - pWnd->state |= WNDS_SENDSIZEMOVEMSGS; - } - } + } + } + + /* + * WS_EX_WINDOWEDGE appears to be enforced based on the other styles, so + * why does the user get to set it? + */ if ((pWnd->ExStyle & WS_EX_DLGMODALFRAME) || (pWnd->style & (WS_DLGFRAME | WS_THICKFRAME))) pWnd->ExStyle |= WS_EX_WINDOWEDGE; else pWnd->ExStyle &= ~WS_EX_WINDOWEDGE; + + if (!(pWnd->style & (WS_CHILD | WS_POPUP))) + pWnd->state |= WNDS_SENDSIZEMOVEMSGS; /* create system menu */ if((Cs->style & WS_SYSMENU) )//&& (dwStyle & WS_CAPTION) == WS_CAPTION) @@ -3670,11 +3714,11 @@ break; case QUERY_WINDOW_ACTIVE: - Result = (DWORD)UserGetActiveWindow(); + Result = (DWORD)pWnd->head.pti->MessageQueue->ActiveWindow; break; case QUERY_WINDOW_FOCUS: - Result = (DWORD)IntGetFocusWindow(); + Result = (DWORD)pWnd->head.pti->MessageQueue->FocusWindow; break; case QUERY_WINDOW_ISHUNG: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sat Dec 10 06:08:29 2011 @@ -22,6 +22,8 @@ (SWP_AGG_NOGEOMETRYCHANGE | SWP_NOZORDER) #define SWP_AGG_STATUSFLAGS \ (SWP_AGG_NOPOSCHANGE | SWP_FRAMECHANGED | SWP_HIDEWINDOW | SWP_SHOWWINDOW) + +#define EMPTYPOINT(pt) ((pt).x == -1 && (pt).y == -1) /* FUNCTIONS *****************************************************************/ @@ -325,6 +327,7 @@ return 0; } Wnd->style &= ~WS_MAXIMIZE; + Wnd->state2 &= ~WNDS2_MAXIMIZEBUTTONDOWN; *NewPos = Wnd->InternalPos.NormalRect; NewPos->right -= NewPos->left; NewPos->bottom -= NewPos->top; @@ -452,9 +455,9 @@ MinMax.ptMaxPosition.x = -xinc; MinMax.ptMaxPosition.y = -yinc; - //if (!EMPTYPOINT(win->max_pos)) MinMax.ptMaxPosition = win->max_pos; - - co_IntSendMessage(Window->head.h, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax); + if (!EMPTYPOINT(Window->InternalPos.MaxPos)) MinMax.ptMaxPosition = Window->InternalPos.MaxPos; + + co_IntSendMessage(Window->head.h, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax); /* if the app didn't change the values, adapt them for the current monitor */ if ((monitor = IntGetPrimaryMonitor())) @@ -1374,11 +1377,13 @@ UINT Swp = 0; RECTL NewPos; BOOLEAN ShowFlag; + LONG style; // HRGN VisibleRgn; ASSERT_REFS_CO(Wnd); WasVisible = (Wnd->style & WS_VISIBLE) != 0; + style = Wnd->style; switch (Cmd) { @@ -1403,7 +1408,7 @@ case SW_MINIMIZE: { Swp |= SWP_NOACTIVATE; - if (!(Wnd->style & WS_MINIMIZE)) + if (!(style & WS_MINIMIZE)) { Swp |= co_WinPosMinMaximize(Wnd, SW_MINIMIZE, &NewPos) | SWP_FRAMECHANGED; @@ -1422,7 +1427,7 @@ case SW_SHOWMAXIMIZED: { Swp |= SWP_SHOWWINDOW; - if (!(Wnd->style & WS_MAXIMIZE)) + if (!(style & WS_MAXIMIZE)) { Swp |= co_WinPosMinMaximize(Wnd, SW_MAXIMIZE, &NewPos) | SWP_FRAMECHANGED; @@ -1445,9 +1450,11 @@ if (WasVisible) return(TRUE); // Nothing to do! Swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; /* Don't activate the topmost window. */ + if (style & WS_CHILD) Swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; case SW_SHOWNOACTIVATE: + Wnd->state2 &= ~WNDS2_MAXIMIZEBUTTONDOWN; //Swp |= SWP_NOZORDER; Swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* Fall through. */ @@ -1455,7 +1462,7 @@ case SW_SHOWDEFAULT: case SW_RESTORE: Swp |= SWP_SHOWWINDOW; - if (Wnd->style & (WS_MINIMIZE | WS_MAXIMIZE)) + if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { Swp |= co_WinPosMinMaximize(Wnd, SW_RESTORE, &NewPos) | SWP_FRAMECHANGED; @@ -1476,6 +1483,8 @@ if (ShowFlag != WasVisible) { co_IntSendMessageNoWait(Wnd->head.h, WM_SHOWWINDOW, ShowFlag, 0); + if (!(Wnd->state2 & WNDS2_WIN31COMPAT)) + co_IntSendMessageNoWait(Wnd->head.h, WM_SETVISIBLE, ShowFlag, 0); } /* We can't activate a child window */ @@ -1484,7 +1493,15 @@ { Swp |= SWP_NOACTIVATE | SWP_NOZORDER; } - +#if 0 // Explorer issues with common controls. Someone does not know how CS_SAVEBITS works. + if ((Wnd->style & (WS_POPUP|WS_CHILD)) != WS_CHILD && + Wnd->pcls->style & CS_SAVEBITS && + ((Cmd == SW_SHOW) || (Cmd == SW_NORMAL))) + { + co_IntSetActiveWindow(Wnd); + Swp |= SWP_NOACTIVATE | SWP_NOZORDER; + } +#endif co_WinPosSetWindowPos(Wnd, 0 != (Wnd->ExStyle & WS_EX_TOPMOST) ? HWND_TOPMOST : HWND_TOP, NewPos.left, NewPos.top, NewPos.right, NewPos.bottom, LOWORD(Swp)); @@ -1508,8 +1525,10 @@ ThreadFocusWindow = UserGetWindowObject(IntGetThreadFocusWindow()); /* Revert focus to parent */ - if (ThreadFocusWindow && (Wnd == ThreadFocusWindow || +/* if (ThreadFocusWindow && (Wnd == ThreadFocusWindow || IntIsChildWindow(Wnd, ThreadFocusWindow))) +*/ + if (Wnd == ThreadFocusWindow) { //faxme: as long as we have ref on Window, we also, indirectly, have ref on parent... co_UserSetFocus(Wnd->spwndParent); @@ -1524,13 +1543,9 @@ co_WinPosSendSizeMove(Wnd); } - /* Activate the window if activation is not requested and the window is not minimized */ - /* - if (!(Swp & (SWP_NOACTIVATE | SWP_HIDEWINDOW)) && !(Window->style & WS_MINIMIZE)) - { - WinPosChangeActiveWindow(Wnd, FALSE); - } - */ + /* if previous state was minimized Windows sets focus to the window */ + if (style & WS_MINIMIZE) co_UserSetFocus(Wnd); + return(WasVisible); } @@ -1744,8 +1759,8 @@ winpos->pos.cx, winpos->pos.cy, winpos->pos.flags); pwnd = UserGetWindowObject(winpos->pos.hwnd); - if(!pwnd) - continue; + if (!pwnd) + continue; UserRefObjectCo(pwnd, &Ref);

1 0

[jimtabor] 54633: [Win32k] - Get FlashWindow working, pass all but 2 tests. Add more win32k atoms.
by jimtabor＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: jimtabor Date: Sat Dec 10 06:00:38 2011 New Revision: 54633 URL: http://svn.reactos.org/svn/reactos?rev=54633&view=rev Log: [Win32k] - Get FlashWindow working, pass all but 2 tests. Add more win32k atoms. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Sat Dec 10 06:00:38 2011 @@ -41,6 +41,11 @@ /* System Context Help Id Atom */ gpsi->atomContextHelpIdProp = IntAddGlobalAtom(L"SysCH", TRUE); + gpsi->atomIconSmProp = IntAddGlobalAtom(L"SysICS", TRUE); + gpsi->atomIconProp = IntAddGlobalAtom(L"SysIC", TRUE); + + gpsi->atomFrostedWindowProp = IntAddGlobalAtom(L"SysFrostedWindow", TRUE); + AtomWndObj = IntAddGlobalAtom(L"SysWNDO", TRUE); AtomLayer = IntAddGlobalAtom(L"SysLayer", TRUE); AtomFlashWndState = IntAddGlobalAtom(L"FlashWState", TRUE); 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] Sat Dec 10 06:00:38 2011 @@ -776,6 +776,31 @@ return TRUE; } +BOOL +FASTCALL +IntFlashWindowEx(PWND pWnd, PFLASHWINFO pfwi) +{ + PPROPERTY pprop; + DWORD FlashState; + BOOL Ret = FALSE; + + pprop = IntGetProp(pWnd, AtomFlashWndState); + if (!pprop) + { + FlashState = pfwi->dwFlags; + IntSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState); + return TRUE; + } + + FlashState = (DWORD)pprop->Data; + if ( pfwi->dwFlags == FLASHW_STOP ) + { + IntRemoveProp(pWnd, AtomFlashWndState); + Ret = TRUE; + } + return Ret; +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -951,7 +976,7 @@ BOOL APIENTRY NtUserFlashWindowEx(IN PFLASHWINFO pfwi) { - //PWND pWnd; + PWND pWnd; FLASHWINFO finfo = {0}; BOOL Ret = TRUE; @@ -971,7 +996,7 @@ if (!Ret) goto Exit; - if (!(/* pWnd = */ (PWND)UserGetObject(gHandleTable, finfo.hwnd, otWindow)) || + if (!( pWnd = (PWND)UserGetObject(gHandleTable, finfo.hwnd, otWindow)) || finfo.cbSize != sizeof(FLASHWINFO) || finfo.dwFlags & ~(FLASHW_ALL|FLASHW_TIMER|FLASHW_TIMERNOFG) ) { @@ -980,7 +1005,7 @@ goto Exit; } - //Ret = IntFlashWindowEx(pWnd, &finfo); + Ret = IntFlashWindowEx(pWnd, &finfo); Exit: UserLeave();

1 0

[cgutman] 54632: [USETUP] - Cache the last data block and offset so we don't have to search from the start each time - This avoids needless swapping of cabinet data in and out of RAM - File copy in...
by cgutman＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: cgutman Date: Sat Dec 10 04:20:39 2011 New Revision: 54632 URL: http://svn.reactos.org/svn/reactos?rev=54632&view=rev Log: [USETUP] - Cache the last data block and offset so we don't have to search from the start each time - This avoids needless swapping of cabinet data in and out of RAM - File copy in text-mode setup on 32 MB RAM is down from 8 minutes to 20 seconds (in my testing) Modified: trunk/reactos/base/setup/usetup/cabinet.c trunk/reactos/base/setup/usetup/cabinet.h Modified: trunk/reactos/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… ============================================================================== --- trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/cabinet.c [iso-8859-1] Sat Dec 10 04:20:39 2011 @@ -757,6 +757,12 @@ // FIXME: check for match against search criteria if (Search->File != Prev) { + if (Prev == NULL || Search->File->FolderIndex != Prev->FolderIndex) + { + Search->CFData = NULL; + Search->Offset = 0; + } + /* don't match the file we started with */ if (wcscmp(Search->Search, L"*") == 0) { @@ -1011,10 +1017,12 @@ ExtractHandler(Search->File, DestName); } - /* find the starting block of the file - start with the first data block of the folder */ - CFData = (PCFDATA)(CabinetFolders[Search->File->FolderIndex].DataOffset + FileBuffer); - CurrentOffset = 0; + if (Search->CFData) + CFData = Search->CFData; + else + CFData = (PCFDATA)(CabinetFolders[Search->File->FolderIndex].DataOffset + FileBuffer); + + CurrentOffset = Search->Offset; while (CurrentOffset + CFData->UncompSize <= Search->File->FileOffset) { /* walk the data blocks until we reach @@ -1022,6 +1030,9 @@ CurrentOffset += CFData->UncompSize; CFData = (PCFDATA)((char *)(CFData + 1) + DataReserved + CFData->CompSize); } + + Search->CFData = CFData; + Search->Offset = CurrentOffset; /* now decompress and discard any data in the block before the start of the file */ Modified: trunk/reactos/base/setup/usetup/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… ============================================================================== --- trunk/reactos/base/setup/usetup/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/cabinet.h [iso-8859-1] Sat Dec 10 04:20:39 2011 @@ -108,6 +108,8 @@ WCHAR Cabinet[MAX_PATH]; USHORT Index; PCFFILE File; // Pointer to current CFFILE + PCFDATA CFData; + ULONG Offset; } CAB_SEARCH, *PCAB_SEARCH;

1 0

[cgutman] 54631: [NTOSKRNL] - Print trimmed consumers during text-mode setup too
by cgutman＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: cgutman Date: Sat Dec 10 04:11:19 2011 New Revision: 54631 URL: http://svn.reactos.org/svn/reactos?rev=54631&view=rev Log: [NTOSKRNL] - Print trimmed consumers during text-mode setup too Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sat Dec 10 04:11:19 2011 @@ -164,9 +164,8 @@ /* Now swap the pages out */ Status = MiMemoryConsumers[Consumer].Trim(Target, 0, &NrFreedPages); - if (!ExpInTextModeSetup) - DPRINT1("Trimming consumer %d: Freed %d pages with a target of %d pages\n", Consumer, NrFreedPages, Target); - + DPRINT1("Trimming consumer %d: Freed %d pages with a target of %d pages\n", Consumer, NrFreedPages, Target); + if (NrFreedPages == 0) DPRINT1("Ran out of pages to swap! Complete memory exhaustion is imminent!\n");

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