Author: rharabien
Date: Wed Jan 18 17:02:34 2012
New Revision: 55005
URL:
http://svn.reactos.org/svn/reactos?rev=55005&view=rev
Log:
[EXPLORER-NEW]
- Move helper macros for IDeskBarClient to shlobj.h
- Remove duplicated commented out calls (spotted by Amine Khaldi)
Modified:
trunk/reactos/base/shell/explorer-new/startmnu.c
trunk/reactos/base/shell/explorer-new/todo.h
trunk/reactos/include/psdk/shlobj.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 17:02:34
2012
@@ -818,18 +818,13 @@
(PVOID)&pbb);
if (SUCCEEDED(hRet))
{
- // hRet = IBanneredBar_SetBitmap(pbb,
- // hbmBanner);
hRet = IBanneredBar_SetBitmap(pbb, hbmBanner);
/* Update the icon size */
- //hRet = IBanneredBar_SetIconSize(pbb,
- // bSmallIcons ? BMICON_SMALL : BMICON_LARGE);
hRet = IBanneredBar_SetIconSize(pbb,
bSmallIcons ? BMICON_SMALL : BMICON_LARGE);
- //IBanneredBar_Release(pbb);
IBanneredBar_Release(pbb);
}
@@ -888,10 +883,7 @@
hr = IMenuPopup_QueryInterface(pMp, &IID_IInitializeObject, (PVOID*)&pIo);
if (SUCCEEDED(hr))
{
- //hr = IInitializeObject_Initialize(pIo);
hr = IInitializeObject_Initialize(pIo);
-
- //IInitializeObject_Release(pIo);
IInitializeObject_Release(pIo);
}
else
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 17:02:34 2012
@@ -1,29 +1,11 @@
#pragma once
-
-#ifdef INTERFACE
-#undef INTERFACE
-#endif
/* FIXME: Ugly hack!!! FIX ASAP! Move to uuid! */
static const GUID VID_HACK_LargeIcons = {0x0057D0E0, 0x3573, 0x11CF, {0xAE, 0x69, 0x08,
0x00, 0x2B, 0x2E, 0x12, 0x62}};
#define VID_LargeIcons VID_HACK_LargeIcons
-static const GUID IID_HACK_IDeskBarClient = {0xEB0FE175, 0x1A3A, 0x11D0, {0x89, 0xB3,
0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC}};
-#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 SID_HACK_SMenuPopup =
{0xD1E7AFEB,0x6A2E,0x11D0,{0x8C,0x78,0x00,0xC0,0x4F,0xD9,0x18,0xB4}};
#define SID_SMenuPopup SID_HACK_SMenuPopup
-
-#ifdef COBJMACROS
-#define IDeskBarClient_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)
-#define IDeskBarClient_AddRef(T) (T)->lpVtbl->AddRef(T)
-#define IDeskBarClient_Release(T) (T)->lpVtbl->Release(T)
-#define IDeskBarClient_GetWindow(T,a) (T)->lpVtbl->GetWindow(T,a)
-#define IDeskBarClient_ContextSensitiveHelp(T,a)
(T)->lpVtbl->ContextSensitiveHelp(T,a)
-#define IDeskBarClient_SetDeskBarSite(T,a) (T)->lpVtbl->SetDeskBarSite(T,a)
-#define IDeskBarClient_SetModeDBC(T,a) (T)->lpVtbl->SetModeDBC(T,a)
-#define IDeskBarClient_UIActivateDBC(T,a) (T)->lpVtbl->UIActivateDBC(T,a)
-#define IDeskBarClient_GetSize(T,a,b) (T)->lpVtbl->GetSize(T,a,b)
-#endif
Modified: trunk/reactos/include/psdk/shlobj.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Wed Jan 18 17:02:34 2012
@@ -744,6 +744,21 @@
};
#undef INTERFACE
+#if !defined(__cplusplus) || defined(CINTERFACE)
+/*** IUnknown methods ***/
+#define IDeskBarClient_QueryInterface(p,a,b)
(p)->lpVtbl->QueryInterface(p,a,b)
+#define IDeskBarClient_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IDeskBarClient_Release(p) (p)->lpVtbl->Release(p)
+/*** IOleWindow methods ***/
+#define IDeskBarClient_GetWindow(p,a) (p)->lpVtbl->GetWindow(p,a)
+#define IDeskBarClient_ContextSensitiveHelp(p,a)
(p)->lpVtbl->ContextSensitiveHelp(p,a)
+/*** IOleWindow IDeskBarClient ***/
+#define IDeskBarClient_SetDeskBarSite(p,a)
(p)->lpVtbl->SetDeskBarSite(p,a)
+#define IDeskBarClient_SetModeDBC(p,a) (p)->lpVtbl->SetModeDBC(p,a)
+#define IDeskBarClient_UIActivateDBC(p,a) (p)->lpVtbl->UIActivateDBC(p,a)
+#define IDeskBarClient_GetSize(p,a,b) (p)->lpVtbl->GetSize(p,a,b)
+#endif
+
#define DBC_GS_IDEAL 0
#define DBC_GS_SIZEDOWN 1