Index: trunk/src/shell32/new/dataobject.cpp
===================================================================
--- trunk/src/shell32/new/dataobject.cpp	(revision 1160)
+++ trunk/src/shell32/new/dataobject.cpp	(revision 1162)
@@ -1,3 +1,3 @@
-/* $Id: dataobject.cpp,v 1.2 1999-10-05 19:33:37 phaller Exp $ */
+/* $Id: dataobject.cpp,v 1.3 1999-10-07 10:34:46 phaller Exp $ */
 
 /*
@@ -347,5 +347,9 @@
 
 static UINT WINAPI IDLList_GetState(LPIDLLIST THIS)
-{	TRACE("(%p)->(uStep=%u dpa=%p)\n",THIS, THIS->uStep, THIS->dpa);
+{
+  dprintf(("SHELL32:dataobject:IDLList_GetState((%p)->(uStep=%u dpa=%p)\n",
+           THIS,
+           THIS->uStep,
+           THIS->dpa));
 
 	if (THIS->uStep == 0)
@@ -358,14 +362,31 @@
 	return(State_UnInit);
 }
+
+
 static LPITEMIDLIST WINAPI IDLList_GetElement(LPIDLLIST THIS, UINT nIndex)
-{	TRACE("(%p)->(index=%u)\n",THIS, nIndex);
+{
+  dprintf(("SHELL32:dataobject:IDLList_GetElement((%p)->(index=%u)\n",
+           THIS,
+           nIndex));
+
 	return((LPITEMIDLIST)pDPA_GetPtr(THIS->dpa, nIndex));
 }
+
+
 static UINT WINAPI IDLList_GetCount(LPIDLLIST THIS)
-{	TRACE("(%p)\n",THIS);
+{
+  dprintf(("SHELL32:dataobject:IDLList_GetCount(%p)\n",
+           THIS));
+
 	return(IDLList_GetState(THIS)==State_Init ? DPA_GetPtrCount(THIS->dpa) : 0);
 }
+
+
 static BOOL WINAPI IDLList_StoreItem(LPIDLLIST THIS, LPITEMIDLIST pidl)
-{	TRACE("(%p)->(pidl=%p)\n",THIS, pidl);
+{
+  dprintf(("SHELL32:dataobject:IDLList_StoreItem((%p)->(pidl=%p)\n",
+           THIS,
+           pidl));
+
 	if (pidl)
         { if (IDLList_InitList(THIS) && pDPA_InsertPtr(THIS->dpa, 0x7fff, (LPSTR)pidl)>=0)
@@ -376,7 +397,14 @@
         return(FALSE);
 }
+
+
 static BOOL WINAPI IDLList_AddItems(LPIDLLIST THIS, LPITEMIDLIST *apidl, UINT cidl)
-{	INT i;
-	TRACE("(%p)->(apidl=%p cidl=%u)\n",THIS, apidl, cidl);
+{
+	INT i;
+
+  dprintf(("SHELL32:dataobject:IDLList_AddItems((%p)->(apidl=%p cidl=%u)\n",
+           THIS,
+           apidl,
+           cidl));
 
 	for (i=0; i<cidl; ++i)
@@ -386,6 +414,11 @@
         return(TRUE);
 }
+
+
 static BOOL WINAPI IDLList_InitList(LPIDLLIST THIS)
-{	TRACE("(%p)\n",THIS);
+{
+  dprintf(("SHELL32:dataobject:IDLList_InitList(%p)\n",
+           THIS));
+
 	switch (IDLList_GetState(THIS))
         { case State_Init:
@@ -402,7 +435,12 @@
         }
 }
+
+
 static void WINAPI IDLList_CleanList(LPIDLLIST THIS)
-{	INT i;
-	TRACE("(%p)\n",THIS);
+{
+	INT i;
+
+  dprintf(("SHELL32:dataobject:IDLList_CleanList(%p)\n",
+           THIS));
 
 	if (THIS->uStep != 0)
@@ -458,5 +496,9 @@
 	char    xriid[50];
 	WINE_StringFromCLSID((LPCLSID)riid,xriid);
-	TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
+
+  dprintf(("SHELL32:dataobject:IDataObject_fnQueryInterface((%p)->(\n\tIID:\t%s,%p)\n",
+           This,
+           xriid,
+           ppvObj));
 
 	*ppvObj = NULL;
@@ -484,5 +526,7 @@
 	ICOM_THIS(IDataObjectImpl,iface);
 
-	TRACE("(%p)->(count=%lu)\n",This, This->ref);
+  dprintf(("SHELL32:dataobject:IDataObject_fnAddRef((%p)->(count=%lu)\n",
+           This,
+           This->ref));
 
 	shell32_ObjCount++;
@@ -495,6 +539,6 @@
 {
 	ICOM_THIS(IDataObjectImpl,iface);
-	TRACE("(%p)->()\n",This);
-
+  dprintf(("SHELL32:dataobject:IDataObject_fnRelease(%p)\n",
+           This));
 	shell32_ObjCount--;
 
@@ -524,5 +568,10 @@
 	
 	GetClipboardFormatNameA (pformatetcIn->cfFormat, szTemp, 256);
-	TRACE("(%p)->(%p %p format=%s)\n", This, pformatetcIn, pmedium, szTemp);
+
+  dprintf(("SHELL32:dataobject:IDataObject_fnGetData(%p)->(%p %p format=%s)\n",
+           This,
+           pformatetcIn,
+           pmedium,
+           szTemp));
 
 	/* test expected format */
