Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[jimtabor] 74257: [NtUser] - Again, add more information from CORE-9667 thememenu.patch so it does not get lost.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Mar 31 23:48:48 2017 New Revision: 74257 URL: http://svn.reactos.org/svn/reactos?rev=74257&view=rev Log: [NtUser] - Again, add more information from CORE-9667 thememenu.patch so it does not get lost. Modified: trunk/reactos/win32ss/include/ntuser.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Fri Mar 31 23:48:48 2017 @@ -2715,10 +2715,10 @@ NtUserPaintMenuBar( HWND hWnd, HDC hDC, - ULONG left, - ULONG right, - ULONG top, - BOOL bActive); // DWORD Flags); + ULONG left, // x, + ULONG right, // width, // Scale the edge thickness, offset? + ULONG top, // y, + BOOL bActive); // DWORD Flags); DC_ACTIVE or WS_ACTIVECAPTION, by checking WNDS_ACTIVEFRAME and foreground. BOOL APIENTRY

7 years, 5 months

[gadamopoulos] 74256: [WIN32K] -Store the flat menus setting and the drop shadow setting in the UserPreferencesMask registry value.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Mar 31 22:27:13 2017 New Revision: 74256 URL: http://svn.reactos.org/svn/reactos?rev=74256&view=rev Log: [WIN32K] -Store the flat menus setting and the drop shadow setting in the UserPreferencesMask registry value. Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c trunk/reactos/win32ss/user/ntuser/sysparams.h Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Fri Mar 31 22:27:13 2017 @@ -289,11 +289,9 @@ gspv.tmCaptionFont.tmAveCharWidth = 6; gspv.bBeep = TRUE; - gspv.bFlatMenu = FALSE; gspv.uiFocusBorderWidth = 1; gspv.uiFocusBorderHeight = 1; gspv.bMenuDropAlign = 1; - gspv.bDropShadow = 1; gspv.dwMenuShowDelay = 100; gspv.dwForegroundFlashCount = 3; @@ -1624,16 +1622,16 @@ return SpiSetBool(&gspv.bMouseVanish, uiParam, KEY_MOUSE, L"", fl); case SPI_GETFLATMENU: - return SpiGetInt(pvParam, &gspv.bFlatMenu, fl); + return SpiGetUserPref(UPM_FLATMENU, pvParam, fl); case SPI_SETFLATMENU: - return SpiSetBool(&gspv.bFlatMenu, (BOOL)pvParam, KEY_MOUSE, L"", fl); + return SpiSetUserPref(UPM_FLATMENU, pvParam, fl); case SPI_GETDROPSHADOW: - return SpiGetInt(pvParam, &gspv.bDropShadow, fl); + return SpiGetUserPref(UPM_DROPSHADOW, pvParam, fl); case SPI_SETDROPSHADOW: - return SpiSetBool(&gspv.bDropShadow, uiParam, KEY_MOUSE, L"", fl); + return SpiSetUserPref(UPM_DROPSHADOW, pvParam, fl); case SPI_GETBLOCKSENDINPUTRESETS: return SpiGetInt(pvParam, &gspv.bBlockSendInputResets, fl); Modified: trunk/reactos/win32ss/user/ntuser/sysparams.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.h [iso-8859-1] Fri Mar 31 22:27:13 2017 @@ -29,6 +29,8 @@ UPM_TOOLTIPFADE = 0x1000, UPM_CURSORSHADOW = 0x2000, UPM_CLICKLOCK = 0x8000, + UPM_FLATMENU = 0x20000, + UPM_DROPSHADOW = 0x40000, // room for more UPM_UIEFFECTS = 0x80000000, UPM_DEFAULT = 0x80003E9E @@ -124,9 +126,7 @@ UINT uiFontSmoothingOrientation; BOOL bDragFullWindows; BOOL bMenuDropAlign; - BOOL bFlatMenu; DWORD dwMenuShowDelay; - BOOL bDropShadow; BOOL bBlockSendInputResets; #if(_WIN32_WINNT >= 0x0600) BOOL bClearType;

