[BROWSEUI]

- Moce CAutoComplete from shell32 to browseui where it belongs

svn path=/trunk/; revision=66473

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<WCHAR *>(strrchrW(key, '\\'));
+            value = const_cast<WCHAR *>(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)

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

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)

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

reactos/dll/win32/browseui/precomp.h

@@ -20,6 +20,7 @@
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlwin.h>
+#include <undocuser.h>
 #include <perhist.h>
 #include <exdispid.h>
 #include <strsafe.h>
@@ -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"

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

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

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"

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"

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)

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