Changeset 7335 for trunk/src

Timestamp:

Nov 14, 2001, 1:49:06 PM (24 years ago)

Author:

phaller

Message:

replaced heap alloc by stack alloc

Location:

trunk/src/ole32

Files:

• compobj.c (modified) (4 diffs)
• storage32.c (modified) (2 diffs)

trunk/src/ole32/compobj.c

@@ -539 +539 @@
         CLSID *id               /* [out] GUID represented by above string */
 ) {
+#ifdef __WIN32OS2__
+    HRESULT    ret;
+    LPOLESTR16 xid;
+    STACK_strdupWtoA(idstr, xid)
+    ret = CLSIDFromString16( (LPOLESTR16)xid,id);
+    if(ret != S_OK) { /* It appears a ProgID is also valid */
+        ret = CLSIDFromProgID(idstr, id);
+    }
+    return ret;
+#else
     LPOLESTR16      xid = HEAP_strdupWtoA(GetProcessHeap(),0,idstr);
     HRESULT       ret = CLSIDFromString16(xid,id);
-
     HeapFree(GetProcessHeap(),0,xid);
     if(ret != S_OK) { /* It appears a ProgID is also valid */
@@ -547 +556 @@
     }
     return ret;
+#endif
 }
 
@@ -779 +789 @@
         LPCLSID riid            /* [out] associated CLSID */
 ) {
+#ifdef __WIN32OS2__
+        LPOLESTR16 pid;
+        STACK_strdupWtoA(progid, pid)
+        return CLSIDFromProgID16((LPOLESTR16)pid,riid);
+#else
         LPOLESTR16 pid = HEAP_strdupWtoA(GetProcessHeap(),0,progid);
         HRESULT       ret = CLSIDFromProgID16(pid,riid);
@@ -784 +799 @@
         HeapFree(GetProcessHeap(),0,pid);
         return ret;
+#endif
 }
 

trunk/src/ole32/storage32.c

@@ -1178 +1178 @@
     ULONG          propertyIndex;
     ULONG          lastProperty  = 0;
+
     ULONG          blockCount    = 0;
 
@@ -7048 +7049 @@
 StgIsStorageFile(LPCOLESTR fn) 
 {
+#ifdef __WIN32OS2__
+        LPOLESTR16 xfn;
+        STACK_strdupWtoA(fn, xfn)
+        return StgIsStorageFile16((LPOLESTR16)xfn);
+#else
         LPOLESTR16      xfn = HEAP_strdupWtoA(GetProcessHeap(),0,fn);
         HRESULT ret = StgIsStorageFile16(xfn);
-
         HeapFree(GetProcessHeap(),0,xfn);
         return ret;
-}
 #endif
+}
+#endif