Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 63543: [NEWDEV] * Fix a nasty stack corruption that was caused by a mismatching prototype. * Brought to you by MSVC Run-Time Error Checks (/RTC1) * Fixed by Christoph von Wittich.
by akhaldi＠svn.reactos.org 06 Jun '14

06 Jun '14

Author: akhaldi Date: Fri Jun 6 13:49:47 2014 New Revision: 63543 URL: http://svn.reactos.org/svn/reactos?rev=63543&view=rev Log: [NEWDEV] * Fix a nasty stack corruption that was caused by a mismatching prototype. * Brought to you by MSVC Run-Time Error Checks (/RTC1) * Fixed by Christoph von Wittich. Modified: trunk/reactos/dll/win32/newdev/newdev.c Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] Fri Jun 6 13:49:47 2014 @@ -810,8 +810,9 @@ BOOL WINAPI ClientSideInstallW( IN HWND hWndOwner, - IN DWORD dwUnknownFlags, - IN LPWSTR lpNamedPipeName) + IN HINSTANCE hInstance, + IN LPWSTR lpNamedPipeName, + IN INT Show) { BOOL ReturnValue = FALSE; BOOL ShowWizard;

1 0

[hbelusca] 63542: [RAPPS][USETUP][SYSDM] "Licence" --> "License" in USA english. Patch by middings contributor. CORE-8288 #resolve #comment Thanks :)
by hbelusca＠svn.reactos.org 05 Jun '14

05 Jun '14

Author: hbelusca Date: Thu Jun 5 19:38:44 2014 New Revision: 63542 URL: http://svn.reactos.org/svn/reactos?rev=63542&view=rev Log: [RAPPS][USETUP][SYSDM] "Licence" --> "License" in USA english. Patch by middings contributor. CORE-8288 #resolve #comment Thanks :) Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/dll/cpl/sysdm/lang/en-US.rc Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Thu Jun 5 19:38:44 2014 @@ -147,7 +147,7 @@ IDS_AINFO_DESCRIPTION "\nDescription: " IDS_AINFO_SIZE "\nSize: " IDS_AINFO_URLSITE "\nHome Page: " - IDS_AINFO_LICENCE "\nLicence: " + IDS_AINFO_LICENCE "\nLicense: " END STRINGTABLE Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Thu Jun 5 19:38:44 2014 @@ -117,7 +117,7 @@ { 0, 0, - "ENTER = Continue R = Repair L = Licence F3 = Quit", + "ENTER = Continue R = Repair L = License F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Thu Jun 5 19:38:44 2014 @@ -18,7 +18,7 @@ LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 CONTROL "Visit the <A HREF=""http://www.reactos.org/"">ReactOS Homepage</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 140, 10 - PUSHBUTTON "View &licence...", IDC_LICENCE, 170, 199, 78, 13 + PUSHBUTTON "View &license...", IDC_LICENCE, 170, 199, 78, 13 END IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 @@ -243,7 +243,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 -CAPTION "Licence" +CAPTION "License" FONT 8, "MS Shell Dlg", 0, 0, 0x0 STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN

1 0

[dquintana] 63541: [BROWSEUI] * Make failure codes print themselves. Helps debug.
by dquintana＠svn.reactos.org 04 Jun '14

04 Jun '14