7 years, 5 months

[jimtabor] 74255: [NtUser] - Add additional information from CORE-9667 thememenu.patch so it does not get lost.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Mar 31 21:57:20 2017 New Revision: 74255 URL: http://svn.reactos.org/svn/reactos?rev=74255&view=rev Log: [NtUser] - Add additional information from CORE-9667 thememenu.patch so it does not get lost. Modified: trunk/reactos/sdk/include/reactos/undocuser.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/sdk/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/undocu… ============================================================================== --- trunk/reactos/sdk/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/undocuser.h [iso-8859-1] Fri Mar 31 21:57:20 2017 @@ -37,6 +37,11 @@ #define WM_LOGONNOTIFY 0x0000004C #define WM_KEYF1 0x0000004D #define WM_KLUDGEMINRECT 0x0000008B +#define WM_UAHDRAWMENU 0x00000091 +#define WM_UAHDRAWITEM 0x00000092 // WM_DRAWITEM +#define WM_UAHINITMENU 0x00000093 +#define WM_UAHMEASUREITEM 0x00000094 // WM_MEASUREITEM +#define WM_UAHDRAWMENUNC 0x00000095 #define WM_NCUAHDRAWCAPTION 0x000000AE #define WM_NCUAHDRAWFRAME 0x000000AF #define WM_SYSTIMER 0x00000118 Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Fri Mar 31 21:57:20 2017 @@ -1212,11 +1212,11 @@ DWORD NTAPI NtUserCalcMenuBar( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5); + HWND hwnd, + DWORD x, + DWORD width, + DWORD y, + LPRECT prc); DWORD NTAPI @@ -2718,7 +2718,7 @@ ULONG left, ULONG right, ULONG top, - BOOL bActive); + BOOL bActive); // DWORD Flags); BOOL APIENTRY Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Fri Mar 31 21:57:20 2017 @@ -866,13 +866,13 @@ DWORD APIENTRY NtUserCalcMenuBar( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5) -{ - STUB; + HWND hwnd, + DWORD x, + DWORD width, // Scale the edge thickness, offset? + DWORD y, + LPRECT prc ) +{ + ERR("hwnd %p, X %d, Width %d, Y %d, prc 0x%x\n",hwnd,x,width,y,prc); return 0; }

7 years, 5 months

