Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[akhaldi] 62151: [CMAKE] * Set PCH as on by default for RosBE 2.1.1 users. * You guys no longer need to alter anything now, just grab RosBE 2.1.1 and have fun ; ) CORE-7716
by akhaldi＠svn.reactos.org 13 Feb '14

13 Feb '14

Author: akhaldi Date: Thu Feb 13 21:42:05 2014 New Revision: 62151 URL: http://svn.reactos.org/svn/reactos?rev=62151&view=rev Log: [CMAKE] * Set PCH as on by default for RosBE 2.1.1 users. * You guys no longer need to alter anything now, just grab RosBE 2.1.1 and have fun ;) CORE-7716 Modified: trunk/reactos/CMakeLists.txt trunk/reactos/configure.cmd trunk/reactos/configure.sh Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=62151&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Feb 13 21:42:05 2014 @@ -132,6 +132,12 @@ if(_WINKD_) add_definitions(-D_WINKD_=1) + endif() + + if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") + set(PCH 1) + else() + set(PCH 0) endif() # Version Options Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=62151&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Thu Feb 13 21:42:05 2014 @@ -150,9 +150,9 @@ ) if "%BUILD_ENVIRONMENT%" == "MinGW" ( - cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" ) else ( - cmake -G %CMAKE_GENERATOR% -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" ) cd.. Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=62151&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Thu Feb 13 21:42:05 2014 @@ -59,6 +59,6 @@ cd ../reactos rm -f CMakeCache.txt -cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" +cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR" echo Configure script complete! Enter directories and execute appropriate build commands $ex: ninja, make, makex, etc...$.

1 0

[akhaldi] 62150: [COMCTL32_WINETEST] * Globally mark expected failures as todos. * Remove redundant definition. ROSTESTS-128
by akhaldi＠svn.reactos.org 13 Feb '14

13 Feb '14

Author: akhaldi Date: Thu Feb 13 21:24:18 2014 New Revision: 62150 URL: http://svn.reactos.org/svn/reactos?rev=62150&view=rev Log: [COMCTL32_WINETEST] * Globally mark expected failures as todos. * Remove redundant definition. ROSTESTS-128 Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Thu Feb 13 21:24:18 2014 @@ -1,7 +1,7 @@ remove_definitions(-D_WIN32_WINNT=0x502 -D_WIN32_IE=0x600) -add_definitions(-D__ROS_LONG64__) +add_definitions(-DUSE_WINE_TODOS) list(APPEND SOURCE comboex.c

1 0