Author: dquintana Date: Wed Jun 4 18:08:35 2014 New Revision: 63541 URL: http://svn.reactos.org/svn/reactos?rev=63541&view=rev Log: [BROWSEUI] * Make failure codes print themselves. Helps debug. Modified: branches/shell-experiments/dll/win32/browseui/aclmulti.cpp branches/shell-experiments/dll/win32/browseui/addressband.cpp branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp branches/shell-experiments/dll/win32/browseui/bandproxy.cpp branches/shell-experiments/dll/win32/browseui/bandsite.cpp branches/shell-experiments/dll/win32/browseui/basebar.cpp branches/shell-experiments/dll/win32/browseui/basebarsite.cpp branches/shell-experiments/dll/win32/browseui/brandband.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/browseui/toolsband.cpp Modified: branches/shell-experiments/dll/win32/browseui/aclmulti.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/aclmulti.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/aclmulti.cpp [iso-8859-1] Wed Jun 4 18:08:35 2014 @@ -57,9 +57,9 @@ CoTaskMemRealloc(fObjects, sizeof(fObjects[0]) * (fObjectCount + 1))); fObjects[fObjectCount].punk = punk; punk->AddRef(); - if (FAILED(punk->QueryInterface(IID_PPV_ARG(IEnumString, &fObjects[fObjectCount].pEnum)))) + if (FAILED_UNEXPECTEDLY(punk->QueryInterface(IID_PPV_ARG(IEnumString, &fObjects[fObjectCount].pEnum)))) fObjects[fObjectCount].pEnum = NULL; - if (FAILED(punk->QueryInterface(IID_PPV_ARG(IACList, &fObjects[fObjectCount].pACL)))) + if (FAILED_UNEXPECTEDLY(punk->QueryInterface(IID_PPV_ARG(IACList, &fObjects[fObjectCount].pACL)))) fObjects[fObjectCount].pACL = NULL; fObjectCount++; return S_OK; Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] Wed Jun 4 18:08:35 2014 @@ -126,7 +126,7 @@ fSite.Release(); hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &fSite)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; // get window handle of parent @@ -155,22 +155,22 @@ #else hResult = E_FAIL; #endif - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { // instantiate new version hResult = CreateAddressEditBox(IID_PPV_ARG(IAddressEditBox, &fAddressEditBox)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IShellService, &shellService)); - if (FAILED(hResult)) - return hResult; - hResult = fAddressEditBox->Init(combobox, fEditControl, 8, pUnkSite /*(IAddressBand *)this*/); - if (FAILED(hResult)) - return hResult; - hResult = shellService->SetOwner(pUnkSite); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = fAddressEditBox->Init(combobox, fEditControl, 8, fSite /*(IAddressBand *)this*/); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = shellService->SetOwner(fSite); + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; // TODO: properly initialize this from registry @@ -285,7 +285,7 @@ HRESULT hResult; hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return oleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); } @@ -333,7 +333,7 @@ if (fActivate) { hResult = fSite->QueryInterface(IID_PPV_ARG(IInputObjectSite, &inputObjectSite)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = inputObjectSite->OnFocusChangeIS(static_cast<IDeskBand *>(this), fActivate); SetFocus(); @@ -361,7 +361,7 @@ break; } hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IWinEventHandler, &winEventHandler)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return winEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); } @@ -374,7 +374,7 @@ if (fAddressEditBox) { hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IWinEventHandler, &winEventHandler)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return winEventHandler->IsWindowOwner(hWnd); } @@ -387,7 +387,7 @@ HRESULT hResult; hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IAddressBand, &addressBand)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return addressBand->FileSysChange(param8, paramC); } @@ -398,7 +398,7 @@ HRESULT hResult; hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IAddressBand, &addressBand)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return addressBand->Refresh(param8); } @@ -494,7 +494,7 @@ } hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; isb->GetPidl(&absolutePIDL); @@ -677,7 +677,7 @@ if (theMenuBar == NULL) return E_OUTOFMEMORY; hResult = theMenuBar->QueryInterface(riid, reinterpret_cast<void **>(ppv)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { delete theMenuBar; return hResult; Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Wed Jun 4 18:08:35 2014 @@ -144,7 +144,7 @@ if (SUCCEEDED(hr)) { hr = pisb->BrowseObject(pidlLastParsed, 0); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) { HWND topLevelWindow; LPCITEMIDLIST pidlChild; @@ -267,7 +267,7 @@ if (theMenuBar == NULL) return E_OUTOFMEMORY; hResult = theMenuBar->QueryInterface(riid, reinterpret_cast<void **>(ppv)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { delete theMenuBar; return hResult; Modified: branches/shell-experiments/dll/win32/browseui/bandproxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/bandproxy.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/bandproxy.cpp [iso-8859-1] Wed Jun 4 18:08:35 2014 @@ -44,11 +44,11 @@ if (browser == NULL) return E_POINTER; hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = serviceProvider->QueryService( SID_IWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &webBrowser)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; *browser = webBrowser.Detach(); return S_OK; @@ -78,7 +78,7 @@ HRESULT hResult; hResult = FindBrowserWindow(&webBrowser); - if (FAILED(hResult) || webBrowser.p == NULL) + if (FAILED_UNEXPECTEDLY(hResult) || webBrowser.p == NULL) return S_FALSE; return S_OK; } @@ -96,10 +96,10 @@ HRESULT hResult; hResult = FindBrowserWindow(&webBrowserUnknown); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = webBrowserUnknown->QueryInterface(IID_PPV_ARG(IWebBrowser2, &webBrowser)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = webBrowser->put_Visible(TRUE); hResult = webBrowser->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); @@ -121,7 +121,7 @@ return E_OUTOFMEMORY; memcpy(V_ARRAY(&args)->pvData, pidl, arraySize); hResult = webBrowser->Navigate2(&args, &emptyVariant, &emptyVariant, &emptyVariant, &emptyVariant); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; } @@ -143,7 +143,7 @@ if (theBandProxy == NULL) return E_OUTOFMEMORY; hResult = theBandProxy->QueryInterface(riid, reinterpret_cast<void **>(ppv)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { delete theBandProxy; return hResult; Modified: branches/shell-experiments/dll/win32/browseui/bandsite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/bandsite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/bandsite.cpp [iso-8859-1] Wed Jun 4 18:08:35 2014 @@ -202,7 +202,7 @@ if (fBands[i].DeskBand != NULL) { hRet = UpdateSingleBand(&fBands[i]); - if (FAILED(hRet)) + if (FAILED_UNEXPECTEDLY(hRet)) return hRet; } } @@ -628,11 +628,11 @@ fOleWindow.Release(); hRet = pUnk->QueryInterface(IID_PPV_ARG(IOleWindow, &fOleWindow)); - if (FAILED(hRet)) + if (FAILED_UNEXPECTEDLY(hRet)) return E_FAIL; hRet = fOleWindow->GetWindow(&hWndParent); - if (FAILED(hRet)) + if (FAILED_UNEXPECTEDLY(hRet)) return E_FAIL; style = WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | RBS_VARHEIGHT | Modified: branches/shell-experiments/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] Wed Jun 4 18:08:35 2014 @@ -180,10 +180,10 @@ HRESULT hResult; hResult = fSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &dockingWindowSite)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = dockingWindowSite->GetBorderDW(static_cast<IDeskBar *>(this), &availableBorderSpace); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; memset(&neededBorderSpace, 0, sizeof(neededBorderSpace)); if (fVisible) @@ -194,7 +194,7 @@ neededBorderSpace.bottom = fNeededSize + GetSystemMetrics(SM_CXFRAME); } hResult = dockingWindowSite->SetBorderSpaceDW(static_cast<IDeskBar *>(this), &neededBorderSpace); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; } @@ -273,7 +273,7 @@ if (fSite == NULL) return E_FAIL; hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; // called for SID_STopLevelBrowser, IID_IBrowserService to find top level browser // called for SID_IWebBrowserApp, IID_IConnectionPointContainer @@ -310,13 +310,13 @@ else { hResult = punkClient->QueryInterface(IID_PPV_ARG(IUnknown, &fClient)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = fSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; Create(ownerWindow, 0, NULL, WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, WS_EX_TOOLWINDOW); @@ -524,7 +524,7 @@ if (theBaseBar == NULL) return E_OUTOFMEMORY; hResult = theBaseBar->QueryInterface (riid, reinterpret_cast<void **>(ppv)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { delete theBaseBar; return hResult; Modified: branches/shell-experiments/dll/win32/browseui/basebarsite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/basebarsite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/basebarsite.cpp [iso-8859-1] Wed Jun 4 18:08:35 2014 @@ -171,22 +171,22 @@ HRESULT hResult; hResult = newBar->QueryInterface(IID_PPV_ARG(IPersist, &persist)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = newBar->QueryInterface(IID_PPV_ARG(IObjectWithSite, &site)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = newBar->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = newBar->QueryInterface(IID_PPV_ARG(IDeskBand, &deskBand)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = newBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = site->SetSite(static_cast<IOleWindow *>(this)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; ATLTRY(newInfo = new CBarInfo); if (newInfo == NULL) @@ -224,7 +224,7 @@ // this call is what makes the tree fill with contents hResult = dockingWindow->ShowDW(TRUE); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; // for now fCurrentActiveBar = newInfo; @@ -267,7 +267,7 @@ if (fDeskBarSite == NULL) return E_FAIL; hResult = fDeskBarSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; // called for SID_STopLevelBrowser, IID_IBrowserService to find top level browser // called for SID_IWebBrowserApp, IID_IConnectionPointContainer @@ -326,13 +326,13 @@ else { hResult = punkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = punkSite->QueryInterface(IID_PPV_ARG(IUnknown, &fDeskBarSite)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; m_hWnd = CreateWindow(REBARCLASSNAMEW, NULL, WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | @@ -487,7 +487,7 @@ if (theBaseBarSite == NULL) return E_OUTOFMEMORY; hResult = theBaseBarSite->QueryInterface(riid, reinterpret_cast<void **>(ppv)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { delete theBaseBarSite; return hResult; Modified: branches/shell-experiments/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/brandband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/brandband.cpp [iso-8859-1] Wed Jun 4 18:08:35 2014 @@ -171,7 +171,7 @@ // get window handle of parent hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &fSite)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; parentWindow = NULL; hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); @@ -356,7 +356,7 @@ if (IsEqualIID(guidService, SID_SBrandBand)) return this->QueryInterface(riid, ppvObject); hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return serviceProvider->QueryService(guidService, riid, ppvObject); } @@ -480,7 +480,7 @@ if (theMenuBar == NULL) return E_OUTOFMEMORY; hResult = theMenuBar->QueryInterface(riid, reinterpret_cast<void **>(ppv)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { delete theMenuBar; return hResult; Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Wed Jun 4 18:08:35 2014 @@ -78,7 +78,7 @@ CComPtr<IInputObject> pio; HRESULT hr; hr = punk->QueryInterface(IID_PPV_ARG(IInputObject, &pio)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return pio->HasFocusIO(); } @@ -90,7 +90,7 @@ if (!punk) return E_FAIL; hr = punk->QueryInterface(IID_PPV_ARG(IInputObject, &pio)); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return hr; return pio->TranslateAcceleratorIO(pmsg); } @@ -228,10 +228,10 @@ fBandID = bandID; fFlags = flags; hResult = IUnknown_SetSite(containedBand, static_cast<IOleWindow *>(this)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = IUnknown_GetWindow(containedBand, &fChildWindow); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; memset(&bandInfo, 0, sizeof(bandInfo)); @@ -252,7 +252,7 @@ HRESULT hResult; hResult = fContainedBand->QueryInterface(IID_PPV_ARG(IDeskBand, &deskBand)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; fDeskBandInfo.dwMask = DBIM_BKCOLOR | DBIM_MODEFLAGS | DBIM_TITLE | DBIM_ACTUAL | @@ -365,7 +365,7 @@ bandInfo.lpText = textBuffer; bandInfo.cch = sizeof(textBuffer) / sizeof(TCHAR); hResult = GetRBBandInfo(bandInfo); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; index = (int)SendMessage(fRebarWindow, RB_IDTOINDEX, fBandID, 0); SendMessage(fRebarWindow, RB_SETBANDINFOW, index, (LPARAM)&bandInfo); @@ -415,10 +415,10 @@ { // create favorites menu hResult = psmd->punk->QueryInterface(IID_PPV_ARG(IShellMenu, &parentMenu)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = parentMenu->GetMenu(&parentHMenu, &ownerWindow, NULL); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; favoritesHMenu = GetSubMenu(parentHMenu, 3); if (favoritesHMenu == NULL) @@ -440,19 +440,19 @@ hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellMenu, &newMenu)); #endif - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = newMenu->Initialize(this, FCIDM_MENU_FAVORITES, -1, SMINIT_VERTICAL | SMINIT_CACHED); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = newMenu->SetMenu(favoritesHMenu, ownerWindow, SMSET_TOP | SMSET_DONTOWN); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = SHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &favoritesPIDL); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = SHBindToFolder(favoritesPIDL, &favoritesFolder); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; RegCreateKeyEx(HKEY_CURRENT_USER, szFavoritesKey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &orderRegKey, &disposition); @@ -571,10 +571,10 @@ RECT availableBorderSpace; HRESULT hResult = fSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &dockingWindowSite)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = dockingWindowSite->GetBorderDW(static_cast<IDockingWindow *>(this), &availableBorderSpace); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; if (availableBorderSpace.top > maxHeight) @@ -615,7 +615,7 @@ hResult = E_FAIL; } - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellMenu, menuBar)); @@ -624,33 +624,33 @@ hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellMenu, menuBar)); #endif - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = fMenuCallback.QueryInterface(IID_PPV_ARG(IShellMenuCallback, &callback)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = (*menuBar)->Initialize(callback, -1, ANCESTORDEFAULT, SMINIT_HORIZONTAL | SMINIT_TOPLEVEL); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = fSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &siteCommandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = siteCommandTarget->Exec(&CGID_Explorer, 0x35, 0, NULL, &menuOut); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; if (V_VT(&menuOut) != VT_INT_PTR || V_INTREF(&menuOut) == NULL) return E_FAIL; hResult = (*menuBar)->SetMenu((HMENU)V_INTREF(&menuOut), ownerWindow, SMSET_DONTOWN); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = IUnknown_Exec(*menuBar, CGID_MenuBand, 3, 1, NULL, NULL); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; } @@ -744,16 +744,16 @@ HRESULT hResult; hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = serviceProvider->QueryService(SID_IBandProxy, IID_PPV_ARG(IBandProxy, &fBandProxy)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { hResult = CreateBandProxy(IID_PPV_ARG(IBandProxy, &fBandProxy)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = fBandProxy->SetSite(fSite); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } return S_OK; @@ -938,15 +938,15 @@ CComPtr<IDockingWindowSite> dockingWindowSite; HRESULT hResult = fSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &dockingWindowSite)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = dockingWindowSite->RequestBorderSpaceDW(static_cast<IDockingWindow *>(this), &neededBorderSpace); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = dockingWindowSite->SetBorderSpaceDW(static_cast<IDockingWindow *>(this), &neededBorderSpace); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; @@ -990,7 +990,7 @@ /* Create and attach the menubar to the rebar */ hResult = CreateMenuBar(&menuBar); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; AddDockItem(menuBar, ITBBID_MENUBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); @@ -1002,7 +1002,7 @@ #if 0 /* Create and attach the brand/logo to the rebar */ hResult = CreateBrandBand(&logoBar); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; AddDockItem(logoBar, ITBBID_BRANDBAND, CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE); fLogoBar.Attach(logoBar.Detach()); // transfer the ref count @@ -1010,17 +1010,17 @@ /* Create and attach the standard toolbar to the rebar */ hResult = CreateToolsBar(&toolsBar); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; AddDockItem(toolsBar, ITBBID_TOOLSBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); fControlsBar.Attach(toolsBar.Detach()); // transfer the ref count hResult = IUnknown_GetWindow(fControlsBar, &fToolbarWindow); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; /* Create and attach the address/navigation toolbar to the rebar */ hResult = CreateAddressBand(&navigationBar); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; AddDockItem(navigationBar, ITBBID_ADDRESSBAND, CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); fNavigationBar.Attach(navigationBar.Detach()); @@ -1163,7 +1163,7 @@ fCommandTarget.Release(); hResult = theTarget->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &fCommandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; fCommandCategory = *category; return S_OK; @@ -1269,10 +1269,10 @@ { // get window handle of owner hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; if (ownerWindow == NULL) return E_FAIL; @@ -1326,7 +1326,7 @@ if (fBandProxy.p == NULL) { hResult = CreateAndInitBandProxy(); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } return fBandProxy->QueryInterface(riid, ppvObject); @@ -1396,26 +1396,31 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState) { + UNIMPLEMENTED; return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CInternetToolbar::RemoveBand(DWORD dwBandID) { + UNIMPLEMENTED; return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CInternetToolbar::GetBandObject(DWORD dwBandID, REFIID riid, void **ppv) { + UNIMPLEMENTED; return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CInternetToolbar::SetBandSiteInfo(const BANDSITEINFO *pbsinfo) { + UNIMPLEMENTED; return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CInternetToolbar::GetBandSiteInfo(BANDSITEINFO *pbsinfo) { + UNIMPLEMENTED; return E_NOTIMPL; } @@ -1426,11 +1431,11 @@ HRESULT hResult; hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_PPV_ARG(IWebBrowser, &webBrowser)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = webBrowser->GoBack(); return 1; @@ -1443,11 +1448,11 @@ HRESULT hResult; hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = serviceProvider->QueryService( SID_SShellBrowser, IID_PPV_ARG(IWebBrowser, &webBrowser)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = webBrowser->GoForward(); return 1; @@ -1459,7 +1464,7 @@ HRESULT hResult; hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = oleCommandTarget->Exec(&CGID_ShellBrowser, IDM_GOTO_UPONELEVEL, 0, NULL, NULL); return 1; @@ -1483,13 +1488,13 @@ hResult = CoCreateInstance(CLSID_ShellSearchExt, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IContextMenu, &contextMenu)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = contextMenu->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = objectWithSite->SetSite(fSite); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = contextMenu->InvokeCommand(&commandInfo); hResult = objectWithSite->SetSite(NULL); @@ -1502,7 +1507,7 @@ HRESULT hResult; hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = oleCommandTarget->Exec(&CGID_Explorer, 0x23, 0, NULL, NULL); return 1; @@ -1752,7 +1757,7 @@ hResult = travelLog->GetToolTipText(browserService, (nID == (UINT)IDM_GOTO_BACK) ? TLOG_BACK : TLOG_FORE, 0, tempString, 299); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { bHandled = FALSE; return 0; @@ -1866,7 +1871,7 @@ if (theToolbar == NULL) return E_OUTOFMEMORY; hResult = theToolbar->QueryInterface (riid, reinterpret_cast<void **>(ppv)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { delete theToolbar; return hResult; Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Wed Jun 4 18:08:35 2014 @@ -203,7 +203,7 @@ CComPtr<IShellFolder> desktop; HRESULT hr = ::SHGetDesktopFolder(&desktop); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return E_FAIL; if (path == NULL || path->mkid.cb == 0) { @@ -752,11 +752,11 @@ #if 0 hResult = CoCreateInstance(CLSID_InternetToolbar, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &fClientBars[BIInternetToolbar].clientBar)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; #else hResult = CreateInternetToolbar(IID_PPV_ARG(IUnknown, &clientBar)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; #endif @@ -768,11 +768,11 @@ return hResult; hResult = IUnknown_SetSite(clientBar, static_cast<IShellBrowser *>(this)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = IUnknown_Exec(clientBar, CGID_PrivCITCommands, 1, 1 /* or 0 */, NULL, NULL); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; // TODO: create settingsStream from registry entry @@ -785,7 +785,7 @@ //else { hResult = persistStreamInit->InitNew(); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } @@ -805,7 +805,7 @@ // browse hResult = BrowseToPIDL(pidl, BTP_UPDATE_NEXT_HISTORY); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; ShowWindow(SW_SHOWNORMAL); @@ -822,13 +822,13 @@ // called by shell view to browse to new folder // also called by explorer band to navigate to new folder hResult = SHBindToFolder(pidl, &newFolder); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; newFolderSettings.ViewMode = FVM_ICON; newFolderSettings.fFlags = 0; hResult = BrowseToPath(newFolder, pidl, &newFolderSettings, flags); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; } @@ -937,7 +937,7 @@ return E_INVALIDARG; hResult = GetTravelLog(&travelLog); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; // update history @@ -955,7 +955,7 @@ // create view object hResult = newShellFolder->CreateViewObject(m_hWnd, IID_PPV_ARG(IShellView, &newShellView)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; previousView = fCurrentShellViewWindow; @@ -986,7 +986,7 @@ // create view window hResult = newShellView->CreateViewWindow(saveCurrentShellView, folderSettings, this, &shellViewWindowBounds, &newShellViewWindow); - if (FAILED(hResult) || newShellViewWindow == NULL) + if (FAILED_UNEXPECTEDLY(hResult) || newShellViewWindow == NULL) { fCurrentShellView = saveCurrentShellView; fCurrentShellFolder = saveCurrentShellFolder; @@ -1086,7 +1086,7 @@ if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = bandSite->QueryBand(1, &deskBand, NULL, NULL, 0); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return deskBand->QueryInterface(riid, shellMenu); } @@ -1108,34 +1108,34 @@ if (*cache == NULL) { hResult = CreateBaseBar(IID_PPV_ARG(IUnknown, &newBaseBar)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = CreateBaseBarSite(IID_PPV_ARG(IUnknown, &newBaseBarSite)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; // tell the new base bar about the shell browser hResult = newBaseBar->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = objectWithSite->SetSite(static_cast<IDropTarget *>(this)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; // tell the new base bar about the new base bar site hResult = newBaseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = deskBar->SetClient(newBaseBarSite); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; // tell the new base bar site about the new base bar hResult = newBaseBarSite->QueryInterface(IID_PPV_ARG(IDeskBarClient, &deskBarClient)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = deskBarClient->SetDeskBarSite(newBaseBar); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; *cache = newBaseBar.Detach(); @@ -1157,30 +1157,30 @@ __debugbreak(); hResult = GetBaseBar(vertical, (IUnknown **)&theBaseBar); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &newBand)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = deskBar->GetClient(&baseBarSite); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = baseBarSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; V_VT(&vaIn) = VT_UNKNOWN; V_UNKNOWN(&vaIn) = newBand.p; hResult = oleCommandTarget->Exec(&CGID_IDeskBand, 1, 1, &vaIn, NULL); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = dockingWindow->ShowDW(TRUE); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; } @@ -1196,7 +1196,7 @@ ILRemoveLastID(newDirectory); hResult = BrowseToPIDL(newDirectory, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); ILFree(newDirectory); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; } @@ -1229,7 +1229,7 @@ // create sheet object hResult = CoCreateInstance(CLSID_ShellFldSetExt, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellPropSheetExt, &folderOptionsSheet)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return E_FAIL; // must set site in order for Apply to all Folders on Advanced page to be enabled @@ -1240,23 +1240,23 @@ #if 0 hResult = CoCreateInstance(CLSID_GlobalFolderSettings, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IGlobalFolderSettings, &globalSettings)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return E_FAIL; hResult = globalSettings->Get(&shellState, sizeof(shellState)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return E_FAIL; #endif // add pages hResult = folderOptionsSheet->AddPages(AddFolderOptionsPage, reinterpret_cast<LPARAM>(&m_PropSheet)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return E_FAIL; if (fCurrentShellView != NULL) { hResult = fCurrentShellView->AddPropertySheetPages( 0, AddFolderOptionsPage, reinterpret_cast<LPARAM>(&m_PropSheet)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return E_FAIL; } @@ -1484,7 +1484,7 @@ canGoBack = false; canGoForward = false; hResult = GetTravelLog(&travelLog); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = travelLog->GetTravelEntry(static_cast<IDropTarget *>(this), TLOG_BACK, &unusedEntry); if (SUCCEEDED(hResult)) @@ -1514,7 +1514,7 @@ position = GetMenuItemCount(theMenu); hResult = GetTravelLog(&travelLog); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return; hResult = travelLog->InsertMenuEntries(static_cast<IDropTarget *>(this), theMenu, position, IDM_GOTO_TRAVEL_FIRSTTARGET, IDM_GOTO_TRAVEL_LASTTARGET, TLMENUF_BACKANDFORTH | TLMENUF_CHECKCURRENT); @@ -1553,7 +1553,7 @@ IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); if (SUCCEEDED(hResult)) hResult = oleCommandTarget->QueryStatus(&CGID_PrivCITCommands, 5, commandList, NULL); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) DeleteMenu(theMenu, IDM_VIEW_TOOLBARS, MF_BYCOMMAND); else { @@ -1595,10 +1595,10 @@ if (int1 == NULL || int2 == NULL) return false; hResult = int1->QueryInterface(IID_PPV_ARG(IUnknown, &int1Retry)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return false; hResult = int2->QueryInterface(IID_PPV_ARG(IUnknown, &int2Retry)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return false; if (int1Retry == int2Retry) return true; @@ -1856,10 +1856,10 @@ if (hmenuShared && IsMenu(hmenuShared) == FALSE) return E_FAIL; hResult = GetMenuBand(IID_PPV_ARG(IShellMenu, &shellMenu)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = shellMenu->SetMenu(hmenuShared, NULL, SMSET_DONTOWN); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; fCurrentMenuBar = hmenuShared; return S_OK; @@ -2083,7 +2083,7 @@ if (fTravelLog.p == NULL) { hResult = CreateTravelLog(IID_PPV_ARG(ITravelLog, &fTravelLog)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } *pptl = fTravelLog.p; @@ -2572,7 +2572,7 @@ HRESULT hResult; hResult = GetTravelLog(&travelLog); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return travelLog->Travel(static_cast<IDropTarget *>(this), TLOG_BACK); } @@ -2583,7 +2583,7 @@ HRESULT hResult; hResult = GetTravelLog(&travelLog); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return travelLog->Travel(static_cast<IDropTarget *>(this), TLOG_FORE); } @@ -2619,7 +2619,7 @@ HRESULT hResult; hResult = fCurrentShellView->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &oleCommandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return oleCommandTarget->Exec(NULL, 22, 1, Level, NULL); } @@ -2831,7 +2831,7 @@ return E_INVALIDARG; pidl = (LPITEMIDLIST)V_ARRAY(URL)->pvData; hResult = BrowseToPIDL((LPITEMIDLIST)pidl, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; } @@ -2975,7 +2975,7 @@ HRESULT hResult; hResult = pStream->Read(&oldState, sizeof(oldState), &numRead); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; if (numRead != sizeof(oldState) || oldState.dwSize != sizeof(oldState)) return E_FAIL; @@ -2985,7 +2985,7 @@ if (pidl == NULL) return E_OUTOFMEMORY; hResult = pStream->Read(pidl, oldState.pidlSize, &numRead); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { ILFree(pidl); return hResult; @@ -3005,7 +3005,7 @@ fHistoryStream = NULL; fHistoryBindContext = NULL; ILFree(pidl); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK; } @@ -3025,20 +3025,20 @@ if (viewPersistHistory.p != NULL) { hResult = viewPersistHistory->GetClassID(&newState.persistClass); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } newState.pidlSize = ILGetSize(fCurrentDirectoryPIDL); hResult = pStream->Write(&newState, sizeof(newState), NULL); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = pStream->Write(fCurrentDirectoryPIDL, newState.pidlSize, NULL); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; if (viewPersistHistory.p != NULL) { hResult = viewPersistHistory->SaveHistory(pStream); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } return S_OK; @@ -3272,7 +3272,7 @@ hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TOOLBARLOCKED, 0, NULL, NULL); return 0; @@ -3285,7 +3285,7 @@ hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TOOLBARBANDSHOWN, 0, NULL, NULL); return 0; @@ -3298,7 +3298,7 @@ hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_ADDRESSBANDSHOWN, 0, NULL, NULL); return 0; @@ -3311,7 +3311,7 @@ hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_LINKSBANDSHOWN, 0, NULL, NULL); return 0; @@ -3324,7 +3324,7 @@ hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TEXTLABELS, 0, NULL, NULL); return 0; @@ -3337,7 +3337,7 @@ hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_CUSTOMIZEENABLED, 0, NULL, NULL); return 0; @@ -3369,7 +3369,7 @@ } hResult = theCabinet->Initialize(parameters->directoryPIDL, 0, 0, 0); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return E_OUTOFMEMORY; while ((Ret = GetMessage(&Msg, NULL, 0, 0)) != 0) Modified: branches/shell-experiments/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] Wed Jun 4 18:08:35 2014 @@ -270,7 +270,7 @@ if (pUnkSite == NULL) return S_OK; hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &fDockSite)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; parentWindow = NULL; hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); @@ -450,7 +450,7 @@ if (theToolbar == NULL) return E_OUTOFMEMORY; hResult = theToolbar->QueryInterface(riid, reinterpret_cast<void **>(ppv)); - if (FAILED(hResult)) + if (FAILED_UNEXPECTEDLY(hResult)) { delete theToolbar; return hResult;

