Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 71481: [CRT] - Introduce an strtol static library that drivers can use to get access to strtol-style functions CORE-11184
by tfaber＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: tfaber Date: Wed Jun 1 07:09:50 2016 New Revision: 71481 URL: http://svn.reactos.org/svn/reactos?rev=71481&view=rev Log: [CRT] - Introduce an strtol static library that drivers can use to get access to strtol-style functions CORE-11184 Modified: trunk/reactos/sdk/lib/crt/CMakeLists.txt Modified: trunk/reactos/sdk/lib/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/sdk/lib/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/CMakeLists.txt [iso-8859-1] Wed Jun 1 07:09:50 2016 @@ -55,3 +55,14 @@ add_library(getopt misc/getopt.c) add_target_compile_definitions(getopt _DLL __USE_CRTIMP) add_dependencies(getopt psdk) + +add_library(strtol + string/ctype.c + string/iswctype.c + string/strtoi64.c + string/strtol.c + string/strtoul.c + string/strtoull.c + string/wctype.c) +add_target_compile_definitions(strtol _LIBCNT_) +add_dependencies(strtol psdk)

1 0

[tfaber] 71480: [CRT] - Give strtoi64_l and strtoul_l their missing leading underscores
by tfaber＠svn.reactos.org 01 Jun '16

01 Jun '16

Author: tfaber Date: Wed Jun 1 07:07:57 2016 New Revision: 71480 URL: http://svn.reactos.org/svn/reactos?rev=71480&view=rev Log: [CRT] - Give strtoi64_l and strtoul_l their missing leading underscores Modified: trunk/reactos/sdk/lib/crt/string/strtoi64.c trunk/reactos/sdk/lib/crt/string/strtoul.c Modified: trunk/reactos/sdk/lib/crt/string/strtoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtoi6… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/strtoi64.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strtoi64.c [iso-8859-1] Wed Jun 1 07:07:57 2016 @@ -7,7 +7,7 @@ * * FIXME: locale parameter is ignored */ -__int64 CDECL strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale) +__int64 CDECL _strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale) { const char *p = nptr; BOOL negative = FALSE; @@ -87,7 +87,7 @@ __int64 _strtoi64(const char *nptr, char **endptr, int base) { - return strtoi64_l(nptr, endptr, base, NULL); + return _strtoi64_l(nptr, endptr, base, NULL); } Modified: trunk/reactos/sdk/lib/crt/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtoul… ============================================================================== --- trunk/reactos/sdk/lib/crt/string/strtoul.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strtoul.c [iso-8859-1] Wed Jun 1 07:07:57 2016 @@ -1,14 +1,12 @@ #include <precomp.h> /* Based on Wine Staging 1.9.9 - dlls/msvcrt/string.c */ -__int64 CDECL strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale); - /****************************************************************** * _strtoul_l (MSVCRT.@) */ -unsigned long CDECL strtoul_l(const char* nptr, char** end, int base, _locale_t locale) +unsigned long CDECL _strtoul_l(const char* nptr, char** end, int base, _locale_t locale) { - __int64 ret = strtoi64_l(nptr, end, base, locale); + __int64 ret = _strtoi64_l(nptr, end, base, locale); if(ret > ULONG_MAX) { ret = ULONG_MAX; @@ -30,5 +28,5 @@ */ unsigned long CDECL strtoul(const char* nptr, char** end, int base) { - return strtoul_l(nptr, end, base, NULL); + return _strtoul_l(nptr, end, base, NULL); }

1 0

[hbelusca] 71479: [REACTOS]: Turn tabs into spaces + indent.
by hbelusca＠svn.reactos.org 31 May '16

31 May '16

Author: hbelusca Date: Tue May 31 23:02:46 2016 New Revision: 71479 URL: http://svn.reactos.org/svn/reactos?rev=71479&view=rev Log: [REACTOS]: Turn tabs into spaces + indent. Modified: trunk/reactos/sdk/include/reactos/buildno.h.cmake trunk/reactos/sdk/include/reactos/version.h.cmake Modified: trunk/reactos/sdk/include/reactos/buildno.h.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/buildn… ============================================================================== --- trunk/reactos/sdk/include/reactos/buildno.h.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/buildno.h.cmake [iso-8859-1] Tue May 31 23:02:46 2016 @@ -1,14 +1,18 @@ /* Do not edit - Machine generated */ #ifndef _INC_REACTOS_BUILDNO #define _INC_REACTOS_BUILDNO -#define KERNEL_VERSION_BUILD @KERNEL_VERSION_BUILD@ -#define KERNEL_VERSION_BUILD_HEX 0x@KERNEL_VERSION_BUILD_HEX@ -#define KERNEL_VERSION_BUILD_STR "@KERNEL_VERSION_BUILD@-@REVISION@" -#define KERNEL_VERSION_BUILD_RC "@KERNEL_VERSION_BUILD@-@REVISION@\0" -#define KERNEL_VERSION_RC "@KERNEL_VERSION@\0" -#define KERNEL_VERSION_STR "@KERNEL_VERSION@" -#define REACTOS_DLL_VERSION_MAJOR @REACTOS_DLL_VERSION_MAJOR@ -#define REACTOS_DLL_VERSION_RC "@DLL_VERSION_STR@\0" -#define REACTOS_DLL_VERSION_STR "@DLL_VERSION_STR@" + +#define KERNEL_VERSION_BUILD @KERNEL_VERSION_BUILD@ +#define KERNEL_VERSION_BUILD_HEX 0x@KERNEL_VERSION_BUILD_HEX@ +#define KERNEL_VERSION_BUILD_STR "@KERNEL_VERSION_BUILD@-@REVISION@" +#define KERNEL_VERSION_BUILD_RC "@KERNEL_VERSION_BUILD@-@REVISION@\0" + +#define KERNEL_VERSION_RC "@KERNEL_VERSION@\0" +#define KERNEL_VERSION_STR "@KERNEL_VERSION@" + +#define REACTOS_DLL_VERSION_MAJOR @REACTOS_DLL_VERSION_MAJOR@ +#define REACTOS_DLL_VERSION_RC "@DLL_VERSION_STR@\0" +#define REACTOS_DLL_VERSION_STR "@DLL_VERSION_STR@" + #endif /* EOF */ Modified: trunk/reactos/sdk/include/reactos/version.h.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/versio… ============================================================================== --- trunk/reactos/sdk/include/reactos/version.h.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/version.h.cmake [iso-8859-1] Tue May 31 23:02:46 2016 @@ -5,25 +5,25 @@ * PURPOSE: Defines the current version * PROGRAMMER: David Welch (welch(a)mcmail.com) * REVISIONS: - * 1999-11-06 (ea) - * Moved from include/internal in include/reactos - * to be used by buildno. - * 2002-01-17 (ea) - * KERNEL_VERSION removed. Use - * reactos/buildno.h:KERNEL_VERSION_STR instead. + * 1999-11-06 (ea) + * Moved from include/internal in include/reactos + * to be used by buildno. + * 2002-01-17 (ea) + * KERNEL_VERSION removed. Use + * reactos/buildno.h:KERNEL_VERSION_STR instead. */ #ifndef __VERSION_H #define __VERSION_H -#define KERNEL_VERSION_MAJOR @KERNEL_VERSION_MAJOR@ -#define KERNEL_VERSION_MINOR @KERNEL_VERSION_MINOR@ -#define KERNEL_VERSION_PATCH_LEVEL @KERNEL_VERSION_PATCH_LEVEL@ +#define KERNEL_VERSION_MAJOR @KERNEL_VERSION_MAJOR@ +#define KERNEL_VERSION_MINOR @KERNEL_VERSION_MINOR@ +#define KERNEL_VERSION_PATCH_LEVEL @KERNEL_VERSION_PATCH_LEVEL@ #define COPYRIGHT_YEAR "@COPYRIGHT_YEAR@" /* KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE "@KERNEL_VERSION_BUILD_TYPE@" +#define KERNEL_VERSION_BUILD_TYPE "@KERNEL_VERSION_BUILD_TYPE@" /* KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) */ #define KERNEL_VERSION_RELEASE_TYPE "@KERNEL_VERSION_RELEASE_TYPE@"

1 0

[hbelusca] 71478: [REACTOS][ROSAPPS][ROSSUBSYS] The buildno #defines KERNEL_RELEASE_STR, KERNEL_RELEASE_RC (introduced in r756 17 years ago), and REACTOS_DLL_RELEASE_STR, REACTOS_DLL_RELEASE_RC (in...
by hbelusca＠svn.reactos.org 31 May '16

31 May '16

