Author: dquintana
Date: Mon Dec 1 16:41:58 2014
New Revision: 65542
URL: http://svn.reactos.org/svn/reactos?rev=65542&view=rev
Log:
[RSHELL]
* Fix gcc build.
Modified:
trunk/reactos/base/shell/rshell/CStartMenu.cpp
trunk/reactos/include/reactos/undocshell.h
Modified: trunk/reactos/base/shell/rshell/CStartMenu.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CStartMenu.cpp?rev=65542&r1=65541&r2=65542&view=diff
==============================================================================
--- trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Mon Dec 1
16:41:58 2014
@@ -415,59 +415,6 @@
return GetMergedFolder(CSIDL_PROGRAMS, CSIDL_COMMON_PROGRAMS,
ppsfStartMenu);
}
-static void DumpIdList(LPCITEMIDLIST pcidl)
-{
- DbgPrint("Begin IDList Dump\n");
-
- for (; pcidl != NULL; pcidl = ILGetNext(pcidl))
- {
- int i;
- int cb = pcidl->mkid.cb;
- BYTE * sh = (BYTE*) &(pcidl->mkid);
- if (cb == 0) // ITEMIDLISTs are terminatedwith a null SHITEMID.
- break;
- DbgPrint("Begin SHITEMID (cb=%d)\n", cb);
- if ((cb & 3) != 0)
- DbgPrint(" - WARNING: cb is not a multiple of 4\n");
- for (i = 0; (i + 4) <= cb; i += 4)
- {
- DbgPrint(" - abID[%08x]: %02x %02x %02x %02x\n",
- i,
- sh[i + 0],
- sh[i + 1],
- sh[i + 2],
- sh[i + 3]);
- }
- if (i < cb)
- {
- cb -= i;
- if (cb == 3)
- {
- DbgPrint(" - abID[%08x]: %02x %02x %02x --\n",
- i,
- sh[i + 0],
- sh[i + 1],
- sh[i + 2]);
- }
- else if (cb == 2)
- {
- DbgPrint(" - abID[%08x]: %02x %02x -- --\n",
- i,
- sh[i + 0],
- sh[i + 1]);
- }
- else if (cb == 1)
- {
- DbgPrint(" - abID[%08x]: %02x -- -- --\n",
- i,
- sh[i + 0]);
- }
- }
- DbgPrint("End SHITEMID\n");
- }
- DbgPrint("End IDList Dump.\n");
-}
-
extern "C"
HRESULT WINAPI
CStartMenu_Constructor(REFIID riid, void **ppv)
Modified: trunk/reactos/include/reactos/undocshell.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocshell.h?rev=65542&r1=65541&r2=65542&view=diff
==============================================================================
--- trunk/reactos/include/reactos/undocshell.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/undocshell.h [iso-8859-1] Mon Dec 1
16:41:58 2014
@@ -608,6 +608,61 @@
{
char padding[128];
DbgDumpMenuInternal(hmenu, padding, 0);
+}
+
+
+static inline
+void DumpIdList(LPCITEMIDLIST pcidl)
+{
+ DbgPrint("Begin IDList Dump\n");
+
+ for (; pcidl != NULL; pcidl = ILGetNext(pcidl))
+ {
+ int i;
+ int cb = pcidl->mkid.cb;
+ BYTE * sh = (BYTE*) &(pcidl->mkid);
+ if (cb == 0) // ITEMIDLISTs are terminatedwith a null SHITEMID.
+ break;
+ DbgPrint("Begin SHITEMID (cb=%d)\n", cb);
+ if ((cb & 3) != 0)
+ DbgPrint(" - WARNING: cb is not a multiple of 4\n");
+ for (i = 0; (i + 4) <= cb; i += 4)
+ {
+ DbgPrint(" - abID[%08x]: %02x %02x %02x %02x\n",
+ i,
+ sh[i + 0],
+ sh[i + 1],
+ sh[i + 2],
+ sh[i + 3]);
+ }
+ if (i < cb)
+ {
+ cb -= i;
+ if (cb == 3)
+ {
+ DbgPrint(" - abID[%08x]: %02x %02x %02x --\n",
+ i,
+ sh[i + 0],
+ sh[i + 1],
+ sh[i + 2]);
+ }
+ else if (cb == 2)
+ {
+ DbgPrint(" - abID[%08x]: %02x %02x -- --\n",
+ i,
+ sh[i + 0],
+ sh[i + 1]);
+ }
+ else if (cb == 1)
+ {
+ DbgPrint(" - abID[%08x]: %02x -- -- --\n",
+ i,
+ sh[i + 0]);
+ }
+ }
+ DbgPrint("End SHITEMID\n");
+ }
+ DbgPrint("End IDList Dump.\n");
}