1 0

[jgardou] 63540: [NTOS/PS] - ULONG --> ULONG_PTR
by jgardou＠svn.reactos.org 04 Jun '14

04 Jun '14

Author: jgardou Date: Wed Jun 4 17:12:09 2014 New Revision: 63540 URL: http://svn.reactos.org/svn/reactos?rev=63540&view=rev Log: [NTOS/PS] - ULONG --> ULONG_PTR Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=63… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Jun 4 17:12:09 2014 @@ -151,7 +151,7 @@ ProcessBasicInfo->UniqueProcessId = (ULONG_PTR)Process-> UniqueProcessId; ProcessBasicInfo->InheritedFromUniqueProcessId = - (ULONG)Process->InheritedFromUniqueProcessId; + (ULONG_PTR)Process->InheritedFromUniqueProcessId; ProcessBasicInfo->BasePriority = Process->Pcb.BasePriority; }

1 0

[dquintana] 63539: [SHELL32] * Fix gcc compilation. [BROWSEUI/RSHELL] * Use virtual destructors and cleanup with delete in the creator functions. * Try to fix a bit the "close" flow, so that less c...
by dquintana＠svn.reactos.org 04 Jun '14

04 Jun '14

Author: dquintana Date: Wed Jun 4 16:25:48 2014 New Revision: 63539 URL: http://svn.reactos.org/svn/reactos?rev=63539&view=rev Log: [SHELL32] * Fix gcc compilation. [BROWSEUI/RSHELL] * Use virtual destructors and cleanup with delete in the creator functions. * Try to fix a bit the "close" flow, so that less circular references remain when the filebrowser windows are closed. 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/CMenuDeskBar.h branches/shell-experiments/base/shell/rshell/CMenuSite.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.h branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp branches/shell-experiments/base/shell/rshell/CMergedFolder.h branches/shell-experiments/dll/win32/browseui/addressband.cpp branches/shell-experiments/dll/win32/browseui/addressband.h branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.h branches/shell-experiments/dll/win32/browseui/precomp.h branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/browseui/toolsband.cpp branches/shell-experiments/dll/win32/shell32/shlview.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] Wed Jun 4 16:25:48 2014 @@ -52,7 +52,7 @@ hr = site->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) - site->Release(); + delete site; #endif return hr; @@ -255,14 +255,15 @@ return m_site->QueryInterface(riid, ppvSite); } -HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow( - HWND *phwnd) +HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow(HWND *phwnd) { if (m_SFToolbar != NULL) return m_SFToolbar->GetWindow(phwnd); if (m_staticToolbar != NULL) return m_staticToolbar->GetWindow(phwnd); + + if (phwnd) *phwnd = NULL; return E_FAIL; } @@ -417,10 +418,25 @@ ShowDW(FALSE); if (m_staticToolbar != NULL) - return m_staticToolbar->Close(); + { + m_staticToolbar->Close(); + delete m_staticToolbar; + m_staticToolbar = NULL; + } if (m_SFToolbar != NULL) - return m_SFToolbar->Close(); + { + m_SFToolbar->Close(); + delete m_staticToolbar; + m_staticToolbar = NULL; + } + + if (m_site) m_site.Release(); + if (m_psmc) m_psmc.Release(); + if (m_subMenuChild) m_subMenuChild.Release(); + if (m_subMenuParent) m_subMenuParent.Release(); + if (m_childBand) m_childBand.Release(); + if (m_parentBand) m_parentBand.Release(); return S_OK; } 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] Wed Jun 4 16:25:48 2014 @@ -69,7 +69,7 @@ public: CMenuBand(); - ~CMenuBand(); + virtual ~CMenuBand(); DECLARE_NOT_AGGREGATABLE(CMenuBand) DECLARE_PROTECT_FINAL_CONSTRUCT() 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] Wed Jun 4 16:25:48 2014 @@ -47,7 +47,7 @@ hr = deskbar->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) - deskbar->Release(); + delete deskbar; #endif return hr; Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -52,7 +52,7 @@ public: CMenuDeskBar(); - ~CMenuDeskBar(); + virtual ~CMenuDeskBar(); DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) DECLARE_PROTECT_FINAL_CONSTRUCT() 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] Wed Jun 4 16:25:48 2014 @@ -45,7 +45,7 @@ hr = site->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) - site->Release(); + delete site; #endif return hr; Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -39,7 +39,7 @@ public: CMenuSite(); - ~CMenuSite() {} + virtual ~CMenuSite() {} DECLARE_WND_CLASS_EX(_T("MenuSite"), 0, COLOR_MENU) Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -36,7 +36,7 @@ public: CEnumMergedFolder() : m_UserLocal(NULL), m_AllUSers(NULL), m_FirstDone(FALSE) {} - ~CEnumMergedFolder() {} + virtual ~CEnumMergedFolder() {} DECLARE_NOT_AGGREGATABLE(CEnumMergedFolder) DECLARE_PROTECT_FINAL_CONSTRUCT() @@ -139,7 +139,7 @@ hr = fld->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) - fld->Release(); + delete fld; return hr; } Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMergedFolder.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMergedFolder.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -29,7 +29,7 @@ public: CMergedFolder() {} - ~CMergedFolder() {} + virtual ~CMergedFolder() {} HRESULT _SetSources(IShellFolder* userLocal, IShellFolder* allUSers); Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -111,15 +111,9 @@ HRESULT STDMETHODCALLTYPE CAddressBand::SetSite(IUnknown *pUnkSite) { CComPtr<IBrowserService> browserService; - CComPtr<IOleWindow> oleWindow; CComPtr<IShellService> shellService; - CComPtr<IUnknown> offset34; HWND parentWindow; HWND combobox; - static const TBBUTTON buttonInfo[] = { {0, 1, TBSTATE_ENABLED, 0} }; - HIMAGELIST normalImagelist; - HIMAGELIST hotImageList; - HINSTANCE shellInstance; HRESULT hResult; if (pUnkSite == NULL) @@ -137,7 +131,7 @@ // get window handle of parent parentWindow = NULL; - hResult = IUnknown_GetWindow(pUnkSite, &parentWindow); + hResult = IUnknown_GetWindow(fSite, &parentWindow); if (!::IsWindow(parentWindow)) return E_FAIL; @@ -182,35 +176,43 @@ // TODO: properly initialize this from registry fGoButtonShown = true; - shellInstance = GetModuleHandle(_T("shell32.dll")); - normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), - 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), - 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - - fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | - WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | - CCS_NOPARENTALIGN | CCS_NORESIZE, - 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); - SendMessage(fGoButton, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - SendMessage(fGoButton, TB_SETMAXTEXTROWS, 1, 0); - if (normalImagelist) - SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(normalImagelist)); - if (hotImageList) - SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(hotImageList)); - SendMessage(fGoButton, TB_ADDSTRINGW, - reinterpret_cast<WPARAM>(_AtlBaseModule.GetResourceInstance()), IDS_GOBUTTONLABEL); - SendMessage(fGoButton, TB_ADDBUTTONSW, 1, (LPARAM)&buttonInfo); - - IImageList * piml; - HRESULT hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); - if (FAILED_UNEXPECTEDLY(hr)) - { - SendMessageW(combobox, CBEM_SETIMAGELIST, 0, 0); - } - else - { - SendMessageW(combobox, CBEM_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); + if (fGoButtonShown) + { + const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; + HIMAGELIST normalImagelist; + HIMAGELIST hotImageList; + HINSTANCE shellInstance; + + shellInstance = GetModuleHandle(_T("shell32.dll")); + normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + + fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | + WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | + CCS_NOPARENTALIGN | CCS_NORESIZE, + 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); + SendMessage(fGoButton, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + SendMessage(fGoButton, TB_SETMAXTEXTROWS, 1, 0); + if (normalImagelist) + SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(normalImagelist)); + if (hotImageList) + SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast<LPARAM>(hotImageList)); + SendMessage(fGoButton, TB_ADDSTRINGW, + reinterpret_cast<WPARAM>(_AtlBaseModule.GetResourceInstance()), IDS_GOBUTTONLABEL); + SendMessage(fGoButton, TB_ADDBUTTONSW, 1, (LPARAM) &buttonInfo); + + IImageList * piml; + HRESULT hr = SHGetImageList(SHIL_SMALL, IID_PPV_ARG(IImageList, &piml)); + if (FAILED_UNEXPECTEDLY(hr)) + { + SendMessageW(combobox, CBEM_SETIMAGELIST, 0, 0); + } + else + { + SendMessageW(combobox, CBEM_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml)); + } } // take advice to watch events @@ -251,6 +253,9 @@ DestroyWindow(); m_hWnd = NULL; + + if (fAddressEditBox) fAddressEditBox.Release(); + if (fSite) fSite.Release(); return S_OK; } @@ -662,8 +667,8 @@ HRESULT CreateAddressBand(REFIID riid, void **ppv) { - CComObject<CAddressBand> *theMenuBar; - HRESULT hResult; + CAddressBand *theMenuBar; + HRESULT hResult; if (ppv == NULL) return E_POINTER; Modified: branches/shell-experiments/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addressband.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addressband.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -45,7 +45,7 @@ DWORD fAdviseCookie; public: CAddressBand(); - ~CAddressBand(); + virtual ~CAddressBand(); private: void FocusChange(BOOL bFocus); public: Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -93,6 +93,44 @@ if (FAILED(hr)) return hr; return pio->TranslateAcceleratorIO(pmsg); +} + +HRESULT IUnknown_RelayWinEvent(IUnknown * punk, HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + CComPtr<IWinEventHandler> menuWinEventHandler; + HRESULT hResult = punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = menuWinEventHandler->IsWindowOwner(hWnd); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + if (hResult == S_OK) + return menuWinEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); + return S_FALSE; +} + +HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow) +{ + CComPtr<IDockingWindow> dockingWindow; + HRESULT hResult = punk->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = dockingWindow->ShowDW(fShow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + return S_OK; +} + +HRESULT IUnknown_CloseDW(IUnknown * punk, DWORD dwReserved) +{ + CComPtr<IDockingWindow> dockingWindow; + HRESULT hResult = punk->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = dockingWindow->CloseDW(dwReserved); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + return S_OK; } typedef HRESULT(*PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); @@ -180,31 +218,19 @@ HRESULT CDockSite::Initialize(IUnknown *containedBand, CInternetToolbar *browser, HWND hwnd, int bandID, int flags) { - CComPtr<IObjectWithSite> child; - CComPtr<IOleWindow> oleWindow; - CComPtr<IDeskBand> deskBand; TCHAR textBuffer[40]; REBARBANDINFOW bandInfo; HRESULT hResult; - hResult = containedBand->QueryInterface(IID_PPV_ARG(IObjectWithSite, &child)); - if (FAILED(hResult)) - return hResult; - hResult = containedBand->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (FAILED(hResult)) - return hResult; - hResult = containedBand->QueryInterface(IID_PPV_ARG(IDeskBand, &deskBand)); - if (FAILED(hResult)) - return hResult; fContainedBand = containedBand; fToolbar = browser; fRebarWindow = hwnd; fBandID = bandID; fFlags = flags; - hResult = child->SetSite(static_cast<IOleWindow *>(this)); - if (FAILED(hResult)) - return hResult; - hResult = oleWindow->GetWindow(&fChildWindow); + hResult = IUnknown_SetSite(containedBand, static_cast<IOleWindow *>(this)); + if (FAILED(hResult)) + return hResult; + hResult = IUnknown_GetWindow(containedBand, &fChildWindow); if (FAILED(hResult)) return hResult; @@ -533,10 +559,9 @@ void CInternetToolbar::AddDockItem(IUnknown *newItem, int bandID, int flags) { - CDockSite *newSite; + CComPtr<CDockSite> newSite; newSite = new CComObject<CDockSite>; - newSite->AddRef(); newSite->Initialize(newItem, this, fMainReBar, bandID, flags); } @@ -624,10 +649,7 @@ hResult = (*menuBar)->SetMenu((HMENU)V_INTREF(&menuOut), ownerWindow, SMSET_DONTOWN); if (FAILED(hResult)) return hResult; - hResult = (*menuBar)->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); - if (FAILED(hResult)) - return hResult; - hResult = commandTarget->Exec(&CGID_MenuBand, 3, 1, NULL, NULL); + hResult = IUnknown_Exec(*menuBar, CGID_MenuBand, 3, 1, NULL, NULL); if (FAILED(hResult)) return hResult; return S_OK; @@ -635,43 +657,25 @@ HRESULT CInternetToolbar::CreateBrandBand(IUnknown **logoBar) { - CComPtr<IUnknown> tempBand; - HRESULT hResult; - #if 1 - hResult = ::CreateBrandBand(IID_PPV_ARG(IUnknown, logoBar)); + return ::CreateBrandBand(IID_PPV_ARG(IUnknown, logoBar)); #else - hResult = CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, logoBar)); + return CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, logoBar)); #endif - if (FAILED(hResult)) - return hResult; - return S_OK; } HRESULT CInternetToolbar::CreateToolsBar(IUnknown **toolsBar) { - HRESULT hResult; - - hResult = ::CreateToolsBar(IID_PPV_ARG(IUnknown, toolsBar)); - if (FAILED(hResult)) - return hResult; - return S_OK; + return ::CreateToolsBar(IID_PPV_ARG(IUnknown, toolsBar)); } HRESULT CInternetToolbar::CreateAddressBand(IUnknown **toolsBar) { - CComPtr<IAddressBand> addressBand; - HRESULT hResult; - #if 1 - hResult = ::CreateAddressBand(IID_PPV_ARG(IUnknown, toolsBar)); + return ::CreateAddressBand(IID_PPV_ARG(IUnknown, toolsBar)); #else - hResult = CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, toolsBar)); + return CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, toolsBar)); #endif - if (FAILED(hResult)) - return hResult; - hResult = (*toolsBar)->QueryInterface(IID_PPV_ARG(IAddressBand, &addressBand)); - return S_OK; } HRESULT CInternetToolbar::LockUnlockToolbars(bool locked) @@ -825,43 +829,54 @@ if (fShow) { hResult = ReserveBorderSpace(); - } + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } + if (fMenuBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->ShowDW(fShow); - } + hResult = IUnknown_ShowDW(fMenuBar, fShow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } + if (fControlsBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->ShowDW(fShow); + hResult = IUnknown_ShowDW(fControlsBar, fShow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; } if (fNavigationBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->ShowDW(fShow); + hResult = IUnknown_ShowDW(fNavigationBar, fShow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; } if (fLogoBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fLogoBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->ShowDW(fShow); + hResult = IUnknown_ShowDW(fLogoBar, fShow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; } return S_OK; } template<class T> -void ReleaseCComPtrExpectZero(CComPtr<T>& cptr) +void ReleaseCComPtrExpectZero(CComPtr<T>& cptr, BOOL forceRelease = FALSE) { if (cptr.p != NULL) { int nrc = cptr->Release(); if (nrc > 0) { - DbgPrint("WARNING: Unexpected RefCount > 0!\n"); + DbgPrint("WARNING: Unexpected RefCount > 0 (%d)!\n", nrc); + if (forceRelease) + { + while (nrc > 0) + { + nrc = cptr->Release(); + } + } } cptr.Detach(); } @@ -873,32 +888,32 @@ if (fMenuBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->CloseDW(dwReserved); - } - ReleaseCComPtrExpectZero(fMenuBar); + hResult = IUnknown_CloseDW(fMenuBar, dwReserved); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + ReleaseCComPtrExpectZero(fMenuBar); + } if (fControlsBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->CloseDW(dwReserved); - } - ReleaseCComPtrExpectZero(fControlsBar); + hResult = IUnknown_CloseDW(fControlsBar, dwReserved); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + ReleaseCComPtrExpectZero(fControlsBar); + } if (fNavigationBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->CloseDW(dwReserved); - } - ReleaseCComPtrExpectZero(fNavigationBar); + hResult = IUnknown_CloseDW(fNavigationBar, dwReserved); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + ReleaseCComPtrExpectZero(fNavigationBar); + } if (fLogoBar) { - CComPtr<IDockingWindow> dockingWindow; - hResult = fLogoBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->CloseDW(dwReserved); - } - ReleaseCComPtrExpectZero(fLogoBar); + hResult = IUnknown_CloseDW(fLogoBar, dwReserved); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + ReleaseCComPtrExpectZero(fLogoBar); + } return S_OK; } @@ -971,9 +986,6 @@ CComPtr<IUnknown> logoBar; CComPtr<IUnknown> toolsBar; CComPtr<IUnknown> navigationBar; - CComPtr<IOleWindow> menuOleWindow; - CComPtr<IOleWindow> toolbarOleWindow; - CComPtr<IOleWindow> navigationOleWindow; HRESULT hResult; /* Create and attach the menubar to the rebar */ @@ -982,8 +994,7 @@ return hResult; AddDockItem(menuBar, ITBBID_MENUBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); - hResult = menuBar->QueryInterface(IID_PPV_ARG(IOleWindow, &menuOleWindow)); - hResult = menuOleWindow->GetWindow(&fMenuBandWindow); + hResult = IUnknown_GetWindow(menuBar, &fMenuBandWindow); fMenuBar.Attach(menuBar.Detach()); // transfer the ref count // FIXME: The ros Rebar does not properly support fixed-size items such as the brandband, @@ -1003,10 +1014,7 @@ return hResult; AddDockItem(toolsBar, ITBBID_TOOLSBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); fControlsBar.Attach(toolsBar.Detach()); // transfer the ref count - hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IOleWindow, &toolbarOleWindow)); - if (FAILED(hResult)) - return hResult; - hResult = toolbarOleWindow->GetWindow(&fToolbarWindow); + hResult = IUnknown_GetWindow(fControlsBar, &fToolbarWindow); if (FAILED(hResult)) return hResult; @@ -1015,9 +1023,8 @@ if (FAILED(hResult)) return hResult; AddDockItem(navigationBar, ITBBID_ADDRESSBAND, CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); - hResult = navigationBar->QueryInterface(IID_PPV_ARG(IOleWindow, &navigationOleWindow)); - hResult = navigationOleWindow->GetWindow(&fNavigationWindow); fNavigationBar.Attach(navigationBar.Detach()); + hResult = IUnknown_GetWindow(fNavigationBar, &fNavigationWindow); return S_OK; } @@ -1330,16 +1337,27 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::OnWinEvent( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - CComPtr<IWinEventHandler> menuWinEventHandler; HRESULT hResult; if (fMenuBar) { - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); - if (menuWinEventHandler->IsWindowOwner(hWnd) == S_OK) - { - return menuWinEventHandler->OnWinEvent(fMenuBandWindow, uMsg, wParam, lParam, theResult); - } + hResult = IUnknown_RelayWinEvent(fMenuBar, hWnd, uMsg, wParam, lParam, theResult); + if (hResult != S_FALSE) + return hResult; + } + + if (fNavigationBar) + { + hResult = IUnknown_RelayWinEvent(fNavigationBar, hWnd, uMsg, wParam, lParam, theResult); + if (hResult != S_FALSE) + return hResult; + } + + if (fLogoBar) + { + hResult = IUnknown_RelayWinEvent(fLogoBar, hWnd, uMsg, wParam, lParam, theResult); + if (hResult != S_FALSE) + return hResult; } return S_FALSE; @@ -1347,16 +1365,19 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::IsWindowOwner(HWND hWnd) { + UNIMPLEMENTED; return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CInternetToolbar::AddBand(IUnknown *punk) { + UNIMPLEMENTED; return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CInternetToolbar::EnumBands(UINT uBand, DWORD *pdwBandID) { + UNIMPLEMENTED; return E_NOTIMPL; } @@ -1751,37 +1772,12 @@ { LRESULT theResult; HRESULT hResult; - HWND target = (HWND) lParam; - - if (fMenuBar) - { - CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); - if (SUCCEEDED(hResult)) - { - if (menuWinEventHandler->IsWindowOwner(target) == S_OK) - { - hResult = menuWinEventHandler->OnWinEvent(target, uMsg, wParam, lParam, &theResult); - return FAILED(hResult) ? 0 : theResult; - } - } - } - - if (fNavigationBar) - { - CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); - if (SUCCEEDED(hResult)) - { - if (menuWinEventHandler->IsWindowOwner(target) == S_OK) - { - hResult = menuWinEventHandler->OnWinEvent(target, uMsg, wParam, lParam, &theResult); - return FAILED(hResult) ? 0 : theResult; - } - } - } - - return 0; + + hResult = OnWinEvent((HWND) lParam, uMsg, wParam, lParam, &theResult); + + bHandled = hResult == S_OK; + + return FAILED_UNEXPECTEDLY(hResult) ? 0 : theResult; } LRESULT CInternetToolbar::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { @@ -1789,37 +1785,13 @@ LRESULT theResult; HRESULT hResult; - notifyHeader = (NMHDR *) lParam; - - if (fMenuBar) - { - CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); - if (SUCCEEDED(hResult)) - { - if (menuWinEventHandler->IsWindowOwner(notifyHeader->hwndFrom) == S_OK) - { - hResult = menuWinEventHandler->OnWinEvent(notifyHeader->hwndFrom, uMsg, wParam, lParam, &theResult); - return FAILED(hResult) ? 0 : theResult; - } - } - } - - if (fNavigationBar) - { - CComPtr<IWinEventHandler> menuWinEventHandler; - hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IWinEventHandler, &menuWinEventHandler)); - if (SUCCEEDED(hResult)) - { - if (menuWinEventHandler->IsWindowOwner(notifyHeader->hwndFrom) == S_OK) - { - hResult = menuWinEventHandler->OnWinEvent(notifyHeader->hwndFrom, uMsg, wParam, lParam, &theResult); - return FAILED(hResult) ? 0 : theResult; - } - } - } - - return 0; + notifyHeader = reinterpret_cast<NMHDR *>(lParam); + + hResult = OnWinEvent(notifyHeader->hwndFrom, uMsg, wParam, lParam, &theResult); + + bHandled = hResult == S_OK; + + return FAILED_UNEXPECTEDLY(hResult) ? 0 : theResult; } LRESULT CInternetToolbar::OnLDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) @@ -1884,8 +1856,8 @@ HRESULT CreateInternetToolbar(REFIID riid, void **ppv) { - CComObject<CInternetToolbar> *theToolbar; - HRESULT hResult; + CInternetToolbar *theToolbar; + HRESULT hResult; if (ppv == NULL) return E_POINTER; Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -45,7 +45,7 @@ CComPtr<IShellMenu> fFavoritesMenu; public: CMenuCallback(); - ~CMenuCallback(); + virtual ~CMenuCallback(); HRESULT STDMETHODCALLTYPE GetObject(LPSMDATA psmd, REFIID riid, void **ppvObject); public: @@ -94,7 +94,7 @@ LONG fStartHeight; public: CInternetToolbar(); - ~CInternetToolbar(); + virtual ~CInternetToolbar(); void AddDockItem(IUnknown *newItem, int bandID, int flags); HRESULT ReserveBorderSpace(LONG maxHeight = -1); HRESULT CreateMenuBar(IShellMenu **menuBar); Modified: branches/shell-experiments/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/precomp.h [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -82,6 +82,78 @@ #define FAILED_UNEXPECTEDLY(hr) FAILED(hr) #endif + +template <class Base> +class CComDebugObject : public Base +{ +public: + CComDebugObject(void * = NULL) + { + _pAtlModule->Lock(); + } + + virtual ~CComDebugObject() + { + this->FinalRelease(); + _pAtlModule->Unlock(); + } + + STDMETHOD_(ULONG, AddRef)() + { + int rc = this->InternalAddRef(); + DbgPrint("RefCount is now %d(++)!\n", rc); + return rc; + } + + STDMETHOD_(ULONG, Release)() + { + ULONG newRefCount; + + newRefCount = this->InternalRelease(); + DbgPrint("RefCount is now %d(--)!\n", newRefCount); + if (newRefCount == 0) + delete this; + return newRefCount; + } + + STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) + { + return this->_InternalQueryInterface(iid, ppvObject); + } + + static HRESULT WINAPI CreateInstance(CComDebugObject<Base> **pp) + { + CComDebugObject<Base> *newInstance; + HRESULT hResult; + + ATLASSERT(pp != NULL); + if (pp == NULL) + return E_POINTER; + + hResult = E_OUTOFMEMORY; + newInstance = NULL; + ATLTRY(newInstance = new CComDebugObject<Base>()) + if (newInstance != NULL) + { + newInstance->SetVoid(NULL); + newInstance->InternalFinalConstructAddRef(); + hResult = newInstance->_AtlInitialConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->FinalConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->_AtlFinalConstruct(); + newInstance->InternalFinalConstructRelease(); + if (hResult != S_OK) + { + delete newInstance; + newInstance = NULL; + } + } + *pp = newInstance; + return hResult; + } +}; + WINE_DEFAULT_DEBUG_CHANNEL(browseui); #endif /* _BROWSEUI_PCH_ */ Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -28,6 +28,8 @@ _Out_ HIMAGELIST *phiml, _Out_ HIMAGELIST *phimlSmall ); + +extern HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow); #include "newatlinterfaces.h" @@ -732,12 +734,9 @@ HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, long b, long c, long d) { - CComPtr<IDockingWindow> dockingWindow; - CComPtr<IStream> settingsStream; CComPtr<IPersistStreamInit> persistStreamInit; - CComPtr<IOleCommandTarget> commandTarget; - CComPtr<IObjectWithSite> objectSite; - HRESULT hResult; + HRESULT hResult; + CComPtr<IUnknown> clientBar; _AtlInitialConstruct(); @@ -756,61 +755,53 @@ if (FAILED(hResult)) return hResult; #else - hResult = CreateInternetToolbar(IID_PPV_ARG(IUnknown, &fClientBars[BIInternetToolbar].clientBar)); + hResult = CreateInternetToolbar(IID_PPV_ARG(IUnknown, &clientBar)); if (FAILED(hResult)) return hResult; #endif + fClientBars[BIInternetToolbar].clientBar = clientBar; + // create interfaces - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IDockingWindow, &dockingWindow)); - if (FAILED(hResult)) + hResult = clientBar->QueryInterface(IID_PPV_ARG(IPersistStreamInit, &persistStreamInit)); + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IPersistStreamInit, &persistStreamInit)); + + hResult = IUnknown_SetSite(clientBar, static_cast<IShellBrowser *>(this)); if (FAILED(hResult)) return hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IOleCommandTarget, &commandTarget)); + + hResult = IUnknown_Exec(clientBar, CGID_PrivCITCommands, 1, 1 /* or 0 */, NULL, NULL); if (FAILED(hResult)) return hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IObjectWithSite, &objectSite)); - if (FAILED(hResult)) - return hResult; - - hResult = objectSite->SetSite(static_cast<IShellBrowser *>(this)); - if (FAILED(hResult)) - return hResult; - - hResult = commandTarget->Exec(&CGID_PrivCITCommands, 1, 1 /* or 0 */, NULL, NULL); - if (FAILED(hResult)) - return hResult; // TODO: create settingsStream from registry entry - if (settingsStream.p == NULL) + //if (settingsStream.p) + //{ + // hResult = persistStreamInit->Load(settingsStream); + // if (FAILED_UNEXPECTEDLY(hResult)) + // return hResult; + //} + //else { hResult = persistStreamInit->InitNew(); if (FAILED(hResult)) return hResult; } - else - { - hResult = persistStreamInit->Load(settingsStream); - if (FAILED(hResult)) - return hResult; - } - hResult = dockingWindow->ShowDW(TRUE); - if (FAILED(hResult)) + + hResult = IUnknown_ShowDW(clientBar, TRUE); + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - fToolbarProxy.Initialize(m_hWnd, fClientBars[BIInternetToolbar].clientBar); + fToolbarProxy.Initialize(m_hWnd, clientBar); + // create status bar fStatusBar = CreateWindow(STATUSCLASSNAMEW, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | SBT_NOBORDERS | SBT_TOOLTIPS, 0, 0, 500, 20, m_hWnd, (HMENU)0xa001, _AtlBaseModule.GetModuleInstance(), 0); fStatusBarVisible = true; + // browse hResult = BrowseToPIDL(pidl, BTP_UPDATE_NEXT_HISTORY); @@ -1091,14 +1082,8 @@ CComPtr<IDeskBand> deskBand; HRESULT hResult; - if (fClientBars[BIInternetToolbar].clientBar.p == NULL) - return E_FAIL; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface( - IID_PPV_ARG(IServiceProvider, &serviceProvider)); - if (FAILED(hResult)) - return hResult; - hResult = serviceProvider->QueryService(SID_IBandSite, IID_PPV_ARG(IBandSite, &bandSite)); - if (FAILED(hResult)) + hResult = IUnknown_QueryService(fClientBars[BIInternetToolbar].clientBar, SID_IBandSite, IID_PPV_ARG(IBandSite, &bandSite)); + if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = bandSite->QueryBand(1, &deskBand, NULL, NULL, 0); if (FAILED(hResult)) @@ -1291,7 +1276,6 @@ CShellBrowser *pThis = reinterpret_cast<CShellBrowser *>(hWnd); _ATL_MSG msg(pThis->m_hWnd, uMsg, wParam, lParam); LRESULT lResult; - CComPtr<IMenuBand> menuBand; const _ATL_MSG *previousMessage; BOOL handled; WNDPROC saveWindowProc; @@ -1301,6 +1285,7 @@ previousMessage = pThis->m_pCurrentMsg; pThis->m_pCurrentMsg = &msg; + CComPtr<IMenuBand> menuBand; hResult = pThis->GetMenuBand(IID_PPV_ARG(IMenuBand, &menuBand)); if (SUCCEEDED(hResult) && menuBand.p != NULL) { @@ -1311,6 +1296,7 @@ wParam = msg.wParam; lParam = msg.lParam; } + menuBand.Release(); handled = pThis->ProcessWindowMessage(hWnd, uMsg, wParam, lParam, lResult, 0); ATLASSERT(pThis->m_pCurrentMsg == &msg); @@ -1867,7 +1853,7 @@ CComPtr<IShellMenu> shellMenu; HRESULT hResult; - if (IsMenu(hmenuShared) == FALSE) + if (hmenuShared && IsMenu(hmenuShared) == FALSE) return E_FAIL; hResult = GetMenuBand(IID_PPV_ARG(IShellMenu, &shellMenu)); if (FAILED(hResult)) @@ -1882,7 +1868,10 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::RemoveMenusSB(HMENU hmenuShared) { if (hmenuShared == fCurrentMenuBar) - fCurrentMenuBar = NULL; + { + //DestroyMenu(fCurrentMenuBar); + SetMenuSB(NULL, NULL, NULL); + } return S_OK; } @@ -3072,7 +3061,7 @@ } template<class T> -void ReleaseCComPtrExpectZero(CComPtr<T>& cptr) +void ReleaseCComPtrExpectZero(CComPtr<T>& cptr, BOOL forceRelease = FALSE) { if (cptr.p != NULL) { @@ -3080,6 +3069,13 @@ if (nrc > 0) { DbgPrint("WARNING: Unexpected RefCount > 0!\n"); + if (forceRelease) + { + while (nrc > 0) + { + nrc = cptr->Release(); + } + } } cptr.Detach(); } @@ -3361,8 +3357,8 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) { - CComPtr< CComObject<CShellBrowser> > theCabinet; - HRESULT hResult; + CComPtr<CShellBrowser> theCabinet; + HRESULT hResult; MSG Msg; BOOL Ret; @@ -3384,14 +3380,14 @@ break; } + if (Msg.message == WM_QUIT) + break; + if (theCabinet->v_MayTranslateAccelerator(&Msg) != S_OK) { TranslateMessage(&Msg); DispatchMessage(&Msg); } - - if (Msg.message == WM_QUIT) - break; } //TerminateProcess(GetCurrentProcess(), hResult); @@ -3399,7 +3395,9 @@ int nrc = theCabinet->Release(); if (nrc > 0) { - DbgPrint("WARNING: There are %d references to the CShellBrowser active or leaked, process will never terminate.\n"); + DbgPrint("WARNING: There are %d references to the CShellBrowser active or leaked, process will never terminate. Terminating forcefully.\n", nrc); + + //TerminateProcess(GetCurrentProcess(), 1); } theCabinet.Detach(); Modified: branches/shell-experiments/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -37,12 +37,12 @@ public IPersistStream { private: - IDockingWindowSite *fDockSite; + CComPtr<IDockingWindowSite> fDockSite; GUID fExecCommandCategory; CComPtr<IOleCommandTarget> fExecCommandTarget; public: CToolsBand(); - ~CToolsBand(); + virtual ~CToolsBand(); public: // *** IDeskBand methods *** virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO* pdbi); @@ -95,14 +95,12 @@ }; CToolsBand::CToolsBand() -{ - fDockSite = NULL; + : fDockSite(NULL) +{ } CToolsBand::~CToolsBand() { - if (fDockSite) - fDockSite->Release(); } HRESULT STDMETHODCALLTYPE CToolsBand::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO* pdbi) @@ -267,8 +265,8 @@ HWND toolbar; HRESULT hResult; - if (fDockSite != NULL) - fDockSite->Release(); + if(fDockSite) fDockSite.Release(); + if (pUnkSite == NULL) return S_OK; hResult = pUnkSite->QueryInterface(IID_PPV_ARG(IDockingWindowSite, &fDockSite)); @@ -364,6 +362,8 @@ m_hWnd = NULL; + if (fDockSite) fDockSite.Release(); + return S_OK; } @@ -440,19 +440,19 @@ HRESULT CreateToolsBar(REFIID riid, void **ppv) { - CComObject<CToolsBand> *theMenuBar; - HRESULT hResult; + CToolsBand *theToolbar; + HRESULT hResult; if (ppv == NULL) return E_POINTER; *ppv = NULL; - ATLTRY (theMenuBar = new CComObject<CToolsBand>); - if (theMenuBar == NULL) + ATLTRY(theToolbar = new CComObject<CToolsBand>); + if (theToolbar == NULL) return E_OUTOFMEMORY; - hResult = theMenuBar->QueryInterface(riid, reinterpret_cast<void **>(ppv)); + hResult = theToolbar->QueryInterface(riid, reinterpret_cast<void **>(ppv)); if (FAILED(hResult)) { - delete theMenuBar; + delete theToolbar; return hResult; } return S_OK; Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Wed Jun 4 16:25:48 2014 @@ -1382,7 +1382,6 @@ INT mic = GetMenuItemCount(m_hMenu); for (int i = 0; i < mic; i++) { - HMENU submenu = GetSubMenu(m_hMenu, 0); DeleteMenu(m_hMenu, 0, MF_BYPOSITION); }

