From 714369041b4cfa72fa84d98c22bec571a4783d68 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Thu, 26 Feb 2015 18:44:34 +0000 Subject: [PATCH] [BROWSEUI] - Moce CAutoComplete from shell32 to browseui where it belongs svn path=/trunk/; revision=66473 --- reactos/dll/win32/{shell32 => browseui}/CAutoComplete.cpp | 6 ++---- reactos/dll/win32/{shell32 => browseui}/CAutoComplete.h | 0 reactos/dll/win32/browseui/CMakeLists.txt | 1 + reactos/dll/win32/browseui/browseui.cpp | 1 + reactos/dll/win32/browseui/browseui.rc | 1 + reactos/dll/win32/browseui/precomp.h | 2 ++ .../{shell32/res/rgs => browseui/res}/autocomplete.rgs | 0 reactos/dll/win32/browseui/resource.h | 1 + reactos/dll/win32/shell32/CMakeLists.txt | 1 - reactos/dll/win32/shell32/precomp.h | 1 - reactos/dll/win32/shell32/rgs_res.rc | 1 - reactos/dll/win32/shell32/shell32.cpp | 1 - reactos/dll/win32/shell32/shresdef.h | 1 - 13 files changed, 8 insertions(+), 9 deletions(-) rename reactos/dll/win32/{shell32 => browseui}/CAutoComplete.cpp (99%) rename reactos/dll/win32/{shell32 => browseui}/CAutoComplete.h (100%) rename reactos/dll/win32/{shell32/res/rgs => browseui/res}/autocomplete.rgs (100%) diff --git a/reactos/dll/win32/shell32/CAutoComplete.cpp b/reactos/dll/win32/browseui/CAutoComplete.cpp similarity index 99% rename from reactos/dll/win32/shell32/CAutoComplete.cpp rename to reactos/dll/win32/browseui/CAutoComplete.cpp index f7d27dcdf78..9e05525d9c6 100644 --- a/reactos/dll/win32/shell32/CAutoComplete.cpp +++ b/reactos/dll/win32/browseui/CAutoComplete.cpp @@ -37,8 +37,6 @@ #include "precomp.h" -WINE_DEFAULT_DEBUG_CHANNEL(shell); - static const WCHAR autocomplete_propertyW[] = {'W','i','n','e',' ','A','u','t','o', 'c','o','m','p','l','e','t','e',' ', 'c','o','n','t','r','o','l',0}; @@ -169,7 +167,7 @@ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR p if (key) { wcscpy(key, pwzsRegKeyPath); - value = const_cast(strrchrW(key, '\\')); + value = const_cast(wcsrchr(key, '\\')); if (value) { @@ -435,7 +433,7 @@ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM if (hr != S_OK) break; - if ((LPWSTR)strstrW(strs, hwndText) == strs) + if ((LPWSTR)wcsstr(strs, hwndText) == strs) { if (pThis->options & ACO_AUTOAPPEND) diff --git a/reactos/dll/win32/shell32/CAutoComplete.h b/reactos/dll/win32/browseui/CAutoComplete.h similarity index 100% rename from reactos/dll/win32/shell32/CAutoComplete.h rename to reactos/dll/win32/browseui/CAutoComplete.h diff --git a/reactos/dll/win32/browseui/CMakeLists.txt b/reactos/dll/win32/browseui/CMakeLists.txt index 016fa4826b7..81f4878e379 100644 --- a/reactos/dll/win32/browseui/CMakeLists.txt +++ b/reactos/dll/win32/browseui/CMakeLists.txt @@ -17,6 +17,7 @@ list(APPEND SOURCE brandband.cpp browseui.cpp browseuiord.cpp + CAutoComplete.cpp commonbrowser.cpp desktopipc.cpp explorerband.cpp diff --git a/reactos/dll/win32/browseui/browseui.cpp b/reactos/dll/win32/browseui/browseui.cpp index c7bd50cfd51..9a269ccf008 100644 --- a/reactos/dll/win32/browseui/browseui.cpp +++ b/reactos/dll/win32/browseui/browseui.cpp @@ -27,6 +27,7 @@ public: BEGIN_OBJECT_MAP(ObjectMap) +OBJECT_ENTRY(CLSID_AutoComplete, CAutoComplete) OBJECT_ENTRY(CLSID_ACLMulti, CACLMulti) OBJECT_ENTRY(CLSID_SH_AddressBand, CAddressBand) OBJECT_ENTRY(CLSID_AddressEditBox, CAddressEditBox) diff --git a/reactos/dll/win32/browseui/browseui.rc b/reactos/dll/win32/browseui/browseui.rc index 09efb0d47f7..f9345f32f2b 100644 --- a/reactos/dll/win32/browseui/browseui.rc +++ b/reactos/dll/win32/browseui/browseui.rc @@ -43,6 +43,7 @@ IDR_INTERNETTOOLBAR REGISTRY "res/internettoolbar.rgs" IDR_REGTREEOPTIONS REGISTRY "res/regtreeoptions.rgs" IDR_EXPLORERBAND REGISTRY "res/explorerband.rgs" IDR_PROGRESSDIALOG REGISTRY "res/progressdialog.rgs" +IDR_AUTOCOMPLETE REGISTRY "res/autocomplete.rgs" /* * Everything specific to any language goes diff --git a/reactos/dll/win32/browseui/precomp.h b/reactos/dll/win32/browseui/precomp.h index 0fdb6479618..cc707efc6d0 100644 --- a/reactos/dll/win32/browseui/precomp.h +++ b/reactos/dll/win32/browseui/precomp.h @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,7 @@ #include "aclmulti.h" #include "addressband.h" #include "addresseditbox.h" +#include "CAutoComplete.h" #include "bandproxy.h" #include "bandsite.h" #include "bandsitemenu.h" diff --git a/reactos/dll/win32/shell32/res/rgs/autocomplete.rgs b/reactos/dll/win32/browseui/res/autocomplete.rgs similarity index 100% rename from reactos/dll/win32/shell32/res/rgs/autocomplete.rgs rename to reactos/dll/win32/browseui/res/autocomplete.rgs diff --git a/reactos/dll/win32/browseui/resource.h b/reactos/dll/win32/browseui/resource.h index bfc7e95c1b6..d5b8945241e 100644 --- a/reactos/dll/win32/browseui/resource.h +++ b/reactos/dll/win32/browseui/resource.h @@ -84,6 +84,7 @@ #define IDR_REGTREEOPTIONS 138 #define IDR_EXPLORERBAND 139 #define IDR_PROGRESSDIALOG 140 +#define IDR_AUTOCOMPLETE 141 #define IDS_SMALLICONS 12301 #define IDS_LARGEICONS 12302 diff --git a/reactos/dll/win32/shell32/CMakeLists.txt b/reactos/dll/win32/shell32/CMakeLists.txt index de88bed9bf5..c41f53c7e44 100644 --- a/reactos/dll/win32/shell32/CMakeLists.txt +++ b/reactos/dll/win32/shell32/CMakeLists.txt @@ -16,7 +16,6 @@ include_directories( ${REACTOS_SOURCE_DIR}) list(APPEND SOURCE - CAutoComplete.cpp CMenuBand.cpp CMenuDeskBar.cpp CIDLDataObj.cpp diff --git a/reactos/dll/win32/shell32/precomp.h b/reactos/dll/win32/shell32/precomp.h index 52bd1f6ce6b..d31d57d230b 100644 --- a/reactos/dll/win32/shell32/precomp.h +++ b/reactos/dll/win32/shell32/precomp.h @@ -48,7 +48,6 @@ #include "CShellItem.h" #include "CShellLink.h" #include "CDropTargetHelper.h" -#include "CAutoComplete.h" #include "folders/CFSFolder.h" #include "folders/CDrivesFolder.h" #include "folders/CDesktopFolder.h" diff --git a/reactos/dll/win32/shell32/rgs_res.rc b/reactos/dll/win32/shell32/rgs_res.rc index 7cab2161e66..dce1e150479 100644 --- a/reactos/dll/win32/shell32/rgs_res.rc +++ b/reactos/dll/win32/shell32/rgs_res.rc @@ -1,7 +1,6 @@ /* REGISTRY */ IDR_ADMINFOLDERSHORTCUT REGISTRY "res/rgs/adminfoldershortcut.rgs" -IDR_AUTOCOMPLETE REGISTRY "res/rgs/autocomplete.rgs" IDR_CONTROLPANEL REGISTRY "res/rgs/controlpanel.rgs" IDR_DRAGDROPHELPER REGISTRY "res/rgs/dragdrophelper.rgs" IDR_FOLDEROPTIONS REGISTRY "res/rgs/folderoptions.rgs" diff --git a/reactos/dll/win32/shell32/shell32.cpp b/reactos/dll/win32/shell32/shell32.cpp index 016f6b04e6a..18439d06a99 100644 --- a/reactos/dll/win32/shell32/shell32.cpp +++ b/reactos/dll/win32/shell32/shell32.cpp @@ -160,7 +160,6 @@ BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_ShellLink, CShellLink) OBJECT_ENTRY(CLSID_DragDropHelper, CDropTargetHelper) OBJECT_ENTRY(CLSID_ControlPanel, CControlPanelFolder) - OBJECT_ENTRY(CLSID_AutoComplete, CAutoComplete) OBJECT_ENTRY(CLSID_MyDocuments, CMyDocsFolder) OBJECT_ENTRY(CLSID_NetworkPlaces, CNetFolder) OBJECT_ENTRY(CLSID_FontsFolderShortcut, CFontsFolder) diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h index ac65055dd2a..9d960e1bccb 100644 --- a/reactos/dll/win32/shell32/shresdef.h +++ b/reactos/dll/win32/shell32/shresdef.h @@ -540,7 +540,6 @@ /* Registrar scripts (RGS) */ #define IDR_ADMINFOLDERSHORTCUT 128 -#define IDR_AUTOCOMPLETE 129 #define IDR_CONTROLPANEL 130 #define IDR_DRAGDROPHELPER 131 #define IDR_FOLDEROPTIONS 132