Author: hbelusca Date: Tue May 31 22:36:48 2016 New Revision: 71478 URL: http://svn.reactos.org/svn/reactos?rev=71478&view=rev Log: [REACTOS][ROSAPPS][ROSSUBSYS] The buildno #defines KERNEL_RELEASE_STR, KERNEL_RELEASE_RC (introduced in r756 17 years ago), and REACTOS_DLL_RELEASE_STR, REACTOS_DLL_RELEASE_RC (introduced in r11297 12 years ago) are things that never really caught out in our project. They were actually eclipsed in favour of the more common KERNEL_VERSION_STR and co. in our code. I therefore remove the very last remains of the old KERNEL_RELEASE_xxx defines and replace them with KERNEL_VERSION_xxx ones. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/ver.c trunk/reactos/sdk/include/reactos/buildno.h.cmake trunk/rosapps/applications/sysutils/lsdd/lsdd.c trunk/rosapps/applications/sysutils/tlist/tlist.c trunk/rossubsys/posix/server/misc/main.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Tue May 31 22:36:48 2016 @@ -1745,7 +1745,7 @@ /* If neither /C or /K was given, display a simple version string */ ConOutChar(_T('\n')); ConOutResPrintf(STRING_REACTOS_VERSION, - _T(KERNEL_RELEASE_STR), + _T(KERNEL_VERSION_STR), _T(KERNEL_VERSION_BUILD_STR)); ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.\n")); } Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Tue May 31 22:36:48 2016 @@ -135,7 +135,7 @@ return 0; } - ConOutResPrintf(STRING_CMD_SHELLINFO, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); + ConOutResPrintf(STRING_CMD_SHELLINFO, _T(KERNEL_VERSION_STR), _T(KERNEL_VERSION_BUILD_STR)); ConOutChar(_T('\n')); ConOutResPuts(STRING_VERSION_RUNNING_ON); PrintOSVersion(); Modified: trunk/reactos/sdk/include/reactos/buildno.h.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/buildn… ============================================================================== --- trunk/reactos/sdk/include/reactos/buildno.h.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/buildno.h.cmake [iso-8859-1] Tue May 31 22:36:48 2016 @@ -5,13 +5,9 @@ #define KERNEL_VERSION_BUILD_HEX 0x@KERNEL_VERSION_BUILD_HEX@ #define KERNEL_VERSION_BUILD_STR "@KERNEL_VERSION_BUILD@-@REVISION@" #define KERNEL_VERSION_BUILD_RC "@KERNEL_VERSION_BUILD@-@REVISION@\0" -#define KERNEL_RELEASE_RC "@KERNEL_VERSION@\0" -#define KERNEL_RELEASE_STR "@KERNEL_VERSION@" #define KERNEL_VERSION_RC "@KERNEL_VERSION@\0" #define KERNEL_VERSION_STR "@KERNEL_VERSION@" #define REACTOS_DLL_VERSION_MAJOR @REACTOS_DLL_VERSION_MAJOR@ -#define REACTOS_DLL_RELEASE_RC "@DLL_VERSION_STR@\0" -#define REACTOS_DLL_RELEASE_STR "@DLL_VERSION_STR@" #define REACTOS_DLL_VERSION_RC "@DLL_VERSION_STR@\0" #define REACTOS_DLL_VERSION_STR "@DLL_VERSION_STR@" #endif Modified: trunk/rosapps/applications/sysutils/lsdd/lsdd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/lsdd… ============================================================================== --- trunk/rosapps/applications/sysutils/lsdd/lsdd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/lsdd/lsdd.c [iso-8859-1] Tue May 31 22:36:48 2016 @@ -60,7 +60,7 @@ printf ( "ReactOS/Win32 %s - List DOS Devices Utility\n" "Written by E.Aliberti (%s)\n\n", - KERNEL_RELEASE_STR, + KERNEL_VERSION_STR, __DATE__ ); Modified: trunk/rosapps/applications/sysutils/tlist/tlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/tlis… ============================================================================== --- trunk/rosapps/applications/sysutils/tlist/tlist.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/tlist/tlist.c [iso-8859-1] Tue May 31 22:36:48 2016 @@ -65,7 +65,7 @@ int WINAPI PrintBanner (VOID) { - printf ("ReactOS "KERNEL_RELEASE_STR" T(ask)List\n"); + printf ("ReactOS "KERNEL_VERSION_STR" T(ask)List\n"); printf ("Copyright (c) 2000,2001 Emanuele Aliberti\n\n"); return EXIT_SUCCESS; } Modified: trunk/rossubsys/posix/server/misc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rossubsys/posix/server/misc/main.c… ============================================================================== --- trunk/rossubsys/posix/server/misc/main.c [iso-8859-1] (original) +++ trunk/rossubsys/posix/server/misc/main.c [iso-8859-1] Tue May 31 22:36:48 2016 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.3 2002/10/29 04:45:54 rex Exp $ +/* $Id$ * * PROJECT : ReactOS / POSIX+ Environment Subsystem Server * FILE : reactos/subsys/psx/server/misc/main.c @@ -49,7 +49,7 @@ { INT c; - debug_print(L"POSIX+ Subsystem for ReactOS "KERNEL_RELEASE_STR); + debug_print(L"POSIX+ Subsystem for ReactOS "KERNEL_VERSION_STR); if (STATUS_SUCCESS == PsxServerInitialization(0,NULL)) { @@ -71,7 +71,7 @@ { UNICODE_STRING Banner; - RtlInitUnicodeString (& Banner, L"POSIX+ Subsystem for ReactOS "KERNEL_RELEASE_STR); + RtlInitUnicodeString (& Banner, L"POSIX+ Subsystem for ReactOS "KERNEL_VERSION_STR); NtDisplayString(& Banner); if (STATUS_SUCCESS == PsxServerInitialization(0,NULL))

1 0

[mjansen] 71477: [APPHELP][ACLAYER][APPSHIM_APITEST] Fix some WCHAR hack constructions that VS 2010 didn't like, as pointed out by Hermès
by mjansen＠svn.reactos.org 31 May '16

31 May '16

Author: mjansen Date: Tue May 31 18:02:54 2016 New Revision: 71477 URL: http://svn.reactos.org/svn/reactos?rev=71477&view=rev Log: [APPHELP][ACLAYER][APPSHIM_APITEST] Fix some WCHAR hack constructions that VS 2010 didn't like, as pointed out by Hermès Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/reactos/dll/appcompat/shims/layer/versionlie.inl trunk/rostests/apitests/appshim/versionlie.c Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Tue May 31 18:02:54 2016 @@ -443,18 +443,19 @@ BOOL WINAPI SdbGetAppPatchDir(HSDB db, LPWSTR path, DWORD size) { static WCHAR* default_dir = NULL; + static CONST WCHAR szAppPatch[] = {'\\','A','p','p','P','a','t','c','h',0}; if(!default_dir) { WCHAR* tmp = NULL; - UINT len = GetSystemWindowsDirectoryW(NULL, 0) + lstrlenW((CONST WCHAR[]){'\\','A','p','p','P','a','t','c','h',0}); + UINT len = GetSystemWindowsDirectoryW(NULL, 0) + lstrlenW(szAppPatch); tmp = SdbAlloc((len + 1)* sizeof(WCHAR)); if(tmp) { UINT r = GetSystemWindowsDirectoryW(tmp, len+1); if (r && r < len) { - if (SUCCEEDED(StringCchCatW(tmp, len+1, (CONST WCHAR[]){'\\','A','p','p','P','a','t','c','h',0}))) + if (SUCCEEDED(StringCchCatW(tmp, len+1, szAppPatch))) { if(InterlockedCompareExchangePointer((void**)&default_dir, tmp, NULL) == NULL) tmp = NULL; Modified: trunk/reactos/dll/appcompat/shims/layer/versionlie.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/layer/… ============================================================================== --- trunk/reactos/dll/appcompat/shims/layer/versionlie.inl [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/layer/versionlie.inl [iso-8859-1] Tue May 31 18:02:54 2016 @@ -47,12 +47,13 @@ { if (fdwReason == SHIM_REASON_ATTACH && VERSION_INFO.wServicePackMajor) { + static CONST WCHAR szServicePack[] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','%','u',0}; HRESULT hr = StringCbPrintfA(VERSION_INFO.szCSDVersionA, sizeof(VERSION_INFO.szCSDVersionA), "Service Pack %u", VERSION_INFO.wServicePackMajor); if (FAILED(hr)) return FALSE; StringCbPrintfW(VERSION_INFO.szCSDVersionW, sizeof(VERSION_INFO.szCSDVersionW), - (CONST WCHAR[]){'S','e','r','v','i','c','e',' ','P','a','c','k',' ','%','u',0}, VERSION_INFO.wServicePackMajor); + szServicePack, VERSION_INFO.wServicePackMajor); if (FAILED(hr)) return FALSE; } @@ -71,3 +72,4 @@ #include <implement_shim.inl> #undef VERSION_INFO + Modified: trunk/rostests/apitests/appshim/versionlie.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/versionl… ============================================================================== --- trunk/rostests/apitests/appshim/versionlie.c [iso-8859-1] (original) +++ trunk/rostests/apitests/appshim/versionlie.c [iso-8859-1] Tue May 31 18:02:54 2016 @@ -161,6 +161,7 @@ } if (ok1 && ok2) { + static const WCHAR szCSDFMT[] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','%','u',0}; WCHAR szCSDVersion[128] = { 0 }; winetest_ok(v1.dwOSVersionInfoSize == v2.dwOSVersionInfoSize, "Expected dwOSVersionInfoSize to be equal, was: %u, %u for %s\n", v1.dwOSVersionInfoSize, v2.dwOSVersionInfoSize, shim); winetest_ok(info->dwMajorVersion == v2.dwMajorVersion, "Expected dwMajorVersion to be equal, was: %u, %u for %s\n", info->dwMajorVersion, v2.dwMajorVersion, shim); @@ -169,7 +170,7 @@ winetest_ok(info->dwPlatformId == v2.dwPlatformId, "Expected dwPlatformId to be equal, was: %u, %u for %s\n", info->dwPlatformId, v2.dwPlatformId, shim); if (info->wServicePackMajor) - swprintf(szCSDVersion, (const WCHAR[]){'S','e','r','v','i','c','e',' ','P','a','c','k',' ','%','u',0}, info->wServicePackMajor); + swprintf(szCSDVersion, szCSDFMT, info->wServicePackMajor); winetest_ok(lstrcmpW(szCSDVersion, v2.szCSDVersion) == 0, "Expected szCSDVersion to be equal, was: %s, %s for %s\n", wine_dbgstr_w(szCSDVersion), wine_dbgstr_w(v2.szCSDVersion), shim); if (v1.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW))

1 0

[mjansen] 71476: [SHELL32] Rename CShell to CShellDispatch CORE-6892
by mjansen＠svn.reactos.org 31 May '16

31 May '16