1 0

[aandrejevic] 63538: [NTVDM] Fix the command line NULL-termination.
by aandrejevic＠svn.reactos.org 03 Jun '14

03 Jun '14

Author: aandrejevic Date: Tue Jun 3 22:34:49 2014 New Revision: 63538 URL: http://svn.reactos.org/svn/reactos?rev=63538&view=rev Log: [NTVDM] Fix the command line NULL-termination. Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Tue Jun 3 22:34:49 2014 @@ -915,6 +915,7 @@ PIMAGE_DOS_HEADER Header; PDWORD RelocationTable; PWORD RelocWord; + LPSTR CmdLinePtr = (LPSTR)CommandLine; DPRINT1("DosLoadExecutable(%d, %s, %s, %s, 0x%08X, 0x%08X)\n", LoadType, @@ -931,8 +932,8 @@ } /* NULL-terminate the command line by removing the return carriage character */ - while (*CommandLine && *CommandLine != '\r') CommandLine++; - *(LPSTR)CommandLine = '\0'; + while (*CmdLinePtr && *CmdLinePtr != '\r') CmdLinePtr++; + *CmdLinePtr = '\0'; /* Open a handle to the executable */ FileHandle = CreateFileA(ExecutablePath,

1 0

[dquintana] 63537: [BROWSEUI] * Plug a few menu leaks. In Windows, it brings down the leaked menus from 20 per navigation, to only 1-2. In ReactOS, from 60 to 20. [RSHELL, SHELL32] * Code tweaks tha...
by dquintana＠svn.reactos.org 03 Jun '14

