Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[dquintana] 62515: [RSHELL] Whoops. MSVC does not not error with this... ; P

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Mar 16 09:30:29 2014 New Revision: 62515 URL: http://svn.reactos.org/svn/reactos?rev=62515&view=rev Log: [RSHELL] Whoops. MSVC does not not error with this... ;P Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sun Mar 16 09:30:29 2014 @@ -521,6 +521,7 @@ if (m_staticToolbar) m_staticToolbar->OnPopupItemChanged(NULL, -1); if (m_SFToolbar) m_SFToolbar->OnPopupItemChanged(NULL, -1); } + return hr; } HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient)

10 years, 9 months

[dquintana] 62514: [RSHELL] * Fix the hot tracking on the filebrowser menubar. Still does not handle switching menus while hovering, though. CORE-7586

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Mar 16 09:28:51 2014 New Revision: 62514 URL: http://svn.reactos.org/svn/reactos?rev=62514&view=rev Log: [RSHELL] * Fix the hot tracking on the filebrowser menubar. Still does not handle switching menus while hovering, though. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sun Mar 16 09:28:51 2014 @@ -61,7 +61,8 @@ m_useBigIcons(FALSE), m_topLevelWindow(NULL), m_hotBar(NULL), - m_hotItem(-1) + m_hotItem(-1), + m_trackingPopup(FALSE) { m_focusManager = CMenuFocusManager::AcquireManager(); } @@ -513,7 +514,13 @@ m_subMenuChild = NULL; if (!punkClient) return S_OK; - return punkClient->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_subMenuChild)); + HRESULT hr = punkClient->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_subMenuChild)); + m_trackingPopup = m_subMenuChild != NULL; + if (!m_trackingPopup) + { + if (m_staticToolbar) m_staticToolbar->OnPopupItemChanged(NULL, -1); + if (m_SFToolbar) m_SFToolbar->OnPopupItemChanged(NULL, -1); + } } HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient) @@ -671,6 +678,7 @@ UINT flags = TPM_VERPOSANIMATION | TPM_VERTICAL | TPM_LEFTALIGN; + m_trackingPopup = TRUE; if (m_menuOwner) { ::TrackPopupMenuEx(popup, flags, x, y, m_menuOwner, &params); @@ -679,6 +687,7 @@ { ::TrackPopupMenuEx(popup, flags, x, y, m_topLevelWindow, &params); } + m_trackingPopup = FALSE; return S_OK; } @@ -691,7 +700,7 @@ HRESULT CMenuBand::_OnHotItemChanged(CMenuToolbarBase * tb, INT id) { - if (m_subMenuChild && id == -1) + if (m_trackingPopup && id == -1) { return S_FALSE; } @@ -801,6 +810,7 @@ } if (m_staticToolbar) m_staticToolbar->OnPopupItemChanged(toolbar, item); if (m_SFToolbar) m_SFToolbar->OnPopupItemChanged(toolbar, item); + m_trackingPopup = popup != NULL; if (popup) { if (m_subMenuParent) Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] Sun Mar 16 09:28:51 2014 @@ -60,6 +60,7 @@ CMenuToolbarBase * m_hotBar; INT m_hotItem; + BOOL m_trackingPopup; public: CMenuBand(); Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Sun Mar 16 09:28:51 2014 @@ -105,7 +105,7 @@ *pItem = NULL; if (m_bandCount <= 0) - return E_FAIL; + return S_FALSE; *pItem = m_bandStack[m_bandCount - 1]; @@ -115,10 +115,10 @@ CMenuFocusManager::CMenuFocusManager() : m_currentBand(NULL), m_currentFocus(NULL), - m_bandCount(0), m_mouseTrackDisabled(FALSE), m_lastMoveFlags(0), - m_lastMovePos(0) + m_lastMovePos(0), + m_bandCount(0) { m_threadId = GetCurrentThreadId(); } @@ -318,6 +318,8 @@ if (newBand == NULL) { + DisableMouseTrack(NULL, FALSE); + hr = RemoveHooks(m_currentFocus); m_currentFocus = NULL; m_currentBand = NULL; Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Sun Mar 16 09:28:51 2014 @@ -472,7 +472,10 @@ if (m_hotBar == this && !(m_toolbarFlags & SMINIT_VERTICAL)) { wasChecked = SendMessage(m_hwndToolbar, TB_ISBUTTONCHECKED, m_hotItem, 0); - SendMessage(m_hwndToolbar, TB_CHECKBUTTON, m_hotItem, FALSE); + if (wasChecked) + { + SendMessage(m_hwndToolbar, TB_CHECKBUTTON, m_hotItem, FALSE); + } } m_hotBar = toolbar; m_hotItem = item; @@ -486,6 +489,10 @@ HRESULT CMenuToolbarBase::OnPopupItemChanged(CMenuToolbarBase * toolbar, INT item) { + if (toolbar == NULL && m_popupBar == this) + { + SendMessage(m_hwndToolbar, TB_CHECKBUTTON, item, FALSE); + } m_popupBar = toolbar; m_popupItem = item; InvalidateDraw();