@@ -587,10 +636,18 @@
 	return (E_INVALIDARG);
 }
+
+
 static HRESULT WINAPI IDataObject_fnGetDataHere(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium)
 {
 	ICOM_THIS(IDataObjectImpl,iface);
-	FIXME("(%p)->()\n", This);
+  dprintf(("SHELL32:dataobject:IDataObject_fnGetDataHere(%p)->(%p %p) not implemented\n",
+           This,
+           pformatetc,
+           pmedium));
+
 	return E_NOTIMPL;
 }
+
+
 static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC pformatetc)
 {
@@ -598,6 +655,9 @@
 	UINT i;
 	
-	TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed);
-	
+  dprintf(("SHELL32:dataobject:IDataObject_fnQueryGetData((%p)->(fmt=0x%08x tym=0x%08lx)\n",
+           This,
+           pformatetc->cfFormat,
+           pformatetc->tymed));
+
 	if(!(DVASPECT_CONTENT & pformatetc->dwAspect))
 	  return DV_E_DVASPECT;
@@ -615,21 +675,40 @@
 	return DV_E_TYMED;
 }
-static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC pformatectIn, LPFORMATETC pformatetcOut)
-{
-	ICOM_THIS(IDataObjectImpl,iface);
-	FIXME("(%p)->()\n", This);
+
+
+static HRESULT WINAPI IDataObject_fnGetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC pformatetcIn, LPFORMATETC pformatetcOut)
+{
+	ICOM_THIS(IDataObjectImpl,iface);
+
+  dprintf(("SHELL32:dataobject:IDataObject_fnGetCanonicalFormatEtc((%p)->(%p %p) not implemented\n",
+           This,
+           pformatetcIn,
+           pformatetcOut));
+
 	return E_NOTIMPL;
 }
+
+
 static HRESULT WINAPI IDataObject_fnSetData(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease)
 {
 	ICOM_THIS(IDataObjectImpl,iface);
-	FIXME("(%p)->()\n", This);
+  dprintf(("SHELL32:dataobject:IDataObject_fnSetData((%p)->(%p %p %08xh) not implemented\n",
+           This,
+           pformatetc,
+           pmedium,
+           fRelease));
 	return E_NOTIMPL;
 }
+
+
 static HRESULT WINAPI IDataObject_fnEnumFormatEtc(LPDATAOBJECT iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc)
 {
 	ICOM_THIS(IDataObjectImpl,iface);
 
-	TRACE("(%p)->()\n", This);
+  dprintf(("SHELL32:dataobject:IDataObject_fnEnumFormatEtc((%p)->(%08xh %p)\n",
+           This,
+           dwDirection,
+           ppenumFormatEtc));
+
 	*ppenumFormatEtc=NULL;
 
@@ -646,11 +725,21 @@
 {
 	ICOM_THIS(IDataObjectImpl,iface);
-	FIXME("(%p)->()\n", This);
+  dprintf(("SHELL32:dataobject:IDataObject_fnDAdvise((%p)->(%p %08xh %p %p) not implemented.\n",
+           This,
+           pformatetc,
+           advf,
+           pAdvSink,
+           pdwConnection));
+
 	return E_NOTIMPL;
 }
+
+
 static HRESULT WINAPI IDataObject_fnDUnadvise(LPDATAOBJECT iface, DWORD dwConnection)
 {
 	ICOM_THIS(IDataObjectImpl,iface);
-	FIXME("(%p)->()\n", This);
+  dprintf(("SHELL32:dataobject:IDataObject_fnDUnadvise((%p)->(%08xh) not implemented.\n",
+           This,
+           dwConnection));
 	return E_NOTIMPL;
 }
@@ -658,5 +747,8 @@
 {
 	ICOM_THIS(IDataObjectImpl,iface);
-	FIXME("(%p)->()\n", This);
+  dprintf(("SHELL32:dataobject:IDataObject_fnEnumDAdvise((%p)->(%p) not implemented.\n",
+           This,
+           ppenumAdvise));
+
 	return E_NOTIMPL;
 }
@@ -711,5 +803,8 @@
 	}
 	