[dquintana] 62149: [RSHELL] * Add more missing code. The custom CMenuDeskBand is now able to show the contents of a CMenuSite/CMenuBand in the right size, including the banner (not yet fully functi...
by dquintana＠svn.reactos.org 13 Feb '14

13 Feb '14

Author: dquintana Date: Thu Feb 13 20:16:30 2014 New Revision: 62149 URL: http://svn.reactos.org/svn/reactos?rev=62149&view=rev Log: [RSHELL] * Add more missing code. The custom CMenuDeskBand is now able to show the contents of a CMenuSite/CMenuBand in the right size, including the banner (not yet fully functional). * Organize the method list in CMenuSite by interface. [EXPLORER-NEW] * Revert the hacks from r62134. [PSDK] * Add IUnknown_QueryServiceExec to shlwapi_undoc.h Modified: branches/shell-experiments/base/shell/explorer-new/explorer.c branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.cpp branches/shell-experiments/include/psdk/shlwapi_undoc.h Modified: branches/shell-experiments/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] Thu Feb 13 20:16:30 2014 @@ -407,7 +407,7 @@ ProcessStartupItems(); - //if (GetShellWindow() == NULL) + if (GetShellWindow() == NULL) CreateShellDesktop = TRUE; /* FIXME - initialize SSO Thread */ @@ -415,7 +415,7 @@ if (CreateShellDesktop) { /* Initialize shell dde support */ - //ShellDDEInit(TRUE); + ShellDDEInit(TRUE); /* Initialize shell icons */ FileIconInit(TRUE); @@ -430,15 +430,15 @@ left screen corner, but is also needed in order to receive HSHELL_* notification messages (which are required for taskbar buttons to work right) */ - /*HideMinimizedWindows(TRUE); + HideMinimizedWindows(TRUE); if (Tray != NULL) - hShellDesktop = DesktopCreateWindow(Tray);*/ + hShellDesktop = DesktopCreateWindow(Tray); } - ///* WinXP: Notify msgina to hide the welcome screen */ - //if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) - // SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); + /* WinXP: Notify msgina to hide the welcome screen */ + if (!SetShellReadyEvent(TEXT("msgina: ShellReadyEvent"))) + SetShellReadyEvent(TEXT("Global\\msgina: ShellReadyEvent")); } else { 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] Thu Feb 13 20:16:30 2014 @@ -20,6 +20,7 @@ #include "precomp.h" #include "wraplog.h" #include <atlwin.h> +#include <shlwapi_undoc.h> WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar); @@ -143,15 +144,15 @@ BEGIN_MSG_MAP(CMenuDeskBar) MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_NOTIFY, OnNotify) + /*MESSAGE_HANDLER(WM_NOTIFY, OnNotify) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) - MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) + MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) */ MESSAGE_HANDLER(WM_ACTIVATE, OnActivate) -/* MESSAGE_HANDLER(WM_PAINT, OnPaint) */ + MESSAGE_HANDLER(WM_PAINT, OnPaint) END_MSG_MAP() BEGIN_COM_MAP(CMenuDeskBar) @@ -166,6 +167,8 @@ COM_INTERFACE_ENTRY_IID(IID_IBanneredBar, IBanneredBar) COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject) END_COM_MAP() + + HRESULT _CreateDeskBarWindow(); }; extern "C" @@ -447,6 +450,7 @@ #else CMenuDeskBar::CMenuDeskBar() : + m_Client(NULL), m_ClientWindow(NULL), m_Vertical(true), m_Visible(false), @@ -457,6 +461,40 @@ CMenuDeskBar::~CMenuDeskBar() { +} + +HRESULT CMenuDeskBar::_CreateDeskBarWindow() +{ + HRESULT hr; + HWND ownerWindow = NULL; + + if (m_Site) + { + CComPtr<IOleWindow> oleWindow; + + hr = m_Site->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); + if (FAILED(hr)) + return hr; + + hr = oleWindow->GetWindow(&ownerWindow); + if (FAILED(hr)) + return hr; + + if (!::IsWindow(ownerWindow)) + return E_FAIL; + } + + // FIXME + if (m_hWnd) + { + SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, (LONG_PTR)ownerWindow); + } + else + { + Create(ownerWindow); + } + + return S_OK; } HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow(HWND *lphwnd) @@ -545,53 +583,36 @@ CComPtr<IDeskBarClient> pDeskBandClient; HRESULT hResult; + m_Client.Release(); + + if (punkClient == NULL) + return S_OK; + if (m_hWnd == NULL) { - HWND ownerWindow = NULL; - if (m_Site) - { - IOleWindow * oleWindow; - - hResult = m_Site->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); - if (SUCCEEDED(hResult)) - hResult = oleWindow->GetWindow(&ownerWindow); - - if (!::IsWindow(ownerWindow)) - return E_FAIL; - } - - Create(ownerWindow); - } - - if (punkClient == NULL) - m_Client.Release(); - else - { - hResult = punkClient->QueryInterface(IID_IUnknown, reinterpret_cast<void **>(&m_Client)); - if (FAILED(hResult)) - return hResult; - - hResult = m_Client->QueryInterface(IID_IDeskBarClient, (VOID**) &pDeskBandClient); - if (FAILED(hResult)) - return hResult; - - hResult = pDeskBandClient->SetDeskBarSite(static_cast<IDeskBar*>(this)); - if (FAILED(hResult)) - return hResult; - - } - - return S_OK; + _CreateDeskBarWindow(); + } + + hResult = punkClient->QueryInterface(IID_IUnknown, reinterpret_cast<void **>(&m_Client)); + if (FAILED(hResult)) + return hResult; + + hResult = m_Client->QueryInterface(IID_IDeskBarClient, (VOID**) &pDeskBandClient); + if (FAILED(hResult)) + return hResult; + + return pDeskBandClient->SetDeskBarSite(static_cast<IDeskBar*>(this)); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetClient(IUnknown **ppunkClient) { if (ppunkClient == NULL) return E_POINTER; - *ppunkClient = m_Client; - if (m_Client.p != NULL) - m_Client.p->AddRef(); - return S_OK; + + if (!m_Client) + return E_FAIL; + + return m_Client->QueryInterface(IID_PPV_ARG(IUnknown, ppunkClient)); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnPosRectChangeDB(LPRECT prc) @@ -603,52 +624,38 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite) { - return S_OK; - CComPtr<IServiceProvider> serviceProvider; - CComPtr<IProfferService> profferService; - HRESULT hResult; - CComPtr<IOleWindow> oleWindow; - HWND ownerWindow; - - - m_Site.Release(); + HRESULT hr; + CComPtr<IOleWindow> oleWindow; + HWND ownerWindow = NULL; + + if (m_Site) + { + if (m_hWnd != NULL) + { + DestroyWindow(); + } + m_Site.Release(); + } + if (pUnkSite == NULL) { return S_OK; } - if (m_hWnd == NULL) - { - // get window handle of parent - hResult = pUnkSite->QueryInterface(IID_ITrayPriv, reinterpret_cast<void **>(&m_Site)); - if (FAILED(hResult)) - return hResult; - - hResult = pUnkSite->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); - if (SUCCEEDED(hResult)) - hResult = oleWindow->GetWindow(&ownerWindow); - - if (!::IsWindow(ownerWindow)) - return E_FAIL; - - Create(ownerWindow); - } - else - { - //Set Owner ? - } - - return S_OK; + // get window handle of parent + hr = pUnkSite->QueryInterface(IID_ITrayPriv, reinterpret_cast<void **>(&m_Site)); + if (FAILED(hr)) + return hr; + + return _CreateDeskBarWindow(); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetSite(REFIID riid, void **ppvSite) { - if (ppvSite == NULL) - return E_POINTER; - *ppvSite = m_Site; - if (m_Site.p != NULL) - m_Site.p->AddRef(); - return S_OK; + if (m_Site == NULL) + return E_FAIL; + + return m_Site->QueryInterface(riid, ppvSite); } LRESULT CMenuDeskBar::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) @@ -674,9 +681,9 @@ if (m_Banner != NULL) { - SIZE sz; - ::GetBitmapDimensionEx(m_Banner, &sz); - rc.left += sz.cx; + BITMAP bm; + ::GetObject(m_Banner, sizeof(bm), &bm); + rc.left += bm.bmWidth; } ::SetWindowPos(clientWnd, NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, 0); @@ -773,9 +780,21 @@ ::GetObject(m_Banner, sizeof(bm), &bm); + RECT rc; + if (!GetClientRect(&rc)) + WARN("GetClientRect failed\n"); + + const int bx = bm.bmWidth; + const int by = bm.bmHeight; + const int cx = rc.right; + const int cy = rc.bottom; + TRACE("Painting banner: %d by %d\n", bm.bmWidth, bm.bmHeight); - if (!::BitBlt(hdc, 0, 0, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCCOPY)) + if (!::StretchBlt(hdc, 0, 0, bx, cy-by, hdcMem, 0, 0, bx, 1, SRCCOPY)) + WARN("StretchBlt failed\n"); + + if (!::BitBlt(hdc, 0, cy-by, bx, by, hdcMem, 0, 0, SRCCOPY)) WARN("BitBlt failed\n"); ::SelectObject(hdcMem, hbmOld); @@ -789,100 +808,82 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) { - //ENTER >> CMenuDeskBar<03901CC0>::Popup(POINTL *ppt=00B3F428, RECTL *prcExclude=00B3F418, MP_POPUPFLAGS dwFlags=80000000) - // ENTER >> CMenuBand<00D2CCF8>::QueryService - - // ENTER >> CMenuBand<00D2CCF8>::ShowDW(BOOL fShow=1) - // ENTER >> CMenuDeskBar<03901CC0>::GetSite(REFIID riid={4622AD10-FF23-11D0-8D34-00A0C90F2719}, PVOID *ppvSite=03901D4C) - // -- *ppvSite=00BDEA90 - // EXIT <<< CMenuDeskBar::GetSite() = 00000000 - // ENTER >> CMenuBand<00D2CCF8>::SetMenu(HMENU hmenu=593F0A07, HWND hwnd=00000000, DWORD dwFlags=20000000) - // EXIT <<< CMenuBand::SetMenu() = 00000000 - // EXIT <<< CMenuBand::ShowDW() = 00000000 - // ENTER >> CMenuBand<00D2CCF8>::GetBandInfo(DWORD dwBandID=0, DWORD dwViewMode=0, DESKBANDINFO *pdbi=00B3F0F0) - // EXIT <<< CMenuBand::GetBandInfo() = 00000000 - // ENTER >> CMenuBand<00D2CCF8>::QueryService(REFGUID guidService={ED9CC020-08B9-11D1-9823-00C04FD91972}, REFIID riid={B722BCCB-4E68-101B-A2BC-00AA00404770}, void **ppvObject=00B3F304) - // -- SID is SID_SMenuBandChild. Using QueryInterface of self instead of wrapped object. - // -- *ppvObject=00D2CD08 - // EXIT <<< CMenuBand::QueryService() = 00000000 - // ENTER >> CMenuBand<00D2CCF8>::Exec(const GUID *pguidCmdGroup=76BAE1FC, DWORD nCmdID=19, DWORD nCmdexecopt=0, VARIANT *pvaIn=00000000, VARIANT *pvaOut=00000000) - // -- *pguidCmdGroup={5B4DAE26-B807-11D0-9815-00C04FD91972} - // EXIT <<< CMenuBand::Exec() = 00000001 - // ENTER >> CMenuBand<00D2CCF8>::OnPosRectChangeDB(RECT *prc=00B3E630) - // -- *prc={L: 0, T: 0, R: 218, B: 305} - // EXIT <<< CMenuBand::OnPosRectChangeDB() = 00000000 - // ENTER >> CMenuBand<00D2CCF8>::UIActivateIO(BOOL fActivate=1, LPMSG lpMsg=00000000) - // EXIT <<< CMenuBand::UIActivateIO() = 00000001 - //EXIT <<< CMenuDeskBar::Popup() = 00000000 HRESULT hr; - IServiceProvider * sp; - IOleCommandTarget * oct; - IInputObject * io; - - hr = m_Client->QueryInterface(IID_PPV_ARG(IServiceProvider, &sp)); + CComPtr<IOleCommandTarget> oct; + CComPtr<IInputObject> io; + CComPtr<IDeskBand> band; + CComPtr<IDeskBarClient> dbc; + + if (m_hWnd == NULL) + return E_FAIL; + + hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IOleCommandTarget, &oct)); if (FAILED(hr)) return hr; + + hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); + if (FAILED(hr)) + return hr; + + // No clue about the arg, using anything != 0 + hr = dbc->UIActivateDBC(TRUE); + if (FAILED(hr)) + return hr; + + RECT rc = { 0 }; + hr = dbc->GetSize(0, &rc); + if (FAILED(hr)) + return hr; + + // Unknown meaning + const int CMD = 19; + const int CMD_EXEC_OPT = 0; + + hr = IUnknown_QueryServiceExec(m_Client, SID_SMenuBandChild, &CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL); + if (FAILED(hr)) + return hr; + + ::AdjustWindowRect(&rc, WS_DLGFRAME, FALSE); + rc.right -= rc.left; + rc.bottom -= rc.top; + + int x = ppt->x; + int y = ppt->y - rc.bottom; + int cx = rc.right; + int cy = rc.bottom; + + this->SetWindowPos(NULL, x, y, cx, cy, SWP_SHOWWINDOW); + + // HACK: The bar needs to be notified of the size AFTER it is shown. + // Quick & dirty way of getting it done. + BOOL bHandled; + OnSize(WM_SIZE, 0, 0, bHandled); hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); if (FAILED(hr)) return hr; - hr = sp->QueryService(SID_SMenuBandChild, IID_PPV_ARG(IOleCommandTarget, &oct)); - if (FAILED(hr)) - { - sp->Release(); - return hr; - } - - // Unknown meaning - const int CMD = 19; - const int CMD_EXEC_OPT = 0; - - hr = oct->Exec(&CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL); - - oct->Release(); - sp->Release(); - return hr; - - // FIXME: everything! - const int hackWidth = 200; - const int hackHeight = 400; - RECT r = { ppt->x, ppt->y - hackHeight, ppt->x + hackWidth, ppt->y }; - if (this->m_hWnd == NULL) - { - this->Create(NULL, &r); - } - this->SetWindowPos(NULL, r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_SHOWWINDOW); + io->UIActivateIO(TRUE, NULL); + return S_OK; } HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetIconSize(THIS_ DWORD iIcon) { HRESULT hr; - IServiceProvider * sp; - IOleCommandTarget * oct; - m_IconSize = iIcon; - hr = m_Client->QueryInterface(IID_PPV_ARG(IServiceProvider, &sp)); + // Unknown meaning (set flags? set icon size?) + const int CMD = 16; + const int CMD_EXEC_OPT = iIcon ? 0 : 2; // seems to work + + hr = IUnknown_QueryServiceExec(m_Client, SID_SMenuBandChild, &CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL); if (FAILED(hr)) return hr; - hr = sp->QueryService(SID_SMenuBandChild, IID_PPV_ARG(IOleCommandTarget, &oct)); - if (FAILED(hr)) - { - sp->Release(); - return hr; - } - - // Unknown meaning - const int CMD = 16; - const int CMD_EXEC_OPT = 2; - - hr = oct->Exec(&CLSID_MenuBand, CMD, CMD_EXEC_OPT, NULL, NULL); - - oct->Release(); - sp->Release(); + BOOL bHandled; + OnSize(WM_SIZE, 0, 0, bHandled); + return hr; } @@ -896,6 +897,10 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetBitmap(THIS_ HBITMAP hBitmap) { m_Banner = hBitmap; + + BOOL bHandled; + OnSize(WM_SIZE, 0, 0, bHandled); + return S_OK; } Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Thu Feb 13 20:16:30 2014 @@ -73,23 +73,39 @@ COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) END_COM_MAP() - virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); - virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); - virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus); + // IBandSite virtual HRESULT STDMETHODCALLTYPE AddBand(IUnknown * punk); virtual HRESULT STDMETHODCALLTYPE EnumBands(UINT uBand, DWORD* pdwBandID); + virtual HRESULT STDMETHODCALLTYPE QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName); + virtual HRESULT STDMETHODCALLTYPE GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv); + + // IDeskBarClient + virtual HRESULT STDMETHODCALLTYPE SetDeskBarSite(IUnknown *punkSite); + virtual HRESULT STDMETHODCALLTYPE GetSize(DWORD dwWhich, LPRECT prc); + virtual HRESULT STDMETHODCALLTYPE UIActivateDBC(DWORD dwState); + + // IOleWindow + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); + + // IOleCommandTarget + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT *pCmdText); virtual HRESULT STDMETHODCALLTYPE Exec(const GUID * pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); - virtual HRESULT STDMETHODCALLTYPE GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv); - virtual HRESULT STDMETHODCALLTYPE GetSize(DWORD dwWhich, LPRECT prc); - virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); + + // IInputObject + virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); + virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); + virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); + + // IInputObjectSite + virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus); + + // IWinEventHandler virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd); virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); - virtual HRESULT STDMETHODCALLTYPE QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName); + + // IServiceProvider virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE SetDeskBarSite(IUnknown *punkSite); - virtual HRESULT STDMETHODCALLTYPE UIActivateDBC(DWORD dwState); - virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); + // Using custom message map instead virtual BOOL ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD mapId = 0); @@ -260,6 +276,7 @@ return S_OK; DESKBANDINFO info = { 0 }; + info.dwMask = DBIM_MAXSIZE; m_DeskBand->GetBandInfo(0, 0, &info); Modified: branches/shell-experiments/include/psdk/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… ============================================================================== --- branches/shell-experiments/include/psdk/shlwapi_undoc.h [iso-8859-1] (original) +++ branches/shell-experiments/include/psdk/shlwapi_undoc.h [iso-8859-1] Thu Feb 13 20:16:30 2014 @@ -58,6 +58,7 @@ HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site); HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *lpClassId); HRESULT WINAPI IUnknown_QueryService(IUnknown* lpUnknown, REFGUID sid, REFIID riid, LPVOID *lppOut); +HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *lpUnknown, REFIID service, const GUID *group, DWORD cmdId, DWORD cmdOpt, VARIANT *pIn, VARIANT *pOut); HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg); BOOL WINAPI SHLoadMenuPopup(HINSTANCE hInst, LPCWSTR szName); void WINAPI SHPropagateMessage(HWND hWnd, UINT uiMsgId, WPARAM wParam, LPARAM lParam, BOOL bSend);

1 0

[akhaldi] 62148: [XMLLITE_WINETEST] * Globally mark expected failures as todos instead of failures. ROSTESTS-128
by akhaldi＠svn.reactos.org 13 Feb '14

13 Feb '14

Author: akhaldi Date: Thu Feb 13 20:09:59 2014 New Revision: 62148 URL: http://svn.reactos.org/svn/reactos?rev=62148&view=rev Log: [XMLLITE_WINETEST] * Globally mark expected failures as todos instead of failures. ROSTESTS-128 Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt trunk/rostests/winetests/xmllite/reader.c Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/CMakeLi… ============================================================================== --- trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] Thu Feb 13 20:09:59 2014 @@ -1,3 +1,5 @@ + +add_definitions(-DUSE_WINE_TODOS) list(APPEND SOURCE reader.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Thu Feb 13 20:09:59 2014 @@ -112,7 +112,7 @@ (pos_broken == -1 ? pos : pos_broken) == p); if (todo) - todo_ros + todo_wine ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); else @@ -761,7 +761,7 @@ hr = IXmlReader_Read(reader, &type); /* newer versions return syntax error here cause document is incomplete, it makes more sense than invalid char error */ -todo_ros { +todo_wine { ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr); ok(type == XmlNodeType_None, "got %d\n", type); } @@ -1405,7 +1405,7 @@ str_exp = a2w(test->value); if (test->todo) { - todo_ros { + todo_wine { ok(len == strlen(test->value), "got %u\n", len); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); } @@ -1643,7 +1643,7 @@ str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_ros { + todo_wine { ok(len == strlen(test->name), "got %u\n", len); str_exp = a2w(test->name); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));

1 0

[cwittich] 62147: spelling fixes
by cwittich＠svn.reactos.org 13 Feb '14

13 Feb '14

Author: cwittich Date: Thu Feb 13 19:10:28 2014 New Revision: 62147 URL: http://svn.reactos.org/svn/reactos?rev=62147&view=rev Log: spelling fixes Modified: trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/win32ss/reactx/dxg/historic.c Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] Thu Feb 13 19:10:28 2014 @@ -50,7 +50,7 @@ /* Set the thumb */ SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_SPEED_TRACK, TBM_SETPOS, TRUE, i); - /* Set the number of ticks for the accelleration trackbar */ + /* Set the number of ticks for the acceleration trackbar */ SendDlgItemMessage(hwndDlg, IDC_MOUSEKEYS_ACCEL_TRACK, TBM_SETRANGE, TRUE, MAKELONG(0, ACCELTICKS - 1)); Modified: trunk/reactos/win32ss/reactx/dxg/historic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/reactx/dxg/histori… ============================================================================== --- trunk/reactos/win32ss/reactx/dxg/historic.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/reactx/dxg/historic.c [iso-8859-1] Thu Feb 13 19:10:28 2014 @@ -59,7 +59,7 @@ * @name DxDdIoctl * @implemented * -* The function DxDdIoctl is the ioctl call to diffent DirectX functions +* The function DxDdIoctl is the ioctl call to different DirectX functions * * @param ULONG ulIoctl * The ioctl code that we want call to

1 0

[akhaldi] 62146: [XMLLITE_WINETEST] * Properly mark some tests as todos instead of failures. ROSTESTS-128
by akhaldi＠svn.reactos.org 13 Feb '14

13 Feb '14

Author: akhaldi Date: Thu Feb 13 18:22:09 2014 New Revision: 62146 URL: http://svn.reactos.org/svn/reactos?rev=62146&view=rev Log: [XMLLITE_WINETEST] * Properly mark some tests as todos instead of failures. ROSTESTS-128 Modified: trunk/rostests/winetests/xmllite/reader.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Thu Feb 13 18:22:09 2014 @@ -112,7 +112,7 @@ (pos_broken == -1 ? pos : pos_broken) == p); if (todo) - todo_wine + todo_ros ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); else @@ -761,7 +761,7 @@ hr = IXmlReader_Read(reader, &type); /* newer versions return syntax error here cause document is incomplete, it makes more sense than invalid char error */ -todo_wine { +todo_ros { ok(hr == WC_E_SYNTAX || broken(hr == WC_E_XMLCHARACTER), "got 0x%08x\n", hr); ok(type == XmlNodeType_None, "got %d\n", type); } @@ -1405,7 +1405,7 @@ str_exp = a2w(test->value); if (test->todo) { - todo_wine { + todo_ros { ok(len == strlen(test->value), "got %u\n", len); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); } @@ -1643,7 +1643,7 @@ str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine { + todo_ros { ok(len == strlen(test->name), "got %u\n", len); str_exp = a2w(test->name); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));

1 0

[akhaldi] 62145: [ADVAPI32_WINETEST] * Properly mark these tests as todos instead of failures. ROSTESTS-128
by akhaldi＠svn.reactos.org 13 Feb '14

13 Feb '14

Author: akhaldi Date: Thu Feb 13 12:33:16 2014 New Revision: 62145 URL: http://svn.reactos.org/svn/reactos?rev=62145&view=rev Log: [ADVAPI32_WINETEST] * Properly mark these tests as todos instead of failures. ROSTESTS-128 Modified: trunk/rostests/winetests/advapi32/cred.c Modified: trunk/rostests/winetests/advapi32/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/cred.c… ============================================================================== --- trunk/rostests/winetests/advapi32/cred.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/cred.c [iso-8859-1] Thu Feb 13 12:33:16 2014 @@ -245,9 +245,9 @@ { if (cred_type == CRED_TYPE_DOMAIN_PASSWORD) { - todo_wine + todo_ros ok_(__FILE__, line)(cred->CredentialBlobSize == 0, "expected CredentialBlobSize of 0 but got %d\n", cred->CredentialBlobSize); - todo_wine + todo_ros ok_(__FILE__, line)(!cred->CredentialBlob, "expected NULL credentials but got %p\n", cred->CredentialBlob); } else

1 0

[akhaldi] 62144: [CMAKE] * Initialize the PCH CMake define in the MSVC builds too.
by akhaldi＠svn.reactos.org 13 Feb '14

13 Feb '14

Author: akhaldi Date: Thu Feb 13 11:44:05 2014 New Revision: 62144 URL: http://svn.reactos.org/svn/reactos?rev=62144&view=rev Log: [CMAKE] * Initialize the PCH CMake define in the MSVC builds too. Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=62144&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Thu Feb 13 11:44:05 2014 @@ -152,7 +152,7 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" ) else ( - cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" + cmake -G %CMAKE_GENERATOR% -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" ) cd..

1 0

[gadamopoulos] 62143: [shell32] - Implement showing the target type in shortcut properties dialog - Patch by Edijs Kolesnikovics - See CORE-7366
by gadamopoulos＠svn.reactos.org 13 Feb '14

13 Feb '14

Author: gadamopoulos Date: Thu Feb 13 11:10:47 2014 New Revision: 62143 URL: http://svn.reactos.org/svn/reactos?rev=62143&view=rev Log: [shell32] - Implement showing the target type in shortcut properties dialog - Patch by Edijs Kolesnikovics - See CORE-7366 Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] Thu Feb 13 11:10:47 2014 @@ -76,6 +76,43 @@ #include "poppack.h" +/************************************************************************** +* SH_GetTargetTypeByPath +* +* Function to get target type by passing full path to it +*/ +LPWSTR SH_GetTargetTypeByPath(LPCWSTR lpcwFullPath) +{ + LPCWSTR pwszExt; + static WCHAR wszBuf[MAX_PATH]; + + /* Get file information */ + SHFILEINFO fi; + if (!SHGetFileInfoW(lpcwFullPath, 0, &fi, sizeof(fi), SHGFI_TYPENAME | SHGFI_USEFILEATTRIBUTES )) + { + ERR("SHGetFileInfoW failed for %ls (%lu)\n", lpcwFullPath, GetLastError()); + fi.szTypeName[0] = L'\0'; + fi.hIcon = NULL; + } + + pwszExt = PathFindExtensionW(lpcwFullPath); + if (pwszExt[0]) + { + if (!fi.szTypeName[0]) + { + /* The file type is unknown, so default to string "FileExtension File" */ + size_t cchRemaining = 0; + LPWSTR pwszEnd = NULL; + + StringCchPrintfExW(wszBuf, _countof(wszBuf), &pwszEnd, &cchRemaining, 0, L"%s ", pwszExt + 1); + } + else + StringCbPrintfW(wszBuf, sizeof(wszBuf), L"%s (%s)", fi.szTypeName, pwszExt); /* Update file type */ + } + + return wszBuf; +} + /* IShellLink Implementation */ static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); @@ -1949,6 +1986,10 @@ else ERR("ExtractIconW failed %ls %u\n", pThis->sIcoPath, pThis->iIcoNdx); + /* target type */ + if (pThis->sPath) + SetDlgItemTextW(hwndDlg, 14005, SH_GetTargetTypeByPath(pThis->sPath)); + /* target location */ if (pThis->sWorkDir) SetDlgItemTextW(hwndDlg, 14007, PathFindFileName(pThis->sWorkDir));

1 0

[hbelusca] 62142: [REACTOS] Revert r62140 per Alex request. Alex, why did we choose Win2k3 SP1 at first, and not SP2 directly? CORE-6611 #comment Reverted in r62142.
by hbelusca＠svn.reactos.org 12 Feb '14

12 Feb '14

Author: hbelusca Date: Wed Feb 12 22:58:13 2014 New Revision: 62142 URL: http://svn.reactos.org/svn/reactos?rev=62142&view=rev Log: [REACTOS] Revert r62140 per Alex request. Alex, why did we choose Win2k3 SP1 at first, and not SP2 directly? CORE-6611 #comment Reverted in r62142. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/include/psdk/ntverp.h trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Feb 12 22:58:13 2014 @@ -1143,8 +1143,8 @@ ; ReactOS specific - by default we report ourselves as Server for the user, ; but we can also report as Workstation if some application needs it. HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkstation",0x00010001,0x00000000 -; Some installers check for SP2 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000200 +; Some installers check for SP1 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x00000012 Modified: trunk/reactos/include/psdk/ntverp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntverp.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/ntverp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntverp.h [iso-8859-1] Wed Feb 12 22:58:13 2014 @@ -14,10 +14,10 @@ */ // -// Windows NT Build 3790.3959 +// Windows NT Build 3790.1830 // #define VER_PRODUCTBUILD 3790 -#define VER_PRODUCTBUILD_QFE 3959 +#define VER_PRODUCTBUILD_QFE 1830 // // Windows NT Version 5.2 Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=621… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Feb 12 22:58:13 2014 @@ -1072,12 +1072,12 @@ /* Setup initial system settings */ CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector); - /* Load static defaults for Service Pack 2 and add our SVN revision */ + /* Load static defaults for Service Pack 1 and add our SVN revision */ /* Format of CSD : SPMajor - SPMinor */ - CmNtCSDVersion = 0x200 | (KERNEL_VERSION_BUILD_HEX << 16); + CmNtCSDVersion = 0x100 | (KERNEL_VERSION_BUILD_HEX << 16); CmNtCSDReleaseType = 0; - /* Set Service Pack data for Service Pack 2 */ + /* Set Service Pack data for Service Pack 1 */ CmNtSpBuildNumber = VER_PRODUCTBUILD_QFE; if (!(CmNtCSDVersion & 0xFFFF0000)) {

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2014