Author: jimtabor Date: Mon Apr 15 23:13:41 2013 New Revision: 58773
URL: http://svn.reactos.org/svn/reactos?rev=58773&view=rev Log: [NtUser] - Fix Silverlight installation splash, see CORE-7036 for details.
Modified: trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/ntuser/winpos.h
Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window.... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Mon Apr 15 23:13:41 2013 @@ -1213,6 +1213,8 @@ else pt.x = Wnd->rcWindow.left; pt.y = Wnd->rcWindow.top; + + IntScreenToClient(WndOldParent, &pt);
if (WndOldParent) UserReferenceObject(WndOldParent); /* Caller must deref */
Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos.... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Mon Apr 15 23:13:41 2013 @@ -137,6 +137,34 @@ }
return MAKELONG(LOWORD(Delta.x), LOWORD(Delta.y)); +} + +BOOL FASTCALL +IntClientToScreen(PWND Wnd, LPPOINT lpPoint) +{ + if (Wnd && Wnd->fnid != FNID_DESKTOP ) + { + if (Wnd->ExStyle & WS_EX_LAYOUTRTL) + lpPoint->x = Wnd->rcClient.right - lpPoint->x; + else + lpPoint->x += Wnd->rcClient.left; + lpPoint->y += Wnd->rcClient.top; + } + return TRUE; +} + +BOOL FASTCALL +IntScreenToClient(PWND Wnd, LPPOINT lpPoint) +{ + if (Wnd && Wnd->fnid != FNID_DESKTOP ) + { + if (Wnd->ExStyle & WS_EX_LAYOUTRTL) + lpPoint->x = Wnd->rcClient.right - lpPoint->x; + else + lpPoint->x -= Wnd->rcClient.left; + lpPoint->y -= Wnd->rcClient.top; + } + return TRUE; }
BOOL FASTCALL IsChildVisible(PWND pWnd)
Modified: trunk/reactos/win32ss/user/ntuser/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos.... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.h [iso-8859-1] Mon Apr 15 23:13:41 2013 @@ -55,3 +55,5 @@ PWND FASTCALL co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest); VOID FASTCALL co_WinPosActivateOtherWindow(PWND); PWND FASTCALL IntRealChildWindowFromPoint(PWND,LONG,LONG); +BOOL FASTCALL IntScreenToClient(PWND,LPPOINT); +BOOL FASTCALL IntClientToScreen(PWND,LPPOINT);