[ros-diffs] [rharabien] 55004: [EXPLORER-NEW] - Use macros for calling IBanneredBar methods - Remove some definitions from todo header because they are already in shlguid_undoc.h

Author: rharabien
Date: Wed Jan 18 16:23:13 2012
New Revision: 55004

URL: http://svn.reactos.org/svn/reactos?rev=55004&view=rev
Log:
[EXPLORER-NEW]
- Use macros for calling IBanneredBar methods
- Remove some definitions from todo header because they are already in shlguid_undoc.h

Modified:
    trunk/reactos/base/shell/explorer-new/startmnu.c
    trunk/reactos/base/shell/explorer-new/todo.h

Modified: trunk/reactos/base/shell/explorer-new/startmnu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st…
==============================================================================
--- trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] Wed Jan 18 16:23:13
2012
@@ -820,18 +820,17 @@
     {
        // hRet = IBanneredBar_SetBitmap(pbb,
        //                               hbmBanner);
-        hRet = pbb->lpVtbl->SetBitmap(pbb,
-                                      hbmBanner);
+        hRet = IBanneredBar_SetBitmap(pbb, hbmBanner);
 
 
         /* Update the icon size */
         //hRet = IBanneredBar_SetIconSize(pbb,
         //                                bSmallIcons ? BMICON_SMALL : BMICON_LARGE);
-        hRet = pbb->lpVtbl->SetIconSize(pbb,
+        hRet = IBanneredBar_SetIconSize(pbb,
                                         bSmallIcons ? BMICON_SMALL : BMICON_LARGE);
 
         //IBanneredBar_Release(pbb);
-        pbb->lpVtbl->Release(pbb);
+        IBanneredBar_Release(pbb);
     }
 
     return hRet;
@@ -890,10 +889,10 @@
     if (SUCCEEDED(hr))
     {
         //hr = IInitializeObject_Initialize(pIo);
-        hr = pIo->lpVtbl->Initialize(pIo);
+        hr = IInitializeObject_Initialize(pIo);
 
         //IInitializeObject_Release(pIo);
-        pIo->lpVtbl->Release(pIo);
+        IInitializeObject_Release(pIo);
     }
     else
         hr = S_OK;

Modified: trunk/reactos/base/shell/explorer-new/todo.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to…
==============================================================================
--- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Wed Jan 18 16:23:13 2012
@@ -5,10 +5,6 @@
 #endif
 
 /* FIXME: Ugly hack!!! FIX ASAP! Move to uuid! */
-static const GUID IID_HACK_IShellView2 =
{0x88E39E80,0x3578,0x11CF,{0xAE,0x69,0x08,0x00,0x2B,0x2E,0x12,0x62}};
-#define IID_IShellView2 IID_HACK_IShellView2
-static const GUID IID_HACK_IShellView3 =
{0xEC39FA88,0xF8AF,0x41CF,{0x84,0x21,0x38,0xBE,0xD2,0x8F,0x46,0x73}};
-#define IID_IShellView3 IID_HACK_IShellView2
 static const GUID VID_HACK_LargeIcons = {0x0057D0E0, 0x3573, 0x11CF, {0xAE, 0x69, 0x08,
0x00, 0x2B, 0x2E, 0x12, 0x62}};
 #define VID_LargeIcons VID_HACK_LargeIcons
 
@@ -16,14 +12,6 @@
 #define IID_IDeskBarClient IID_HACK_IDeskBarClient
 static const GUID IID_HACK_IDeskBar = {0xEB0FE173, 0x1A3A, 0x11D0, {0x89, 0xB3, 0x00,
0xA0, 0xC9, 0x0A, 0x90, 0xAC}};
 #define IID_IDeskBar IID_HACK_IDeskBar
-
-static const GUID IID_HACK_IMenuPopup =
{0xD1E7AFEB,0x6A2E,0x11D0,{0x8C,0x78,0x00,0xC0,0x4F,0xD9,0x18,0xB4}};
-#define IID_IMenuPopup IID_HACK_IMenuPopup
-static const GUID IID_HACK_IBanneredBar =
{0x596A9A94,0x013E,0x11D1,{0x8D,0x34,0x00,0xA0,0xC9,0x0F,0x27,0x19}};
-#define IID_IBanneredBar IID_HACK_IBanneredBar
-
-static const GUID IID_HACK_IInitializeObject =
{0x4622AD16,0xFF23,0x11D0,{0x8D,0x34,0x00,0xA0,0xC9,0x0F,0x27,0x19}};
-#define IID_IInitializeObject IID_HACK_IInitializeObject
 
 static const GUID SID_HACK_SMenuPopup =
{0xD1E7AFEB,0x6A2E,0x11D0,{0x8C,0x78,0x00,0xC0,0x4F,0xD9,0x18,0xB4}};
 #define SID_SMenuPopup SID_HACK_SMenuPopup