Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 70722: [UNDOCSHELL]: Add descriptions for the RunFileDlg shell function (ripped off taskmgr's run.h file).
by hbelusca＠svn.reactos.org 12 Feb '16

12 Feb '16

Author: hbelusca Date: Fri Feb 12 23:50:33 2016 New Revision: 70722 URL: http://svn.reactos.org/svn/reactos?rev=70722&view=rev Log: [UNDOCSHELL]: Add descriptions for the RunFileDlg shell function (ripped off taskmgr's run.h file). Modified: trunk/reactos/include/reactos/undocshell.h Modified: trunk/reactos/include/reactos/undocshell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocshell… ============================================================================== --- trunk/reactos/include/reactos/undocshell.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocshell.h [iso-8859-1] Fri Feb 12 23:50:33 2016 @@ -92,11 +92,11 @@ */ /* RunFileDlg flags */ -#define RFF_NOBROWSE 0x01 -#define RFF_NODEFAULT 0x02 -#define RFF_CALCDIRECTORY 0x04 -#define RFF_NOLABEL 0x08 -#define RFF_NOSEPARATEMEM 0x20 /* NT only */ +#define RFF_NOBROWSE 0x01 /* Removes the browse button */ +#define RFF_NODEFAULT 0x02 /* No default item selected */ +#define RFF_CALCDIRECTORY 0x04 /* Calculates the working directory from the file name */ +#define RFF_NOLABEL 0x08 /* Removes the edit box label */ +#define RFF_NOSEPARATEMEM 0x20 /* Removes the Separate Memory Space check box (Windows NT only) */ #define DE_SAMEFILE 0x71 #define DE_DESTSAMETREE 0x7D

1 0

[hbelusca] 70721: Whitespace fix only.
by hbelusca＠svn.reactos.org 12 Feb '16

12 Feb '16

Author: hbelusca Date: Fri Feb 12 23:46:14 2016 New Revision: 70721 URL: http://svn.reactos.org/svn/reactos?rev=70721&view=rev Log: Whitespace fix only. Modified: trunk/reactos/base/applications/taskmgr/run.h Modified: trunk/reactos/base/applications/taskmgr/run.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/run.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/run.h [iso-8859-1] Fri Feb 12 23:46:14 2016 @@ -32,20 +32,19 @@ void TaskManager_OnFileNew(void); -typedef void (WINAPI *RUNFILEDLG)( +typedef void (WINAPI *RUNFILEDLG)( HWND hwndOwner, HICON hIcon, LPCWSTR lpstrDirectory, LPCWSTR lpstrTitle, -LPCWSTR lpstrDescription, +LPCWSTR lpstrDescription, UINT uFlags); /* * Flags for RunFileDlg */ - -#define RFF_NOBROWSE 0x01 /* Removes the browse button. */ -#define RFF_NODEFAULT 0x02 /* No default item selected. */ -#define RFF_CALCDIRECTORY 0x04 /* Calculates the working directory from the file name. */ -#define RFF_NOLABEL 0x08 /* Removes the edit box label. */ -#define RFF_NOSEPARATEMEM 0x20 /* Removes the Separate Memory Space check box (Windows NT only). */ +#define RFF_NOBROWSE 0x01 /* Removes the browse button. */ +#define RFF_NODEFAULT 0x02 /* No default item selected. */ +#define RFF_CALCDIRECTORY 0x04 /* Calculates the working directory from the file name. */ +#define RFF_NOLABEL 0x08 /* Removes the edit box label. */ +#define RFF_NOSEPARATEMEM 0x20 /* Removes the Separate Memory Space check box (Windows NT only). */

1 0

[hbelusca] 70720: [WIN32K]: Since r7146 (12 years ago) we correctly set a small Close button for tool windows. WARNING: Please do NOT sync this piece of code with Wine! Ours behave better when one ...
by hbelusca＠svn.reactos.org 12 Feb '16

12 Feb '16

Author: hbelusca Date: Fri Feb 12 23:10:59 2016 New Revision: 70720 URL: http://svn.reactos.org/svn/reactos?rev=70720&view=rev Log: [WIN32K]: Since r7146 (12 years ago) we correctly set a small Close button for tool windows. WARNING: Please do NOT sync this piece of code with Wine! Ours behave better when one changes the values of SM_CXSMSIZE / SM_CYSMSIZE. Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Fri Feb 12 23:10:59 2016 @@ -689,7 +689,7 @@ * FIXME: * - Cache bitmaps, then just bitblt instead of calling DFC() (and * wasting precious CPU cycles) every time - * - Center the buttons verticaly in the rect + * - Center the buttons vertically in the rect */ VOID UserDrawCaptionButton(PWND pWnd, LPRECT Rect, DWORD Style, DWORD ExStyle, HDC hDC, BOOL bDown, ULONG Type) @@ -751,8 +751,7 @@ PMENU pSysMenu = IntGetSystemMenu(pWnd, FALSE); UINT MenuState = IntGetMenuState(UserHMGetHandle(pSysMenu), SC_CLOSE, MF_BYCOMMAND); /* in case of error MenuState==0xFFFFFFFF */ - /* FIXME: A tool window has a smaller Close button */ - + /* A tool window has a smaller Close button */ if (ExStyle & WS_EX_TOOLWINDOW) { TempRect.left = TempRect.right - UserGetSystemMetrics(SM_CXSMSIZE);

1 0

[hbelusca] 70719: [UXTHEME] Temporarily disable the WS_EX_DLGMODALFRAME test whose presence broke opening the system menu when the user clicks on the window caption icon. This half-broken DefWndNCH...
by hbelusca＠svn.reactos.org 12 Feb '16

12 Feb '16

Author: hbelusca Date: Fri Feb 12 22:12:51 2016 New Revision: 70719 URL: http://svn.reactos.org/svn/reactos?rev=70719&view=rev Log: [UXTHEME] Temporarily disable the WS_EX_DLGMODALFRAME test whose presence broke opening the system menu when the user clicks on the window caption icon. This half-broken DefWndNCHitTest comes from user32; see r70718 for more details. Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Fri Feb 12 22:12:51 2016 @@ -950,7 +950,7 @@ ButtonWidth = GetSystemMetrics(SM_CXSIZE); ButtonWidth -= 4; - ButtonWidth+= BUTTON_GAP_SIZE; + ButtonWidth += BUTTON_GAP_SIZE; if (wi.dwStyle & WS_SYSMENU) { @@ -960,7 +960,13 @@ } else { - if(!(wi.dwExStyle & WS_EX_DLGMODALFRAME)) + // if(!(wi.dwExStyle & WS_EX_DLGMODALFRAME)) + // FIXME: The real test should check whether there is + // an icon for the system window, and if so, do the + // rect.left increase. + // See win32ss/user/user32/windows/nonclient.c!DefWndNCHitTest + // and win32ss/user/ntuser/nonclient.c!GetNCHitEx which does + // the test better. WindowRect.left += ButtonWidth; WindowRect.right -= ButtonWidth; }

1 0

[hbelusca] 70718: [WIN32K][USER32] - Both functions UserGetInsideRectNC and NC_GetInsideRect are the same: remove the redundant code and keep only NC_GetInsideRect. - Move default WM_NCHITTEST into...
by hbelusca＠svn.reactos.org 12 Feb '16

12 Feb '16

Author: hbelusca Date: Fri Feb 12 22:10:29 2016 New Revision: 70718 URL: http://svn.reactos.org/svn/reactos?rev=70718&view=rev Log: [WIN32K][USER32] - Both functions UserGetInsideRectNC and NC_GetInsideRect are the same: remove the redundant code and keep only NC_GetInsideRect. - Move default WM_NCHITTEST into kernel side, getting rid of half-broken DefWndNCHitTest in user32. Note that we use a DefWndNCHitTest version almost unmodified in uxtheme.dll. I did this move also because otherwise, we didn't correctly checked for the presence of the window system menu icon. On the contrary the function GetNCHitEx (obviously taken from Wine's NC_HandleNCHitTest) correctly checks for this. James, please review! Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/nonclient.c trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/user32/include/user32p.h trunk/reactos/win32ss/user/user32/windows/defwnd.c trunk/reactos/win32ss/user/user32/windows/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Fri Feb 12 22:10:29 2016 @@ -629,8 +629,8 @@ co_WinPosShowWindow(Wnd, wParam ? SW_SHOWNOACTIVATE : SW_HIDE); } - } - break; + break; + } case WM_CLIENTSHUTDOWN: return IntClientShutdown(Wnd, wParam, lParam); @@ -688,16 +688,16 @@ break; case WM_NCLBUTTONDOWN: - return (NC_HandleNCLButtonDown( Wnd, wParam, lParam)); + return NC_HandleNCLButtonDown(Wnd, wParam, lParam); + + case WM_NCRBUTTONDOWN: + return NC_HandleNCRButtonDown(Wnd, wParam, lParam); case WM_LBUTTONDBLCLK: - return (NC_HandleNCLButtonDblClk( Wnd, HTCLIENT, lParam)); + return NC_HandleNCLButtonDblClk(Wnd, HTCLIENT, lParam); case WM_NCLBUTTONDBLCLK: - return (NC_HandleNCLButtonDblClk( Wnd, wParam, lParam)); - - case WM_NCRBUTTONDOWN: - return NC_HandleNCRButtonDown( Wnd, wParam, lParam ); + return NC_HandleNCLButtonDblClk(Wnd, wParam, lParam); case WM_RBUTTONUP: { Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Fri Feb 12 22:10:29 2016 @@ -2212,7 +2212,7 @@ { if ( (Wnd->style & WS_MINIMIZE)) { - UserGetInsideRectNC(Wnd, &rect); + NC_GetInsideRect(Wnd, &rect); UserDrawSysMenuButton(Wnd, hdc, &rect, lpitem->fState & (MF_HILITE | MF_MOUSESELECT)); } return; Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Fri Feb 12 22:10:29 2016 @@ -67,7 +67,7 @@ * Get the 'inside' rectangle of a window, i.e. the whole window rectangle * but without the borders (if any). */ -void FASTCALL +void FASTCALL // Previously known as "UserGetInsideRectNC" NC_GetInsideRect(PWND Wnd, RECT *rect) { ULONG Style; @@ -83,27 +83,22 @@ if (Style & WS_ICONIC) return; /* Remove frame from rectangle */ - if (UserHasThickFrameStyle(Style, ExStyle )) + if (UserHasThickFrameStyle(Style, ExStyle)) { RECTL_vInflateRect(rect, -UserGetSystemMetrics(SM_CXFRAME), -UserGetSystemMetrics(SM_CYFRAME)); } - else + else if (UserHasDlgFrameStyle(Style, ExStyle)) { - if (UserHasDlgFrameStyle(Style, ExStyle )) - { - RECTL_vInflateRect(rect, -UserGetSystemMetrics(SM_CXDLGFRAME), -UserGetSystemMetrics(SM_CYDLGFRAME)); - /* FIXME: this isn't in NC_AdjustRect? why not? */ - if (ExStyle & WS_EX_DLGMODALFRAME) - RECTL_vInflateRect( rect, -1, 0 ); - } - else - { - if (UserHasThinFrameStyle(Style, ExStyle)) - { - RECTL_vInflateRect(rect, -UserGetSystemMetrics(SM_CXBORDER), -UserGetSystemMetrics(SM_CYBORDER)); - } - } + RECTL_vInflateRect(rect, -UserGetSystemMetrics(SM_CXDLGFRAME), -UserGetSystemMetrics(SM_CYDLGFRAME)); + /* FIXME: this isn't in NC_AdjustRect? why not? */ + if (ExStyle & WS_EX_DLGMODALFRAME) + RECTL_vInflateRect( rect, -1, 0 ); } + else if (UserHasThinFrameStyle(Style, ExStyle)) + { + RECTL_vInflateRect(rect, -UserGetSystemMetrics(SM_CXBORDER), -UserGetSystemMetrics(SM_CYBORDER)); + } + /* We have additional border information if the window * is a child (but not an MDI child) */ if ((Style & WS_CHILD) && !(ExStyle & WS_EX_MDICHILD)) @@ -672,57 +667,6 @@ return Ret; } -void -UserGetInsideRectNC(PWND Wnd, RECT *rect) -{ - ULONG Style; - ULONG ExStyle; - - Style = Wnd->style; - ExStyle = Wnd->ExStyle; - - rect->top = rect->left = 0; - rect->right = Wnd->rcWindow.right - Wnd->rcWindow.left; - rect->bottom = Wnd->rcWindow.bottom - Wnd->rcWindow.top; - - if (Style & WS_ICONIC) - { - return; - } - - /* Remove frame from rectangle */ - if (UserHasThickFrameStyle(Style, ExStyle )) - { - RECTL_vInflateRect(rect, -UserGetSystemMetrics(SM_CXFRAME), -UserGetSystemMetrics(SM_CYFRAME)); - } - else - { - if (UserHasDlgFrameStyle(Style, ExStyle )) - { - RECTL_vInflateRect(rect, -UserGetSystemMetrics(SM_CXDLGFRAME), -UserGetSystemMetrics(SM_CYDLGFRAME)); - /* FIXME: this isn't in NC_AdjustRect? why not? */ - if (ExStyle & WS_EX_DLGMODALFRAME) - RECTL_vInflateRect( rect, -1, 0 ); - } - else - { - if (UserHasThinFrameStyle(Style, ExStyle)) - { - RECTL_vInflateRect(rect, -UserGetSystemMetrics(SM_CXBORDER), -UserGetSystemMetrics(SM_CYBORDER)); - } - } - } - /* We have additional border information if the window - * is a child (but not an MDI child) */ - if ((Style & WS_CHILD) && !(ExStyle & WS_EX_MDICHILD)) - { - if (ExStyle & WS_EX_CLIENTEDGE) - RECTL_vInflateRect (rect, -UserGetSystemMetrics(SM_CXEDGE), -UserGetSystemMetrics(SM_CYEDGE)); - if (ExStyle & WS_EX_STATICEDGE) - RECTL_vInflateRect (rect, -UserGetSystemMetrics(SM_CXBORDER), -UserGetSystemMetrics(SM_CYBORDER)); - } -} - BOOL IntIsScrollBarVisible(PWND pWnd, INT hBar) { @@ -1588,7 +1532,7 @@ { RECT rect; HDC hDC = UserGetWindowDC(pWnd); - UserGetInsideRectNC(pWnd, &rect); + NC_GetInsideRect(pWnd, &rect); UserDrawSysMenuButton(pWnd, hDC, &rect, TRUE); UserReleaseDC( pWnd, hDC, FALSE ); } @@ -1720,6 +1664,229 @@ } +#if 0 // Old version, kept there for reference, which is also used + // almost unmodified in uxtheme.dll (in nonclient.c) +/* + * FIXME: + * - Check the scrollbar handling + */ +LRESULT +DefWndNCHitTest(HWND hWnd, POINT Point) +{ + RECT WindowRect, ClientRect, OrigWndRect; + POINT ClientPoint; + SIZE WindowBorders; + DWORD Style = GetWindowLongPtrW(hWnd, GWL_STYLE); + DWORD ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE); + + GetWindowRect(hWnd, &WindowRect); + if (!PtInRect(&WindowRect, Point)) + { + return HTNOWHERE; + } + OrigWndRect = WindowRect; + + if (UserHasWindowEdge(Style, ExStyle)) + { + LONG XSize, YSize; + + UserGetWindowBorders(Style, ExStyle, &WindowBorders, FALSE); + InflateRect(&WindowRect, -WindowBorders.cx, -WindowBorders.cy); + XSize = GetSystemMetrics(SM_CXSIZE) * GetSystemMetrics(SM_CXBORDER); + YSize = GetSystemMetrics(SM_CYSIZE) * GetSystemMetrics(SM_CYBORDER); + if (!PtInRect(&WindowRect, Point)) + { + BOOL ThickFrame; + + ThickFrame = (Style & WS_THICKFRAME); + if (Point.y < WindowRect.top) + { + if(Style & WS_MINIMIZE) + return HTCAPTION; + if(!ThickFrame) + return HTBORDER; + if (Point.x < (WindowRect.left + XSize)) + return HTTOPLEFT; + if (Point.x >= (WindowRect.right - XSize)) + return HTTOPRIGHT; + return HTTOP; + } + if (Point.y >= WindowRect.bottom) + { + if(Style & WS_MINIMIZE) + return HTCAPTION; + if(!ThickFrame) + return HTBORDER; + if (Point.x < (WindowRect.left + XSize)) + return HTBOTTOMLEFT; + if (Point.x >= (WindowRect.right - XSize)) + return HTBOTTOMRIGHT; + return HTBOTTOM; + } + if (Point.x < WindowRect.left) + { + if(Style & WS_MINIMIZE) + return HTCAPTION; + if(!ThickFrame) + return HTBORDER; + if (Point.y < (WindowRect.top + YSize)) + return HTTOPLEFT; + if (Point.y >= (WindowRect.bottom - YSize)) + return HTBOTTOMLEFT; + return HTLEFT; + } + if (Point.x >= WindowRect.right) + { + if(Style & WS_MINIMIZE) + return HTCAPTION; + if(!ThickFrame) + return HTBORDER; + if (Point.y < (WindowRect.top + YSize)) + return HTTOPRIGHT; + if (Point.y >= (WindowRect.bottom - YSize)) + return HTBOTTOMRIGHT; + return HTRIGHT; + } + } + } + else + { + if (ExStyle & WS_EX_STATICEDGE) + InflateRect(&WindowRect, + -GetSystemMetrics(SM_CXBORDER), + -GetSystemMetrics(SM_CYBORDER)); + if (!PtInRect(&WindowRect, Point)) + return HTBORDER; + } + + if ((Style & WS_CAPTION) == WS_CAPTION) + { + if (ExStyle & WS_EX_TOOLWINDOW) + WindowRect.top += GetSystemMetrics(SM_CYSMCAPTION); + else + WindowRect.top += GetSystemMetrics(SM_CYCAPTION); + if (!PtInRect(&WindowRect, Point)) + { + if (Style & WS_SYSMENU) + { + if (ExStyle & WS_EX_TOOLWINDOW) + { + WindowRect.right -= GetSystemMetrics(SM_CXSMSIZE); + } + else + { + // if(!(ExStyle & WS_EX_DLGMODALFRAME)) + // FIXME: The real test should check whether there is + // an icon for the system window, and if so, do the + // rect.left increase. + // See dll/win32/uxtheme/nonclient.c!DefWndNCHitTest + // and win32ss/user/ntuser/nonclient.c!GetNCHitEx which does + // the test better. + WindowRect.left += GetSystemMetrics(SM_CXSIZE); + WindowRect.right -= GetSystemMetrics(SM_CXSIZE); + } + } + if (Point.x < WindowRect.left) + return HTSYSMENU; + if (WindowRect.right <= Point.x) + return HTCLOSE; + if (Style & WS_MAXIMIZEBOX || Style & WS_MINIMIZEBOX) + WindowRect.right -= GetSystemMetrics(SM_CXSIZE); + if (Point.x >= WindowRect.right) + return HTMAXBUTTON; + if (Style & WS_MINIMIZEBOX) + WindowRect.right -= GetSystemMetrics(SM_CXSIZE); + if (Point.x >= WindowRect.right) + return HTMINBUTTON; + return HTCAPTION; + } + } + + if(!(Style & WS_MINIMIZE)) + { + ClientPoint = Point; + ScreenToClient(hWnd, &ClientPoint); + GetClientRect(hWnd, &ClientRect); + + if (PtInRect(&ClientRect, ClientPoint)) + { + return HTCLIENT; + } + + if (GetMenu(hWnd) && !(Style & WS_CHILD)) + { + if (Point.x > 0 && Point.x < WindowRect.right && ClientPoint.y < 0) + return HTMENU; + } + + if (ExStyle & WS_EX_CLIENTEDGE) + { + InflateRect(&WindowRect, -2 * GetSystemMetrics(SM_CXBORDER), + -2 * GetSystemMetrics(SM_CYBORDER)); + } + + if ((Style & WS_VSCROLL) && (Style & WS_HSCROLL) && + (WindowRect.bottom - WindowRect.top) > GetSystemMetrics(SM_CYHSCROLL)) + { + RECT ParentRect, TempRect = WindowRect, TempRect2 = WindowRect; + HWND Parent = GetParent(hWnd); + + TempRect.bottom -= GetSystemMetrics(SM_CYHSCROLL); + if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) + TempRect.right = TempRect.left + GetSystemMetrics(SM_CXVSCROLL); + else + TempRect.left = TempRect.right - GetSystemMetrics(SM_CXVSCROLL); + if (PtInRect(&TempRect, Point)) + return HTVSCROLL; + + TempRect2.top = TempRect2.bottom - GetSystemMetrics(SM_CYHSCROLL); + if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) + TempRect2.left += GetSystemMetrics(SM_CXVSCROLL); + else + TempRect2.right -= GetSystemMetrics(SM_CXVSCROLL); + if (PtInRect(&TempRect2, Point)) + return HTHSCROLL; + + TempRect.top = TempRect2.top; + TempRect.bottom = TempRect2.bottom; + if(Parent) + GetClientRect(Parent, &ParentRect); + if (PtInRect(&TempRect, Point) && HASSIZEGRIP(Style, ExStyle, + GetWindowLongPtrW(Parent, GWL_STYLE), OrigWndRect, ParentRect)) + { + if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) + return HTBOTTOMLEFT; + else + return HTBOTTOMRIGHT; + } + } + else + { + if (Style & WS_VSCROLL) + { + RECT TempRect = WindowRect; + + if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) + TempRect.right = TempRect.left + GetSystemMetrics(SM_CXVSCROLL); + else + TempRect.left = TempRect.right - GetSystemMetrics(SM_CXVSCROLL); + if (PtInRect(&TempRect, Point)) + return HTVSCROLL; + } else + if (Style & WS_HSCROLL) + { + RECT TempRect = WindowRect; + TempRect.top = TempRect.bottom - GetSystemMetrics(SM_CYHSCROLL); + if (PtInRect(&TempRect, Point)) + return HTHSCROLL; + } + } + } + + return HTNOWHERE; +} +#endif + DWORD FASTCALL GetNCHitEx(PWND pWnd, POINT pt) { Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Fri Feb 12 22:10:29 2016 @@ -134,7 +134,7 @@ LRESULT NC_HandleNCCalcSize( PWND wnd, WPARAM wparam, RECTL *winRect, BOOL Suspended ); VOID NC_DrawFrame( HDC hDC, RECT *CurrentRect, BOOL Active, DWORD Style, DWORD ExStyle); VOID UserDrawCaptionBar( PWND pWnd, HDC hDC, INT Flags); -void UserGetInsideRectNC(PWND Wnd, RECT *rect); +void FASTCALL NC_GetInsideRect(PWND Wnd, RECT *rect); LRESULT NC_HandleNCLButtonDown(PWND Wnd, WPARAM wParam, LPARAM lParam); LRESULT NC_HandleNCLButtonDblClk(PWND Wnd, WPARAM wParam, LPARAM lParam); LRESULT NC_HandleNCRButtonDown( PWND wnd, WPARAM wParam, LPARAM lParam ); Modified: trunk/reactos/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] Fri Feb 12 22:10:29 2016 @@ -125,7 +125,6 @@ VOID FASTCALL IntNotifyWinEvent(DWORD, HWND, LONG, LONG, DWORD); UINT WINAPI WinPosGetMinMaxInfo(HWND hWnd, POINT* MaxSize, POINT* MaxPos, POINT* MinTrack, POINT* MaxTrack); VOID UserGetWindowBorders(DWORD, DWORD, SIZE *, BOOL); -void UserGetInsideRectNC(PWND Wnd, RECT *rect); VOID FASTCALL GetConnected(VOID); extern BOOL FASTCALL EnumNamesA(HWINSTA WindowStation, NAMEENUMPROCA EnumFunc, LPARAM Context, BOOL Desktops); extern BOOL FASTCALL EnumNamesW(HWINSTA WindowStation, NAMEENUMPROCW EnumFunc, LPARAM Context, BOOL Desktops); Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Fri Feb 12 22:10:29 2016 @@ -16,8 +16,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); -LRESULT DefWndNCHitTest(HWND hWnd, POINT Point); - /* GLOBALS *******************************************************************/ /* FUNCTIONS *****************************************************************/ @@ -86,57 +84,6 @@ Ret = NtUserDefSetText(hWnd, (String ? &lsString : NULL)); return Ret; -} - -void -UserGetInsideRectNC(PWND Wnd, RECT *rect) -{ - ULONG Style; - ULONG ExStyle; - - Style = Wnd->style; - ExStyle = Wnd->ExStyle; - - rect->top = rect->left = 0; - rect->right = Wnd->rcWindow.right - Wnd->rcWindow.left; - rect->bottom = Wnd->rcWindow.bottom - Wnd->rcWindow.top; - - if (Style & WS_ICONIC) - { - return; - } - - /* Remove frame from rectangle */ - if (UserHasThickFrameStyle(Style, ExStyle )) - { - InflateRect(rect, -GetSystemMetrics(SM_CXFRAME), -GetSystemMetrics(SM_CYFRAME)); - } - else - { - if (UserHasDlgFrameStyle(Style, ExStyle )) - { - InflateRect(rect, -GetSystemMetrics(SM_CXDLGFRAME), -GetSystemMetrics(SM_CYDLGFRAME)); - /* FIXME: this isn't in NC_AdjustRect? why not? */ - if (ExStyle & WS_EX_DLGMODALFRAME) - InflateRect( rect, -1, 0 ); - } - else - { - if (UserHasThinFrameStyle(Style, ExStyle)) - { - InflateRect(rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER)); - } - } - } - /* We have additional border information if the window - * is a child (but not an MDI child) */ - if ((Style & WS_CHILD) && !(ExStyle & WS_EX_MDICHILD)) - { - if (ExStyle & WS_EX_CLIENTEDGE) - InflateRect (rect, -GetSystemMetrics(SM_CXEDGE), -GetSystemMetrics(SM_CYEDGE)); - if (ExStyle & WS_EX_STATICEDGE) - InflateRect (rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER)); - } } HWND FASTCALL @@ -412,10 +359,10 @@ LRESULT WINAPI User32DefWindowProc(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - BOOL bUnicode) + UINT Msg, + WPARAM wParam, + LPARAM lParam, + BOOL bUnicode) { PWND pWnd = NULL; if (hWnd) @@ -438,14 +385,6 @@ return 0; } - case WM_NCHITTEST: - { - POINT Point; - Point.x = GET_X_LPARAM(lParam); - Point.y = GET_Y_LPARAM(lParam); - return (DefWndNCHitTest(hWnd, Point)); - } - case WM_RBUTTONUP: { POINT Pt; @@ -489,7 +428,7 @@ } else { - goto GoSS; + goto GoSS; } break; } @@ -553,7 +492,7 @@ case WM_CTLCOLORDLG: case WM_CTLCOLORSTATIC: case WM_CTLCOLORSCROLLBAR: - return (LRESULT) DefWndControlColor((HDC)wParam, Msg - WM_CTLCOLORMSGBOX); + return (LRESULT) DefWndControlColor((HDC)wParam, Msg - WM_CTLCOLORMSGBOX); case WM_CTLCOLOR: return (LRESULT) DefWndControlColor((HDC)wParam, HIWORD(lParam)); @@ -852,9 +791,9 @@ case WM_RBUTTONDOWN: case WM_MBUTTONDOWN: case WM_NCLBUTTONDOWN: + case WM_NCRBUTTONDOWN: case WM_LBUTTONDBLCLK: case WM_NCLBUTTONDBLCLK: - case WM_NCRBUTTONDOWN: case WM_KEYF1: case WM_KEYUP: case WM_SYSKEYUP: @@ -872,6 +811,7 @@ case WM_NCPAINT: case WM_NCACTIVATE: case WM_NCCALCSIZE: + case WM_NCHITTEST: case WM_SYNCPAINT: case WM_SETREDRAW: case WM_CLIENTSHUTDOWN: Modified: trunk/reactos/win32ss/user/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] Fri Feb 12 22:10:29 2016 @@ -25,17 +25,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); - -#define HAS_DLGFRAME(Style, ExStyle) \ - (((ExStyle) & WS_EX_DLGMODALFRAME) || \ - (((Style) & WS_DLGFRAME) && (!((Style) & (WS_THICKFRAME | WS_MINIMIZE))))) - -#define HAS_THICKFRAME(Style, ExStyle) \ - (((Style) & WS_THICKFRAME) && !((Style) & WS_MINIMIZE) && \ - (!(((Style) & (WS_DLGFRAME | WS_BORDER)) == WS_DLGFRAME))) - -#define HAS_THINFRAME(Style, ExStyle) \ - (((Style) & (WS_BORDER | WS_MINIMIZE)) || (!((Style) & (WS_CHILD | WS_POPUP)))) #define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ @@ -87,220 +76,6 @@ } /* - * FIXME: - * - Check the scrollbar handling - */ -LRESULT -DefWndNCHitTest(HWND hWnd, POINT Point) -{ - RECT WindowRect, ClientRect, OrigWndRect; - POINT ClientPoint; - SIZE WindowBorders; - DWORD Style = GetWindowLongPtrW(hWnd, GWL_STYLE); - DWORD ExStyle = GetWindowLongPtrW(hWnd, GWL_EXSTYLE); - - GetWindowRect(hWnd, &WindowRect); - if (!PtInRect(&WindowRect, Point)) - { - return HTNOWHERE; - } - OrigWndRect = WindowRect; - - if (UserHasWindowEdge(Style, ExStyle)) - { - LONG XSize, YSize; - - UserGetWindowBorders(Style, ExStyle, &WindowBorders, FALSE); - InflateRect(&WindowRect, -WindowBorders.cx, -WindowBorders.cy); - XSize = GetSystemMetrics(SM_CXSIZE) * GetSystemMetrics(SM_CXBORDER); - YSize = GetSystemMetrics(SM_CYSIZE) * GetSystemMetrics(SM_CYBORDER); - if (!PtInRect(&WindowRect, Point)) - { - BOOL ThickFrame; - - ThickFrame = (Style & WS_THICKFRAME); - if (Point.y < WindowRect.top) - { - if(Style & WS_MINIMIZE) - return HTCAPTION; - if(!ThickFrame) - return HTBORDER; - if (Point.x < (WindowRect.left + XSize)) - return HTTOPLEFT; - if (Point.x >= (WindowRect.right - XSize)) - return HTTOPRIGHT; - return HTTOP; - } - if (Point.y >= WindowRect.bottom) - { - if(Style & WS_MINIMIZE) - return HTCAPTION; - if(!ThickFrame) - return HTBORDER; - if (Point.x < (WindowRect.left + XSize)) - return HTBOTTOMLEFT; - if (Point.x >= (WindowRect.right - XSize)) - return HTBOTTOMRIGHT; - return HTBOTTOM; - } - if (Point.x < WindowRect.left) - { - if(Style & WS_MINIMIZE) - return HTCAPTION; - if(!ThickFrame) - return HTBORDER; - if (Point.y < (WindowRect.top + YSize)) - return HTTOPLEFT; - if (Point.y >= (WindowRect.bottom - YSize)) - return HTBOTTOMLEFT; - return HTLEFT; - } - if (Point.x >= WindowRect.right) - { - if(Style & WS_MINIMIZE) - return HTCAPTION; - if(!ThickFrame) - return HTBORDER; - if (Point.y < (WindowRect.top + YSize)) - return HTTOPRIGHT; - if (Point.y >= (WindowRect.bottom - YSize)) - return HTBOTTOMRIGHT; - return HTRIGHT; - } - } - } - else - { - if (ExStyle & WS_EX_STATICEDGE) - InflateRect(&WindowRect, - -GetSystemMetrics(SM_CXBORDER), - -GetSystemMetrics(SM_CYBORDER)); - if (!PtInRect(&WindowRect, Point)) - return HTBORDER; - } - - if ((Style & WS_CAPTION) == WS_CAPTION) - { - if (ExStyle & WS_EX_TOOLWINDOW) - WindowRect.top += GetSystemMetrics(SM_CYSMCAPTION); - else - WindowRect.top += GetSystemMetrics(SM_CYCAPTION); - if (!PtInRect(&WindowRect, Point)) - { - if (Style & WS_SYSMENU) - { - if (ExStyle & WS_EX_TOOLWINDOW) - { - WindowRect.right -= GetSystemMetrics(SM_CXSMSIZE); - } - else - { - if(!(ExStyle & WS_EX_DLGMODALFRAME)) - WindowRect.left += GetSystemMetrics(SM_CXSIZE); - WindowRect.right -= GetSystemMetrics(SM_CXSIZE); - } - } - if (Point.x < WindowRect.left) - return HTSYSMENU; - if (WindowRect.right <= Point.x) - return HTCLOSE; - if (Style & WS_MAXIMIZEBOX || Style & WS_MINIMIZEBOX) - WindowRect.right -= GetSystemMetrics(SM_CXSIZE); - if (Point.x >= WindowRect.right) - return HTMAXBUTTON; - if (Style & WS_MINIMIZEBOX) - WindowRect.right -= GetSystemMetrics(SM_CXSIZE); - if (Point.x >= WindowRect.right) - return HTMINBUTTON; - return HTCAPTION; - } - } - - if(!(Style & WS_MINIMIZE)) - { - ClientPoint = Point; - ScreenToClient(hWnd, &ClientPoint); - GetClientRect(hWnd, &ClientRect); - - if (PtInRect(&ClientRect, ClientPoint)) - { - return HTCLIENT; - } - - if (GetMenu(hWnd) && !(Style & WS_CHILD)) - { - if (Point.x > 0 && Point.x < WindowRect.right && ClientPoint.y < 0) - return HTMENU; - } - - if (ExStyle & WS_EX_CLIENTEDGE) - { - InflateRect(&WindowRect, -2 * GetSystemMetrics(SM_CXBORDER), - -2 * GetSystemMetrics(SM_CYBORDER)); - } - - if ((Style & WS_VSCROLL) && (Style & WS_HSCROLL) && - (WindowRect.bottom - WindowRect.top) > GetSystemMetrics(SM_CYHSCROLL)) - { - RECT ParentRect, TempRect = WindowRect, TempRect2 = WindowRect; - HWND Parent = GetParent(hWnd); - - TempRect.bottom -= GetSystemMetrics(SM_CYHSCROLL); - if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) - TempRect.right = TempRect.left + GetSystemMetrics(SM_CXVSCROLL); - else - TempRect.left = TempRect.right - GetSystemMetrics(SM_CXVSCROLL); - if (PtInRect(&TempRect, Point)) - return HTVSCROLL; - - TempRect2.top = TempRect2.bottom - GetSystemMetrics(SM_CYHSCROLL); - if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) - TempRect2.left += GetSystemMetrics(SM_CXVSCROLL); - else - TempRect2.right -= GetSystemMetrics(SM_CXVSCROLL); - if (PtInRect(&TempRect2, Point)) - return HTHSCROLL; - - TempRect.top = TempRect2.top; - TempRect.bottom = TempRect2.bottom; - if(Parent) - GetClientRect(Parent, &ParentRect); - if (PtInRect(&TempRect, Point) && HASSIZEGRIP(Style, ExStyle, - GetWindowLongPtrW(Parent, GWL_STYLE), OrigWndRect, ParentRect)) - { - if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) - return HTBOTTOMLEFT; - else - return HTBOTTOMRIGHT; - } - } - else - { - if (Style & WS_VSCROLL) - { - RECT TempRect = WindowRect; - - if ((ExStyle & WS_EX_LEFTSCROLLBAR) != 0) - TempRect.right = TempRect.left + GetSystemMetrics(SM_CXVSCROLL); - else - TempRect.left = TempRect.right - GetSystemMetrics(SM_CXVSCROLL); - if (PtInRect(&TempRect, Point)) - return HTVSCROLL; - } else - if (Style & WS_HSCROLL) - { - RECT TempRect = WindowRect; - TempRect.top = TempRect.bottom - GetSystemMetrics(SM_CYHSCROLL); - if (PtInRect(&TempRect, Point)) - return HTHSCROLL; - } - } - } - - return HTNOWHERE; -} - -/* RealUserDrawCaption: This function is passed through RegisterUserApiHook to uxtheme to call it when the classic caption is needed to be drawn. */

1 0

[hbelusca] 70717: [UXTHEME]: Use a similar working logic to display (or not) the icon (or the default one) to windows/dialogs, taking in particular their exstyle WS_EX_DLGMODALFRAME in particular. ...
by hbelusca＠svn.reactos.org 12 Feb '16

12 Feb '16

Author: hbelusca Date: Fri Feb 12 19:07:29 2016 New Revision: 70717 URL: http://svn.reactos.org/svn/reactos?rev=70717&view=rev Log: [UXTHEME]: Use a similar working logic to display (or not) the icon (or the default one) to windows/dialogs, taking in particular their exstyle WS_EX_DLGMODALFRAME in particular. Dedicated to Jared Smudde. CORE-9635 #resolve #comment A better fix was committed in r70717 to match r70715 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Fri Feb 12 19:07:29 2016 @@ -13,20 +13,19 @@ void InitMenuFont(VOID) { - NONCLIENTMETRICS ncm; + NONCLIENTMETRICS ncm; ncm.cbSize = sizeof(NONCLIENTMETRICS); - if(!SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) - { - return ; + if (!SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) + { + return; } hMenuFont = CreateFontIndirect(&ncm.lfMenuFont); ncm.lfMenuFont.lfWeight = max(ncm.lfMenuFont.lfWeight + 300, 1000); hMenuFontBold = CreateFontIndirect(&ncm.lfMenuFont); - } static BOOL @@ -64,26 +63,27 @@ return FALSE; } -HICON -UserGetWindowIcon(HWND hwnd) -{ - HICON hIcon = 0; - - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); +static HICON +UserGetWindowIcon(PDRAW_CONTEXT pcontext) +{ + HICON hIcon = NULL; + + SendMessageTimeout(pcontext->hWnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + SendMessageTimeout(pcontext->hWnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + SendMessageTimeout(pcontext->hWnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICONSM); + hIcon = (HICON)GetClassLong(pcontext->hWnd, GCL_HICONSM); if (!hIcon) - hIcon = (HICON)GetClassLong(hwnd, GCL_HICON); - - if(!hIcon) + hIcon = (HICON)GetClassLong(pcontext->hWnd, GCL_HICON); + + // See also win32ss/user/ntuser/nonclient.c!NC_IconForWindow + if (!hIcon && !(pcontext->wi.dwExStyle & WS_EX_DLGMODALFRAME)) hIcon = LoadIconW(NULL, (LPCWSTR)IDI_WINLOGO); return hIcon; @@ -306,7 +306,7 @@ ThemeGetButtonState(HTHELP, htHot, htDown, pcontext->Active)); } -/* Used from WM_NCPAINT and WM_NCACTIVATE handlers*/ +/* Used from WM_NCPAINT and WM_NCACTIVATE handlers */ static void ThemeDrawCaption(PDRAW_CONTEXT pcontext, RECT* prcCurrent) { @@ -315,7 +315,13 @@ HICON hIcon; WCHAR *CaptionText; - hIcon = UserGetWindowIcon(pcontext->hWnd); + // See also win32ss/user/ntuser/nonclient.c!UserDrawCaptionBar + // and win32ss/user/ntuser/nonclient.c!UserDrawCaption + if ((pcontext->wi.dwStyle & WS_SYSMENU) && !(pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW)) + hIcon = UserGetWindowIcon(pcontext); + else + hIcon = NULL; + CaptionText = UserGetWindowCaption(pcontext->hWnd); /* Get the caption part and state id */ @@ -328,7 +334,7 @@ iState = pcontext->Active ? FS_ACTIVE : FS_INACTIVE; - /* Draw the caption background*/ + /* Draw the caption background */ rcPart = *prcCurrent; rcPart.bottom = rcPart.top + pcontext->CaptionHeight; prcCurrent->top = rcPart.bottom; @@ -352,8 +358,7 @@ rcPart.top += 3 ; /* Draw the icon */ - if(hIcon && !(pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW) - && !(pcontext->wi.dwExStyle & WS_EX_DLGMODALFRAME)) + if (hIcon) { int IconHeight = GetSystemMetrics(SM_CYSMICON); int IconWidth = GetSystemMetrics(SM_CXSMICON); @@ -364,9 +369,9 @@ rcPart.right -= 4; /* Draw the caption */ - if(CaptionText) - { - /*FIXME: Use DrawThemeTextEx*/ + if (CaptionText) + { + /* FIXME: Use DrawThemeTextEx */ ThemeDrawCaptionText(pcontext->theme, pcontext->hDC, iPart, @@ -375,7 +380,7 @@ lstrlenW(CaptionText), DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS, 0, - &rcPart , + &rcPart, pcontext->Active); HeapFree(GetProcessHeap(), 0, CaptionText); } @@ -446,7 +451,7 @@ } /* Now the other bit of the frame */ - if (context->wi.dwStyle & (WS_DLGFRAME | WS_BORDER) || context->wi.dwExStyle & WS_EX_DLGMODALFRAME) + if (context->wi.dwStyle & (WS_DLGFRAME | WS_BORDER) || (context->wi.dwExStyle & WS_EX_DLGMODALFRAME)) { INT Width = GetSystemMetrics(SM_CXBORDER); INT Height = GetSystemMetrics(SM_CYBORDER); @@ -594,7 +599,7 @@ Rect = MenuBarInfo.rcBar; OffsetRect(&Rect, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); - /* Draw a line under the menu*/ + /* Draw a line under the menu */ oldPen = (HPEN)SelectObject(pcontext->hDC, GetStockObject(DC_PEN)); SetDCPenColor(pcontext->hDC, GetSysColor(COLOR_3DFACE)); MoveToEx(pcontext->hDC, Rect.left, Rect.bottom, NULL); @@ -611,7 +616,7 @@ SelectObject(pcontext->hDC, FontOld); - /* Fill the menu background area that isn't painted yet*/ + /* Fill the menu background area that isn't painted yet */ FillRect(pcontext->hDC, &Rect, GetSysColorBrush(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); } @@ -652,7 +657,7 @@ } /* - Message handlers + * Message handlers */ static LRESULT @@ -937,7 +942,6 @@ if (!PtInRect(&WindowRect, Point)) { - INT ButtonWidth; if (wi.dwExStyle & WS_EX_TOOLWINDOW)

1 0

[hbelusca] 70716: This stuff should not have been committed.
by hbelusca＠svn.reactos.org 12 Feb '16

12 Feb '16

Author: hbelusca Date: Fri Feb 12 17:37:41 2016 New Revision: 70716 URL: http://svn.reactos.org/svn/reactos?rev=70716&view=rev Log: This stuff should not have been committed. Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Fri Feb 12 17:37:41 2016 @@ -356,9 +356,7 @@ hdc = UserGetDCEx( pWndParent, 0, DCX_CACHE ); if (iconic) { - // DragCursor = pwnd->pcls->spcur; DragCursor = pwnd->pcls->spicn; - ERR("pwnd->pcls->spicn = 0x%p ; pwnd->pcls->spcur = 0x%p\n", pwnd->pcls->spicn, pwnd->pcls->spcur); if (DragCursor) { UserReferenceObject(DragCursor);

1 0

[hbelusca] 70715: [WIN32K]: Fix display of window title icon for dialogs having the WS_EX_DLGMODALFRAME style. CORE-10850 #resolve CORE-10437 #comment The real fix was committed in r70715.
by hbelusca＠svn.reactos.org 12 Feb '16

12 Feb '16

Author: hbelusca Date: Fri Feb 12 17:31:19 2016 New Revision: 70715 URL: http://svn.reactos.org/svn/reactos?rev=70715&view=rev Log: [WIN32K]: Fix display of window title icon for dialogs having the WS_EX_DLGMODALFRAME style. CORE-10850 #resolve CORE-10437 #comment The real fix was committed in r70715. Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Fri Feb 12 17:31:19 2016 @@ -356,7 +356,9 @@ hdc = UserGetDCEx( pWndParent, 0, DCX_CACHE ); if (iconic) { + // DragCursor = pwnd->pcls->spcur; DragCursor = pwnd->pcls->spicn; + ERR("pwnd->pcls->spicn = 0x%p ; pwnd->pcls->spcur = 0x%p\n", pwnd->pcls->spicn, pwnd->pcls->spcur); if (DragCursor) { UserReferenceObject(DragCursor); @@ -630,7 +632,10 @@ if (!hIcon && pWnd->pcls->spicn) return pWnd->pcls->spicn; - if (!hIcon && (pWnd->style & DS_MODALFRAME)) + // WARNING: Wine code has this test completely wrong. The following is how + // Windows behaves for windows having the WS_EX_DLGMODALFRAME style set: + // it does not use the default icon! And it does not check for DS_MODALFRAME. + if (!hIcon && !(pWnd->ExStyle & WS_EX_DLGMODALFRAME)) { if (!hIcon) hIcon = gpsi->hIconSmWindows; // Both are IDI_WINLOGO Small if (!hIcon) hIcon = gpsi->hIconWindows; // Reg size. @@ -656,13 +661,13 @@ { UserReferenceObject(WindowIcon); - Ret = UserDrawIconEx( hDC, - Rect->left + 2, - Rect->top + 2, - WindowIcon, - UserGetSystemMetrics(SM_CXSMICON), - UserGetSystemMetrics(SM_CYSMICON), - 0, NULL, DI_NORMAL); + Ret = UserDrawIconEx(hDC, + Rect->left + 2, + Rect->top + 2, + WindowIcon, + UserGetSystemMetrics(SM_CXSMICON), + UserGetSystemMetrics(SM_CYSMICON), + 0, NULL, DI_NORMAL); UserDereferenceObject(WindowIcon); } @@ -966,9 +971,8 @@ } if (!(Flags & DC_ICON) && + !(Flags & DC_SMALLCAP) && (Style & WS_SYSMENU) && - !(Flags & DC_SMALLCAP) && - !(ExStyle & WS_EX_DLGMODALFRAME) && !(ExStyle & WS_EX_TOOLWINDOW) ) { pIcon = NC_IconForWindow(pWnd); // Force redraw of caption with icon if DC_ICON not flaged.... @@ -1435,7 +1439,7 @@ wParam = DC_CAPTION; } - if (Wnd->state & WNDS_NONCPAINT || !(Wnd->style & WS_VISIBLE)) + if ((Wnd->state & WNDS_NONCPAINT) || !(Wnd->style & WS_VISIBLE)) return 0; /* This isn't documented but is reproducible in at least XP SP2 and Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Fri Feb 12 17:31:19 2016 @@ -573,7 +573,7 @@ if (Next) continue; } - if ( Child->style & WS_VISIBLE) + if (Child->style & WS_VISIBLE) { USER_REFERENCE_ENTRY Ref; UserRefObjectCo(Child, &Ref); @@ -2101,14 +2101,14 @@ RECTL_vMakeWellOrdered(lpRc); + /* Determine whether the icon needs to be displayed */ if (!hIcon && pWnd != NULL) { - HasIcon = (uFlags & DC_ICON) && (pWnd->style & WS_SYSMENU) - && !(uFlags & DC_SMALLCAP) && !(pWnd->ExStyle & WS_EX_DLGMODALFRAME) - && !(pWnd->ExStyle & WS_EX_TOOLWINDOW); + HasIcon = (uFlags & DC_ICON) && !(uFlags & DC_SMALLCAP) && + (pWnd->style & WS_SYSMENU) && !(pWnd->ExStyle & WS_EX_TOOLWINDOW); } else - HasIcon = (hIcon != 0); + HasIcon = (hIcon != NULL); // Draw the caption background if((uFlags & DC_GRADIENT) && !(uFlags & DC_INBUTTON)) @@ -2192,7 +2192,7 @@ LONG cx = UserGetSystemMetrics(SM_CXSMICON); LONG cy = UserGetSystemMetrics(SM_CYSMICON); LONG x = Rect.left - cx/2 + 1 + (Rect.bottom - Rect.top)/2; // this is really what Window does - LONG y = (Rect.top + Rect.bottom)/2 - cy/2; // center + LONG y = (Rect.top + Rect.bottom - cy)/2; // center UserDrawIconEx(hDc, x, y, pIcon, cx, cy, 0, NULL, DI_NORMAL); UserDereferenceObject(pIcon); }

1 0

[hbelusca] 70714: [SYSICON]: Whitespace fixes only.
by hbelusca＠svn.reactos.org 12 Feb '16

12 Feb '16

Author: hbelusca Date: Fri Feb 12 17:21:32 2016 New Revision: 70714 URL: http://svn.reactos.org/svn/reactos?rev=70714&view=rev Log: [SYSICON]: Whitespace fixes only. Modified: trunk/rostests/win32/user32/sysicon/sysicon.c Modified: trunk/rostests/win32/user32/sysicon/sysicon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/sysicon/sysi… ============================================================================== --- trunk/rostests/win32/user32/sysicon/sysicon.c [iso-8859-1] (original) +++ trunk/rostests/win32/user32/sysicon/sysicon.c [iso-8859-1] Fri Feb 12 17:21:32 2016 @@ -76,7 +76,7 @@ memset(&wcx, 0, sizeof(wcx)); wcx.cbSize = sizeof(wcx); - wcx.lpfnWndProc = (WNDPROC) WndProc; + wcx.lpfnWndProc = (WNDPROC)WndProc; wcx.hInstance = hInst; wcx.hbrBackground = (HBRUSH)COLOR_WINDOW; wcx.lpszClassName = WndClass; @@ -92,7 +92,7 @@ hWnd1a = CreateWindowExW(WS_EX_DLGMODALFRAME, WndClass, L"WS_SYSMENU | WS_EX_DLGMODALFRAME without user icon", - WS_CAPTION | WS_SYSMENU , + WS_CAPTION | WS_SYSMENU, CW_USEDEFAULT, CW_USEDEFAULT, 400, 100, NULL, 0, @@ -107,7 +107,7 @@ hWnd1b = CreateWindowExW(WS_EX_DLGMODALFRAME, WndClass, L"WS_SYSMENU | WS_EX_DLGMODALFRAME with user icon", - WS_CAPTION | WS_SYSMENU , + WS_CAPTION | WS_SYSMENU, CW_USEDEFAULT, CW_USEDEFAULT, 400, 100, NULL, 0, @@ -124,7 +124,7 @@ hWnd2a = CreateWindowExW(WS_EX_TOOLWINDOW, WndClass, L"WS_SYSMENU | WS_EX_TOOLWINDOW without user icon", - WS_CAPTION | WS_SYSMENU , + WS_CAPTION | WS_SYSMENU, CW_USEDEFAULT, CW_USEDEFAULT, 400, 100, NULL, 0, @@ -138,7 +138,7 @@ hWnd2b = CreateWindowExW(WS_EX_TOOLWINDOW, WndClass, L"WS_SYSMENU | WS_EX_TOOLWINDOW with user icon", - WS_CAPTION | WS_SYSMENU , + WS_CAPTION | WS_SYSMENU, CW_USEDEFAULT, CW_USEDEFAULT, 400, 100, NULL, 0,

1 0

[hbelusca] 70713: [WIN32SS] - Fix orthograph - Mention in the code that some stuff are hacks & need to be fixed. - Add parentheses around bit checks.
by hbelusca＠svn.reactos.org 12 Feb '16

12 Feb '16

Author: hbelusca Date: Fri Feb 12 16:40:36 2016 New Revision: 70713 URL: http://svn.reactos.org/svn/reactos?rev=70713&view=rev Log: [WIN32SS] - Fix orthograph - Mention in the code that some stuff are hacks & need to be fixed. - Add parentheses around bit checks. Modified: trunk/reactos/win32ss/user/ntuser/csr.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/csr.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] Fri Feb 12 16:40:36 2016 @@ -3,7 +3,7 @@ * PROJECT: ReactOS Win32k subsystem * PURPOSE: Interface between Win32k and USERSRV * FILE: win32ss/user/ntuser/csr.c - * PROGRAMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr), based on + * PROGRAMMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr), based on * the original code by Ge van Geldorp (ge(a)gse.nl) and by * the CSR code in NTDLL. */ Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Fri Feb 12 16:40:36 2016 @@ -397,9 +397,8 @@ { BOOL Ret = FALSE; - if ( pWnd->style & WS_VISIBLE && (pWnd->style & WS_CAPTION) == WS_CAPTION ) + if ( (pWnd->style & WS_VISIBLE) && ((pWnd->style & WS_CAPTION) == WS_CAPTION) ) { - if (pWnd->state & WNDS_HASCAPTION && pWnd->head.pti->MessageQueue == gpqForeground) Flags |= DC_ACTIVE; /* Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Fri Feb 12 16:40:36 2016 @@ -103,7 +103,7 @@ /* FIXME: Do some more security checks here */ - /* FIXME: The first check is a reactos specific hack for system threads */ + /* FIXME: HACK: The first check is a reactos specific hack for system threads */ if(!PsIsSystemProcess(ptiCurrent->ppi->peProcess) && ptiCurrent->ppi != ppiCsr) { 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] Fri Feb 12 16:40:36 2016 @@ -724,8 +724,8 @@ pwndParent = Window->spwndParent; if (pwndParent == UserGetDesktopWindow()) { - ERR("Parent is Desktop, Min off screen!\n"); - /* ReactOS doesn't support iconic minimize to desktop */ + ERR("FIXME: Parent is Desktop, Min off screen!\n"); + /* FIXME: ReactOS doesn't support iconic minimize to desktop */ Pos->x = Pos->y = -32000; Window->InternalPos.flags |= WPF_MININIT; Window->InternalPos.IconPos.x = Pos->x;

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