Ros-diffs June 2014

ros-diffs@reactos.org

15 participants
157 discussions

[akhaldi] 63550: [DEVENUM] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174
by akhaldi＠svn.reactos.org 08 Jun '14

08 Jun '14

Author: akhaldi Date: Sun Jun 8 12:02:59 2014 New Revision: 63550 URL: http://svn.reactos.org/svn/reactos?rev=63550&view=rev Log: [DEVENUM] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174 Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt trunk/reactos/dll/directx/wine/devenum/createdevenum.c Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/C… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] Sun Jun 8 12:02:59 2014 @@ -1,6 +1,3 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -22,7 +19,7 @@ set_source_files_properties(devenum.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/devenum_classes.rgs) set_module_type(devenum win32dll UNICODE) target_link_libraries(devenum strmiids uuid wine) -add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll) +add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 shlwapi msvcrt kernel32 ntdll) add_delay_importlibs(devenum msvfw32) add_pch(devenum devenum_private.h SOURCE) add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/c… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] Sun Jun 8 12:02:59 2014 @@ -27,6 +27,7 @@ #include <vfw.h> #include <aviriff.h> +#include <shlwapi.h> #include "resource.h" @@ -675,15 +676,15 @@ * or switched from pulseaudio to alsa, delete all old devices first */ if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioRendererCategory, &basekey, path, MAX_PATH))) - RegDeleteTreeW(basekey, path); + SHDeleteKeyW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioInputDeviceCategory, &basekey, path, MAX_PATH))) - RegDeleteTreeW(basekey, path); + SHDeleteKeyW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoInputDeviceCategory, &basekey, path, MAX_PATH))) - RegDeleteTreeW(basekey, path); + SHDeleteKeyW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_MidiRendererCategory, &basekey, path, MAX_PATH))) - RegDeleteTreeW(basekey, path); + SHDeleteKeyW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoCompressorCategory, &basekey, path, MAX_PATH))) - RegDeleteTreeW(basekey, path); + SHDeleteKeyW(basekey, path); rf2.dwVersion = 2; rf2.dwMerit = MERIT_PREFERRED;

1 0

[akhaldi] 63549: [REG] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174
by akhaldi＠svn.reactos.org 08 Jun '14

08 Jun '14

Author: akhaldi Date: Sun Jun 8 11:56:30 2014 New Revision: 63549 URL: http://svn.reactos.org/svn/reactos?rev=63549&view=rev Log: [REG] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174 Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt trunk/reactos/base/applications/cmdutils/reg/reg.c Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] Sun Jun 8 11:56:30 2014 @@ -1,8 +1,5 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_executable(reg reg.c reg.rc) set_module_type(reg win32cui UNICODE) -add_importlibs(reg advapi32 user32 msvcrt kernel32) +add_importlibs(reg advapi32 user32 shlwapi msvcrt kernel32) add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] Sun Jun 8 11:56:30 2014 @@ -22,6 +22,7 @@ #include <winuser.h> #include <winreg.h> #include <wincon.h> +#include <shlwapi.h> #include <wine/unicode.h> #include "reg.h" @@ -293,7 +294,7 @@ /* Delete subtree only if no /v* option is given */ if (!value_name && !value_empty && !value_all) { - if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) + if (SHDeleteKey(root, p) != ERROR_SUCCESS) { reg_message(STRING_CANNOT_FIND); return 1;

1 0

[dquintana] 63548: [BROWSEUI] * Fix stack corruption in VS2010 builds. No idea why it doesn't crash with other compilers. [EXPLORER-NEW] * Fix a similar bug that does not appear to cause any issue, ...
by dquintana＠svn.reactos.org 07 Jun '14

07 Jun '14

Author: dquintana Date: Sat Jun 7 23:26:35 2014 New Revision: 63548 URL: http://svn.reactos.org/svn/reactos?rev=63548&view=rev Log: [BROWSEUI] * Fix stack corruption in VS2010 builds. No idea why it doesn't crash with other compilers. [EXPLORER-NEW] * Fix a similar bug that does not appear to cause any issue, but is a bug regardless. Modified: branches/shell-experiments/base/shell/explorer-new/rshell.c branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp Modified: branches/shell-experiments/base/shell/explorer-new/rshell.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/rshell.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/rshell.c [iso-8859-1] Sat Jun 7 23:26:35 2014 @@ -22,7 +22,7 @@ static HINSTANCE hRShell = NULL; -typedef HRESULT(*PSTARTMENU_CONSTRUCTOR)(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PSTARTMENU_CONSTRUCTOR)(REFIID riid, void **ppv); HRESULT CStartMenu_Constructor(REFIID riid, void **ppv) { @@ -47,7 +47,7 @@ ppv); } -typedef HANDLE(WINAPI *PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk); +typedef HANDLE(WINAPI * PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk); HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk) { 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] Sat Jun 7 23:26:35 2014 @@ -73,6 +73,8 @@ extern HRESULT CreateBandProxy(REFIID riid, void **ppv); extern HRESULT CreateAddressBand(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); + HRESULT IUnknown_HasFocusIO(IUnknown * punk) { CComPtr<IInputObject> pio; @@ -132,8 +134,6 @@ return hResult; return S_OK; } - -typedef HRESULT(*PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); class CInternetToolbar; @@ -594,9 +594,9 @@ VARIANT menuOut; HWND ownerWindow; HRESULT hResult; + if (!pMenuBar) return E_POINTER; - *pMenuBar = NULL;

1 0

[ekohl] 63547: [USETUP] Implement scolling through the list of logical partitions. Multiple disks are not supported yet.
by ekohl＠svn.reactos.org 07 Jun '14

07 Jun '14

Author: ekohl Date: Sat Jun 7 20:02:26 2014 New Revision: 63547 URL: http://svn.reactos.org/svn/reactos?rev=63547&view=rev Log: [USETUP] Implement scolling through the list of logical partitions. Multiple disks are not supported yet. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Jun 7 20:02:26 2014 @@ -1581,12 +1581,14 @@ else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_DOWN)) /* DOWN */ { - ScrollDownPartitionList(PartitionList); + if (ScrollDownPartitionList(PartitionList)) + DrawPartitionList(PartitionList); } else if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && (Ir->Event.KeyEvent.wVirtualKeyCode == VK_UP)) /* UP */ { - ScrollUpPartitionList(PartitionList); + if (ScrollUpPartitionList(PartitionList)) + DrawPartitionList(PartitionList); } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Jun 7 20:02:26 2014 @@ -1174,6 +1174,29 @@ DumpPartitionTable(DiskEntry); #endif + if (DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart != 0 && + DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionLength.QuadPart != 0 && + DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionType != 0) + { + if ((DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector) % DiskEntry->SectorsPerTrack == 0) + { + DPRINT1("Use %lu Sector alignment!\n", DiskEntry->SectorsPerTrack); + } + else if (DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart % 1048756 == 0) + { + DPRINT1("Use megabyte (%lu Sectors) alignment!\n", 1048756 / DiskEntry->BytesPerSector); + } + else + { + DPRINT1("No matching aligment found! Partiton 1 starts at %I64u\n", DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart); + } + } + else + { + DPRINT1("No valid partiton table found! Use megabyte (%lu Sectors) alignment!\n", 1048756 / DiskEntry->BytesPerSector); + } + + if (DiskEntry->LayoutBuffer->PartitionCount == 0) { DiskEntry->NewDisk = TRUE; @@ -1986,32 +2009,79 @@ } -VOID +BOOL ScrollDownPartitionList( PPARTLIST List) { // PDISKENTRY DiskEntry; PPARTENTRY PartEntry; -// PLIST_ENTRY Entry1; - PLIST_ENTRY Entry2; + PLIST_ENTRY Entry; /* Check for empty disks */ if (IsListEmpty(&List->DiskListHead)) - return; + return FALSE; + /* Check for next usable entry on current disk */ if (List->CurrentPartition != NULL) { - Entry2 = List->CurrentPartition->ListEntry.Flink; - if (Entry2 != &List->CurrentDisk->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); - - List->CurrentPartition = PartEntry; - DrawPartitionList(List); - return; - } - } + if (List->CurrentPartition->LogicalPartition) + { + /* Logical partition */ + + Entry = List->CurrentPartition->ListEntry.Flink; + if (Entry != &List->CurrentDisk->LogicalPartListHead) + { + /* Next logical partition */ + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + List->CurrentPartition = PartEntry; + return TRUE; + } + else + { + Entry = List->CurrentDisk->ExtendedPartition->ListEntry.Flink; + if (Entry != &List->CurrentDisk->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + List->CurrentPartition = PartEntry; + return TRUE; + } + } + } + else + { + /* Primary or extended partition */ + + if (IsContainerPartition(List->CurrentPartition->PartitionType)) + { + /* First logical partition */ + Entry = List->CurrentDisk->LogicalPartListHead.Flink; + if (Entry != &List->CurrentDisk->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + List->CurrentPartition = PartEntry; + return TRUE; + } + } + else + { + /* Next primary partition */ + Entry = List->CurrentPartition->ListEntry.Flink; + if (Entry != &List->CurrentDisk->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + List->CurrentPartition = PartEntry; + return TRUE; + } + } + } + } + + DPRINT1("TODO: Check the next drive!\n"); #if 0 /* Check for first usable entry on next disk */ @@ -2037,37 +2107,67 @@ } } #endif -} - - -VOID + + return FALSE; +} + + +BOOL ScrollUpPartitionList( PPARTLIST List) { // PDISKENTRY DiskEntry; PPARTENTRY PartEntry; -// PLIST_ENTRY Entry1; - PLIST_ENTRY Entry2; + PLIST_ENTRY Entry; /* Check for empty disks */ if (IsListEmpty(&List->DiskListHead)) - return; - - /* check for previous usable entry on current disk */ + return FALSE; + + /* Check for previous usable entry on current disk */ if (List->CurrentPartition != NULL) { - Entry2 = List->CurrentPartition->ListEntry.Blink; - if (Entry2 != &List->CurrentDisk->PrimaryPartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (List->CurrentPartition->LogicalPartition) + { + /* Logical partition */ + Entry = List->CurrentPartition->ListEntry.Blink; + if (Entry != &List->CurrentDisk->LogicalPartListHead) + { + /* Previous logical partition */ + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + } + else + { + /* Extended partition*/ + PartEntry = List->CurrentDisk->ExtendedPartition; + } List->CurrentPartition = PartEntry; - - /* Draw partition list and return */ - DrawPartitionList(List); - return; - } - } + return TRUE; + } + else + { + /* Primary or extended partition */ + + Entry = List->CurrentPartition->ListEntry.Blink; + if (Entry != &List->CurrentDisk->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + if (IsContainerPartition(PartEntry->PartitionType)) + { + Entry = List->CurrentDisk->LogicalPartListHead.Blink; + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + } + + List->CurrentPartition = PartEntry; + return TRUE; + } + + } + } + + DPRINT1("TODO: Check the previous drive!\n"); #if 0 /* check for last usable entry on previous disk */ @@ -2095,6 +2195,8 @@ } } #endif + + return FALSE; } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sat Jun 7 20:02:26 2014 @@ -211,11 +211,11 @@ SetMountedDeviceValues( PPARTLIST List); -VOID +BOOL ScrollDownPartitionList( PPARTLIST List); -VOID +BOOL ScrollUpPartitionList( PPARTLIST List);

1 0

[dquintana] 63546: [RSHELL] * Use the debugging class to track COM refcounting of the CMenuBand. * CMenuSite: Remove an useless line. [BROWSEUI] * Refactor the CreateMenuBar method in an attempt to...
by dquintana＠svn.reactos.org 07 Jun '14

07 Jun '14

Author: dquintana Date: Sat Jun 7 13:54:11 2014 New Revision: 63546 URL: http://svn.reactos.org/svn/reactos?rev=63546&view=rev Log: [RSHELL] * Use the debugging class to track COM refcounting of the CMenuBand. * CMenuSite: Remove an useless line. [BROWSEUI] * Refactor the CreateMenuBar method in an attempt to figure out a seemingly magic crash with VS2010 (not yet solved). * Begin fixing some unused-but-set warnings. [SHELL32] * Fix some small bugs spotted by Victor. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.cpp branches/shell-experiments/base/shell/rshell/precomp.h branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.h branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/dialogs.cpp branches/shell-experiments/dll/win32/shell32/pidl.cpp branches/shell-experiments/dll/win32/shell32/shell32_main.cpp branches/shell-experiments/dll/win32/shell32/shlfolder.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -44,7 +44,7 @@ #else *ppv = NULL; - CMenuBand * site = new CComObject<CMenuBand>(); + CMenuBand * site = new CComDebugObject<CMenuBand>(); if (!site) return E_OUTOFMEMORY; 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] Sat Jun 7 13:54:11 2014 @@ -354,7 +354,6 @@ { RECT Rect = { 0 }; GetClientRect(&Rect); - Rect.right = Rect.right; pMenuPopup->OnPosRectChangeDB(&Rect); } } Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -113,3 +113,75 @@ #else #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; + } +}; 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] Sat Jun 7 13:54:11 2014 @@ -547,9 +547,11 @@ fLocked = false; fMenuBandWindow = NULL; fNavigationWindow = NULL; - fMenuCallback.AddRef(); + fMenuCallback = new CComDebugObject<CMenuCallback>(); fToolbarWindow = NULL; fAdviseCookie = 0; + + fMenuCallback->AddRef(); } CInternetToolbar::~CInternetToolbar() @@ -585,73 +587,77 @@ return ResizeBorderDW(&availableBorderSpace, fSite, FALSE); } -HRESULT CInternetToolbar::CreateMenuBar(IShellMenu **menuBar) -{ - CComPtr<IOleCommandTarget> siteCommandTarget; - CComPtr<IOleWindow> oleWindow; - CComPtr<IOleCommandTarget> commandTarget; +HRESULT CInternetToolbar::CreateMenuBar(IShellMenu **pMenuBar) +{ + CComPtr<IShellMenu> menubar; CComPtr<IShellMenuCallback> callback; VARIANT menuOut; HWND ownerWindow; HRESULT hResult; - + if (!pMenuBar) + return E_POINTER; + + + *pMenuBar = NULL; + + hResult = E_FAIL; #if USE_CUSTOM_MENUBAND - HMODULE hrs = LoadLibraryW(L"rshell.dll"); - - if (!hrs) - { - DbgPrint("Failed: %d\n", GetLastError()); - return E_FAIL; - } - - PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor"); - if (func) - { - hResult = func(IID_PPV_ARG(IShellMenu, menuBar)); - } - else - { - DbgPrint("Failed: %d\n", GetLastError()); - hResult = E_FAIL; - } + HMODULE hrs = GetModuleHandleW(L"rshell.dll"); + if (!hrs) hrs = LoadLibraryW(L"rshell.dll"); + + if (hrs) + { + PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor"); + if (func) + { + hResult = func(IID_PPV_ARG(IShellMenu, &menubar)); + } + } +#endif + + menubar->AddRef(); + if (FAILED_UNEXPECTEDLY(hResult)) { hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, menuBar)); - } -#else - hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, menuBar)); -#endif - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = fMenuCallback.QueryInterface(IID_PPV_ARG(IShellMenuCallback, &callback)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = (*menuBar)->Initialize(callback, -1, ANCESTORDEFAULT, SMINIT_HORIZONTAL | SMINIT_TOPLEVEL); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = fSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = oleWindow->GetWindow(&ownerWindow); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = fSite->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &siteCommandTarget)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = siteCommandTarget->Exec(&CGID_Explorer, 0x35, 0, NULL, &menuOut); - 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_UNEXPECTEDLY(hResult)) - return hResult; - hResult = IUnknown_Exec(*menuBar, CGID_MenuBand, 3, 1, NULL, NULL); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; + IID_PPV_ARG(IShellMenu, &menubar)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } + + hResult = fMenuCallback->QueryInterface(IID_PPV_ARG(IShellMenuCallback, &callback)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + hResult = menubar->Initialize(callback, -1, ANCESTORDEFAULT, SMINIT_HORIZONTAL | SMINIT_TOPLEVEL); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + // Set Menu + { + hResult = IUnknown_Exec(fSite, CGID_Explorer, 0x35, 0, NULL, &menuOut); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + if (V_VT(&menuOut) != VT_INT_PTR || V_INTREF(&menuOut) == NULL) + return E_FAIL; + + hResult = IUnknown_GetWindow(fSite, &ownerWindow); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + hResult = menubar->SetMenu((HMENU) V_INTREF(&menuOut), ownerWindow, SMSET_DONTOWN); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + } + + hResult = IUnknown_Exec(menubar, CGID_MenuBand, 3, 1, NULL, NULL); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + *pMenuBar = menubar.Detach(); + return S_OK; } @@ -1686,7 +1692,7 @@ mii.cbSize = sizeof(mii); mii.fMask = MIIM_STATE; mii.fState = fLocked ? MFS_CHECKED : MFS_UNCHECKED; - command = SetMenuItemInfo(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, FALSE, &mii); + SetMenuItemInfo(contextMenu, IDM_TOOLBARS_LOCKTOOLBARS, FALSE, &mii); // TODO: use GetSystemMetrics(SM_MENUDROPALIGNMENT) to determine menu alignment command = TrackPopupMenu(contextMenu, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD, 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] Sat Jun 7 13:54:11 2014 @@ -83,7 +83,7 @@ CComPtr<IUnknown> fLogoBar; // the reactos logo CComPtr<IUnknown> fControlsBar; // navigation controls CComPtr<IUnknown> fNavigationBar; // address bar - CComObject<CMenuCallback> fMenuCallback; + CComPtr<CMenuCallback> fMenuCallback; CComPtr<IOleCommandTarget> fCommandTarget; GUID fCommandCategory; HWND fToolbarWindow; 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] Sat Jun 7 13:54:11 2014 @@ -903,10 +903,21 @@ HRESULT hResult; hResult = SHBindToFolderIDListParent(NULL, pidl, &IID_PPV_ARG(IShellFolder, &parentFolder), &childPIDL); + if (FAILED(hResult)) + return hResult; + hResult = parentFolder->GetDisplayNameOf(childPIDL, uFlags, &L108); + if (FAILED(hResult)) + return hResult; + StrRetToBufW(&L108, childPIDL, pszBuf, cchBuf); if (rgfInOut) + { hResult = parentFolder->GetAttributesOf(1, const_cast<LPCITEMIDLIST *>(&childPIDL), rgfInOut); + if (FAILED(hResult)) + return hResult; + } + ILFree(childPIDL); return S_OK; } Modified: branches/shell-experiments/dll/win32/shell32/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/dialogs.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/dialogs.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -62,7 +62,7 @@ PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)lParam; if (IS_INTRESOURCE(lpszName)) - swprintf(szName, L"%u", lpszName); + swprintf(szName, L"%u", (DWORD)lpszName); else wcscpy(szName, (WCHAR*)lpszName); Modified: branches/shell-experiments/dll/win32/shell32/pidl.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -753,11 +753,13 @@ */ UINT WINAPI ILGetSize(LPCITEMIDLIST pidl) { - LPCSHITEMID si = &(pidl->mkid); + LPCSHITEMID si; UINT len = 0; if (pidl) { + si = &(pidl->mkid); + while (si->cb) { len += si->cb; Modified: branches/shell-experiments/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -752,7 +752,7 @@ temppsfi.dwAttributes=psfi->dwAttributes; if (psfi == NULL) - ret = SHGetFileInfoW(pathW, dwFileAttributes, NULL, sizeof(temppsfi), flags); + ret = SHGetFileInfoW(pathW, dwFileAttributes, NULL, 0, flags); else ret = SHGetFileInfoW(pathW, dwFileAttributes, &temppsfi, sizeof(temppsfi), flags); Modified: branches/shell-experiments/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sat Jun 7 13:54:11 2014 @@ -126,35 +126,41 @@ LPITEMIDLIST * pidlInOut, LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes) { HRESULT hr = E_INVALIDARG; - LPITEMIDLIST pidlOut = NULL, - pidlTemp = NULL; - IShellFolder *psfChild; - - TRACE ("(%p, %p, %p, %s)\n", psf, pbc, pidlInOut ? *pidlInOut : NULL, debugstr_w (szNext)); + LPITEMIDLIST pidlIn = pidlInOut ? *pidlInOut : NULL; + LPITEMIDLIST pidlOut = NULL; + LPITEMIDLIST pidlTemp = NULL; + CComPtr<IShellFolder> psfChild; + + TRACE ("(%p, %p, %p, %s)\n", psf, pbc, pidlIn, debugstr_w (szNext)); /* get the shellfolder for the child pidl and let it analyse further */ - hr = psf->BindToObject(*pidlInOut, pbc, IID_PPV_ARG(IShellFolder, &psfChild)); - - if (SUCCEEDED(hr)) { + hr = psf->BindToObject(pidlIn, pbc, IID_PPV_ARG(IShellFolder, &psfChild)); + if (FAILED(hr)) + return hr; + hr = psfChild->ParseDisplayName(hwndOwner, pbc, szNext, pEaten, &pidlOut, pdwAttributes); - psfChild->Release(); - - if (SUCCEEDED(hr)) { - pidlTemp = ILCombine (*pidlInOut, pidlOut); - - if (!pidlTemp) + if (FAILED(hr)) + return hr; + + pidlTemp = ILCombine (pidlIn, pidlOut); + if (!pidlTemp) + { hr = E_OUTOFMEMORY; + if (pidlOut) + ILFree(pidlOut); + return hr; } if (pidlOut) ILFree (pidlOut); - } - - ILFree (*pidlInOut); + + if (pidlIn) + ILFree (pidlIn); + *pidlInOut = pidlTemp; TRACE ("-- pidl=%p ret=0x%08x\n", pidlInOut ? *pidlInOut : NULL, hr); - return hr; + return S_OK; } /***********************************************************************

