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

Timestamp:

Sep 2, 1999, 7:25:19 PM (26 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/shell32/new/regstream.cpp

@@ -17 +17 @@
 #include "shell32_main.h"
 
+#include <heapstring.h>
 #include <misc.h>
 
@@ -32 +33 @@
 } ISHRegStream;
 
-static struct ICOM_VTABLE(IStream) rstvt;
-
-/**************************************************************************
-*   IStream_Constructor()
-*/
-IStream *IStream_Constructor(HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD grfMode)
-{       ISHRegStream*   rstr;
-        DWORD           dwType;
-        
-        rstr = (ISHRegStream*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ISHRegStream));
-        rstr->lpvtbl=&rstvt;
-        rstr->ref = 1;
-
-        if ( ERROR_SUCCESS == RegOpenKeyExA (hKey, pszSubKey, 0, KEY_READ, &(rstr->hKey)))
-        { if ( ERROR_SUCCESS == RegQueryValueExA(rstr->hKey, (LPSTR)pszValue,0,0,0,&(rstr->dwLength)))
-          {
-            /* read the binary data into the buffer */
-            rstr->pbBuffer = HeapAlloc(GetProcessHeap(),0,rstr->dwLength);
-            if (rstr->pbBuffer)
-            { if ( ERROR_SUCCESS == RegQueryValueExA(rstr->hKey, (LPSTR)pszValue,0,&dwType,rstr->pbBuffer,&(rstr->dwLength)))
-              { if (dwType == REG_BINARY )
-                { 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);
-                  shell32_ObjCount++;
-                  return (IStream*)rstr;
-                }
-              }
-              HeapFree (GetProcessHeap(),0,rstr->pbBuffer);
-            }
-          }
-          RegCloseKey(rstr->hKey);
-
-        }
-        HeapFree (GetProcessHeap(),0,rstr);
-        return NULL;
-}
+//static struct ICOM_VTABLE(IStream) rstvt;
+
 
 /**************************************************************************
@@ -274 +240 @@
 };
 
+/**************************************************************************
+*   IStream_Constructor()
+*/
+IStream *IStream_Constructor(HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, DWORD grfMode)
+{       ISHRegStream*   rstr;
+        DWORD           dwType;
+        
+        rstr = (ISHRegStream*)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ISHRegStream));
+        rstr->lpvtbl=&rstvt;
+        rstr->ref = 1;
+
+        if ( ERROR_SUCCESS == RegOpenKeyExA (hKey, pszSubKey, 0, KEY_READ, &(rstr->hKey)))
+        { if ( ERROR_SUCCESS == RegQueryValueExA(rstr->hKey, (LPSTR)pszValue,0,0,0,&(rstr->dwLength)))
+          {
+            /* read the binary data into the buffer */
+            rstr->pbBuffer = (BYTE*)HeapAlloc(GetProcessHeap(),0,rstr->dwLength);
+            if (rstr->pbBuffer)
+            { if ( ERROR_SUCCESS == RegQueryValueExA(rstr->hKey, (LPSTR)pszValue,0,&dwType,rstr->pbBuffer,&(rstr->dwLength)))
+              { if (dwType == REG_BINARY )
+                { 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);
+                  shell32_ObjCount++;
+                  return (IStream*)rstr;
+                }
+              }
+              HeapFree (GetProcessHeap(),0,rstr->pbBuffer);
+            }
+          }
+          RegCloseKey(rstr->hKey);
+
+        }
+        HeapFree (GetProcessHeap(),0,rstr);
+        return NULL;
+}
+
+
 /*************************************************************************
  * OpenRegStream                                [SHELL32.85]