10 years, 9 months

[hbelusca] 62513: [CONSRV] - Free allocated memory in case GlobalLock fails. - Implement bitmap copy of graphics screen buffers. It seems that the call to StretchDIBits doesn't work correctly (it c...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 16 02:15:53 2014 New Revision: 62513 URL: http://svn.reactos.org/svn/reactos?rev=62513&view=rev Log: [CONSRV] - Free allocated memory in case GlobalLock fails. - Implement bitmap copy of graphics screen buffers. It seems that the call to StretchDIBits doesn't work correctly (it copies the image but removes a band of height == Console->Selection.srSelection.Top at the bottom of the copied image), so in the meantime I call SetDIBitsToDevice which does correctly the job. It would be nice that some win32k guy has a look at this... :D Have fun! Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] Sun Mar 16 02:15:53 2014 @@ -16,19 +16,100 @@ /* FUNCTIONS ******************************************************************/ VOID -GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer) +GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData) { /* * This function supposes that the system clipboard was opened. */ - // PCONSOLE Console = Buffer->Header.Console; + PCONSOLE Console = Buffer->Header.Console; - UNIMPLEMENTED; + HDC hMemDC; + HBITMAP hBitmapTarget, hBitmapOld; + HPALETTE hPalette, hPaletteOld; + ULONG selWidth, selHeight; + + if (Buffer->BitMap == NULL) return; + + selWidth = Console->Selection.srSelection.Right - Console->Selection.srSelection.Left + 1; + selHeight = Console->Selection.srSelection.Bottom - Console->Selection.srSelection.Top + 1; + DPRINT1("Selection is (%d|%d) to (%d|%d)\n", + Console->Selection.srSelection.Left, + Console->Selection.srSelection.Top, + Console->Selection.srSelection.Right, + Console->Selection.srSelection.Bottom); + + hMemDC = CreateCompatibleDC(GuiData->hMemDC); + if (hMemDC == NULL) return; + + /* Allocate a bitmap to be given to the clipboard, so it will not be freed here */ + hBitmapTarget = CreateCompatibleBitmap(GuiData->hMemDC, selWidth, selHeight); + if (hBitmapTarget == NULL) + { + DeleteDC(hMemDC); + return; + } + + /* Select the new bitmap */ + hBitmapOld = SelectObject(hMemDC, hBitmapTarget); + + /* Change the palette in hMemDC if the current palette does exist */ + if (Buffer->PaletteHandle == NULL) + hPalette = GuiData->hSysPalette; + else + hPalette = Buffer->PaletteHandle; + + if (hPalette) hPaletteOld = SelectPalette(hMemDC, hPalette, FALSE); + + /* Grab the mutex */ + NtWaitForSingleObject(Buffer->Mutex, FALSE, NULL); + + // The equivalent of a SetDIBitsToDevice call... + // It seems to be broken: it does not copy the tail of the bitmap. + // http://wiki.allegro.cc/index.php?title=StretchDIBits +#if 0 + StretchDIBits(hMemDC, + 0, 0, + selWidth, selHeight, + Console->Selection.srSelection.Left, + Console->Selection.srSelection.Top, + selWidth, selHeight, + Buffer->BitMap, + Buffer->BitMapInfo, + Buffer->BitMapUsage, + SRCCOPY); +#else + SetDIBitsToDevice(hMemDC, + /* Coordinates / size of the repainted rectangle, in the framebuffer's frame */ + 0, 0, + selWidth, selHeight, + /* Coordinates / size of the corresponding image portion, in the graphics screen-buffer's frame */ + Console->Selection.srSelection.Left, + Console->Selection.srSelection.Top, + 0, + Buffer->ScreenBufferSize.Y, // == Buffer->BitMapInfo->bmiHeader.biHeight + Buffer->BitMap, + Buffer->BitMapInfo, + Buffer->BitMapUsage); +#endif + + /* Release the mutex */ + NtReleaseMutant(Buffer->Mutex, NULL); + + /* Restore the palette and the old bitmap */ + if (hPalette) SelectPalette(hMemDC, hPaletteOld, FALSE); + SelectObject(hMemDC, hBitmapOld); + + EmptyClipboard(); + SetClipboardData(CF_BITMAP, hBitmapTarget); + + DeleteDC(hMemDC); } VOID -GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer) +GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData) { /* * This function supposes that the system clipboard was opened. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Mar 16 02:15:53 2014 @@ -1333,8 +1333,12 @@ return 0; } -VOID GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer); -VOID GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer); +VOID +GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData); +VOID +GuiCopyFromGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData); static VOID GuiConsoleCopy(PGUI_CONSOLE_DATA GuiData) @@ -1346,11 +1350,11 @@ if (GetType(Buffer) == TEXTMODE_BUFFER) { - GuiCopyFromTextModeBuffer((PTEXTMODE_SCREEN_BUFFER)Buffer); + GuiCopyFromTextModeBuffer((PTEXTMODE_SCREEN_BUFFER)Buffer, GuiData); } else /* if (GetType(Buffer) == GRAPHICS_BUFFER) */ { - GuiCopyFromGraphicsBuffer((PGRAPHICS_SCREEN_BUFFER)Buffer); + GuiCopyFromGraphicsBuffer((PGRAPHICS_SCREEN_BUFFER)Buffer, GuiData); } CloseClipboard(); @@ -1361,8 +1365,12 @@ } } -VOID GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer); -VOID GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer); +VOID +GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData); +VOID +GuiPasteToGraphicsBuffer(PGRAPHICS_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData); static VOID GuiConsolePaste(PGUI_CONSOLE_DATA GuiData) @@ -1373,11 +1381,11 @@ if (GetType(Buffer) == TEXTMODE_BUFFER) { - GuiPasteToTextModeBuffer((PTEXTMODE_SCREEN_BUFFER)Buffer); + GuiPasteToTextModeBuffer((PTEXTMODE_SCREEN_BUFFER)Buffer, GuiData); } else /* if (GetType(Buffer) == GRAPHICS_BUFFER) */ { - GuiPasteToGraphicsBuffer((PGRAPHICS_SCREEN_BUFFER)Buffer); + GuiPasteToGraphicsBuffer((PGRAPHICS_SCREEN_BUFFER)Buffer, GuiData); } CloseClipboard(); @@ -1909,6 +1917,8 @@ EnableMenuItem(hMenu, ID_SYSTEM_EDIT_COPY , MF_BYCOMMAND | ((Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) && (Console->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) ? MF_ENABLED : MF_GRAYED)); + // FIXME: Following whether the active screen buffer is text-mode + // or graphics-mode, search for CF_UNICODETEXT or CF_BITMAP formats. EnableMenuItem(hMenu, ID_SYSTEM_EDIT_PASTE, MF_BYCOMMAND | (!(Console->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) && IsClipboardFormatAvailable(CF_UNICODETEXT) ? MF_ENABLED : MF_GRAYED)); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] Sun Mar 16 02:15:53 2014 @@ -30,7 +30,8 @@ } VOID -GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer) +GuiCopyFromTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData) { /* * This function supposes that the system clipboard was opened. @@ -72,12 +73,16 @@ size += 1; /* Null-termination */ size *= sizeof(WCHAR); - /* Allocate memory, it will be passed to the system and may not be freed here */ + /* Allocate some memory area to be given to the clipboard, so it will not be freed here */ hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, size); if (hData == NULL) return; data = GlobalLock(hData); - if (data == NULL) return; + if (data == NULL) + { + GlobalFree(hData); + return; + } DPRINT("Copying %dx%d selection\n", selWidth, selHeight); dstPos = data; @@ -121,7 +126,8 @@ } VOID -GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer) +GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, + PGUI_CONSOLE_DATA GuiData) { /* * This function supposes that the system clipboard was opened.

10 years, 9 months

[hbelusca] 62512: [CONSRV]: Code formatting only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 16 02:11:25 2014 New Revision: 62512 URL: http://svn.reactos.org/svn/reactos?rev=62512&view=rev Log: [CONSRV]: Code formatting only. Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] Sun Mar 16 02:11:25 2014 @@ -88,7 +88,8 @@ /* We do not use anything else than uncompressed bitmaps */ if (GraphicsInfo->Info.lpBitMapInfo->bmiHeader.biCompression != BI_RGB) { - DPRINT1("biCompression == %d != BI_RGB, correct that!\n", GraphicsInfo->Info.lpBitMapInfo->bmiHeader.biCompression); + DPRINT1("biCompression == %d != BI_RGB, fix that!\n", + GraphicsInfo->Info.lpBitMapInfo->bmiHeader.biCompression); GraphicsInfo->Info.lpBitMapInfo->bmiHeader.biCompression = BI_RGB; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] Sun Mar 16 02:11:25 2014 @@ -52,7 +52,7 @@ HWND hWindow; /* Handle to the console's window */ HDC hMemDC; /* Memory DC holding the console framebuffer */ - HBITMAP hBitmap; /* Console framebuffer */ + HBITMAP hBitmap; /* Console framebuffer */ HPALETTE hSysPalette; /* Handle to the original system palette */ HICON hIcon; /* Handle to the console's icon (big) */

10 years, 9 months

[dquintana] 62511: [RSHELL] * Use a better way to toggle using TBSTYLE_EX_VERTICAL instead of TBSTATE_WRAP. CORE-7586

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Mar 16 01:21:54 2014 New Revision: 62511 URL: http://svn.reactos.org/svn/reactos?rev=62511&view=rev Log: [RSHELL] * Use a better way to toggle using TBSTYLE_EX_VERTICAL instead of TBSTATE_WRAP. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Sun Mar 16 01:21:54 2014 @@ -35,7 +35,7 @@ ); // FIXME: Enable if/when wine comctl supports this flag properly -//#define TBSTYLE_EX_VERTICAL 4 +#define USE_TBSTYLE_EX_VERTICAL 0 #define TIMERID_HOTTRACK 1 #define SUBCLASS_ID_MENUBAND 1 @@ -287,7 +287,7 @@ { tbStyles |= CCS_VERT; -#ifdef TBSTYLE_EX_VERTICAL +#if USE_TBSTYLE_EX_VERTICAL // FIXME: Use when it works in ros (?) tbExStyles |= TBSTYLE_EX_VERTICAL | WS_EX_TOOLWINDOW; #endif @@ -747,7 +747,7 @@ TBBUTTON tbb = { 0 }; tbb.fsState = TBSTATE_ENABLED; -#ifndef TBSTYLE_EX_VERTICAL +#if !USE_TBSTYLE_EX_VERTICAL if (!last && (m_toolbarFlags & SMINIT_VERTICAL)) tbb.fsState |= TBSTATE_WRAP; #endif @@ -776,7 +776,7 @@ TBBUTTON tbb = { 0 }; tbb.fsState = TBSTATE_ENABLED; -#ifndef TBSTYLE_EX_VERTICAL +#if !USE_TBSTYLE_EX_VERTICAL if (!last && (m_toolbarFlags & SMINIT_VERTICAL)) tbb.fsState |= TBSTATE_WRAP; #endif

10 years, 9 months

[dquintana] 62510: [RSHELL] * Make this crazy nested conditional mess a bit flatter.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Mar 15 21:44:49 2014 New Revision: 62510 URL: http://svn.reactos.org/svn/reactos?rev=62510&view=rev Log: [RSHELL] * Make this crazy nested conditional mess a bit flatter. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sat Mar 15 21:44:49 2014 @@ -347,33 +347,19 @@ return hr; } - CComPtr<IObjectWithSite> ows; - if (SUCCEEDED(m_subMenuParent->QueryInterface(IID_PPV_ARG(IObjectWithSite, &ows)))) - { - CComPtr<IServiceProvider> sp; - if (SUCCEEDED(ows->GetSite(IID_PPV_ARG(IServiceProvider, &sp)))) - { - CComPtr<IDeskBar> db0; - if (SUCCEEDED(sp->QueryInterface(IID_PPV_ARG(IDeskBar, &db0)))) - { - CComPtr<IUnknown> unk0; - if (SUCCEEDED(db0->GetClient(&unk0))) - { - CComPtr<IDeskBar> db; - if (SUCCEEDED(IUnknown_QueryService(unk0, SID_SMenuBandChild, IID_PPV_ARG(IDeskBar, &db)))) - { - CComPtr<IDeskBar> db1; - if (SUCCEEDED(IUnknown_QueryService(m_site, SID_SMenuBandParent, IID_PPV_ARG(IDeskBar, &db1)))) - { - if (fShow) - db->SetClient(db1); - else - db->SetClient(NULL); - } - } - } - } - } + CComPtr<IServiceProvider> sp; + CComPtr<IUnknown> unk0; + CComPtr<IDeskBar> db0, db, db1; + if (SUCCEEDED(IUnknown_GetSite(m_subMenuParent, IID_PPV_ARG(IServiceProvider, &sp))) && + SUCCEEDED(sp->QueryInterface(IID_PPV_ARG(IDeskBar, &db0))) && + SUCCEEDED(db0->GetClient(&unk0)) && + SUCCEEDED(IUnknown_QueryService(unk0, SID_SMenuBandChild, IID_PPV_ARG(IDeskBar, &db))) && + SUCCEEDED(IUnknown_QueryService(m_site, SID_SMenuBandParent, IID_PPV_ARG(IDeskBar, &db1)))) + { + if (fShow) + db->SetClient(db1); + else + db->SetClient(NULL); } if (m_dwFlags & SMINIT_VERTICAL)

10 years, 9 months

[dquintana] 62509: [RSHELL] * Fix keyboard navigation and hottracking behaviour. One glitch remains where quickly moving the mouse to a parent's toolbar item, and returning to the submenu before it...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Mar 15 21:38:15 2014 New Revision: 62509 URL: http://svn.reactos.org/svn/reactos?rev=62509&view=rev Log: [RSHELL] * Fix keyboard navigation and hottracking behaviour. One glitch remains where quickly moving the mouse to a parent's toolbar item, and returning to the submenu before it closes, won't restore the parent's hot item to the one with the submenu. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sat Mar 15 21:38:15 2014 @@ -345,6 +345,35 @@ hr = _CallCB(SMC_INITMENU, 0, 0); if (FAILED_UNEXPECTEDLY(hr)) return hr; + } + + CComPtr<IObjectWithSite> ows; + if (SUCCEEDED(m_subMenuParent->QueryInterface(IID_PPV_ARG(IObjectWithSite, &ows)))) + { + CComPtr<IServiceProvider> sp; + if (SUCCEEDED(ows->GetSite(IID_PPV_ARG(IServiceProvider, &sp)))) + { + CComPtr<IDeskBar> db0; + if (SUCCEEDED(sp->QueryInterface(IID_PPV_ARG(IDeskBar, &db0)))) + { + CComPtr<IUnknown> unk0; + if (SUCCEEDED(db0->GetClient(&unk0))) + { + CComPtr<IDeskBar> db; + if (SUCCEEDED(IUnknown_QueryService(unk0, SID_SMenuBandChild, IID_PPV_ARG(IDeskBar, &db)))) + { + CComPtr<IDeskBar> db1; + if (SUCCEEDED(IUnknown_QueryService(m_site, SID_SMenuBandParent, IID_PPV_ARG(IDeskBar, &db1)))) + { + if (fShow) + db->SetClient(db1); + else + db->SetClient(NULL); + } + } + } + } + } } if (m_dwFlags & SMINIT_VERTICAL) @@ -494,8 +523,11 @@ HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient) { - UNIMPLEMENTED; - return S_OK; + if (m_subMenuChild) + m_subMenuChild = NULL; + if (!punkClient) + return S_OK; + return punkClient->QueryInterface(IID_PPV_ARG(IMenuPopup, &m_subMenuChild)); } HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient) @@ -673,6 +705,10 @@ HRESULT CMenuBand::_OnHotItemChanged(CMenuToolbarBase * tb, INT id) { + if (m_subMenuChild && id == -1) + { + return S_FALSE; + } m_hotBar = tb; m_hotItem = id; if (m_staticToolbar) m_staticToolbar->OnHotItemChanged(tb, id); @@ -779,7 +815,6 @@ } if (m_staticToolbar) m_staticToolbar->OnPopupItemChanged(toolbar, item); if (m_SFToolbar) m_SFToolbar->OnPopupItemChanged(toolbar, item); - m_subMenuChild = popup; if (popup) { if (m_subMenuParent) @@ -792,6 +827,15 @@ return S_OK; } +HRESULT CMenuBand::_DisableMouseTrack(BOOL bDisable) +{ + if (m_staticToolbar) + m_staticToolbar->DisableMouseTrack(bDisable); + if (m_SFToolbar) + m_SFToolbar->DisableMouseTrack(bDisable); + return S_OK; +} + HRESULT STDMETHODCALLTYPE CMenuBand::GetSubMenu(THIS) { UNIMPLEMENTED; Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] Sat Mar 15 21:38:15 2014 @@ -176,6 +176,7 @@ HRESULT _OnHotItemChanged(CMenuToolbarBase * tb, INT id); HRESULT _MenuItemHotTrack(DWORD changeType); HRESULT _OnPopupSubMenu(IMenuPopup * popup, POINTL * pAt, RECTL * pExclude, CMenuToolbarBase * toolbar, INT item); + HRESULT _DisableMouseTrack(BOOL bDisable); BOOL UseBigIcons() { Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Sat Mar 15 21:38:15 2014 @@ -607,8 +607,6 @@ LRESULT CMenuDeskBar::_OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - DbgPrint("BaseBar %08p (de)activated (%08x, %08x).\n", m_hWnd, wParam, lParam); - // BUG in ReactOS: WM_ACTIVATE/WA_INACTIVE makes no sense with lParam==hWnd if (LOWORD(wParam) != 0 || reinterpret_cast<HWND>(lParam) == m_hWnd) { Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Sat Mar 15 21:38:15 2014 @@ -115,13 +115,76 @@ CMenuFocusManager::CMenuFocusManager() : m_currentBand(NULL), m_currentFocus(NULL), - m_bandCount(0) + m_bandCount(0), + m_mouseTrackDisabled(FALSE), + m_lastMoveFlags(0), + m_lastMovePos(0) { m_threadId = GetCurrentThreadId(); } CMenuFocusManager::~CMenuFocusManager() { +} + +void CMenuFocusManager::DisableMouseTrack(HWND enableTo, BOOL disableThis) +{ + BOOL bDisable = FALSE; + + int i = m_bandCount; + while (--i >= 0) + { + CMenuBand * band = m_bandStack[i]; + + HWND hwnd; + HRESULT hr = band->_GetTopLevelWindow(&hwnd); + if (FAILED_UNEXPECTEDLY(hr)) + break; + + if (hwnd == enableTo) + { + band->_DisableMouseTrack(disableThis); + bDisable = TRUE; + } + else + { + band->_DisableMouseTrack(bDisable); + } + } + + if (m_mouseTrackDisabled == bDisable) + { + if (bDisable) + { + SetCapture(m_currentFocus); + } + else + ReleaseCapture(); + + m_mouseTrackDisabled = bDisable; + } +} + +HRESULT CMenuFocusManager::IsTrackedWindow(HWND hWnd) +{ + if (hWnd == m_currentFocus) + return S_OK; + + int i = m_bandCount - 1; + while (--i >= 0) + { + CMenuBand * band = m_bandStack[i]; + + HWND hwnd; + HRESULT hr = band->_GetTopLevelWindow(&hwnd); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (hwnd == hWnd) + return S_OK; + } + + return S_FALSE; } LRESULT CMenuFocusManager::GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam) @@ -129,6 +192,8 @@ if (nCode < 0) return CallNextHookEx(m_hHook, nCode, wParam, lParam); + DWORD pos = GetMessagePos(); + if (nCode == HC_ACTION) { BOOL callNext = TRUE; @@ -138,10 +203,33 @@ switch (msg->message) { + case WM_ACTIVATE: // does not trigger + ActivationChange(msg->hwnd); case WM_CLOSE: + break; + case WM_MOUSEMOVE: + if (m_lastMoveFlags != wParam || m_lastMovePos != pos) + { + m_lastMoveFlags = wParam; + m_lastMovePos = pos; + + POINT pt = { GET_X_LPARAM(pos), GET_Y_LPARAM(pos) }; + + HWND window = WindowFromPoint(pt); + + if (IsTrackedWindow(window) == S_OK) + { + DisableMouseTrack(window, FALSE); + } + else + { + DisableMouseTrack(NULL, FALSE); + } + } break; case WM_SYSKEYDOWN: case WM_KEYDOWN: + DisableMouseTrack(m_currentFocus, TRUE); switch (msg->wParam) { case VK_MENU: @@ -193,6 +281,36 @@ return S_OK; } +HRESULT CMenuFocusManager::ActivationChange(HWND newHwnd) +{ + HRESULT hr; + CMenuBand * newBand = NULL; + + CMenuBand * band; + PeekArray(&band); + + while (m_bandCount >= 0) + { + HWND hwnd; + hr = band->_GetTopLevelWindow(&hwnd); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (hwnd == newHwnd) + { + newBand = band; + break; + } + else + { + PopFromArray(NULL); + PeekArray(&band); + } + } + + return UpdateFocus(newBand); +} + HRESULT CMenuFocusManager::UpdateFocus(CMenuBand * newBand) { HRESULT hr; @@ -217,6 +335,11 @@ return hr; } + CHAR title[1024]; + GetWindowTextA(newFocus, title, 1024); + + DbgPrint("Focus is now at %08p, hwnd=%08x, title='%s'. m_bandCount=%d\n", newBand, newFocus, title, m_bandCount); + m_currentFocus = newFocus; m_currentBand = newBand; @@ -239,14 +362,33 @@ CMenuBand * mbc; HRESULT hr; - hr = PopFromArray(&mbc); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - if (mb != mbc) + HWND newFocus; + hr = mb->_GetTopLevelWindow(&newFocus); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + DbgPrint("Trying to pop %08p, hwnd=%08x\n", mb, newFocus); + + do { + hr = PopFromArray(&mbc); + if (FAILED_UNEXPECTEDLY(hr)) + { + mbc = NULL; + return hr; + } + } + while (mbc && mb != mbc); + + hr = PeekArray(&mb); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = UpdateFocus(mb); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + if (!mbc) return E_FAIL; - hr = PeekArray(&mbc); - - return UpdateFocus(mbc); -} + return S_OK; +} Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] Sat Mar 15 21:38:15 2014 @@ -43,6 +43,9 @@ HWND m_currentFocus; HHOOK m_hHook; DWORD m_threadId; + BOOL m_mouseTrackDisabled; + WPARAM m_lastMoveFlags; + LPARAM m_lastMovePos; // TODO: make dynamic #define MAX_RECURSE 20 @@ -64,10 +67,14 @@ BEGIN_COM_MAP(CMenuFocusManager) END_COM_MAP() +private: LRESULT GetMsgHook(INT nCode, WPARAM wParam, LPARAM lParam); HRESULT PlaceHooks(HWND window); HRESULT RemoveHooks(HWND window); HRESULT UpdateFocus(CMenuBand * newBand); + HRESULT ActivationChange(HWND newHwnd); + void DisableMouseTrack(HWND enableTo, BOOL disableThis); + HRESULT IsTrackedWindow(HWND hWnd); public: HRESULT PushMenu(CMenuBand * mb); Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Sat Mar 15 21:38:15 2014 @@ -40,6 +40,12 @@ #define TIMERID_HOTTRACK 1 #define SUBCLASS_ID_MENUBAND 1 +HRESULT CMenuToolbarBase::DisableMouseTrack(BOOL bDisable) +{ + m_disableMouseTrack = bDisable; + return S_OK; +} + HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { NMHDR * hdr; @@ -82,7 +88,7 @@ return OnCommand(wParam, 0, theResult); case TBN_HOTITEMCHANGE: - return OnHotItemChange(reinterpret_cast<LPNMTBHOTITEM>(hdr)); + return OnHotItemChange(reinterpret_cast<LPNMTBHOTITEM>(hdr), theResult); case NM_RCLICK: return OnContextMenu(reinterpret_cast<LPNMMOUSE>(hdr)); @@ -183,7 +189,8 @@ CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) : m_hwnd(NULL), m_useFlatMenus(FALSE), - m_SubclassOld(NULL), + m_SubclassOld(NULL), + m_disableMouseTrack(FALSE), m_menuBand(menuBand), m_hwndToolbar(NULL), m_dwMenuFlags(0), @@ -417,18 +424,34 @@ return m_SubclassOld(hWnd, uMsg, wParam, lParam); } -HRESULT CMenuToolbarBase::OnHotItemChange(const NMTBHOTITEM * hot) -{ +HRESULT CMenuToolbarBase::OnHotItemChange(const NMTBHOTITEM * hot, LRESULT * theResult) +{ + if (m_disableMouseTrack && hot->dwFlags & HICF_MOUSE) + { + *theResult = 1; + return S_OK; + } + if (hot->dwFlags & HICF_LEAVING) { KillTimer(m_hwndToolbar, TIMERID_HOTTRACK); - m_hotItem = -1; - m_menuBand->_OnHotItemChanged(NULL, -1); - m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING); + + if (m_menuBand->_OnHotItemChanged(NULL, -1) == S_FALSE) + { + *theResult = 1; + return S_OK; + } + else + { + m_hotItem = -1; + m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING); + return S_OK; + } } else if (m_hotItem != hot->idNew) { - if (m_toolbarFlags & SMINIT_VERTICAL) + if (hot->dwFlags & HICF_MOUSE && + m_toolbarFlags & SMINIT_VERTICAL) { DWORD elapsed = 0; SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0); @@ -438,6 +461,7 @@ m_hotItem = hot->idNew; m_menuBand->_OnHotItemChanged(this, m_hotItem); m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING); + return S_OK; } return S_OK; } @@ -693,11 +717,9 @@ if (btn.dwData) { - m_hotItem = btn.idCommand; - if (prev != m_hotItem) + if (prev != btn.idCommand) { SendMessage(m_hwndToolbar, TB_SETHOTITEM, index, 0); - return m_menuBand->_OnHotItemChanged(this, m_hotItem); } return S_OK; } @@ -713,11 +735,9 @@ } } - m_hotItem = -1; - if (prev != m_hotItem) + if (prev != -1) { SendMessage(m_hwndToolbar, TB_SETHOTITEM, -1, 0); - m_menuBand->_OnHotItemChanged(NULL, -1); } return S_FALSE; } Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Sat Mar 15 21:38:15 2014 @@ -29,6 +29,7 @@ HFONT m_marlett; BOOL m_useFlatMenus; WNDPROC m_SubclassOld; + BOOL m_disableMouseTrack; protected: CMenuBand * m_menuBand; @@ -67,12 +68,14 @@ HRESULT DoContextMenu(IContextMenu* contextMenu); HRESULT ChangeHotItem(DWORD changeType); - HRESULT OnHotItemChange(const NMTBHOTITEM * hot); + HRESULT OnHotItemChange(const NMTBHOTITEM * hot, LRESULT * theResult); HRESULT GetIdealSize(SIZE& size); HRESULT SetPosSize(int x, int y, int cx, int cy); void InvalidateDraw(); + + HRESULT DisableMouseTrack(BOOL bDisable); virtual HRESULT FillToolbar(BOOL clearFirst=FALSE) = 0; virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0;

10 years, 9 months

[hbelusca] 62508: [CMAKE:MSVC] Generate uniquely-named .bin compiled messages files; this fixes broken messages inclusion in ntdll, kernel32 ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 15 21:30:49 2014 New Revision: 62508 URL: http://svn.reactos.org/svn/reactos?rev=62508&view=rev Log: [CMAKE:MSVC] Generate uniquely-named .bin compiled messages files; this fixes broken messages inclusion in ntdll, kernel32 ... Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=62508… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Mar 15 21:30:49 2014 @@ -302,7 +302,7 @@ endfunction() macro(macro_mc FLAG FILE) - set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) + set(COMMAND_MC ${CMAKE_MC_COMPILER} ${FLAG} -b ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) endmacro() #pseh workaround

10 years, 9 months

[fireball] 62507: [ARWINSS] * Update the FreeType header inclusions, as per 62417.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Mar 15 21:18:27 2014 New Revision: 62507 URL: http://svn.reactos.org/svn/reactos?rev=62507&view=rev Log: [ARWINSS] * Update the FreeType header inclusions, as per 62417. Modified: branches/arwinss/arwinss/client/gdi32/freetype.c Modified: branches/arwinss/arwinss/client/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/fr… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/freetype.c [iso-8859-1] Sat Mar 15 21:18:27 2014 @@ -100,44 +100,44 @@ #include <ft2build.h> #endif #ifdef HAVE_FREETYPE_FREETYPE_H -#include <freetype/freetype.h> +#include <freetype.h> #endif #ifdef HAVE_FREETYPE_FTGLYPH_H -#include <freetype/ftglyph.h> +#include <ftglyph.h> #endif #ifdef HAVE_FREETYPE_TTTABLES_H -#include <freetype/tttables.h> +#include <tttables.h> #endif #ifdef HAVE_FREETYPE_FTTYPES_H -#include <freetype/fttypes.h> +#include <fttypes.h> #endif #ifdef HAVE_FREETYPE_FTSNAMES_H -#include <freetype/ftsnames.h> +#include <ftsnames.h> #else # ifdef HAVE_FREETYPE_FTNAMES_H -# include <freetype/ftnames.h> +# include <ftnames.h> # endif #endif #ifdef HAVE_FREETYPE_TTNAMEID_H -#include <freetype/ttnameid.h> +#include <ttnameid.h> #endif #ifdef HAVE_FREETYPE_FTOUTLN_H -#include <freetype/ftoutln.h> +#include <ftoutln.h> #endif #ifdef HAVE_FREETYPE_INTERNAL_SFNT_H -#include <freetype/internal/sfnt.h> +#include <internal/sfnt.h> #endif #ifdef HAVE_FREETYPE_FTTRIGON_H -#include <freetype/fttrigon.h> +#include <fttrigon.h> #endif #ifdef HAVE_FREETYPE_FTWINFNT_H -#include <freetype/ftwinfnt.h> +#include <ftwinfnt.h> #endif #ifdef HAVE_FREETYPE_FTMODAPI_H -#include <freetype/ftmodapi.h> +#include <ftmodapi.h> #endif #ifdef HAVE_FREETYPE_FTLCDFIL_H -#include <freetype/ftlcdfil.h> +#include <ftlcdfil.h> #endif #ifndef HAVE_FT_TRUETYPEENGINETYPE

10 years, 9 months

[cwittich] 62506: [comctl32] sync toolbar with wine head

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Mar 15 21:13:25 2014 New Revision: 62506 URL: http://svn.reactos.org/svn/reactos?rev=62506&view=rev Log: [comctl32] sync toolbar with wine head Modified: trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sat Mar 15 21:13:25 2014 @@ -843,8 +843,11 @@ /* empirical tests show that iBitmap can/will be non-zero */ /* when drawing the vertical bar... */ if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) { - if (dwStyle & CCS_VERT) - TOOLBAR_DrawFlatHorizontalSeparator (&rc, hdc, infoPtr); + if (dwStyle & CCS_VERT) { + RECT rcsep = rc; + InflateRect(&rcsep, -infoPtr->szPadding.cx, -infoPtr->szPadding.cy); + TOOLBAR_DrawFlatHorizontalSeparator (&rcsep, hdc, infoPtr); + } else TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); } @@ -1662,7 +1665,7 @@ if (btnPtr->fsStyle & BTNS_SEP) { if (infoPtr->dwStyle & CCS_VERT) { cy = (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; - cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nWidth; + cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nButtonWidth; } else cx = (btnPtr->cx > 0) ? btnPtr->cx :

10 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
24
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 March 2014