-	TRACE("(%p)->(apidl=%p cidl=%u)\n",dto, apidl, cidl);
+  dprintf(("SHELL32:dataobject:IDataObject_Constructor((%p)->(apidl=%p cidl=%u)\n",
+           dto,
+           apidl,
+           cidl));
 	return (LPDATAOBJECT)dto;
 }
Index: trunk/src/shell32/new/enumidlist.cpp
===================================================================
--- trunk/src/shell32/new/enumidlist.cpp	(revision 1160)
+++ trunk/src/shell32/new/enumidlist.cpp	(revision 1162)
@@ -1,2 +1,12 @@
+/* $Id: enumidlist.cpp,v 1.2 1999-10-07 10:34:46 phaller Exp $ */
+
+/*
+ * Win32 SHELL32 for OS/2
+ *
+ * Copyright 1999 Patrick Haller (haller@zebra.fh-weingarten.de)
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
+ */
+
 /*
  *	IEnumIDList
@@ -5,8 +15,13 @@
  */
 
+
+/*****************************************************************************
+ * Includes                                                                  *
+ *****************************************************************************/
+
 #include <stdlib.h>
 #include <string.h>
-
 #include <odin.h>
+#include <odinwrap.h>
 
 #define ICOM_CINTERFACE 1
@@ -26,5 +41,7 @@
 #include <misc.h>
 
-DEFAULT_DEBUG_CHANNEL(shell)
+
+
+ODINDEBUGCHANNEL(SHELL32-ENUMIDLIST)
 
 typedef struct tagENUMLIST
@@ -311,5 +328,9 @@
 	char	xriid[50];
 	WINE_StringFromCLSID((LPCLSID)riid,xriid);
-	TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
+
+  dprintf(("SHELL32:enumidlist: IEnumIDList_fnQueryInterface((%p)->(\n\tIID:\t%s,%p)\n",
+           This,
+           xriid,
+           ppvObj));
 
 	*ppvObj = NULL;
@@ -340,5 +361,7 @@
 	ICOM_THIS(IEnumIDListImpl,iface);
 
-	TRACE("(%p)->(%lu)\n",This,This->ref);
+  dprintf(("SHELL32:enumidlist: IEnumIDList_fnAddRef((%p)->(%lu)\n",
+           This,
+           This->ref));
 
 	shell32_ObjCount++;
@@ -353,5 +376,7 @@
 	ICOM_THIS(IEnumIDListImpl,iface);
 
-	TRACE("(%p)->(%lu)\n",This,This->ref);
+  dprintf(("SHELL32:enumidlist: IEnumIDList_fnRelease((%p)->(%lu)\n",
+           This,
+           This->ref));
 
 	shell32_ObjCount--;
@@ -382,5 +407,9 @@
 	LPITEMIDLIST  temp;
 
