Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[jimtabor] 54636: - Fix dialog themes support for get text.

by jimtabor＠svn.reactos.org

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; } /*

13 years

[jimtabor] 54635: - Fix make window active so to restore window.

by jimtabor＠svn.reactos.org

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);

13 years

[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

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);

13 years

[jimtabor] 54633: [Win32k] - Get FlashWindow working, pass all but 2 tests. Add more win32k atoms.

by jimtabor＠svn.reactos.org

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();

13 years

[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

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;

13 years

[cgutman] 54631: [NTOSKRNL] - Print trimmed consumers during text-mode setup too

by cgutman＠svn.reactos.org

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");

13 years

[rmessiant] 54630: [WIN32K] Probe the whole GAMMARAMP struct before reading/writing from it. CID 14114 & 14115.

by rmessiant＠svn.reactos.org

Author: rmessiant Date: Sat Dec 10 00:14:31 2011 New Revision: 54630 URL: http://svn.reactos.org/svn/reactos?rev=54630&view=rev Log: [WIN32K] Probe the whole GAMMARAMP struct before reading/writing from it. CID 14114 & 14115. Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] Sat Dec 10 00:14:31 2011 @@ -150,12 +150,8 @@ _SEH2_TRY { - ProbeForWrite( Ramp, - sizeof(PVOID), - 1); - RtlCopyMemory( Ramp, - SafeRamp, - sizeof(GAMMARAMP)); + ProbeForWrite(Ramp, sizeof(GAMMARAMP), 1); + RtlCopyMemory(Ramp, SafeRamp, sizeof(GAMMARAMP)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -376,12 +372,8 @@ } _SEH2_TRY { - ProbeForRead( Ramp, - sizeof(PVOID), - 1); - RtlCopyMemory( SafeRamp, - Ramp, - sizeof(GAMMARAMP)); + ProbeForRead(Ramp, sizeof(GAMMARAMP), 1); + RtlCopyMemory(SafeRamp, Ramp, sizeof(GAMMARAMP)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

13 years

[fireball] 54629: [LDR] - Fix invalid errors about "system DLL kernel32.dll was relocated in memory". This reverts my previous fix suggested by rafalh and puts a better explanation there in comments.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 9 21:43:03 2011 New Revision: 54629 URL: http://svn.reactos.org/svn/reactos?rev=54629&view=rev Log: [LDR] - Fix invalid errors about "system DLL kernel32.dll was relocated in memory". This reverts my previous fix suggested by rafalh and puts a better explanation there in comments. Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Fri Dec 9 21:43:03 2011 @@ -1397,8 +1397,8 @@ } } - /* Check if this was a non-relocatable DLL or a known dll */ - if (!RelocatableDll || KnownDll) + /* Known DLLs are not allowed to be relocated */ + if (KnownDll && !RelocatableDll) { /* Setup for hard error */ HardErrorParameters[0] = (ULONG_PTR)&IllegalDll;

13 years

[pschweitzer] 54628: [USP10] Fix memory leak. Already sent & committed upstream: http://source.winehq.org/git/wine.git/commit/06f65740b2efc23ff6520cef44ea73fc79409e0a

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Dec 9 20:51:43 2011 New Revision: 54628 URL: http://svn.reactos.org/svn/reactos?rev=54628&view=rev Log: [USP10] Fix memory leak. Already sent & committed upstream: http://source.winehq.org/git/wine.git/commit/06f65740b2efc23ff6520cef44ea73… Modified: trunk/reactos/dll/win32/usp10/usp10.c Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Fri Dec 9 20:51:43 2011 @@ -1464,6 +1464,7 @@ if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset || !abc) { + heap_free (BidiLevel); heap_free (glyphs); heap_free (pwLogClust); heap_free (piAdvance);

13 years

[fireball] 54627: [ACTCTX] - One more leftover from 54623. Remove actctx_init() from the activation context stack allocation.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 9 16:47:50 2011 New Revision: 54627 URL: http://svn.reactos.org/svn/reactos?rev=54627&view=rev Log: [ACTCTX] - One more leftover from 54623. Remove actctx_init() from the activation context stack allocation. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=54627… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Fri Dec 9 16:47:50 2011 @@ -2801,10 +2801,6 @@ *Context = ContextStack; - /* FIXME: Documentation on MSDN reads that activation contexts are only created - for modules that have a valid manifest file or resource */ - actctx_init(); - return STATUS_SUCCESS; }

13 years

← Newer
1
...
14
15
16
17
18
19
20
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2011