03 Jun '14

Author: dquintana Date: Tue Jun 3 01:04:19 2014 New Revision: 63537 URL: http://svn.reactos.org/svn/reactos?rev=63537&view=rev Log: [BROWSEUI] * Plug a few menu leaks. In Windows, it brings down the leaked menus from 20 per navigation, to only 1-2. In ReactOS, from 60 to 20. [RSHELL,SHELL32] * Code tweaks that shouldn't change the actual behaviour. Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/shlview.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] Tue Jun 3 01:04:19 2014 @@ -1095,6 +1095,10 @@ { } +CMenuStaticToolbar::~CMenuStaticToolbar() +{ +} + HRESULT CMenuStaticToolbar::GetMenu( _Out_opt_ HMENU *phmenu, _Out_opt_ HWND *phwnd, 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] Tue Jun 3 01:04:19 2014 @@ -132,7 +132,7 @@ public: CMenuStaticToolbar(CMenuBand *menuBand); - virtual ~CMenuStaticToolbar() {} + virtual ~CMenuStaticToolbar(); HRESULT SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags); HRESULT GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Tue Jun 3 01:04:19 2014 @@ -1680,6 +1680,8 @@ SendMessage(fToolbarWindow, TB_CUSTOMIZE, 0, 0); break; } + + DestroyMenu(contextMenuBar); return 1; } Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Tue Jun 3 01:04:19 2014 @@ -1571,8 +1571,15 @@ DeleteMenu(theMenu, IDM_VIEW_TOOLBARS, MF_BYCOMMAND); else { + menuItemInfo.cbSize = sizeof(menuItemInfo); + menuItemInfo.fMask = MIIM_SUBMENU; + GetMenuItemInfo(theMenu, IDM_VIEW_TOOLBARS, FALSE, &menuItemInfo); + DestroyMenu(menuItemInfo.hSubMenu); + toolbarMenuBar = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_CABINET_CONTEXTMENU)); toolbarMenu = GetSubMenu(toolbarMenuBar, 0); + RemoveMenu(toolbarMenuBar, 0, MF_BYPOSITION); + DestroyMenu(toolbarMenuBar); SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_STANDARDBUTTONS, commandList[0].cmdf); SHCheckMenuItem(toolbarMenu, IDM_TOOLBARS_ADDRESSBAR, commandList[1].cmdf & OLECMDF_ENABLED); @@ -1847,6 +1854,8 @@ int GCCU(itemCount3) = GetMenuItemCount(hmenuShared); Unused(itemCount3); + DestroyMenu(mainMenu); + lpMenuWidths->width[0] = 2; lpMenuWidths->width[2] = 3; lpMenuWidths->width[4] = 1; Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Tue Jun 3 01:04:19 2014 @@ -1383,9 +1383,7 @@ for (int i = 0; i < mic; i++) { HMENU submenu = GetSubMenu(m_hMenu, 0); - RemoveMenu(m_hMenu, 0, MF_BYPOSITION); - if (submenu) - DestroyMenu(submenu); + DeleteMenu(m_hMenu, 0, MF_BYPOSITION); } m_pShellBrowser->InsertMenusSB(m_hMenu, &omw);