Author: mjansen Date: Tue May 31 17:40:44 2016 New Revision: 71476 URL: http://svn.reactos.org/svn/reactos?rev=71476&view=rev Log: [SHELL32] Rename CShell to CShellDispatch CORE-6892 Added: trunk/reactos/dll/win32/shell32/CShellDispatch.cpp (with props) trunk/reactos/dll/win32/shell32/CShellDispatch.h (with props) Removed: trunk/reactos/dll/win32/shell32/CShell.cpp trunk/reactos/dll/win32/shell32/CShell.h Modified: trunk/reactos/dll/win32/shell32/CDefViewDual.cpp trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/shell32.cpp trunk/reactos/dll/win32/shell32/wine/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/CDefViewDual.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefViewDual.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefViewDual.cpp [iso-8859-1] Tue May 31 17:40:44 2016 @@ -47,7 +47,7 @@ { if (!app) return E_INVALIDARG; - return CShell_Constructor(IID_IDispatch, (LPVOID*)app); + return CShellDispatch_Constructor(IID_IDispatch, (LPVOID*)app); } virtual HRESULT STDMETHODCALLTYPE get_Parent(IDispatch **parent) override Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Tue May 31 17:40:44 2016 @@ -65,7 +65,7 @@ CDefaultContextMenu.cpp COpenWithMenu.cpp CNewMenu.cpp - CShell.cpp + CShellDispatch.cpp CFolder.cpp CFolderItems.cpp CFolderItemVerbs.cpp Removed: trunk/reactos/dll/win32/shell32/CShell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShell.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/CShell.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CShell.cpp (removed) @@ -1,325 +0,0 @@ -/* - * IShellDispatch implementation - * - * Copyright 2015 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); - - -CShell::CShell() -{ -} - -CShell::~CShell() -{ -} - -HRESULT CShell::Initialize() -{ - return S_OK; -} - -// *** IShellDispatch methods *** -HRESULT STDMETHODCALLTYPE CShell::get_Application(IDispatch **ppid) -{ - TRACE("(%p, %p)\n", this, ppid); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::get_Parent(IDispatch **ppid) -{ - TRACE("(%p, %p)\n", this, ppid); - return E_NOTIMPL; -} - -HRESULT VariantToIdlist(VARIANT* var, LPITEMIDLIST* idlist) -{ - HRESULT hr = S_FALSE; - if(V_VT(var) == VT_I4) - { - hr = SHGetSpecialFolderLocation(NULL, V_I4(var), idlist); - } - else if(V_VT(var) == VT_BSTR) - { - hr = SHILCreateFromPathW(V_BSTR(var), idlist, NULL); - } - return hr; -} - -HRESULT STDMETHODCALLTYPE CShell::NameSpace(VARIANT vDir, Folder **ppsdf) -{ - TRACE("(%p, %s, %p)\n", this, debugstr_variant(&vDir), ppsdf); - if (!ppsdf) - return E_POINTER; - *ppsdf = NULL; - LPITEMIDLIST idlist = NULL; - HRESULT hr = VariantToIdlist(&vDir, &idlist); - if (!SUCCEEDED(hr) || !idlist) - return S_FALSE; - CFolder* fld = new CComObject<CFolder>(); - fld->Init(idlist); - *ppsdf = fld; - fld->AddRef(); - return hr; -} - -HRESULT STDMETHODCALLTYPE CShell::BrowseForFolder(LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf) -{ - TRACE("(%p, %lu, %ls, %lu, %s, %p)\n", this, Hwnd, Title, Options, debugstr_variant(&RootFolder), ppsdf); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::Windows(IDispatch **ppid) -{ - TRACE("(%p, %p)\n", this, ppid); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::Open(VARIANT vDir) -{ - TRACE("(%p, %s)\n", this, debugstr_variant(&vDir)); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::Explore(VARIANT vDir) -{ - TRACE("(%p, %s)\n", this, debugstr_variant(&vDir)); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::MinimizeAll() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::UndoMinimizeALL() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::FileRun() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::CascadeWindows() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::TileVertically() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::TileHorizontally() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::ShutdownWindows() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::Suspend() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::EjectPC() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::SetTime() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::TrayProperties() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::Help() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::FindFiles() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::FindComputer() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::RefreshMenu() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::ControlPanelItem(BSTR szDir) -{ - TRACE("(%p, %ls)\n", this, szDir); - return E_NOTIMPL; -} - - -// *** IShellDispatch2 methods *** -HRESULT STDMETHODCALLTYPE CShell::IsRestricted(BSTR group, BSTR restriction, LONG *value) -{ - TRACE("(%p, %ls, %ls, %p)\n", this, group, restriction, value); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::ShellExecute(BSTR file, VARIANT args, VARIANT dir, VARIANT op, VARIANT show) -{ - TRACE("(%p, %ls, %s, %s, %s, %s)\n", this, file, debugstr_variant(&args), debugstr_variant(&dir), debugstr_variant(&op), debugstr_variant(&show)); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::FindPrinter(BSTR name, BSTR location, BSTR model) -{ - TRACE("(%p, %ls, %ls, %ls)\n", this, name, location, model); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::GetSystemInformation(BSTR name, VARIANT *ret) -{ - TRACE("(%p, %ls, %p)\n", this, name, ret); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::ServiceStart(BSTR service, VARIANT persistent, VARIANT *ret) -{ - TRACE("(%p, %ls, %s, %p)\n", this, service, wine_dbgstr_variant(&persistent), ret); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::ServiceStop(BSTR service, VARIANT persistent, VARIANT *ret) -{ - TRACE("(%p, %ls, %s, %p)\n", this, service, wine_dbgstr_variant(&persistent), ret); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::IsServiceRunning(BSTR service, VARIANT *running) -{ - TRACE("(%p, %ls, %p)\n", this, service, running); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::CanStartStopService(BSTR service, VARIANT *ret) -{ - TRACE("(%p, %ls, %p)\n", this, service, ret); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::ShowBrowserBar(BSTR clsid, VARIANT show, VARIANT *ret) -{ - TRACE("(%p, %ls, %s, %p)\n", this, clsid, wine_dbgstr_variant(&show), ret); - return E_NOTIMPL; -} - - -// *** IShellDispatch3 methods *** -HRESULT STDMETHODCALLTYPE CShell::AddToRecent(VARIANT file, BSTR category) -{ - TRACE("(%p, %s, %ls)\n", this, wine_dbgstr_variant(&file), category); - return E_NOTIMPL; -} - - -// *** IShellDispatch4 methods *** -HRESULT STDMETHODCALLTYPE CShell::WindowsSecurity() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::ToggleDesktop() -{ - TRACE("(%p)\n", this); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::ExplorerPolicy(BSTR policy, VARIANT *value) -{ - TRACE("(%p, %ls, %p)\n", this, policy, value); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::GetSetting(LONG setting, VARIANT_BOOL *result) -{ - TRACE("(%p, %lu, %p)\n", this, setting, result); - return E_NOTIMPL; -} - - -// *** IObjectSafety methods *** -HRESULT STDMETHODCALLTYPE CShell::GetInterfaceSafetyOptions(REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) -{ - TRACE("(%p, %s, %p, %p)\n", this, wine_dbgstr_guid(&riid), pdwSupportedOptions, pdwEnabledOptions); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::SetInterfaceSafetyOptions(REFIID riid, DWORD dwOptionSetMask, DWORD dwEnabledOptions) -{ - TRACE("(%p, %s, %lu, %lu)\n", this, wine_dbgstr_guid(&riid), dwOptionSetMask, dwEnabledOptions); - return E_NOTIMPL; -} - - -// *** IObjectWithSite methods *** -HRESULT STDMETHODCALLTYPE CShell::SetSite(IUnknown *pUnkSite) -{ - TRACE("(%p, %p)\n", this, pUnkSite); - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShell::GetSite(REFIID riid, PVOID *ppvSite) -{ - TRACE("(%p, %s, %p)\n", this, wine_dbgstr_guid(&riid), ppvSite); - return E_NOTIMPL; -} - -HRESULT WINAPI CShell_Constructor(REFIID riid, LPVOID * ppvOut) -{ - return ShellObjectCreatorInit<CShell>(riid, ppvOut); -} - Removed: trunk/reactos/dll/win32/shell32/CShell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShell.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/CShell.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CShell.h (removed) @@ -1,111 +0,0 @@ -/* - * IShellDispatch implementation - * - * Copyright 2015 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef _SHELL_H_ -#define _SHELL_H_ - -#undef ShellExecute - -class CShell: - public CComCoClass<CShell, &CLSID_Shell>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IDispatchImpl<IShellDispatch4, &IID_IShellDispatch4>, - public IObjectSafety, - public IObjectWithSite -{ -private: - -public: - CShell(); - ~CShell(); - - HRESULT Initialize(); - - // *** IShellDispatch methods *** - virtual HRESULT STDMETHODCALLTYPE get_Application(IDispatch **ppid); - virtual HRESULT STDMETHODCALLTYPE get_Parent(IDispatch **ppid); - virtual HRESULT STDMETHODCALLTYPE NameSpace(VARIANT vDir, Folder **ppsdf); - virtual HRESULT STDMETHODCALLTYPE BrowseForFolder(LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf); - virtual HRESULT STDMETHODCALLTYPE Windows(IDispatch **ppid); - virtual HRESULT STDMETHODCALLTYPE Open(VARIANT vDir); - virtual HRESULT STDMETHODCALLTYPE Explore(VARIANT vDir); - virtual HRESULT STDMETHODCALLTYPE MinimizeAll(); - virtual HRESULT STDMETHODCALLTYPE UndoMinimizeALL(); - virtual HRESULT STDMETHODCALLTYPE FileRun(); - virtual HRESULT STDMETHODCALLTYPE CascadeWindows(); - virtual HRESULT STDMETHODCALLTYPE TileVertically(); - virtual HRESULT STDMETHODCALLTYPE TileHorizontally(); - virtual HRESULT STDMETHODCALLTYPE ShutdownWindows(); - virtual HRESULT STDMETHODCALLTYPE Suspend(); - virtual HRESULT STDMETHODCALLTYPE EjectPC(); - virtual HRESULT STDMETHODCALLTYPE SetTime(); - virtual HRESULT STDMETHODCALLTYPE TrayProperties(); - virtual HRESULT STDMETHODCALLTYPE Help(); - virtual HRESULT STDMETHODCALLTYPE FindFiles(); - virtual HRESULT STDMETHODCALLTYPE FindComputer(); - virtual HRESULT STDMETHODCALLTYPE RefreshMenu(); - virtual HRESULT STDMETHODCALLTYPE ControlPanelItem(BSTR szDir); - - // *** IShellDispatch2 methods *** - virtual HRESULT STDMETHODCALLTYPE IsRestricted(BSTR group, BSTR restriction, LONG *value); - virtual HRESULT STDMETHODCALLTYPE ShellExecute(BSTR file, VARIANT args, VARIANT dir, VARIANT op, VARIANT show); - virtual HRESULT STDMETHODCALLTYPE FindPrinter(BSTR name, BSTR location, BSTR model); - virtual HRESULT STDMETHODCALLTYPE GetSystemInformation(BSTR name, VARIANT *ret); - virtual HRESULT STDMETHODCALLTYPE ServiceStart(BSTR service, VARIANT persistent, VARIANT *ret); - virtual HRESULT STDMETHODCALLTYPE ServiceStop(BSTR service, VARIANT persistent, VARIANT *ret); - virtual HRESULT STDMETHODCALLTYPE IsServiceRunning(BSTR service, VARIANT *running); - virtual HRESULT STDMETHODCALLTYPE CanStartStopService(BSTR service, VARIANT *ret); - virtual HRESULT STDMETHODCALLTYPE ShowBrowserBar(BSTR clsid, VARIANT show, VARIANT *ret); - - // *** IShellDispatch3 methods *** - virtual HRESULT STDMETHODCALLTYPE AddToRecent(VARIANT file, BSTR category); - - // *** IShellDispatch4 methods *** - virtual HRESULT STDMETHODCALLTYPE WindowsSecurity(); - virtual HRESULT STDMETHODCALLTYPE ToggleDesktop(); - virtual HRESULT STDMETHODCALLTYPE ExplorerPolicy(BSTR policy, VARIANT *value); - virtual HRESULT STDMETHODCALLTYPE GetSetting(LONG setting, VARIANT_BOOL *result); - - // *** IObjectSafety methods *** - virtual HRESULT STDMETHODCALLTYPE GetInterfaceSafetyOptions(REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions); - virtual HRESULT STDMETHODCALLTYPE SetInterfaceSafetyOptions(REFIID riid, DWORD dwOptionSetMask, DWORD dwEnabledOptions); - - // *** IObjectWithSite methods *** - virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); - virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite); - - -DECLARE_REGISTRY_RESOURCEID(IDR_SHELL) -DECLARE_NOT_AGGREGATABLE(CShell) - -DECLARE_PROTECT_FINAL_CONSTRUCT() - -BEGIN_COM_MAP(CShell) - COM_INTERFACE_ENTRY_IID(IID_IShellDispatch4, IShellDispatch4) - COM_INTERFACE_ENTRY_IID(IID_IShellDispatch3, IShellDispatch3) - COM_INTERFACE_ENTRY_IID(IID_IShellDispatch2, IShellDispatch2) - COM_INTERFACE_ENTRY_IID(IID_IShellDispatch, IShellDispatch) - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) - COM_INTERFACE_ENTRY_IID(IID_IObjectSafety, IObjectSafety) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) -END_COM_MAP() -}; - -#endif /* _SHELL_H_ */ Added: trunk/reactos/dll/win32/shell32/CShellDispatch.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShellDi… ============================================================================== --- trunk/reactos/dll/win32/shell32/CShellDispatch.cpp (added) +++ trunk/reactos/dll/win32/shell32/CShellDispatch.cpp [iso-8859-1] Tue May 31 17:40:44 2016 @@ -0,0 +1,325 @@ +/* + * IShellDispatch implementation + * + * Copyright 2015 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + + +CShellDispatch::CShellDispatch() +{ +} + +CShellDispatch::~CShellDispatch() +{ +} + +HRESULT CShellDispatch::Initialize() +{ + return S_OK; +} + +// *** IShellDispatch methods *** +HRESULT STDMETHODCALLTYPE CShellDispatch::get_Application(IDispatch **ppid) +{ + TRACE("(%p, %p)\n", this, ppid); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::get_Parent(IDispatch **ppid) +{ + TRACE("(%p, %p)\n", this, ppid); + return E_NOTIMPL; +} + +HRESULT VariantToIdlist(VARIANT* var, LPITEMIDLIST* idlist) +{ + HRESULT hr = S_FALSE; + if(V_VT(var) == VT_I4) + { + hr = SHGetSpecialFolderLocation(NULL, V_I4(var), idlist); + } + else if(V_VT(var) == VT_BSTR) + { + hr = SHILCreateFromPathW(V_BSTR(var), idlist, NULL); + } + return hr; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::NameSpace(VARIANT vDir, Folder **ppsdf) +{ + TRACE("(%p, %s, %p)\n", this, debugstr_variant(&vDir), ppsdf); + if (!ppsdf) + return E_POINTER; + *ppsdf = NULL; + LPITEMIDLIST idlist = NULL; + HRESULT hr = VariantToIdlist(&vDir, &idlist); + if (!SUCCEEDED(hr) || !idlist) + return S_FALSE; + CFolder* fld = new CComObject<CFolder>(); + fld->Init(idlist); + *ppsdf = fld; + fld->AddRef(); + return hr; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::BrowseForFolder(LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf) +{ + TRACE("(%p, %lu, %ls, %lu, %s, %p)\n", this, Hwnd, Title, Options, debugstr_variant(&RootFolder), ppsdf); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::Windows(IDispatch **ppid) +{ + TRACE("(%p, %p)\n", this, ppid); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::Open(VARIANT vDir) +{ + TRACE("(%p, %s)\n", this, debugstr_variant(&vDir)); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::Explore(VARIANT vDir) +{ + TRACE("(%p, %s)\n", this, debugstr_variant(&vDir)); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::MinimizeAll() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::UndoMinimizeALL() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::FileRun() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::CascadeWindows() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::TileVertically() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::TileHorizontally() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::ShutdownWindows() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::Suspend() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::EjectPC() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::SetTime() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::TrayProperties() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::Help() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::FindFiles() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::FindComputer() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::RefreshMenu() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::ControlPanelItem(BSTR szDir) +{ + TRACE("(%p, %ls)\n", this, szDir); + return E_NOTIMPL; +} + + +// *** IShellDispatch2 methods *** +HRESULT STDMETHODCALLTYPE CShellDispatch::IsRestricted(BSTR group, BSTR restriction, LONG *value) +{ + TRACE("(%p, %ls, %ls, %p)\n", this, group, restriction, value); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::ShellExecute(BSTR file, VARIANT args, VARIANT dir, VARIANT op, VARIANT show) +{ + TRACE("(%p, %ls, %s, %s, %s, %s)\n", this, file, debugstr_variant(&args), debugstr_variant(&dir), debugstr_variant(&op), debugstr_variant(&show)); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::FindPrinter(BSTR name, BSTR location, BSTR model) +{ + TRACE("(%p, %ls, %ls, %ls)\n", this, name, location, model); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::GetSystemInformation(BSTR name, VARIANT *ret) +{ + TRACE("(%p, %ls, %p)\n", this, name, ret); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::ServiceStart(BSTR service, VARIANT persistent, VARIANT *ret) +{ + TRACE("(%p, %ls, %s, %p)\n", this, service, wine_dbgstr_variant(&persistent), ret); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::ServiceStop(BSTR service, VARIANT persistent, VARIANT *ret) +{ + TRACE("(%p, %ls, %s, %p)\n", this, service, wine_dbgstr_variant(&persistent), ret); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::IsServiceRunning(BSTR service, VARIANT *running) +{ + TRACE("(%p, %ls, %p)\n", this, service, running); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::CanStartStopService(BSTR service, VARIANT *ret) +{ + TRACE("(%p, %ls, %p)\n", this, service, ret); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::ShowBrowserBar(BSTR clsid, VARIANT show, VARIANT *ret) +{ + TRACE("(%p, %ls, %s, %p)\n", this, clsid, wine_dbgstr_variant(&show), ret); + return E_NOTIMPL; +} + + +// *** IShellDispatch3 methods *** +HRESULT STDMETHODCALLTYPE CShellDispatch::AddToRecent(VARIANT file, BSTR category) +{ + TRACE("(%p, %s, %ls)\n", this, wine_dbgstr_variant(&file), category); + return E_NOTIMPL; +} + + +// *** IShellDispatch4 methods *** +HRESULT STDMETHODCALLTYPE CShellDispatch::WindowsSecurity() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::ToggleDesktop() +{ + TRACE("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::ExplorerPolicy(BSTR policy, VARIANT *value) +{ + TRACE("(%p, %ls, %p)\n", this, policy, value); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::GetSetting(LONG setting, VARIANT_BOOL *result) +{ + TRACE("(%p, %lu, %p)\n", this, setting, result); + return E_NOTIMPL; +} + + +// *** IObjectSafety methods *** +HRESULT STDMETHODCALLTYPE CShellDispatch::GetInterfaceSafetyOptions(REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) +{ + TRACE("(%p, %s, %p, %p)\n", this, wine_dbgstr_guid(&riid), pdwSupportedOptions, pdwEnabledOptions); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::SetInterfaceSafetyOptions(REFIID riid, DWORD dwOptionSetMask, DWORD dwEnabledOptions) +{ + TRACE("(%p, %s, %lu, %lu)\n", this, wine_dbgstr_guid(&riid), dwOptionSetMask, dwEnabledOptions); + return E_NOTIMPL; +} + + +// *** IObjectWithSite methods *** +HRESULT STDMETHODCALLTYPE CShellDispatch::SetSite(IUnknown *pUnkSite) +{ + TRACE("(%p, %p)\n", this, pUnkSite); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellDispatch::GetSite(REFIID riid, PVOID *ppvSite) +{ + TRACE("(%p, %s, %p)\n", this, wine_dbgstr_guid(&riid), ppvSite); + return E_NOTIMPL; +} + +HRESULT WINAPI CShellDispatch_Constructor(REFIID riid, LPVOID * ppvOut) +{ + return ShellObjectCreatorInit<CShellDispatch>(riid, ppvOut); +} + Propchange: trunk/reactos/dll/win32/shell32/CShellDispatch.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shell32/CShellDispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CShellDi… ============================================================================== --- trunk/reactos/dll/win32/shell32/CShellDispatch.h (added) +++ trunk/reactos/dll/win32/shell32/CShellDispatch.h [iso-8859-1] Tue May 31 17:40:44 2016 @@ -0,0 +1,111 @@ +/* + * IShellDispatch implementation + * + * Copyright 2015 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _SHELLDISPATCH_H_ +#define _SHELLDISPATCH_H_ + +#undef ShellExecute + +class CShellDispatch: + public CComCoClass<CShellDispatch, &CLSID_Shell>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDispatchImpl<IShellDispatch4, &IID_IShellDispatch4>, + public IObjectSafety, + public IObjectWithSite +{ +private: + +public: + CShellDispatch(); + ~CShellDispatch(); + + HRESULT Initialize(); + + // *** IShellDispatch methods *** + virtual HRESULT STDMETHODCALLTYPE get_Application(IDispatch **ppid); + virtual HRESULT STDMETHODCALLTYPE get_Parent(IDispatch **ppid); + virtual HRESULT STDMETHODCALLTYPE NameSpace(VARIANT vDir, Folder **ppsdf); + virtual HRESULT STDMETHODCALLTYPE BrowseForFolder(LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf); + virtual HRESULT STDMETHODCALLTYPE Windows(IDispatch **ppid); + virtual HRESULT STDMETHODCALLTYPE Open(VARIANT vDir); + virtual HRESULT STDMETHODCALLTYPE Explore(VARIANT vDir); + virtual HRESULT STDMETHODCALLTYPE MinimizeAll(); + virtual HRESULT STDMETHODCALLTYPE UndoMinimizeALL(); + virtual HRESULT STDMETHODCALLTYPE FileRun(); + virtual HRESULT STDMETHODCALLTYPE CascadeWindows(); + virtual HRESULT STDMETHODCALLTYPE TileVertically(); + virtual HRESULT STDMETHODCALLTYPE TileHorizontally(); + virtual HRESULT STDMETHODCALLTYPE ShutdownWindows(); + virtual HRESULT STDMETHODCALLTYPE Suspend(); + virtual HRESULT STDMETHODCALLTYPE EjectPC(); + virtual HRESULT STDMETHODCALLTYPE SetTime(); + virtual HRESULT STDMETHODCALLTYPE TrayProperties(); + virtual HRESULT STDMETHODCALLTYPE Help(); + virtual HRESULT STDMETHODCALLTYPE FindFiles(); + virtual HRESULT STDMETHODCALLTYPE FindComputer(); + virtual HRESULT STDMETHODCALLTYPE RefreshMenu(); + virtual HRESULT STDMETHODCALLTYPE ControlPanelItem(BSTR szDir); + + // *** IShellDispatch2 methods *** + virtual HRESULT STDMETHODCALLTYPE IsRestricted(BSTR group, BSTR restriction, LONG *value); + virtual HRESULT STDMETHODCALLTYPE ShellExecute(BSTR file, VARIANT args, VARIANT dir, VARIANT op, VARIANT show); + virtual HRESULT STDMETHODCALLTYPE FindPrinter(BSTR name, BSTR location, BSTR model); + virtual HRESULT STDMETHODCALLTYPE GetSystemInformation(BSTR name, VARIANT *ret); + virtual HRESULT STDMETHODCALLTYPE ServiceStart(BSTR service, VARIANT persistent, VARIANT *ret); + virtual HRESULT STDMETHODCALLTYPE ServiceStop(BSTR service, VARIANT persistent, VARIANT *ret); + virtual HRESULT STDMETHODCALLTYPE IsServiceRunning(BSTR service, VARIANT *running); + virtual HRESULT STDMETHODCALLTYPE CanStartStopService(BSTR service, VARIANT *ret); + virtual HRESULT STDMETHODCALLTYPE ShowBrowserBar(BSTR clsid, VARIANT show, VARIANT *ret); + + // *** IShellDispatch3 methods *** + virtual HRESULT STDMETHODCALLTYPE AddToRecent(VARIANT file, BSTR category); + + // *** IShellDispatch4 methods *** + virtual HRESULT STDMETHODCALLTYPE WindowsSecurity(); + virtual HRESULT STDMETHODCALLTYPE ToggleDesktop(); + virtual HRESULT STDMETHODCALLTYPE ExplorerPolicy(BSTR policy, VARIANT *value); + virtual HRESULT STDMETHODCALLTYPE GetSetting(LONG setting, VARIANT_BOOL *result); + + // *** IObjectSafety methods *** + virtual HRESULT STDMETHODCALLTYPE GetInterfaceSafetyOptions(REFIID riid, DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions); + virtual HRESULT STDMETHODCALLTYPE SetInterfaceSafetyOptions(REFIID riid, DWORD dwOptionSetMask, DWORD dwEnabledOptions); + + // *** IObjectWithSite methods *** + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite); + + +DECLARE_REGISTRY_RESOURCEID(IDR_SHELL) +DECLARE_NOT_AGGREGATABLE(CShellDispatch) + +DECLARE_PROTECT_FINAL_CONSTRUCT() + +BEGIN_COM_MAP(CShellDispatch) + COM_INTERFACE_ENTRY_IID(IID_IShellDispatch4, IShellDispatch4) + COM_INTERFACE_ENTRY_IID(IID_IShellDispatch3, IShellDispatch3) + COM_INTERFACE_ENTRY_IID(IID_IShellDispatch2, IShellDispatch2) + COM_INTERFACE_ENTRY_IID(IID_IShellDispatch, IShellDispatch) + COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) + COM_INTERFACE_ENTRY_IID(IID_IObjectSafety, IObjectSafety) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) +END_COM_MAP() +}; + +#endif /* _SHELLDISPATCH_H_ */ Propchange: trunk/reactos/dll/win32/shell32/CShellDispatch.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Tue May 31 17:40:44 2016 @@ -53,7 +53,7 @@ #include "CFolderItemVerbs.h" #include "CFolderItems.h" #include "CFolder.h" -#include "CShell.h" +#include "CShellDispatch.h" #include "CDropTargetHelper.h" #include "CFolderOptions.h" #include "folders/CFSFolder.h" Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Tue May 31 17:40:44 2016 @@ -196,7 +196,7 @@ OBJECT_ENTRY(CLSID_ShellDesktop, CDesktopFolder) OBJECT_ENTRY(CLSID_ShellItem, CShellItem) OBJECT_ENTRY(CLSID_ShellLink, CShellLink) - OBJECT_ENTRY(CLSID_Shell, CShell) + OBJECT_ENTRY(CLSID_Shell, CShellDispatch) OBJECT_ENTRY(CLSID_DragDropHelper, CDropTargetHelper) OBJECT_ENTRY(CLSID_ControlPanel, CControlPanelFolder) OBJECT_ENTRY(CLSID_MyDocuments, CMyDocsFolder) Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Tue May 31 17:40:44 2016 @@ -72,7 +72,7 @@ HRESULT WINAPI IShellView_Constructor(IShellFolder *pFolder, IShellView **newView); HRESULT WINAPI CDefView_Constructor(IShellFolder *pFolder, REFIID riid, LPVOID * ppvOut); HRESULT WINAPI CDefViewDual_Constructor(REFIID riid, LPVOID * ppvOut); -HRESULT WINAPI CShell_Constructor(REFIID riid, LPVOID * ppvOut); +HRESULT WINAPI CShellDispatch_Constructor(REFIID riid, LPVOID * ppvOut); HRESULT WINAPI IShellLink_ConstructFromPath(WCHAR *path, REFIID riid, LPVOID *ppv); HRESULT WINAPI IShellLink_ConstructFromFile(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv);

1 0

[gadamopoulos] 71475: [BROWSEUI] - Implement CShellBrowser::Navigate and CShellBrowser::Navigate2. - Part of the work submitted by Sylvain Deverre. CORE-10838
by gadamopoulos＠svn.reactos.org 31 May '16

31 May '16

Author: gadamopoulos Date: Tue May 31 14:57:05 2016 New Revision: 71475 URL: http://svn.reactos.org/svn/reactos?rev=71475&view=rev Log: [BROWSEUI] - Implement CShellBrowser::Navigate and CShellBrowser::Navigate2. - Part of the work submitted by Sylvain Deverre. CORE-10838 Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Tue May 31 14:57:05 2016 @@ -2884,7 +2884,17 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::Navigate(BSTR URL, VARIANT *Flags, VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { - return E_NOTIMPL; + CComHeapPtr<ITEMIDLIST> pidl; + HRESULT hResult; + CComPtr<IShellFolder> pDesktop; + + hResult = SHGetDesktopFolder(&pDesktop); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + hResult = pDesktop->ParseDisplayName(NULL, NULL, URL, NULL, &pidl, NULL); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + return BrowseObject(pidl, 1); } HRESULT STDMETHODCALLTYPE CShellBrowser::Refresh() @@ -3104,14 +3114,23 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::Navigate2(VARIANT *URL, VARIANT *Flags, VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { + LPITEMIDLIST pidl = NULL; + HRESULT hResult; // called from drive combo box to navigate to a directory - if (V_VT(URL) != (VT_ARRAY | VT_UI1)) - return E_INVALIDARG; - if (V_ARRAY(URL)->cDims != 1 || V_ARRAY(URL)->cbElements != 1) - return E_INVALIDARG; - - LPITEMIDLIST pidl = static_cast<LPITEMIDLIST>(V_ARRAY(URL)->pvData); - HRESULT hResult = BrowseToPIDL(pidl, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); + // Also called by search band to display shell results folder view + + if (V_VT(URL) == VT_BSTR) + { + return this->Navigate(V_BSTR(URL), Flags, TargetFrameName, PostData, Headers); + } + if (V_VT(URL) == (VT_ARRAY | VT_UI1)) + { + if (V_ARRAY(URL)->cDims != 1 || V_ARRAY(URL)->cbElements != 1) + return E_INVALIDARG; + + pidl = static_cast<LPITEMIDLIST>(V_ARRAY(URL)->pvData); + } + hResult = BrowseToPIDL(pidl, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; return S_OK;