-	TRACE("(%p)->(%ld,%p, %p)\n",This,celt,rgelt,pceltFetched);
+  dprintf(("SHELL32:enumidlist: IEnumIDList_fnNext((%p)->(%ld,%p, %p)\n",
+           This,
+           celt,
+           rgelt,
+           pceltFetched));
 
 /* It is valid to leave pceltFetched NULL when celt is 1. Some of explorer's
@@ -423,5 +452,7 @@
 	HRESULT  hr = S_OK;
 
-	TRACE("(%p)->(%lu)\n",This,celt);
+  dprintf(("SHELL32:enumidlist: IEnumIDList_fnSkip((%p)->(%lu)\n",
+           This,
+           celt));
 
 	for(dwIndex = 0; dwIndex < celt; dwIndex++)
@@ -434,4 +465,6 @@
 	return hr;
 }
+
+
 /**************************************************************************
 *  IEnumIDList_fnReset
@@ -442,5 +475,7 @@
 	ICOM_THIS(IEnumIDListImpl,iface);
 
-	TRACE("(%p)\n",This);
+  dprintf(("SHELL32:enumidlist: IEnumIDList_fnReset((%p)\n",
+           This));
+
 	This->mpCurrent = This->mpFirst;
 	return S_OK;
@@ -454,5 +489,8 @@
 	ICOM_THIS(IEnumIDListImpl,iface);
 
-	TRACE("(%p)->() to (%p)->() E_NOTIMPL\n",This,ppenum);
+  dprintf(("SHELL32:enumidlist: IEnumIDList_fnClone((%p)->() to (%p)->() not implemented\n",
+           This,
+           ppenum));
+
 	return E_NOTIMPL;
 }
@@ -488,5 +526,9 @@
 	lpeidl = (IEnumIDListImpl*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IEnumIDListImpl));
 
-	TRACE("(%p)->(%s flags=0x%08lx kind=0x%08lx)\n",lpeidl,debugstr_a(lpszPath),dwFlags, dwKind);
+  dprintf(("SHELL32:enumidlist: IEnumIDList_Constructor((%p)->(%08xh flags=0x%08lx kind=0x%08lx)\n",
+           lpeidl,
+           lpszPath,
+           dwFlags,
+           dwKind));
 
 	if (lpeidl)
Index: trunk/src/shell32/new/if_macros.h
===================================================================
--- trunk/src/shell32/new/if_macros.h	(revision 1160)
+++ trunk/src/shell32/new/if_macros.h	(revision 1162)
@@ -1,6 +1,26 @@
+/* $Id: if_macros.h,v 1.2 1999-10-07 10:34:47 phaller Exp $ */
+
+/*
+ * Win32 SHELL32 for OS/2
+ *
+ * Copyright 1999 Patrick Haller (haller@zebra.fh-weingarten.de)
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
+ */
+
 #ifndef _WINE_IFMACROS_
 #define _WINE_IFMACROS_
 
+
+/*****************************************************************************
+ * Includes                                                                  *
+ *****************************************************************************/
+
 #include "shlobj.h"
+
+
+/*****************************************************************************
+ * Definitions                                                               *
+ *****************************************************************************/
 
 #define IShellBrowser_QueryInterface(p,a,b)	(p)->lpvtbl->fnQueryInterface(p,a,b)
Index: trunk/src/shell32/new/pidl.h
===================================================================
--- trunk/src/shell32/new/pidl.h	(revision 1160)
+++ trunk/src/shell32/new/pidl.h	(revision 1162)
@@ -1,2 +1,12 @@
+/* $Id: pidl.h,v 1.2 1999-10-07 10:34:47 phaller Exp $ */
+
+/*
+ * Win32 SHELL32 for OS/2
+ *
+ * Copyright 1999 Patrick Haller (haller@zebra.fh-weingarten.de)
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
+ */
+
 /*
  * internal pidl functions
@@ -6,16 +16,21 @@
  *
  * The contents of a pidl should never used from a application
- * directly. 
+ * directly.
  *
- * This stuff is used from SHGetFileAttributes, ShellFolder 
+ * This stuff is used from SHGetFileAttributes, ShellFolder
  * EnumIDList and ShellView.
  */
- 
+
 #ifndef __WINE_PIDL_H
 #define __WINE_PIDL_H
 
+
+/*****************************************************************************
+ * Includes                                                                  *
+ *****************************************************************************/
+
 #include "shlobj.h"
 
-/* 
+/*
 * the pidl does cache fileattributes to speed up SHGetAttributes when
 * displaying a big number of files.
@@ -51,5 +66,5 @@
 * (3) two strings	"workgroup" "microsoft network"
 * (4) one string	"\\sirius"
-* (5) one string	"whole network" 
+* (5) one string	"whole network"
 * (6) one string	"\\sirius\c"
 * (7) contains string   "mk:@MSITStore:C:\path\file.chm::/path/filename.htm"
@@ -89,5 +104,5 @@
 	    /* the drive seems to be 25 bytes every time */
 	  } drive;