1 0

[dquintana] 63536: [BROWSEUI] * Fix gcc build.
by dquintana＠svn.reactos.org 02 Jun '14

02 Jun '14

Author: dquintana Date: Mon Jun 2 21:37:26 2014 New Revision: 63536 URL: http://svn.reactos.org/svn/reactos?rev=63536&view=rev Log: [BROWSEUI] * Fix gcc build. Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon Jun 2 21:37:26 2014 @@ -3352,7 +3352,7 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) { - CComPtr<CComObject<CShellBrowser>> theCabinet; + CComPtr< CComObject<CShellBrowser> > theCabinet; HRESULT hResult; MSG Msg; BOOL Ret;

1 0

[dquintana] 63535: [BROWSEUI/RSHELL] * Begin fixing the process of destroying the related objects when closing the window, so that eventually the filebrowser/explorer process will properly exit cle...
by dquintana＠svn.reactos.org 02 Jun '14

02 Jun '14

Author: dquintana Date: Mon Jun 2 21:35:32 2014 New Revision: 63535 URL: http://svn.reactos.org/svn/reactos?rev=63535&view=rev Log: [BROWSEUI/RSHELL] * Begin fixing the process of destroying the related objects when closing the window, so that eventually the filebrowser/explorer process will properly exit cleanly when no more windows are open. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.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] Mon Jun 2 21:35:32 2014 @@ -74,7 +74,8 @@ m_hotBar(NULL), m_hotItem(-1), m_popupBar(NULL), - m_popupItem(-1) + m_popupItem(-1), + m_Show(FALSE) { m_focusManager = CMenuFocusManager::AcquireManager(); } @@ -363,6 +364,9 @@ { HRESULT hr = S_OK; + if (m_Show == fShow) + return S_OK; + if (m_staticToolbar != NULL) { hr = m_staticToolbar->ShowWindow(fShow); @@ -402,6 +406,8 @@ else hr = m_focusManager->PopMenuBar(this); } + + m_Show = fShow; return S_OK; } 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] Mon Jun 2 21:35:32 2014 @@ -65,6 +65,8 @@ CMenuToolbarBase * m_popupBar; INT m_popupItem; + BOOL m_Show; + public: CMenuBand(); ~CMenuBand(); Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon Jun 2 21:35:32 2014 @@ -819,19 +819,87 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::ShowDW(BOOL fShow) { - CComPtr<IDockingWindow> dockingWindow; HRESULT hResult; // show the bar here - hResult = ReserveBorderSpace(); - hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - hResult = dockingWindow->ShowDW(fShow); - return S_OK; + if (fShow) + { + hResult = ReserveBorderSpace(); + } + if (fMenuBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->ShowDW(fShow); + } + if (fControlsBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->ShowDW(fShow); + } + if (fNavigationBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->ShowDW(fShow); + } + if (fLogoBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fLogoBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->ShowDW(fShow); + } + return S_OK; +} + +template<class T> +void ReleaseCComPtrExpectZero(CComPtr<T>& cptr) +{ + if (cptr.p != NULL) + { + int nrc = cptr->Release(); + if (nrc > 0) + { + DbgPrint("WARNING: Unexpected RefCount > 0!\n"); + } + cptr.Detach(); + } } HRESULT STDMETHODCALLTYPE CInternetToolbar::CloseDW(DWORD dwReserved) { - return E_NOTIMPL; + HRESULT hResult; + + if (fMenuBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fMenuBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->CloseDW(dwReserved); + } + ReleaseCComPtrExpectZero(fMenuBar); + if (fControlsBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->CloseDW(dwReserved); + } + ReleaseCComPtrExpectZero(fControlsBar); + if (fNavigationBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fNavigationBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->CloseDW(dwReserved); + } + ReleaseCComPtrExpectZero(fNavigationBar); + if (fLogoBar) + { + CComPtr<IDockingWindow> dockingWindow; + hResult = fLogoBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = dockingWindow->CloseDW(dwReserved); + } + ReleaseCComPtrExpectZero(fLogoBar); + return S_OK; } HRESULT STDMETHODCALLTYPE CInternetToolbar::ResizeBorderDW(LPCRECT prcBorder, Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon Jun 2 21:35:32 2014 @@ -3062,9 +3062,49 @@ return 0; } +template<class T> +void ReleaseCComPtrExpectZero(CComPtr<T>& cptr) +{ + if (cptr.p != NULL) + { + int nrc = cptr->Release(); + if (nrc > 0) + { + DbgPrint("WARNING: Unexpected RefCount > 0!\n"); + } + cptr.Detach(); + } +} + LRESULT CShellBrowser::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { + HRESULT hr; // TODO: rip down everything + { + fCurrentShellView->DestroyViewWindow(); + fCurrentShellView->UIActivate(SVUIA_DEACTIVATE); + ReleaseCComPtrExpectZero(fCurrentShellView); + + for (int i = 0; i < 3; i++) + { + if (fClientBars[i].clientBar == NULL) + continue; + IDockingWindow * pdw; + hr = fClientBars[i].clientBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &pdw)); + if (FAILED_UNEXPECTEDLY(hr)) + continue; + pdw->ShowDW(FALSE); + pdw->CloseDW(0); + pdw->Release(); + ReleaseCComPtrExpectZero(fClientBars[i].clientBar); + } + ReleaseCComPtrExpectZero(fTravelLog); + + fCurrentShellFolder.Release(); + ILFree(fCurrentDirectoryPIDL); + ::DestroyWindow(fStatusBar); + DestroyMenu(fCurrentMenuBar); + } PostQuitMessage(0); return 0; } @@ -3312,31 +3352,20 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) { - CComPtr<IShellBrowser> shellBrowser; - CComObject<CShellBrowser> *theCabinet; + CComPtr<CComObject<CShellBrowser>> theCabinet; HRESULT hResult; MSG Msg; BOOL Ret; - - OleInitialize(NULL); - + ATLTRY(theCabinet = new CComObject<CShellBrowser>); if (theCabinet == NULL) { - hResult = E_OUTOFMEMORY; - goto uninitialize; - } - - hResult = theCabinet->QueryInterface(IID_PPV_ARG(IShellBrowser, &shellBrowser)); - if (FAILED(hResult)) - { - delete theCabinet; - goto uninitialize; - } - + return E_OUTOFMEMORY; + } + hResult = theCabinet->Initialize(parameters->directoryPIDL, 0, 0, 0); if (FAILED(hResult)) - goto uninitialize; + return E_OUTOFMEMORY; while ((Ret = GetMessage(&Msg, NULL, 0, 0)) != 0) { @@ -3355,14 +3384,30 @@ if (Msg.message == WM_QUIT) break; } - -uninitialize: + + //TerminateProcess(GetCurrentProcess(), hResult); + + int nrc = theCabinet->Release(); + if (nrc > 0) + { + DbgPrint("WARNING: There are %d references to the CShellBrowser active or leaked, process will never terminate.\n"); + } + + theCabinet.Detach(); + + return hResult; +} + +DWORD WINAPI BrowserThreadProc(LPVOID lpThreadParameter) +{ + HRESULT hr; + IEThreadParamBlock * parameters = (IEThreadParamBlock *) lpThreadParameter; + + OleInitialize(NULL); + + ATLTRY(hr = ExplorerMessageLoop(parameters)); + OleUninitialize(); - return hResult; -} - -DWORD WINAPI BrowserThreadProc(LPVOID lpThreadParameter) -{ - IEThreadParamBlock * parameters = (IEThreadParamBlock *) lpThreadParameter; - return ExplorerMessageLoop(parameters); -} + + return hr; +}

