PATCH: shell32 new compiler

[Marcus Meissner]

Hi,

The new compiler complained about some superflous "const" in return definitions.

Also debughlp had lots of internal functions exported, marked as static now.

Ciao, Marcus

Changelog:
	Marked some functions in debughlp as static.
	Do not use REFIID as return, but *IID.

Index: dlls/shell32/debughlp.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/debughlp.c,v
retrieving revision 1.14
diff -u -r1.14 debughlp.c
--- dlls/shell32/debughlp.c	19 Apr 2004 19:26:57 -0000	1.14
+++ dlls/shell32/debughlp.c	7 Aug 2004 13:37:10 -0000
@@ -35,6 +35,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(pidl);
 
+static
 LPITEMIDLIST _dbg_ILGetNext(LPCITEMIDLIST pidl)
 {
 	WORD len;
@@ -50,11 +51,13 @@
 	return NULL;
 }
 
+static
 BOOL _dbg_ILIsDesktop(LPCITEMIDLIST pidl)
 {
 	return ( !pidl || (pidl && pidl->mkid.cb == 0x00) );
 }
 
+static
 LPPIDLDATA _dbg_ILGetDataPointer(LPCITEMIDLIST pidl)
 {
 	if(pidl && pidl->mkid.cb != 0x00)
@@ -62,6 +65,7 @@
 	return NULL;
 }
 
+static
 LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl)
 {
 	LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl);
@@ -99,6 +103,7 @@
 	return NULL;
 }
 
+static
 LPSTR _dbg_ILGetSTextPointer(LPCITEMIDLIST pidl)
 {
 	LPPIDLDATA pdata =_dbg_ILGetDataPointer(pidl);
@@ -121,7 +126,8 @@
 	return NULL;
 }
 
-REFIID _dbg_ILGetGUIDPointer(LPCITEMIDLIST pidl)
+static
+IID* _dbg_ILGetGUIDPointer(LPCITEMIDLIST pidl)
 {
 	LPPIDLDATA pdata =_ILGetDataPointer(pidl);
 
@@ -137,6 +143,7 @@
 	return NULL;
 }
 
+static
 DWORD _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize)
 {
 	DWORD		dwReturn=0;
Index: dlls/shell32/pidl.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/pidl.c,v
retrieving revision 1.117
diff -u -r1.117 pidl.c
--- dlls/shell32/pidl.c	28 Jun 2004 20:32:53 -0000	1.117
+++ dlls/shell32/pidl.c	7 Aug 2004 13:37:11 -0000
@@ -1940,7 +1940,7 @@
  *
  * returns reference to guid stored in some pidls
  */
-REFIID _ILGetGUIDPointer(LPCITEMIDLIST pidl)
+IID* _ILGetGUIDPointer(LPCITEMIDLIST pidl)
 {
 	LPPIDLDATA pdata =_ILGetDataPointer(pidl);
 
@@ -1953,7 +1953,7 @@
 	  {
 	    case PT_SHELLEXT:
 	    case PT_GUID:
-	      return (REFIID) &(pdata->u.guid.guid);
+	      return &(pdata->u.guid.guid);
 
 	    default:
 		TRACE("Unknown pidl type 0x%04x\n", pdata->type);
Index: dlls/shell32/pidl.h
===================================================================
RCS file: /home/wine/wine/dlls/shell32/pidl.h,v
retrieving revision 1.42
diff -u -r1.42 pidl.h
--- dlls/shell32/pidl.h	15 Apr 2004 04:57:46 -0000	1.42
+++ dlls/shell32/pidl.h	7 Aug 2004 13:37:11 -0000
@@ -228,7 +228,7 @@
 LPPIDLDATA	_ILGetDataPointer	(LPCITEMIDLIST);
 LPSTR		_ILGetTextPointer	(LPCITEMIDLIST);
 LPSTR		_ILGetSTextPointer	(LPCITEMIDLIST);
-REFIID		_ILGetGUIDPointer	(LPCITEMIDLIST pidl);
+IID		*_ILGetGUIDPointer	(LPCITEMIDLIST pidl);
 
 /*
  * debug helper