1 0

[gadamopoulos] 71474: [BROWSEUI] - Implement the toolbar that allows the user to close the band. - Part of the work submitted by Sylvain Deverre. CORE-10838
by gadamopoulos＠svn.reactos.org 31 May '16

31 May '16

Author: gadamopoulos Date: Tue May 31 14:52:18 2016 New Revision: 71474 URL: http://svn.reactos.org/svn/reactos?rev=71474&view=rev Log: [BROWSEUI] - Implement the toolbar that allows the user to close the band. - Part of the work submitted by Sylvain Deverre. CORE-10838 Added: trunk/reactos/dll/win32/browseui/res/barbtn.bmp (with props) Modified: trunk/reactos/dll/win32/browseui/basebarsite.cpp trunk/reactos/dll/win32/browseui/browseui.rc Modified: trunk/reactos/dll/win32/browseui/basebarsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] Tue May 31 14:52:18 2016 @@ -27,14 +27,13 @@ /* TODO: -****Fix so an already created bar will be detected and just shown instead of added again -****When a new bar is added, initiate a resize - **Add owner draw for base bar +****When a new bar is added, resize correctly the band inside instead of keeping current size. + *Translate close button label + **Add owner draw for base bar -- hackplemented atm **Make label text in base bar always draw in black - **Make base bar show close box - **Create close toolbar button - **Fix to delete all CBarInfo on deletion - + ***Set rebar band style flags accordingly to what band object asked. + ***Set rebar style accordingly to direction +****This class should also manage desktop bands ? (another kind of explorer bands) */ class CBaseBarSite : @@ -65,6 +64,8 @@ // HWND fRebarWindow; // rebar for top of window CComPtr<IUnknown> fDeskBarSite; DWORD fNextBandID; + HWND toolbarWnd; + HIMAGELIST toolImageList; BOOL fVertical; public: CBaseBarSite(); @@ -127,15 +128,20 @@ // message handlers LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnCustomDraw(LPNMCUSTOMDRAW pnmcd); // Helper functions + HFONT GetTitleFont(); HRESULT FindBandByGUID(REFIID pGuid, DWORD *pdwBandID); HRESULT ShowBand(DWORD dwBandID); HRESULT GetInternalBandInfo(UINT uBand, REBARBANDINFO *pBandInfo); HRESULT GetInternalBandInfo(UINT uBand, REBARBANDINFO *pBandInfo, DWORD fMask); + BEGIN_MSG_MAP(CBaseBarSite) MESSAGE_HANDLER(WM_NOTIFY, OnNotify) + MESSAGE_HANDLER(WM_COMMAND, OnCommand) END_MSG_MAP() BEGIN_COM_MAP(CBaseBarSite) @@ -163,6 +169,7 @@ CBaseBarSite::~CBaseBarSite() { + TRACE("CBaseBarSite deleted\n"); } HRESULT CBaseBarSite::InsertBar(IUnknown *newBar) @@ -313,21 +320,31 @@ CComPtr<IDeskBar> deskBar; CComPtr<IWinEventHandler> winEventHandler; NMHDR *notifyHeader; + // RECT newBounds; HRESULT hResult; - + hResult = S_OK; if (uMsg == WM_NOTIFY) { notifyHeader = (NMHDR *)lParam; - if (notifyHeader->hwndFrom == m_hWnd && notifyHeader->code == RBN_AUTOSIZE) + if (notifyHeader->hwndFrom == m_hWnd) { + switch (notifyHeader->code) + { + case RBN_AUTOSIZE: // For now, don't notify basebar we tried to resize ourselves, we don't // get correct values at the moment. #if 0 - hResult = fDeskBarSite->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); - GetClientRect(&newBounds); - hResult = deskBar->OnPosRectChangeDB(&newBounds); + hResult = fDeskBarSite->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); + GetClientRect(&newBounds); + hResult = deskBar->OnPosRectChangeDB(&newBounds); + #endif + break; + case NM_CUSTOMDRAW: + *theResult = OnCustomDraw((LPNMCUSTOMDRAW)lParam); + return S_OK; + } } } if (fCurrentActiveBar != NULL) @@ -374,6 +391,9 @@ } else { + TBBUTTON closeBtn; + HBITMAP hBmp; + hResult = punkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; @@ -399,6 +419,37 @@ SendMessage(RB_SETTEXTCOLOR, 0, CLR_DEFAULT); SendMessage(RB_SETBKCOLOR, 0, CLR_DEFAULT); + + /* Create close toolbar and imagelist */ + toolbarWnd = CreateWindowW(TOOLBARCLASSNAMEW, NULL, + WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | + TBSTYLE_FLAT | TBSTYLE_TRANSPARENT | TBSTYLE_TOOLTIPS | + CCS_NOMOVEY | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NODIVIDER + , 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); + + toolImageList = ImageList_Create(13, 11, ILC_COLOR24 | ILC_MASK, 3, 0); + + hBmp = (HBITMAP)LoadImage(_AtlBaseModule.GetModuleInstance(), + MAKEINTRESOURCE(IDB_BANDBUTTONS), IMAGE_BITMAP, 0, 0, + LR_LOADTRANSPARENT); + + ImageList_AddMasked(toolImageList, hBmp, RGB(192, 192, 192)); + DeleteObject(hBmp); + + SendMessage(toolbarWnd, TB_SETIMAGELIST, 0, (LPARAM)toolImageList); + + /* Add button to toolbar */ + closeBtn.iBitmap = MAKELONG(1, 0); + closeBtn.idCommand = IDM_BASEBAR_CLOSE; + closeBtn.fsState = TBSTATE_ENABLED; + closeBtn.fsStyle = BTNS_BUTTON; + ZeroMemory(closeBtn.bReserved, sizeof(closeBtn.bReserved)); + closeBtn.dwData = 0; + closeBtn.iString = (INT_PTR)L"Close"; + + SendMessage(toolbarWnd, TB_INSERTBUTTON, 0, (LPARAM)&closeBtn); + SendMessage(toolbarWnd, TB_SETMAXTEXTROWS, 0, 0); + //SendMessage(toolbarWnd, TB_AUTOSIZE, 0, 0); } return S_OK; } @@ -437,6 +488,9 @@ if (V_VT(pvaIn) != VT_UNKNOWN) return E_INVALIDARG; return InsertBar(V_UNKNOWN(pvaIn)); + case 0x17: + // redim band + break; } } return E_FAIL; @@ -631,6 +685,88 @@ } bHandled = FALSE; /* forward notification to parent */ return 0; +} + +LRESULT CBaseBarSite::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + HRESULT hResult; + CComPtr<IDockingWindow> parentSite; + + if (HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDM_BASEBAR_CLOSE) + { + hResult = fDeskBarSite->QueryInterface(IID_PPV_ARG(IDockingWindow, &parentSite)); + if (!SUCCEEDED(hResult)) + { + return E_FAIL; + } + parentSite->ShowDW(FALSE); + bHandled = TRUE; + } + return 0; +} + +LRESULT CBaseBarSite::OnCustomDraw(LPNMCUSTOMDRAW pnmcd) +{ + switch (pnmcd->dwDrawStage) + { + case CDDS_PREPAINT: + case CDDS_PREERASE: + return CDRF_NOTIFYITEMDRAW; + case CDDS_ITEMPREPAINT: + if (fVertical) + { + REBARBANDINFO info; + WCHAR wszTitle[MAX_PATH]; + DWORD index; + RECT rt; + HFONT newFont, oldFont; + + index = SendMessage(RB_IDTOINDEX, fCurrentActiveBar->fBandID , 0); + ZeroMemory(&info, sizeof(info)); + ZeroMemory(wszTitle, sizeof(wszTitle)); + DrawEdge(pnmcd->hdc, &pnmcd->rc, EDGE_ETCHED, BF_BOTTOM); + // We also resize our close button + ::SetWindowPos(toolbarWnd, HWND_TOP, pnmcd->rc.right - 22, 0, 20, 18, SWP_SHOWWINDOW); + // Draw the text + info.cch = MAX_PATH; + info.lpText = wszTitle; + rt = pnmcd->rc; + rt.right -= 24; + rt.left += 2; + if (FAILED_UNEXPECTEDLY(GetInternalBandInfo(index, &info, RBBIM_TEXT))) + return CDRF_SKIPDEFAULT; + newFont = GetTitleFont(); + if (newFont) + oldFont = (HFONT)SelectObject(pnmcd->hdc, newFont); + DrawText(pnmcd->hdc, info.lpText, -1, &rt, DT_SINGLELINE | DT_LEFT); + SelectObject(pnmcd->hdc, oldFont); + DeleteObject(newFont); + return CDRF_SKIPDEFAULT; + } + else + { + DrawEdge(pnmcd->hdc, &pnmcd->rc, EDGE_ETCHED, BF_BOTTOM); + // We also resize our close button + ::SetWindowPos(toolbarWnd, HWND_TOP, 0, 2, 20, 18, SWP_SHOWWINDOW); + } + return CDRF_SKIPDEFAULT; + default: + break; + } + return CDRF_DODEFAULT; +} + +HFONT CBaseBarSite::GetTitleFont() +{ + NONCLIENTMETRICS mt; + mt.cbSize = sizeof(mt); + if (!SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(mt), &mt, 0)) + { + ERR("Can't get system parameters !\n"); + return NULL; + } + return CreateFontIndirect(&mt.lfMenuFont); + } HRESULT CBaseBarSite::FindBandByGUID(REFGUID pGuid, DWORD *pdwBandID) Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] Tue May 31 14:52:18 2016 @@ -103,4 +103,7 @@ #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif +#endif + +/* Include band button bitmaps */ +IDB_BANDBUTTONS BITMAP "res/barbtn.bmp" Added: trunk/reactos/dll/win32/browseui/res/barbtn.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/bar… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/browseui/res/barbtn.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[gadamopoulos] 71473: [BROWSEUI] - CShellBrowser: Implement the Explrer bar menu. Implement checking if a band is already loaded. Destroy all bands while destroying the browser window. Misc changes...
by gadamopoulos＠svn.reactos.org 31 May '16