1 0

[aandrejevic] 63534: [NTVDM] Initialize the VGA-related BDA data fields.
by aandrejevic＠svn.reactos.org 02 Jun '14

02 Jun '14

Author: aandrejevic Date: Mon Jun 2 18:24:58 2014 New Revision: 63534 URL: http://svn.reactos.org/svn/reactos?rev=63534&view=rev Log: [NTVDM] Initialize the VGA-related BDA data fields. Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h trunk/reactos/subsystems/ntvdm/bios/vidbios.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] Mon Jun 2 18:24:58 2014 @@ -76,7 +76,8 @@ WORD KeybdBufferEnd; // 0x82 BYTE ScreenRows; // 0x84 WORD CharacterHeight; // 0x85 - BYTE EGAFlags[2]; // 0x87 + BYTE VGAOptions; // 0x87 + BYTE VGASwitches; // 0x88 BYTE VGAFlags[2]; // 0x89 DWORD Reserved3; // 0x8b BYTE Reserved4; // 0x8f Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Mon Jun 2 18:24:58 2014 @@ -1572,6 +1572,10 @@ ((PULONG)BaseAddress)[0x43] = (ULONG)NULL; ((PULONG)BaseAddress)[0x44] = (ULONG)NULL; + /* Initialize the VGA BDA data */ + Bda->VGAOptions = 0x30; /* 256 KB Video RAM */ + Bda->VGASwitches = 0x09; /* High-resolution */ + // // FIXME: At the moment we always set a VGA mode. In the future, // we should set this mode **only** when:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs