Changeset 7343 for trunk/src

Timestamp:

Nov 14, 2001, 7:50:18 PM (24 years ago)

Author:

sandervl

Message:

removed unnecessary changes

Location:

trunk/src

Files:

• NTDLL/wcstring.c (modified) (1 diff)
• ole32/compobj.c (modified) (4 diffs)
• ole32/storage32.c (modified) (2 diffs)
• shell32/shelllink.c (modified) (2 diffs)

trunk/src/NTDLL/wcstring.c

@@ -285 +285 @@
 INT __cdecl NTDLL_wcstol(LPWSTR s,LPWSTR *end,INT base)
 {
-    INT ret;
-#ifdef __WIN32OS2__
-    LPSTR endA;
-    LPSTR sA;
-    STACK_strdupWtoA(s, sA)
-#else
     LPSTR sA = HEAP_strdupWtoA(GetProcessHeap(),0,s),endA;
-#endif
-  
-    strtol(sA,&endA,base);
-
-#ifndef __WIN32OS2__
+    INT ret = strtol(sA,&endA,base);
+
     HeapFree(GetProcessHeap(),0,sA);
-#endif
     if (end) *end = s+(endA-sA); /* pointer magic checked. */
     return ret;

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 */
@@ -556 +547 @@
     }
     return ret;
-#endif
 }
 
@@ -789 +779 @@
         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);
@@ -799 +784 @@
         HeapFree(GetProcessHeap(),0,pid);
         return ret;
-#endif
 }
 

trunk/src/ole32/storage32.c

@@ -1178 +1178 @@
     ULONG          propertyIndex;
     ULONG          lastProperty  = 0;
-
     ULONG          blockCount    = 0;
 
@@ -7049 +7048 @@
 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

trunk/src/shell32/shelllink.c

@@ -232 +232 @@
         _IPersistStream_From_ICOM_THIS(IPersistStream, This)
 
-#ifdef __WIN32OS2__
-        STACK_strdupWtoA(pszFileName, sFile)
-#else
         sFile = HEAP_strdupWtoA ( GetProcessHeap(), 0, pszFileName);
-#endif
 
         TRACE("(%p, %s)\n",This, sFile);
@@ -252 +248 @@
         }
         
-#ifndef __WIN32OS2__
+#ifdef __WIN32OS2__
        // PH 2001-11-13 memory leak in WINE?
        HeapFree( GetProcessHeap(), 0, sFile);