31 May '16

Author: gadamopoulos Date: Tue May 31 14:42:01 2016 New Revision: 71473 URL: http://svn.reactos.org/svn/reactos?rev=71473&view=rev Log: [BROWSEUI] - CShellBrowser: Implement the Explrer bar menu. Implement checking if a band is already loaded. Destroy all bands while destroying the browser window. Misc changes. - Part of the work submitted by Sylvain Deverre. CORE-10838 Modified: trunk/reactos/dll/win32/browseui/precomp.h trunk/reactos/dll/win32/browseui/resource.h trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… ============================================================================== --- trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] Tue May 31 14:42:01 2016 @@ -13,6 +13,7 @@ #include <wingdi.h> #include <shlobj.h> #include <tlogstg.h> +#include <shellapi.h> #include <shlobj_undoc.h> #include <shlguid_undoc.h> #include <shdeprecated.h> Modified: trunk/reactos/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/resourc… ============================================================================== --- trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] Tue May 31 14:42:01 2016 @@ -56,11 +56,17 @@ #define IDM_TOOLS_FOLDEROPTIONS 0xA123 #define IDM_HELP_ISTHISCOPYLEGAL 0xA104 #define IDM_HELP_ABOUT 0xA102 - #define IDM_TASKBAR_TOOLBARS 268 #define IDM_TASKBAR_TOOLBARS_DESKTOP 3 #define IDM_TASKBAR_TOOLBARS_QUICKLAUNCH 4 #define IDM_TASKBAR_TOOLBARS_NEW 1 + +/* Random id for band close button, feel free to change it */ +#define IDM_BASEBAR_CLOSE 0xA200 + +/* User-installed explorer band IDs according to API Monitor traces */ +#define IDM_EXPLORERBAND_BEGINCUSTOM 0xA240 +#define IDM_EXPLORERBAND_ENDCUSTOM 0xA25C #define IDM_GOTO_TRAVEL_FIRST 0xA141 #define IDM_GOTO_TRAVEL_LAST 0xA151 @@ -118,3 +124,5 @@ #define IDC_TEXTOPTIONS 4096 #define IDC_ICONOPTIONS 4097 + +#define IDB_BANDBUTTONS 545 Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Tue May 31 14:42:01 2016 @@ -24,7 +24,7 @@ #include <htiframe.h> #include <strsafe.h> -#define USE_CUSTOM_EXPLORERBAND 1 +#define USE_CUSTOM_EXPLORERBAND 0 extern HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow); @@ -118,14 +118,6 @@ "language='*'\"") #endif // __GNUC__ -struct categoryCacheHeader -{ - long dwSize; // size of header only - long version; // currently 1 - SYSTEMTIME writeTime; // time we were written to registry - long classCount; // number of classes following -}; - static const unsigned int folderOptionsPageCountMax = 20; static const long BTP_DONT_UPDATE_HISTORY = 0; static const long BTP_UPDATE_CUR_HISTORY = 1; @@ -257,6 +249,11 @@ where vaIn will be a VT_UNKNOWN with the new bar. It also sends a RB_SHOWBAND to the rebar */ + +struct MenuBandInfo { + GUID barGuid; + BOOL fVertical; +}; class CShellBrowser : public CWindowImpl<CShellBrowser, CWindow, CFrameWinTraits>, @@ -304,6 +301,7 @@ IOleObject *fHistoryObject; IStream *fHistoryStream; IBindCtx *fHistoryBindContext; + HDSA menuDsa; HACCEL m_hAccel; public: #if 0 @@ -328,11 +326,15 @@ FOLDERSETTINGS *folderSettings, long flags); HRESULT GetMenuBand(REFIID riid, void **shellMenu); HRESULT GetBaseBar(bool vertical, IUnknown **theBaseBar); + BOOL IsBandLoaded(const CLSID clsidBand, bool verticali, DWORD *pdwBandID); HRESULT ShowBand(const CLSID &classID, bool vertical); HRESULT NavigateToParent(); HRESULT DoFolderOptions(); static LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); void RepositionBars(); + HRESULT BuildExplorerBandMenu(); + HRESULT BuildExplorerBandCategory(HMENU hBandsMenu, CATID category, DWORD dwPos, UINT *nbFound); + BOOL IsBuiltinBand(CLSID &bandID); virtual WNDPROC GetWindowProc() { return WindowProc; @@ -345,7 +347,6 @@ HRESULT UpdateUpState(); void UpdateGotoMenu(HMENU theMenu); void UpdateViewMenu(HMENU theMenu); - HRESULT OnSearch(); /* // *** IDockingWindowFrame methods *** virtual HRESULT STDMETHODCALLTYPE AddToolbar(IUnknown *punkSrc, LPCWSTR pwszItem, DWORD dwAddFlags); @@ -616,7 +617,9 @@ LRESULT OnToggleTextLabels(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnToolbarCustomize(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT OnGoTravel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); + LRESULT OnExplorerBar(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled); LRESULT RelayCommands(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + HRESULT OnSearch(); static ATL::CWndClassInfo& GetWndClassInfo() { @@ -657,8 +660,13 @@ COMMAND_ID_HANDLER(IDM_TOOLBARS_LINKSBAR, OnToggleLinksBandVisible) COMMAND_ID_HANDLER(IDM_TOOLBARS_TEXTLABELS, OnToggleTextLabels) COMMAND_ID_HANDLER(IDM_TOOLBARS_CUSTOMIZE, OnToolbarCustomize) + COMMAND_ID_HANDLER(IDM_EXPLORERBAR_SEARCH, OnExplorerBar) + COMMAND_ID_HANDLER(IDM_EXPLORERBAR_FOLDERS, OnExplorerBar) + COMMAND_ID_HANDLER(IDM_EXPLORERBAR_HISTORY, OnExplorerBar) + COMMAND_ID_HANDLER(IDM_EXPLORERBAR_FAVORITES, OnExplorerBar) COMMAND_ID_HANDLER(IDM_BACKSPACE, OnBackspace) COMMAND_RANGE_HANDLER(IDM_GOTO_TRAVEL_FIRSTTARGET, IDM_GOTO_TRAVEL_LASTTARGET, OnGoTravel) + COMMAND_RANGE_HANDLER(IDM_EXPLORERBAND_BEGINCUSTOM, IDM_EXPLORERBAND_ENDCUSTOM, OnExplorerBar) MESSAGE_HANDLER(WM_COMMAND, RelayCommands) END_MSG_MAP() @@ -706,6 +714,8 @@ CShellBrowser::~CShellBrowser() { + if (menuDsa) + DSA_Destroy(menuDsa); } HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, long b, long c, long d) @@ -715,6 +725,10 @@ CComPtr<IUnknown> clientBar; _AtlInitialConstruct(); + + menuDsa = DSA_Create(sizeof(MenuBandInfo), 5); + if (!menuDsa) + return E_OUTOFMEMORY; fCabinetState.cLength = sizeof(fCabinetState); if (ReadCabinetState(&fCabinetState, sizeof(fCabinetState)) == FALSE) @@ -1112,7 +1126,10 @@ hResult = CreateBaseBarSite(IID_PPV_ARG(IUnknown, &newBaseBarSite), vertical); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - + + // we have to store our basebar into cache now + *cache = newBaseBar; + // tell the new base bar about the shell browser hResult = IUnknown_SetSite(newBaseBar, static_cast<IDropTarget *>(this)); if (FAILED_UNEXPECTEDLY(hResult)) @@ -1134,9 +1151,61 @@ if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - *cache = newBaseBar.Detach(); } return (*cache)->QueryInterface(IID_PPV_ARG(IUnknown, theBaseBar)); +} + +BOOL CShellBrowser::IsBandLoaded(const CLSID clsidBand, bool vertical, DWORD *pdwBandID) +{ + HRESULT hResult; + CComPtr<IUnknown> baseBar; + CComPtr<IDeskBar> deskBar; + CComPtr<IUnknown> baseBarSite; + CComPtr<IBandSite> bandSite; + CLSID clsidTmp; + DWORD numBands; + DWORD dwBandID; + DWORD i; + + /* Get our basebarsite to be able to enumerate bands */ + hResult = GetBaseBar(vertical, &baseBar); + if (FAILED_UNEXPECTEDLY(hResult)) + return FALSE; + hResult = baseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); + if (FAILED_UNEXPECTEDLY(hResult)) + return FALSE; + hResult = deskBar->GetClient(&baseBarSite); + if (FAILED_UNEXPECTEDLY(hResult)) + return FALSE; + hResult = baseBarSite->QueryInterface(IID_PPV_ARG(IBandSite, &bandSite)); + if (FAILED_UNEXPECTEDLY(hResult)) + return FALSE; + + hResult = bandSite->EnumBands(-1, &numBands); + if (FAILED_UNEXPECTEDLY(hResult)) + return FALSE; + + for(i = 0; i < numBands; i++) + { + CComPtr<IPersist> bandPersist; + + hResult = bandSite->EnumBands(i, &dwBandID); + if (FAILED_UNEXPECTEDLY(hResult)) + return FALSE; + + hResult = bandSite->GetBandObject(dwBandID, IID_PPV_ARG(IPersist, &bandPersist)); + if (FAILED_UNEXPECTEDLY(hResult)) + return FALSE; + hResult = bandPersist->GetClassID(&clsidTmp); + if (FAILED_UNEXPECTEDLY(hResult)) + return FALSE; + if (IsEqualGUID(clsidBand, clsidTmp)) + { + if (pdwBandID) *pdwBandID = dwBandID; + return TRUE; + } + } + return FALSE; } HRESULT CShellBrowser::ShowBand(const CLSID &classID, bool vertical) @@ -1148,42 +1217,59 @@ CComPtr<IDeskBar> deskBar; VARIANT vaIn; HRESULT hResult; + DWORD dwBandID; hResult = GetBaseBar(vertical, (IUnknown **)&theBaseBar); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - -#if USE_CUSTOM_EXPLORERBAND - TRACE("ShowBand called for CLSID %s, vertical=%d...\n", wine_dbgstr_guid(&classID), vertical); - if (IsEqualCLSID(CLSID_ExplorerBand, classID)) - { - TRACE("CLSID_ExplorerBand requested, building internal band.\n"); - hResult = CExplorerBand_Constructor(IID_PPV_ARG(IUnknown, &newBand)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - } - else -#endif - { - TRACE("A different CLSID requested, using CoCreateInstance.\n"); + + hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + hResult = deskBar->GetClient(&baseBarSite); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + if (!IsBandLoaded(classID, vertical, &dwBandID)) + { hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &newBand)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } - hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = deskBar->GetClient(&baseBarSite); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; + else + { + CComPtr<IBandSite> pBandSite; + + hResult = baseBarSite->QueryInterface(IID_PPV_ARG(IBandSite, &pBandSite)); + if (!SUCCEEDED(hResult)) + { + ERR("Can't get IBandSite interface\n"); + return E_FAIL; + } + hResult = pBandSite->GetBandObject(dwBandID, IID_PPV_ARG(IUnknown, &newBand)); + if (!SUCCEEDED(hResult)) + { + ERR("Can't find band object\n"); + return E_FAIL; + } + + // It's hackish, but we should be able to show the wanted band until we + // find the proper way to do this (but it seems to work to add a new band) + // Here we'll just re-add the existing band to the site, causing it to display. + } V_VT(&vaIn) = VT_UNKNOWN; V_UNKNOWN(&vaIn) = newBand.p; hResult = IUnknown_Exec(baseBarSite, CGID_IDeskBand, 1, 1, &vaIn, NULL); if (FAILED_UNEXPECTEDLY(hResult)) + { return hResult; + } + hResult = dockingWindow->ShowDW(TRUE); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; @@ -1634,9 +1720,93 @@ SetMenuItemInfo(theMenu, IDM_VIEW_TOOLBARS, FALSE, &menuItemInfo); } SHCheckMenuItem(theMenu, IDM_VIEW_STATUSBAR, fStatusBarVisible ? TRUE : FALSE); - - // TODO: Implement - SHEnableMenuItem(theMenu, IDM_VIEW_EXPLORERBAR, FALSE); +} + +HRESULT CShellBrowser::BuildExplorerBandMenu() +{ + HMENU hBandsMenu; + UINT nbFound; + + hBandsMenu = SHGetMenuFromID(fCurrentMenuBar, IDM_VIEW_EXPLORERBAR); + if (!hBandsMenu) + { + OutputDebugString(L"No menu !\n"); + return E_FAIL; + } + DSA_DeleteAllItems(menuDsa); + BuildExplorerBandCategory(hBandsMenu, CATID_InfoBand, 4, NULL); + BuildExplorerBandCategory(hBandsMenu, CATID_CommBand, 20, &nbFound); + if (!nbFound) + { + // Remove separator + DeleteMenu(hBandsMenu, IDM_EXPLORERBAR_SEPARATOR, MF_BYCOMMAND); + } + // Remove media menu since XP does it (according to API Monitor) + DeleteMenu(hBandsMenu, IDM_EXPLORERBAR_MEDIA, MF_BYCOMMAND); + return S_OK; +} + +HRESULT CShellBrowser::BuildExplorerBandCategory(HMENU hBandsMenu, CATID category, DWORD dwPos, UINT *nbFound) +{ + HRESULT hr; + CComPtr<IEnumGUID> pEnumGUID; + WCHAR wszBandName[MAX_PATH]; + WCHAR wszBandGUID[MAX_PATH]; + WCHAR wRegKey[MAX_PATH]; + UINT cBands; + DWORD dwRead; + DWORD dwDataSize; + GUID iter; + MenuBandInfo mbi; + + mbi.fVertical = IsEqualGUID(category, CATID_InfoBand); + cBands = 0; + hr = SHEnumClassesOfCategories(1, &category, 0, NULL, &pEnumGUID); + if (FAILED_UNEXPECTEDLY(hr)) + { + return hr; + } + do + { + pEnumGUID->Next(1, &iter, &dwRead); + if (dwRead) + { + // Get the band name + if (IsBuiltinBand(iter)) + continue; + if (!StringFromGUID2(iter, wszBandGUID, MAX_PATH)) + continue; + StringCchPrintfW(wRegKey, MAX_PATH, L"CLSID\\%s", wszBandGUID); + dwDataSize = MAX_PATH; + SHGetValue(HKEY_CLASSES_ROOT, wRegKey, NULL, NULL, wszBandName, &dwDataSize); + + mbi.barGuid = iter; + InsertMenu(hBandsMenu, dwPos + cBands, MF_BYPOSITION, IDM_EXPLORERBAND_BEGINCUSTOM + DSA_GetItemCount(menuDsa), wszBandName); + DSA_AppendItem(menuDsa, &mbi); + cBands++; + } + } + while (dwRead > 0); + if (nbFound) + *nbFound = cBands; + return S_OK; +} + +BOOL CShellBrowser::IsBuiltinBand(CLSID &bandID) +{ + if (IsEqualCLSID(bandID, CLSID_ExplorerBand)) + return TRUE; + if (IsEqualCLSID(bandID, CLSID_SH_SearchBand) || IsEqualCLSID(bandID, CLSID_SearchBand)) + return TRUE; + if (IsEqualCLSID(bandID, CLSID_IE_SearchBand) || IsEqualCLSID(bandID, CLSID_FileSearchBand)) + return TRUE; + if (IsEqualCLSID(bandID, CLSID_SH_HistBand)) + return TRUE; + if (IsEqualCLSID(bandID, CLSID_SH_FavBand)) + return TRUE; + if (IsEqualCLSID(bandID, CLSID_ChannelsBand)) + return TRUE; + return FALSE; } HRESULT CShellBrowser::OnSearch() @@ -1805,6 +1975,11 @@ { HRESULT hResult; + if (!pguidCmdGroup) + { + TRACE("Unhandled null CGID %d %d %p %p\n", nCmdID, nCmdexecopt, pvaIn, pvaOut); + return E_NOTIMPL; + } if (IsEqualIID(*pguidCmdGroup, CGID_Explorer)) { switch (nCmdID) @@ -1868,6 +2043,9 @@ case 0x12: // refresh on toolbar clicked return S_OK; + case 0x26: + // called for unknown bands ? + return S_OK; case 0x4d: // tell the view if it should hide the task pane or not return (fClientBars[BIVerticalBaseBar].clientBar.p == NULL) ? S_FALSE : S_OK; @@ -1960,20 +2138,22 @@ if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - if (hmenuShared) - { - // FIXME: Figure out the proper way to do this. - HMENU hMenuFavs = GetSubMenu(hmenuShared, 3); - if (hMenuFavs) - { - DeleteMenu(hMenuFavs, IDM_FAVORITES_EMPTY, MF_BYCOMMAND); - } + if (!hmenuShared) + { + hmenuShared = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_CABINET_MAINMENU)); + } + // FIXME: Figure out the proper way to do this. + HMENU hMenuFavs = GetSubMenu(hmenuShared, 3); + if (hMenuFavs) + { + DeleteMenu(hMenuFavs, IDM_FAVORITES_EMPTY, MF_BYCOMMAND); } hResult = shellMenu->SetMenu(hmenuShared, m_hWnd, SMSET_DONTOWN); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; fCurrentMenuBar = hmenuShared; + BuildExplorerBandMenu(); return S_OK; } @@ -1998,7 +2178,7 @@ { } - return E_NOTIMPL; + return S_OK; } HRESULT STDMETHODCALLTYPE CShellBrowser::EnableModelessSB(BOOL fEnable) @@ -2028,7 +2208,7 @@ if (lphwnd == NULL) return E_POINTER; *lphwnd = NULL; - switch(id) + switch (id) { case FCW_TOOLBAR: *lphwnd = fToolbarProxy.m_hWnd; @@ -2054,7 +2234,7 @@ if (pret != NULL) *pret = 0; - switch(id) + switch (id) { case FCW_TOOLBAR: result = fToolbarProxy.SendMessage(uMsg, wParam, lParam); @@ -3172,15 +3352,39 @@ for (int i = 0; i < 3; i++) { + CComPtr<IDockingWindow> pdw; + CComPtr<IDeskBar> bar; + CComPtr<IUnknown> pBarSite; + CComPtr<IDeskBarClient> pClient; + if (fClientBars[i].clientBar == NULL) continue; - IDockingWindow * pdw; + hr = fClientBars[i].clientBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &pdw)); if (FAILED_UNEXPECTEDLY(hr)) continue; - pdw->ShowDW(FALSE); + + /* We should destroy our basebarsite too */ + hr = pdw->QueryInterface(IID_PPV_ARG(IDeskBar, &bar)); + if (SUCCEEDED(hr)) + { + hr = bar->GetClient(&pBarSite); + if (SUCCEEDED(hr) && pBarSite) + { + hr = pBarSite->QueryInterface(IID_PPV_ARG(IDeskBarClient, &pClient)); + if (SUCCEEDED(hr)) + pClient->SetDeskBarSite(NULL); + } + } pdw->CloseDW(0); - pdw->Release(); + pdw = NULL; + /* For some reasons, it's like we miss some AddRef in ATL when QueryInterface on + * same interface or inherited one, so we are removing already removed (!) object. + * TODO: check with MSVC's ATL to see if this behaviour happens too + */ + bar.Detach(); + pClient.Detach(); + pBarSite.Detach(); ReleaseCComPtrExpectZero(fClientBars[i].clientBar); } ReleaseCComPtrExpectZero(fTravelLog); @@ -3471,6 +3675,40 @@ return 0; } +LRESULT CShellBrowser::OnExplorerBar(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) +{ + // TODO: HACK ! use the proper mechanism to show the band (i.e. pass the BSTR to basebar) + if (wID >= IDM_EXPLORERBAND_BEGINCUSTOM && wID <= IDM_EXPLORERBAND_ENDCUSTOM) + { + MenuBandInfo *mbi; + mbi = (MenuBandInfo*)DSA_GetItemPtr(menuDsa, (wID - IDM_EXPLORERBAND_BEGINCUSTOM)); + if (!mbi) + return 0; + ShowBand(mbi->barGuid, mbi->fVertical); + bHandled = TRUE; + return 1; + } + switch (wID) + { + case IDM_EXPLORERBAR_SEARCH: + Exec(&CLSID_CommonButtons, 0x123, 1, NULL, NULL); + break; + case IDM_EXPLORERBAR_FOLDERS: + ShowBand(CLSID_ExplorerBand, true); + break; + case IDM_EXPLORERBAR_HISTORY: + ShowBand(CLSID_SH_HistBand, true); + break; + case IDM_EXPLORERBAR_FAVORITES: + ShowBand(CLSID_SH_FavBand, true); + break; + default: + WARN("Unknown id %x\n", wID); + } + bHandled = TRUE; + return 1; +} + LRESULT CShellBrowser::RelayCommands(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { if (HIWORD(wParam) == 0 && LOWORD(wParam) < FCIDM_SHVIEWLAST && fCurrentShellViewWindow != NULL)

1 0

[gadamopoulos] 71472: [BROWSEUI] - Fix a crash that can happen under weird circumstances. - Part of the work submitted by Sylvain Deverre. CORE-10838
by gadamopoulos＠svn.reactos.org 31 May '16

31 May '16

Author: gadamopoulos Date: Tue May 31 14:02:58 2016 New Revision: 71472 URL: http://svn.reactos.org/svn/reactos?rev=71472&view=rev Log: [BROWSEUI] - Fix a crash that can happen under weird circumstances. - Part of the work submitted by Sylvain Deverre. CORE-10838 Modified: trunk/reactos/dll/win32/browseui/travellog.cpp Modified: trunk/reactos/dll/win32/browseui/travellog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/travell… ============================================================================== --- trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] Tue May 31 14:02:58 2016 @@ -172,6 +172,7 @@ GetToolTipText(punk, wch); TRACE("Updating entry with display name: %S\n", wch); + ZeroMemory(&windowData, sizeof(WINDOWDATA)); ILFree(fPIDL); fPIDL = NULL; GlobalFree(fPersistState);

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