[gadamopoulos] 74254: [UXTHEME] -Get rid of the hack that partly draws the menu bar in uxtheme. This was added to hack around the fact that we didn't set the flat menus setting. Use PaintMenuBar in...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Mar 31 19:24:00 2017 New Revision: 74254 URL: http://svn.reactos.org/svn/reactos?rev=74254&view=rev Log: [UXTHEME] -Get rid of the hack that partly draws the menu bar in uxtheme. This was added to hack around the fact that we didn't set the flat menus setting. Use PaintMenuBar instead. 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 Mar 31 19:24:00 2017 @@ -481,145 +481,6 @@ } } -static void -ThemeDrawMenuItem(PDRAW_CONTEXT pcontext, HMENU Menu, int imenu) -{ - PWCHAR Text; - BOOL flat_menu = FALSE; - MENUITEMINFOW Item; - RECT Rect,rcCalc; - WCHAR wstrItemText[20]; - register int i = 0; - HFONT FontOld = NULL; - UINT uFormat = DT_CENTER | DT_VCENTER | DT_SINGLELINE; - - Item.cbSize = sizeof(MENUITEMINFOW); - Item.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_STRING; - Item.dwTypeData = wstrItemText; - Item.cch = 20; - if (!GetMenuItemInfoW(Menu, imenu, TRUE, &Item)) - return; - - if(Item.fType & MF_SEPARATOR) - return; - - if(Item.cch >= 20) - { - Item.cch++; - Item.dwTypeData = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, Item.cch * sizeof(WCHAR)); - Item.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_STRING; - GetMenuItemInfoW(Menu, imenu, TRUE, &Item); - } - - if(Item.cch == 0) - return; - - flat_menu = GetThemeSysBool(pcontext->theme, TMT_FLATMENUS); - - GetMenuItemRect(pcontext->hWnd, Menu, imenu, &Rect); - - OffsetRect(&Rect, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); - - SetBkColor(pcontext->hDC, GetSysColor(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); - SetTextColor(pcontext->hDC, GetSysColor(Item.fState & MF_GRAYED ? COLOR_GRAYTEXT : COLOR_MENUTEXT)); - - if (0 != (Item.fState & MFS_DEFAULT)) - { - FontOld = (HFONT)SelectObject(pcontext->hDC, hMenuFontBold); - } - - Rect.left += MENU_BAR_ITEMS_SPACE / 2; - Rect.right -= MENU_BAR_ITEMS_SPACE / 2; - - Text = (PWCHAR) Item.dwTypeData; - if(Text) - { - for (i = 0; L'\0' != Text[i]; i++) - { - if (L'\t' == Text[i] || L'\b' == Text[i]) - { - break; - } - } - } - - SetBkMode(pcontext->hDC, OPAQUE); - - if (0 != (Item.fState & MF_GRAYED)) - { - if (0 == (Item.fState & MF_HILITE)) - { - ++Rect.left; ++Rect.top; ++Rect.right; ++Rect.bottom; - SetTextColor(pcontext->hDC, RGB(0xff, 0xff, 0xff)); - DrawTextW(pcontext->hDC, Text, i, &Rect, uFormat); - --Rect.left; --Rect.top; --Rect.right; --Rect.bottom; - } - SetTextColor(pcontext->hDC, RGB(0x80, 0x80, 0x80)); - SetBkMode(pcontext->hDC, TRANSPARENT); - } - - DrawTextW(pcontext->hDC, Text, i, &Rect, uFormat); - - /* Exclude from the clip region the area drawn by DrawText */ - SetRect(&rcCalc, 0,0,0,0); - DrawTextW(pcontext->hDC, Text, i, &rcCalc, uFormat | DT_CALCRECT); - InflateRect( &Rect, 0, -(rcCalc.bottom+1)/2); - ExcludeClipRect(pcontext->hDC, Rect.left, Rect.top, Rect.right, Rect.bottom); - - if (NULL != FontOld) - { - SelectObject(pcontext->hDC, FontOld); - } -} - -void WINAPI -ThemeDrawMenuBar(PDRAW_CONTEXT pcontext, PRECT prcCurrent) -{ - HMENU Menu; - MENUBARINFO MenuBarInfo; - int i; - HFONT FontOld = NULL; - BOOL flat_menu; - RECT Rect; - HPEN oldPen ; - - if (!hMenuFont) - InitMenuFont(); - - flat_menu = GetThemeSysBool(pcontext->theme, TMT_FLATMENUS); - - MenuBarInfo.cbSize = sizeof(MENUBARINFO); - if (! GetMenuBarInfo(pcontext->hWnd, OBJID_MENU, 0, &MenuBarInfo)) - return; - - Menu = GetMenu(pcontext->hWnd); - if (GetMenuItemCount(Menu) == 0) - return; - - Rect = MenuBarInfo.rcBar; - OffsetRect(&Rect, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); - - /* 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); - LineTo(pcontext->hDC, Rect.right, Rect.bottom); - SelectObject(pcontext->hDC, oldPen); - - /* Draw menu items */ - FontOld = (HFONT)SelectObject(pcontext->hDC, hMenuFont); - - for (i = 0; i < GetMenuItemCount(Menu); i++) - { - ThemeDrawMenuItem(pcontext, Menu, i); - } - - SelectObject(pcontext->hDC, FontOld); - - /* Fill the menu background area that isn't painted yet */ - FillRect(pcontext->hDC, &Rect, GetSysColorBrush(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); -} - static void ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent, BOOL bDoDoubleBuffering) { @@ -644,8 +505,8 @@ return; if(HAS_MENU(pcontext->hWnd, pcontext->wi.dwStyle)) - ThemeDrawMenuBar(pcontext, prcCurrent); - + PaintMenuBar(pcontext->hWnd, pcontext->hDC, prcCurrent->left, prcCurrent->right, prcCurrent->top, pcontext->Active); + if(pcontext->wi.dwStyle & WS_HSCROLL) ThemeDrawScrollBar(pcontext, SB_HORZ , NULL);

7 years, 5 months

[gadamopoulos] 74253: [WIN32K] -Get the new value of SPI_SETFLATMENU from pvParam.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Mar 31 19:04:31 2017 New Revision: 74253 URL: http://svn.reactos.org/svn/reactos?rev=74253&view=rev Log: [WIN32K] -Get the new value of SPI_SETFLATMENU from pvParam. Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Fri Mar 31 19:04:31 2017 @@ -1627,7 +1627,7 @@ return SpiGetInt(pvParam, &gspv.bFlatMenu, fl); case SPI_SETFLATMENU: - return SpiSetBool(&gspv.bFlatMenu, uiParam, KEY_MOUSE, L"", fl); + return SpiSetBool(&gspv.bFlatMenu, (BOOL)pvParam, KEY_MOUSE, L"", fl); case SPI_GETDROPSHADOW: return SpiGetInt(pvParam, &gspv.bDropShadow, fl);

7 years, 5 months

[gadamopoulos] 74252: [DESK.CPL] -Load the TMT_FLATMENUS property from the theme and use SPI_SETFLATMENU to set it.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Mar 31 18:18:19 2017 New Revision: 74252 URL: http://svn.reactos.org/svn/reactos?rev=74252&view=rev Log: [DESK.CPL] -Load the TMT_FLATMENUS property from the theme and use SPI_SETFLATMENU to set it. Modified: trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=7… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Fri Mar 31 18:18:19 2017 @@ -411,6 +411,8 @@ /* Hide underlined letters for keyboard navigation until I press the Alt key */ SYS_CONFIG(SPI_SETKEYBOARDCUES, 0, IntToPtr(scheme->Effects.bKeyboardCues)); + SYS_CONFIG(SPI_SETFLATMENU, 0, IntToPtr(scheme->bFlatMenus)); + // SYS_CONFIG(SPI_SETACTIVEWINDOWTRACKING, 0, IntToPtr(scheme->Effects.bActiveWindowTracking)); // SYS_CONFIG(SPI_SETCOMBOBOXANIMATION, 0, IntToPtr(scheme->Effects.bComboBoxAnimation)); // SYS_CONFIG(SPI_SETLISTBOXSMOOTHSCROLLING, 0, IntToPtr(scheme->Effects.bListBoxSmoothScrolling)); @@ -934,6 +936,8 @@ GetThemeSysFont(hTheme, TMT_MSGBOXFONT, &scheme->ncMetrics.lfMessageFont); GetThemeSysFont(hTheme, TMT_ICONTITLEFONT, &scheme->icMetrics.lfFont); + scheme->bFlatMenus = GetThemeSysBool(hTheme, TMT_FLATMENUS); + CloseThemeData(hTheme); return TRUE;

7 years, 5 months

[gadamopoulos] 74251: [WIN32K] -Stub NtUserPaintMenuBar. I'm still not sure about the last parameter and its return value.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Mar 31 18:05:27 2017 New Revision: 74251 URL: http://svn.reactos.org/svn/reactos?rev=74251&view=rev Log: [WIN32K] -Stub NtUserPaintMenuBar. I'm still not sure about the last parameter and its return value. Modified: trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/ntstubs.c 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 Mar 31 18:05:27 2017 @@ -6045,6 +6045,41 @@ } +DWORD +APIENTRY +NtUserPaintMenuBar( + HWND hWnd, + HDC hDC, + ULONG left, + ULONG right, + ULONG top, + BOOL bActive) +{ + PWND Window; + RECT Rect; + + UserEnterExclusive(); + + if(!(Window = UserGetWindowObject(hWnd))) + { + EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); + UserLeave(); + return 0; + } + + Rect.left = left; + Rect.right = right; + Rect.top = top; + Rect.bottom = 0; + + MENU_DrawMenuBar(hDC, &Rect, Window, FALSE); + + UserLeave(); + + /* I am not sure about what this function returns */ + return 0; +} + /* * @implemented */ Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Fri Mar 31 18:05:27 2017 @@ -878,21 +878,6 @@ DWORD APIENTRY -NtUserPaintMenuBar( - HWND hWnd, - HDC hDC, - ULONG left, - ULONG right, - ULONG top, - BOOL bActive) -{ - STUB; - return 0; -} - - -DWORD -APIENTRY NtUserRemoteConnect( DWORD dwUnknown1, DWORD dwUnknown2,

7 years, 5 months

[gadamopoulos] 74250: [WIN32K] -Update the prototype of NtUserPaintMenuBar here as well.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Mar 31 17:17:35 2017 New Revision: 74250 URL: http://svn.reactos.org/svn/reactos?rev=74250&view=rev Log: [WIN32K] -Update the prototype of NtUserPaintMenuBar here as well. Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Fri Mar 31 17:17:35 2017 @@ -879,12 +879,12 @@ DWORD APIENTRY NtUserPaintMenuBar( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5, - DWORD dwUnknown6) + HWND hWnd, + HDC hDC, + ULONG left, + ULONG right, + ULONG top, + BOOL bActive) { STUB; return 0;

7 years, 5 months

[gadamopoulos] 74249: [SDK] -Add the prototype of PaintMenuBar and update the prototype of NtUserPaintMenuBar.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Mar 31 16:55:20 2017 New Revision: 74249 URL: http://svn.reactos.org/svn/reactos?rev=74249&view=rev Log: [SDK] -Add the prototype of PaintMenuBar and update the prototype of NtUserPaintMenuBar. Modified: trunk/reactos/sdk/include/reactos/undocuser.h trunk/reactos/win32ss/include/ntuser.h Modified: trunk/reactos/sdk/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/undocu… ============================================================================== --- trunk/reactos/sdk/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/undocuser.h [iso-8859-1] Fri Mar 31 16:55:20 2017 @@ -190,6 +190,7 @@ BOOL WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT); BOOL WINAPI DrawCaptionTempW(HWND,HDC,const RECT*,HFONT,HICON,LPCWSTR,UINT); +BOOL WINAPI PaintMenuBar(HWND hWnd, HDC hDC, ULONG left, ULONG right, ULONG top, BOOL bActive); #ifdef UNICODE #define DrawCaptionTemp DrawCaptionTempW Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Fri Mar 31 16:55:20 2017 @@ -2713,12 +2713,12 @@ DWORD NTAPI NtUserPaintMenuBar( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5, - DWORD dwUnknown6); + HWND hWnd, + HDC hDC, + ULONG left, + ULONG right, + ULONG top, + BOOL bActive); BOOL APIENTRY

7 years, 5 months

[gadamopoulos] 74248: Fix gcc build.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Mar 31 11:33:53 2017 New Revision: 74248 URL: http://svn.reactos.org/svn/reactos?rev=74248&view=rev Log: Fix gcc build. 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 Mar 31 11:33:53 2017 @@ -97,12 +97,6 @@ text = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (text) InternalGetWindowText(hwnd, text, len); return text; -} - -static void -ThemeDrawTitle(PDRAW_CONTEXT context, RECT* prcCurrent) -{ - } HRESULT WINAPI ThemeDrawCaptionText(HTHEME hTheme, HDC hdc, int iPartId, int iStateId,

7 years, 5 months

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 March 2017