Changeset 1167 for trunk/src/shell32/new/regstream.cpp

Timestamp:

Oct 7, 1999, 3:57:31 PM (26 years ago)

Author:

phaller

Message:

Fix: debug info

File:

• trunk/src/shell32/new/regstream.cpp (modified) (20 diffs)

trunk/src/shell32/new/regstream.cpp

@@ +1 @@
+/* $Id: regstream.cpp,v 1.3 1999-10-07 13:57:31 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
+ *
+ */
+
 /*
  *      SHRegOpenStream
  */
+
+/*****************************************************************************
+ * Includes                                                                  *
+ *****************************************************************************/
+
 #include <string.h>
 #include <odin.h>
+#include <odinwrap.h>
+#include <os2sel.h>
 
 #define ICOM_CINTERFACE 1
@@ -20 +38 @@
 #include <misc.h>
 
-DEFAULT_DEBUG_CHANNEL(shell)
+
+ODINDEBUGCHANNEL(SHELL32-REGSTREAM)
+
+
+/*****************************************************************************
+ * Implementation                                                            *
+ *****************************************************************************/
 
 typedef struct
@@ -46 +70 @@
         WINE_StringFromCLSID((LPCLSID)riid,xriid);
 
-        TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,xriid,ppvObj);
+  dprintf(("SHELL32:regstream IStream_fnQueryInterface (%p)->(\n\tIID:\t%s,%p)\n",
+           This,
+           xriid,
+           ppvObj));
 
         *ppvObj = NULL;
@@ -60 +87 @@
         {
           IStream_AddRef((IStream*)*ppvObj);
-          TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj);
+          dprintf(("SHELL32:regstream IStream_fnQueryInterface -- Interface: (%p)->(%p)\n",
+            ppvObj,
+            *ppvObj));
           return S_OK;
         }
-        TRACE("-- Interface: E_NOINTERFACE\n");
+        dprintf(("SHELL32:regstream IStream_fnQueryInterface-- Interface: E_NOINTERFACE\n"));
         return E_NOINTERFACE;
 }
@@ -74 +103 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)->(count=%lu)\n",This, This->ref);
+          dprintf(("SHELL32:regstream IStream_fnAddRef (%p)->(count=%lu)\n",
+            This,
+            This->ref));
 
         shell32_ObjCount++;
@@ -87 +118 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)->()\n",This);
+          dprintf(("SHELL32:regstream IStream_fnRelease(%p)->()\n",
+            This));
 
         shell32_ObjCount--;
 
         if (!--(This->ref))
-        { TRACE(" destroying SHReg IStream (%p)\n",This);
+        { dprintf(("SHELL32:regstream IStream_fnRelease destroying SHReg IStream (%p)\n",
+            This));
 
           if (This->pszSubKey)
@@ -118 +151 @@
         DWORD dwBytesToRead, dwBytesLeft;
         
-        TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead);
+        dprintf(("SHELL32:regstream IStream_fnRead(%p)->(%p,0x%08lx,%p)\n",
+          This,
+          pv,
+          cb,
+          pcbRead));
         
         if ( !pv )
@@ -143 +180 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)\n",This);
+        dprintf(("SHELL32:regstream IStream_fnWrite(%p)\n",
+          This));
 
         return E_NOTIMPL;
@@ -151 +189 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)\n",This);
+        dprintf(("SHELL32:regstream IStream_fnSeek(%p)\n",
+          This));
 
         return E_NOTIMPL;
@@ -159 +198 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)\n",This);
+        dprintf(("SHELL32:regstream IStream_fnSetSize(%p)\n",
+          This));
 
         return E_NOTIMPL;
@@ -167 +207 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)\n",This);
+          dprintf(("SHELL32:regstream IStream_fnCopyTo(%p)\n",
+            This));
 
         return E_NOTIMPL;
@@ -175 +216 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)\n",This);
+          dprintf(("SHELL32:regstream IStream_fnCommit(%p)\n",
+            This));
 
         return E_NOTIMPL;
@@ -183 +225 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)\n",This);
+        dprintf(("SHELL32:regstream IStream_fnRevert(%p)\n",
+          This));
 
         return E_NOTIMPL;
@@ -191 +234 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)\n",This);
+        dprintf(("SHELL32:regstream IStream_fnLockRegion(%p)\n",
+          This));
 
         return E_NOTIMPL;
@@ -199 +243 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)\n",This);
+          dprintf(("SHELL32:regstream IStream_fnUnlockRegion(%p)\n",
+            This));
 
         return E_NOTIMPL;
@@ -207 +252 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)\n",This);
+          dprintf(("SHELL32:regstream IStream_fnStat(%p)\n",
+            This));
 
         return E_NOTIMPL;
@@ -215 +261 @@
         ICOM_THIS(ISHRegStream, iface);
 
-        TRACE("(%p)\n",This);
+          dprintf(("SHELL32:regstream IStream_fnClone(%p)\n",
+            This));
 
         return E_NOTIMPL;
@@ -251 +298 @@
         rstr->ref = 1;
 
+ dprintf(("SHELL32:regstream IStream_Constructor(%08xh,%ls,%ls,%08xh)\n",
+          hKey,
+          pszSubKey,
+          pszValue,
+          grfMode));
+
         if ( ERROR_SUCCESS == RegOpenKeyExA (hKey, pszSubKey, 0, KEY_READ, &(rstr->hKey)))
         { if ( ERROR_SUCCESS == RegQueryValueExA(rstr->hKey, (LPSTR)pszValue,0,0,0,&(rstr->dwLength)))
@@ -261 +314 @@
                 { rstr->pszSubKey = HEAP_strdupA (GetProcessHeap(),0, pszSubKey);
                   rstr->pszValue = HEAP_strdupA (GetProcessHeap(),0, pszValue);         
-                  TRACE("(%p)->0x%08x,%s,%s,0x%08lx\n", rstr, hKey, pszSubKey, pszValue, grfMode);
+                    dprintf(("SHELL32:regstream IStream_Constructor(%p)->0x%08x,%s,%s,0x%08lx\n", rstr, hKey, pszSubKey, pszValue, grfMode));
                   shell32_ObjCount++;
                   return (IStream*)rstr;
@@ -285 +338 @@
 IStream * WINAPI OpenRegStream(HKEY hkey, LPCSTR pszSubkey, LPCSTR pszValue, DWORD grfMode)
 {
-        TRACE("(0x%08x,%s,%s,0x%08lx)\n",hkey, pszSubkey, pszValue, grfMode);
+  dprintf(("SHELL32:regstream OpenRegStream(0x%08x,%s,%s,0x%08lx)\n",
+           hkey,
+           pszSubkey,
+           pszValue,
+           grfMode));
         return IStream_Constructor(hkey, pszSubkey, pszValue, grfMode);
 }