1 0

[hbelusca] 63545: [CONSRV] - Rename a macro to something meaningful. - Localize selection type strings.
by hbelusca＠svn.reactos.org 06 Jun '14

06 Jun '14

Author: hbelusca Date: Fri Jun 6 21:05:59 2014 New Revision: 63545 URL: http://svn.reactos.org/svn/reactos?rev=63545&view=rev Log: [CONSRV] - Rename a macro to something meaningful. - Localize selection type strings. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -731,8 +731,8 @@ if ((GuiData->Selection.dwFlags & CONSOLE_SELECTION_IN_PROGRESS) == 0) { - LPWSTR SelectionType, WindowTitle = NULL; - SIZE_T Length = 0; + LPWSTR SelTypeStr = NULL , WindowTitle = NULL; + SIZE_T SelTypeStrLength = 0, Length = 0; /* Clear the old selection */ if (GuiData->Selection.dwFlags & CONSOLE_SELECTION_NOT_EMPTY) @@ -740,21 +740,34 @@ InvalidateRect(GuiData->hWindow, &oldRect, FALSE); } - if (GuiData->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) - { - SelectionType = L"Selection - "; - } - else - { - SelectionType = L"Mark - "; - } - - Length = Console->Title.Length + wcslen(SelectionType) + 1; - WindowTitle = ConsoleAllocHeap(0, Length * sizeof(WCHAR)); - wcscpy(WindowTitle, SelectionType); - wcscat(WindowTitle, Console->Title.Buffer); - SetWindowText(GuiData->hWindow, WindowTitle); - ConsoleFreeHeap(WindowTitle); + /* + * When passing a zero-length buffer size, LoadString(...) returns + * a read-only pointer buffer to the program's resource string. + */ + SelTypeStrLength = + LoadStringW(ConSrvDllInstance, + (GuiData->Selection.dwFlags & CONSOLE_MOUSE_SELECTION) + ? IDS_SELECT_TITLE : IDS_MARK_TITLE, + (LPWSTR)&SelTypeStr, 0); + + /* + * Prepend the selection type string to the current console title + * if we succeeded in retrieving a valid localized string. + */ + if (SelTypeStr) + { + // 3 for " - " and 1 for NULL + Length = Console->Title.Length + (SelTypeStrLength + 3 + 1) * sizeof(WCHAR); + WindowTitle = ConsoleAllocHeap(0, Length); + + wcsncpy(WindowTitle, SelTypeStr, SelTypeStrLength); + WindowTitle[SelTypeStrLength] = L'\0'; + wcscat(WindowTitle, L" - "); + wcscat(WindowTitle, Console->Title.Buffer); + + SetWindowText(GuiData->hWindow, WindowTitle); + ConsoleFreeHeap(WindowTitle); + } GuiData->Selection.dwFlags |= CONSOLE_SELECTION_IN_PROGRESS; ConioPause(Console, PAUSED_FROM_SELECTION); @@ -771,6 +784,7 @@ GuiData->Selection.dwFlags = CONSOLE_NO_SELECTION; ConioUnpause(Console, PAUSED_FROM_SELECTION); + /* Restore the console title */ SetWindowText(GuiData->hWindow, Console->Title.Buffer); } } @@ -1305,10 +1319,7 @@ if (GetType(Buffer) == TEXTMODE_BUFFER) { -#ifdef IS_WHITESPACE -#undef IS_WHITESPACE -#endif -#define IS_WHITESPACE(c) \ +#define IS_WORD_SEP(c) \ ((c) == L'\0' || (c) == L' ' || (c) == L'\t' || (c) == L'\r' || (c) == L'\n') PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer; @@ -1320,15 +1331,15 @@ ptrL = ptrR = ConioCoordToPointer(TextBuffer, cL.X, cL.Y); /* Enlarge the selection by checking for whitespace */ - while ((0 < cL.X) && !IS_WHITESPACE(ptrL->Char.UnicodeChar) - && !IS_WHITESPACE((ptrL-1)->Char.UnicodeChar)) + while ((0 < cL.X) && !IS_WORD_SEP(ptrL->Char.UnicodeChar) + && !IS_WORD_SEP((ptrL-1)->Char.UnicodeChar)) { --cL.X; --ptrL; } while ((cR.X < TextBuffer->ScreenBufferSize.X - 1) && - !IS_WHITESPACE(ptrR->Char.UnicodeChar) && - !IS_WHITESPACE((ptrR+1)->Char.UnicodeChar)) + !IS_WORD_SEP(ptrR->Char.UnicodeChar) && + !IS_WORD_SEP((ptrR+1)->Char.UnicodeChar)) { ++cR.X; ++ptrR; Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Eingabeaufforderung" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Marquage" + IDS_SELECT_TITLE "SÃ©lection" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -30,3 +30,9 @@ */ IDS_TERMINAL_TITLE "Konsola ReactOS" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "Consola ReactOS" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -27,3 +27,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -24,3 +24,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -22,3 +22,9 @@ */ IDS_TERMINAL_TITLE "ReactOS Console" END + +STRINGTABLE +BEGIN + IDS_MARK_TITLE "Mark" + IDS_SELECT_TITLE "Select" +END Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -18,17 +18,18 @@ #define ID_SYSTEM_DEFAULTS 0xFFF6 #define ID_SYSTEM_PROPERTIES 0xFFF7 -#define NCPOPUP_MENU 103 +#define IDS_EDIT 204 +#define IDS_MARK 205 +#define IDS_COPY 206 +#define IDS_PASTE 207 +#define IDS_SELECTALL 208 +#define IDS_SCROLL 209 +#define IDS_FIND 210 +#define IDS_DEFAULTS 211 +#define IDS_PROPERTIES 212 -#define IDS_EDIT 204 -#define IDS_MARK 205 -#define IDS_COPY 206 -#define IDS_PASTE 207 -#define IDS_SELECTALL 208 -#define IDS_SCROLL 209 -#define IDS_FIND 210 -#define IDS_DEFAULTS 211 -#define IDS_PROPERTIES 212 +#define IDS_MARK_TITLE 220 +#define IDS_SELECT_TITLE 221 // Scrollbar resource ids. Unused. /* Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] Fri Jun 6 21:05:59 2014 @@ -59,9 +59,6 @@ GuiData->Selection.srSelection.Right, GuiData->Selection.srSelection.Bottom); -#ifdef IS_WHITESPACE -#undef IS_WHITESPACE -#endif #define IS_WHITESPACE(c) ((c) == L'\0' || (c) == L' ' || (c) == L'\t') /* Basic size for one line... */

1 0

[akhaldi] 63544: * Forgot this file.
by akhaldi＠svn.reactos.org 06 Jun '14

06 Jun '14

Author: akhaldi Date: Fri Jun 6 13:54:42 2014 New Revision: 63544 URL: http://svn.reactos.org/svn/reactos?rev=63544&view=rev Log: * Forgot this file. Modified: trunk/reactos/dll/win32/newdev/newdev.spec Modified: trunk/reactos/dll/win32/newdev/newdev.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.sp… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.spec [iso-8859-1] Fri Jun 6 13:54:42 2014 @@ -1,4 +1,4 @@ -@ stdcall ClientSideInstallW(ptr long wstr) +@ stdcall ClientSideInstallW(ptr ptr wstr long) @ stdcall DevInstallW(ptr ptr wstr long) @ stub InstallDevInst @ stub InstallDevInstEx

1 0

[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

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 June 2014