[ros-diffs] [dquintana] 63709: [RSHELL] * Really fix GCC build.

Author: dquintana
Date: Thu Jul 10 19:16:21 2014
New Revision: 63709

URL: http://svn.reactos.org/svn/reactos?rev=63709&view=rev
Log:
[RSHELL]
* Really fix GCC build.

Modified:
    branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp
    branches/shell-experiments/base/shell/rshell/CMergedFolder.h
    branches/shell-experiments/base/shell/rshell/CStartMenu.cpp
    branches/shell-experiments/base/shell/rshell/rshell.spec

Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/rshell/CMergedFolder.cpp	[iso-8859-1] Thu Jul 10
19:16:21 2014
@@ -111,7 +111,7 @@
     m_UserLocalFolder = userLocal;
     m_AllUSersFolder = allUSers;
 
-    TRACE("SetSources %p %p\n", m_UserLocalFolder, m_AllUSersFolder);
+    TRACE("SetSources %p %p\n", userLocal, allUSers);
     return S_OK;
 }
 
@@ -397,7 +397,7 @@
         return E_NOTIMPL;
     }
 
-    TRACE("AddNameSpace %p %p\n", m_UserLocal, m_AllUSers);
+    TRACE("AddNameSpace %p %p\n", m_UserLocal.p, m_AllUSers.p);
     
     // FIXME: Use a DSA to store the list of merged namespaces, together with their
related info (psf, pidl, ...)
     // For now, assume only 2 will ever be used, and ignore all the other data.

Modified: branches/shell-experiments/base/shell/rshell/CMergedFolder.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMergedFolder.h	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMergedFolder.h	[iso-8859-1] Thu Jul 10
19:16:21 2014
@@ -19,9 +19,9 @@
  */
 #pragma once
 
-static IID IID_IAugmentedShellFolder  = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00,
0xC0, 0x4F, 0xD9, 0x19, 0x72 } };
-static IID IID_IAugmentedShellFolder2 = { 0x8DB3B3F4, 0x6CFE, 0x11D1, { 0x8A, 0xE9, 0x00,
0xC0, 0x4F, 0xD9, 0x18, 0xD0 } };
-static CLSID CLSID_MergedFolder       = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03,
0x2D, 0x8E, 0xA5, 0x16, 0x2E } };
+extern IID IID_IAugmentedShellFolder;
+extern IID IID_IAugmentedShellFolder2;
+extern CLSID CLSID_MergedFolder;
 
 interface IAugmentedShellFolder : public IShellFolder
 {

Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp	[iso-8859-1] Thu Jul 10
19:16:21 2014
@@ -20,6 +20,10 @@
 #include "precomp.h"
 
 #include "CMergedFolder.h"
+
+IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0,
0x4F, 0xD9, 0x19, 0x72 } };
+IID IID_IAugmentedShellFolder2 = { 0x8DB3B3F4, 0x6CFE, 0x11D1, { 0x8A, 0xE9, 0x00, 0xC0,
0x4F, 0xD9, 0x18, 0xD0 } };
+CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E,
0xA5, 0x16, 0x2E } };
 
 //#define TEST_TRACKPOPUPMENU_SUBMENUS
 
@@ -406,7 +410,8 @@
     if (FAILED_UNEXPECTEDLY(hr))
         return hr;
 
-    hr = psf->ParseDisplayName(NULL, NULL, L"Programs", NULL,
&pidlPrograms, NULL);
+    WCHAR name[] = L"Programs";
+    hr = psf->ParseDisplayName(NULL, NULL, name, NULL, &pidlPrograms, NULL);
     if (FAILED_UNEXPECTEDLY(hr))
         return hr;
 

Modified: branches/shell-experiments/base/shell/rshell/rshell.spec
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/rshell.spec	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/rshell.spec	[iso-8859-1] Thu Jul 10
19:16:21 2014
@@ -2,4 +2,4 @@
 @   stdcall CMenuDeskBar_Constructor(ptr ptr);
 @   stdcall CMenuSite_Constructor(ptr ptr);
 @   stdcall CMenuBand_Constructor(ptr ptr);
-@	stdcall CMergedFolder_Constructor(ptr ptr ptr ptr)
+@	stdcall CMergedFolder_Constructor(ptr ptr);