[ros-diffs] [hpoussin] 30447: Fix USE_API_SHCREATEDESKTOP = 0 case

Author: hpoussin
Date: Wed Nov 14 18:35:58 2007
New Revision: 30447

URL: http://svn.reactos.org/svn/reactos?rev=30447&view=rev
Log:
Fix USE_API_SHCREATEDESKTOP = 0 case

Modified:
    trunk/reactos/base/shell/explorer-new/desktop.c
    trunk/reactos/base/shell/explorer-new/undoc.h

Modified: trunk/reactos/base/shell/explorer-new/desktop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/de…
==============================================================================
--- trunk/reactos/base/shell/explorer-new/desktop.c (original)
+++ trunk/reactos/base/shell/explorer-new/desktop.c Wed Nov 14 18:35:58 2007
@@ -136,10 +136,38 @@
 /*
  ******************************************************************************
  * NOTE: This could may be reused in a shell implementation of                *
+ *       SHCreateShellFolderView().                                           *
+ ******************************************************************************
+ */
+
+HRESULT WINAPI
+SHCreateShellFolderView(
+    const SFV_CREATE *pcsfv,
+    IShellView **ppsv)
+{
+    CSFV csfv;
+
+    ZeroMemory(&csfv, sizeof(CSFV));
+    csfv.cbSize = sizeof(CSFV);
+    csfv.pshf = pcsfv->pshf;
+    csfv.psvOuter = pcsfv->psvOuter;
+    /* FIXME: handle pcsfv->psfvcb */
+    return SHCreateShellFolderViewEx(&csfv, ppsv);
+}
+
+
+/*
+ ******************************************************************************
+ * NOTE: This could may be reused in a shell implementation of                *
  *       SHCreateDesktop().                                                   *
  ******************************************************************************
  */
 
+#define IShellView2 IShellView
+#define IShellView2_Release(This) IShellView_Release((This))
+#define IShellView2_CreateViewWindow2(This, Params) IShellView_CreateViewWindow((This),
(Params)->psvPrev, (Params)->pfs, (Params)->psbOwner, (Params)->prcView,
&(Params)->hwndView)
+
+#include "undoc.h"
 #define WM_SHELL_ADDDRIVENOTIFY (WM_USER + 0x100)
 
 static const IShellBrowserVtbl IDesktopShellBrowserImpl_Vtbl;
@@ -590,7 +618,7 @@
                                                         &cne);
 
     /* Create the tray window */
-    This->Tray = CreateTrayWindow(This->hWnd);
+    This->Tray = CreateTrayWindow();
     return This;
 }
 
@@ -1256,7 +1284,6 @@
     volatile DESKCREATEINFO *DeskCreateInfo = (volatile DESKCREATEINFO *)lpParameter;
     HWND hwndDesktop;
     IDesktopShellBrowserImpl *pDesktop;
-    IShellDesktopTray *pSdt;
     MSG Msg;
     BOOL Ret;
 
@@ -1274,7 +1301,7 @@
                                  hExplorerInstance,
                                  NULL);
 
-    DeskCreateInfo->hWndDesktop = hWndDesktop;
+    DeskCreateInfo->hWndDesktop = hwndDesktop;
     if (hwndDesktop == NULL)
         return 1;
 

Modified: trunk/reactos/base/shell/explorer-new/undoc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/un…
==============================================================================
--- trunk/reactos/base/shell/explorer-new/undoc.h (original)
+++ trunk/reactos/base/shell/explorer-new/undoc.h Wed Nov 14 18:35:58 2007
@@ -96,7 +96,6 @@
 #define IWindowEventHandler_ContainsWindow(T,a) (T)->lpVtbl->ContainsWindow(T,a)
 #endif
 
-#if USE_API_SHCREATEDESKTOP != 0
 #define INTERFACE IShellDesktopTray
 DECLARE_INTERFACE_(IShellDesktopTray,IUnknown)
 {
@@ -122,6 +121,7 @@
 #define IShellDesktopTray_Unknown(T,a,b) (T)->lpVtbl->Unknown(T,a,b)
 #endif
 
+#if USE_API_SHCREATEDESKTOP != 0
 #if 0
 HANDLE WINAPI SHCreateDesktop(IShellDesktopTray*);
 BOOL WINAPI SHDesktopMessageLoop(HANDLE);