-	  struct 
+	  struct
 	  { BYTE dummy;			/*01 is 0x00 for files or dirs */
 	    DWORD dwFileSize;		/*02*/
@@ -96,7 +111,7 @@
 	    WORD uFileAttribs;		/*10*/
 	    CHAR szNames[1];		/*12*/
-	    /* Here are comming two strings. The first is the long name. 
+	    /* Here are comming two strings. The first is the long name.
 	    The second the dos name when needed or just 0x00 */
-	  } file, folder, generic; 
+	  } file, folder, generic;
 	  struct
 	  { WORD dummy;		/*01*/
Index: trunk/src/shell32/new/she.cpp
===================================================================
--- trunk/src/shell32/new/she.cpp	(revision 1160)
+++ trunk/src/shell32/new/she.cpp	(revision 1162)
@@ -1,3 +1,3 @@
-/* $Id: she.cpp,v 1.2 1999-10-04 19:11:27 sandervl Exp $ */
+/* $Id: she.cpp,v 1.3 1999-10-07 10:34:47 phaller Exp $ */
 
 /*
@@ -11,4 +11,7 @@
  * Includes                                                                  *
  *****************************************************************************/
+
+#include <odin.h>
+#include <odinwrap.h>
 
 #include <os2win.h>
@@ -34,4 +37,6 @@
  *****************************************************************************/
 
+ODINDEBUGCHANNEL(SHELL32-SHE)
+
 
 /*****************************************************************************
@@ -47,11 +52,12 @@
  *****************************************************************************/
 
-HRESULT WIN32API SheSetCurDrive(DWORD x1)
+ODINFUNCTION1(HRESULT, SheSetCurDrive,
+              DWORD, x1)
 {
-  dprintf(("SHELL32: SheSetCurDrive(%08xh) not implemented.\n",
-           x1));
+  dprintf(("SHELL32: SheSetCurDrive not implemented.\n"));
 
   return 0;
 }
+
 
 /*****************************************************************************
@@ -67,8 +73,12 @@
  *****************************************************************************/
 
-void WIN32API SheRemoveQuotesA(VOID)
+ODINFUNCTION1(HRESULT, SheRemoveQuotesA,
+              LPCSTR,  lpszString)
 {
-  dprintf(("SHELL32: undoc SheRemoveQuotesA\n"));
+  dprintf(("SHELL32: SheRemoveQuotesA\n not implemented"));
+
+  return 0;
 }
+
 
 /*****************************************************************************
@@ -84,6 +94,10 @@
  *****************************************************************************/
 
-void WIN32API SheRemoveQuotesW(VOID)
+ODINFUNCTION1(HRESULT, SheRemoveQuotesW,
+              LPCWSTR, lpszString)
 {
-  dprintf(("SHELL32: undoc SheRemoveQuotesW\n"));
+  dprintf(("SHELL32: SheRemoveQuotesW\n not implemented"));
+
+  return 0;
 }
+
Index: trunk/src/shell32/new/shell32.def
===================================================================
--- trunk/src/shell32/new/shell32.def	(revision 1160)
+++ trunk/src/shell32/new/shell32.def	(revision 1162)
@@ -1,3 +1,3 @@
-; $Id: shell32.def,v 1.6 1999-09-09 21:30:15 phaller Exp $
+; $Id: shell32.def,v 1.7 1999-10-07 10:34:47 phaller Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -290,6 +290,6 @@
     SheGetDirW                        = _SheGetDirW@8                         @280
 ;   SheGetPathOffsetW                 = _SheGetPathOffsetW@?                  @281
-    SheRemoveQuotesA                  = _SheRemoveQuotesA@0                   @282
-    SheRemoveQuotesW                  = _SheRemoveQuotesW@0                   @283
+    SheRemoveQuotesA                  = _SheRemoveQuotesA@4                   @282
+    SheRemoveQuotesW                  = _SheRemoveQuotesW@4                   @283
 ;   SheSetCurDrive                    = _SheSetCurDrive@?                     @284
     SheShortenPathA                   = _SheShortenPathA@8                    @285
Index: trunk/src/shell32/new/shell32_main.h
===================================================================
--- trunk/src/shell32/new/shell32_main.h	(revision 1160)
+++ trunk/src/shell32/new/shell32_main.h	(revision 1162)
@@ -1,2 +1,12 @@
+/* $Id: shell32_main.h,v 1.4 1999-10-07 10:34:47 phaller Exp $ */
+
+/*
+ * Win32 SHELL32 for OS/2
+ *
+ * Copyright 1999 Patrick Haller (haller@zebra.fh-weingarten.de)
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
+ */
+
 /*
  * 	internal Shell32 Library definitions
@@ -5,4 +15,9 @@
 #ifndef __WINE_SHELL_MAIN_H
 #define __WINE_SHELL_MAIN_H
+
+
+/*****************************************************************************
+ * Includes                                                                  *
+ *****************************************************************************/
 
 #include "imagelist.h"
Index: trunk/src/shell32/new/shellguid.cpp
===================================================================
--- trunk/src/shell32/new/shellguid.cpp	(revision 1160)
+++ trunk/src/shell32/new/shellguid.cpp	(revision 1162)
@@ -1,2 +1,13 @@
+/* $Id: shellguid.cpp,v 1.4 1999-10-07 10:34:47 phaller Exp $ */
+
+/*
+ * Win32 SHELL32 for OS/2
+ *
+ * Copyright 1997 Marcus Meissner
+ * Copyright 1999 Patrick Haller (haller@zebra.fh-weingarten.de)
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
+ */
+
 /*
  *  Shell UID
@@ -7,5 +18,12 @@
  *
  */
+
+
+/*****************************************************************************
+ * Includes                                                                  *
+ *****************************************************************************/
+
 #include <odin.h>
+#include <odinwrap.h>
 
 #define ICOM_CINTERFACE 1
@@ -38,2 +56,6 @@
  will have to be in the same place as everybody else. This is * the same
  problem as with "real" Windows programs. */
+
+ODINDEBUGCHANNEL(SHELL32-SHELLGUID)
+
+
Index: trunk/src/shell32/new/shresdef.h
===================================================================
--- trunk/src/shell32/new/shresdef.h	(revision 1160)
+++ trunk/src/shell32/new/shresdef.h	(revision 1162)
@@ -1,3 +1,3 @@
-/* $Id: shresdef.h,v 1.2 1999-10-05 19:33:37 phaller Exp $ */
+/* $Id: shresdef.h,v 1.3 1999-10-07 10:34:48 phaller Exp $ */
 
 /*
@@ -11,10 +11,11 @@
 
 
+#ifndef __WINE_SHELL_RES_H
+#define __WINE_SHELL_RES_H
+
+
 /*****************************************************************************
  * Includes                                                                  *
  *****************************************************************************/
-
-#ifndef __WINE_SHELL_RES_H
-#define __WINE_SHELL_RES_H
 
 /*
Index: trunk/src/shell32/new/shv_bg_cmenu.cpp
===================================================================
--- trunk/src/shell32/new/shv_bg_cmenu.cpp	(revision 1160)
+++ trunk/src/shell32/new/shv_bg_cmenu.cpp	(revision 1162)
@@ -1,2 +1,10 @@
+/* $Id: shv_bg_cmenu.cpp,v 1.3 1999-10-07 10:34:48 phaller Exp $ */
+
+/*
+ * Project Odin Software License can be found in LICENSE.TXT
+ * Win32 SHELL32 Subsystem for OS/2
+ * 1998/05/19 PH Patrick Haller (haller@zebra.fh-weingarten.de)
+ */
+
 /*
  *	IContextMenu
@@ -5,6 +13,12 @@
  *	Copyright 1999	Juergen Schmied <juergen.schmied@metronet.de>
  */
+
+/*****************************************************************************
+ * Includes                                                                  *
+ *****************************************************************************/
+
 #include <string.h>
 #include <odin.h>
+#include <odinwrap.h>
 
 #define ICOM_CINTERFACE 1
@@ -24,5 +38,6 @@
 #include <misc.h>
 
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(SHELL32-SHV-BG-CMENU)
+
 
 /**************************************************************************
@@ -47,5 +62,8 @@
 	WINE_StringFromCLSID((LPCLSID)riid,xriid);
 
-	TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
+  dprintf(("SHELL32:shv_bg_cmenu: ISVBgCm_fnQueryInterface(%08xh,%s,%08xh)\n",
+           This,
+           xriid,
+           ppvObj));
 
 	*ppvObj = NULL;
@@ -81,5 +99,7 @@
 	ICOM_THIS(BgCmImpl, iface);
 
-	TRACE("(%p)->(count=%lu)\n",This, This->ref);
+  dprintf(("SHELL32:shv_bg_cmenu: ISVBgCm_fnAddRef(%08xh,%u)\n",
+           This,
+           This->ref));
 
 	shell32_ObjCount++;
@@ -94,5 +114,6 @@
 	ICOM_THIS(BgCmImpl, iface);
 
-	TRACE("(%p)->()\n",This);
+  dprintf(("SHELL32:shv_bg_cmenu: ISVBgCm_fnRelease(%08xh)\n",
+           This));
 
 	shell32_ObjCount--;
@@ -124,5 +145,11 @@
 	ICOM_THIS(BgCmImpl, iface);
 
-	TRACE("(%p)->(hmenu=%x indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
+  dprintf(("SHELL32:shv_bg_cmenu: ISVBgCm_fnQueryContextMenu(%08xh,%08xh,%08xh,%08xh,%08xh,%08xh)\n",
+           This,
+           hMenu,
+           indexMenu,
+           idCmdFirst,
+           idCmdLast,
+           uFlags));
 
 	hMyMenu = LoadMenuA(shell32_hInstance, "MENU_002");
@@ -148,5 +175,9 @@
 	HWND	hWndSV;
 
-	TRACE("(%p)->(invcom=%p verb=%p wnd=%x)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd);
+  dprintf(("SHELL32:shv_bg_cmenu: ISVBgCm_fnInvokeCommand((%p)->(invcom=%p verb=%p wnd=%x)\n",
+           This,
+           lpcmi,
+           lpcmi->lpVerb,
+           lpcmi->hwnd));
 
 	/* get the active IShellView */
@@ -215,5 +246,11 @@
 	ICOM_THIS(BgCmImpl, iface);
 
-	TRACE("(%p)->(idcom=%x flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen);
+  dprintf(("SHELL32:shv_bg_cmenu: ISVBgCm_fnGetCommandString((%p)->(idcom=%x flags=%x %p name=%p len=%x)\n",
+           This,
+           idCommand,
+           uFlags,
+           lpReserved,
+           lpszName,
+           uMaxNameLen));
 
 	/* test the existance of the menu items, the file dialog enables
@@ -247,5 +284,9 @@
 	ICOM_THIS(BgCmImpl, iface);
 
-	FIXME("(%p)->(msg=%x wp=%x lp=%lx)\n",This, uMsg, wParam, lParam);
+  dprintf(("SHELL32:shv_bg_cmenu: ISVBgCm_fnHandleMenuMsg((%p)->(msg=%x wp=%x lp=%lx)\n",
+           This,
+           uMsg,
+           wParam,
+           lParam));
 
 	return E_NOTIMPL;
@@ -280,5 +321,7 @@
 	cm->ref = 1;
 
-	TRACE("(%p)->()\n",cm);
+  dprintf(("SHELL32:shv_bg_cmenu: ISVBgCm_Constructor(%p)\n",
+           cm));
+
 	shell32_ObjCount++;
 	return (IContextMenu*)cm;
Index: trunk/src/shell32/new/unknown.cpp
===================================================================
--- trunk/src/shell32/new/unknown.cpp	(revision 1160)
+++ trunk/src/shell32/new/unknown.cpp	(revision 1162)
@@ -1,3 +1,3 @@
-/* $Id: unknown.cpp,v 1.1 1999-09-09 10:25:28 phaller Exp $ */
+/* $Id: unknown.cpp,v 1.2 1999-10-07 10:34:48 phaller Exp $ */
 
 /*
@@ -11,4 +11,6 @@
  *****************************************************************************/
 
+#include <odin.h>
+#include <odinwrap.h>
 #include <os2win.h>
 #include <shellapi.h>
@@ -16,4 +18,6 @@
 //#include "shell32.h"
 
+
+ODINDEBUGCHANNEL(SHELL32-UNKNOWN)
 
 /*****************************************************************************
@@ -47,18 +51,13 @@
  *****************************************************************************/
 
-HINSTANCE WIN32API RealShellExecuteA(HWND    hwnd,
-                                     LPCTSTR lpOperation,
-                                     LPCTSTR lpFile,
-                                     LPCTSTR lpParameters,
-                                     LPCTSTR lpDirectory,
-                                     INT     nShowCmd)
-{
-  dprintf (("SHELL32: RealShellExecuteA(%08xh,%s,%s,%s,%s,%08xh) not implemented.\n",
-            hwnd,
-            lpOperation,
-            lpFile,
-            lpParameters,
-            lpDirectory,
-            nShowCmd));
+ODINFUNCTION6(HINSTANCE, RealShellExecuteA,
+              HWND,      hwnd,
+              LPCTSTR,   lpOperation,
+              LPCTSTR,   lpFile,
+              LPCTSTR,   lpParameters,
+              LPCTSTR,   lpDirectory,
+              INT,       nShowCmd)
+{
+  dprintf (("SHELL32: RealShellExecuteA not implemented.\n"));
 
   return(0); //out of memory
@@ -83,10 +82,11 @@
  *****************************************************************************/
 
-HINSTANCE WIN32API RealShellExecuteW(HWND    hwnd,
-                                     LPCWSTR lpOperation,
-                                     LPCWSTR lpFile,
-                                     LPCWSTR lpParameters,
-                                     LPCWSTR lpDirectory,
-                                     INT     nShowCmd)
+ODINFUNCTION6(HINSTANCE, RealShellExecuteW,
+              HWND,      hwnd,
+              LPCWSTR,   lpOperation,
+              LPCWSTR,   lpFile,
+              LPCWSTR,   lpParameters,
+              LPCWSTR,   lpDirectory,
+              INT,       nShowCmd)
 {
   HINSTANCE hInstance;
@@ -132,8 +132,8 @@
  *****************************************************************************/
 
-BOOL WIN32API RealShellExecuteExA(LPSHELLEXECUTEINFOA lpExecInfo)
-{
-  dprintf(("SHELL32: RealShellExecuteExA (%08xh) not implemented.\n",
-           lpExecInfo));
+ODINFUNCTION1(BOOL,                RealShellExecuteExA,
+              LPSHELLEXECUTEINFOA, lpExecInfo)
+{
+  dprintf(("SHELL32: RealShellExecuteExA not implemented.\n"));
 
   return (0);
@@ -153,8 +153,8 @@
  *****************************************************************************/
 
-BOOL WIN32API RealShellExecuteExW(LPSHELLEXECUTEINFOW lpExecInfo)
-{
-  dprintf(("SHELL32: RealShellExecuteExW (%08xh) not implemented.\n",
-           lpExecInfo));
+ODINFUNCTION1(BOOL,                RealShellExecuteExW,
+              LPSHELLEXECUTEINFOW, lpExecInfo)
+{
+  dprintf(("SHELL32: RealShellExecuteExW not implemented.\n"));
 
   return (0);
@@ -174,10 +174,9 @@
  *****************************************************************************/
 
-DWORD WIN32API RegenerateUserEnvironment(DWORD x1,
-                                         DWORD x2)
-{
-  dprintf(("SHELL32: RegenerateUserEnvironment(%08xh,%08xhz) not implemented.\n",
-           x1,
-           x2));
+ODINFUNCTION2(DWORD, RegenerateUserEnvironment,
+              DWORD, x1,
+              DWORD, x2)
+{
+  dprintf(("SHELL32: RegenerateUserEnvironment not implemented.\n"));
 
   return (0);
@@ -197,12 +196,10 @@
  *****************************************************************************/
 
-DWORD WIN32API RestartDialog(DWORD x1,
-                             DWORD x2,
-                             DWORD x3)
-{
-  dprintf(("SHELL32: RestartDialog(%08xh,%08xh,%08xh) not implemented.\n",
-           x1,
-           x2,
-           x3));
+ODINFUNCTION3(DWORD, RestartDialog,
+              DWORD, x1,
+              DWORD, x2,
+              DWORD, x3)
+{
+  dprintf(("SHELL32: RestartDialog not implemented.\n"));
 
   return (0);
@@ -222,10 +219,9 @@
  *****************************************************************************/
 
-DWORD WIN32API SheConvertPathW(DWORD x1,
-                               DWORD x2)
-{
-  dprintf(("SHELL32: SheConvertPathW(%08xh,%08xh) not implemented.\n",
-           x1,
-           x2));
+ODINFUNCTION2(DWORD, SheConvertPathW,
+              DWORD, x1,
+              DWORD, x2)
+{
+  dprintf(("SHELL32: SheConvertPathW not implemented.\n"));
 
   return (0);
@@ -245,10 +241,9 @@
  *****************************************************************************/
 
-DWORD WIN32API SheShortenPathW(DWORD x1,
-                               DWORD x2)
-{
-  dprintf(("SHELL32: SheShortenPathW(%08xh,%08xh) not implemented.\n",
-           x1,
-           x2));
+ODINFUNCTION2(DWORD, SheShortenPathW,
+              DWORD, x1,
+              DWORD, x2)
+{
+  dprintf(("SHELL32: SheShortenPathW not implemented.\n"));
 
   return (0);
@@ -268,11 +263,11 @@
  *****************************************************************************/
 
-DWORD WIN32API SheShortenPathA(DWORD x1,
-                               DWORD x2)
-{
-  dprintf(("SHELL32: SheShortenPathA(%08xh,%08xh) not implemented.\n",
-           x1,
-           x2));
-
-  return (0);
-}
+ODINFUNCTION2(DWORD, SheShortenPathA,
+              DWORD, x1,
+              DWORD, x2)
+{
+  dprintf(("SHELL32: SheShortenPathA not implemented.\n"));
+
+  return (0);
+}
+
