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

Timestamp:

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

Author:

phaller

Message:

.

File:

• trunk/src/shell32/new/shelllink.cpp (modified) (6 diffs)

trunk/src/shell32/new/shelllink.cpp

@@ -26 +26 @@
 #include "shlguid.h"
 
+#include <heapstring.h>
 #include <misc.h>
 
@@ -67 +68 @@
 #include "poppack.h"
 
-static ICOM_VTABLE(IShellLink)          slvt;
-static ICOM_VTABLE(IShellLinkW)         slvtw;
-static ICOM_VTABLE(IPersistFile)        pfvt;
-static ICOM_VTABLE(IPersistStream)      psvt;
+//static ICOM_VTABLE(IShellLink)                slvt;
+//static ICOM_VTABLE(IShellLinkW)               slvtw;
+//static ICOM_VTABLE(IPersistFile)      pfvt;
+//static ICOM_VTABLE(IPersistStream)    psvt;
 
 /* IShellLink Implementation */
@@ -295 +296 @@
         IStream*         pLoadStream)
 {
-        PLINK_HEADER lpLinkHeader = HeapAlloc(GetProcessHeap(), 0, LINK_HEADER_SIZE);
+        PLINK_HEADER lpLinkHeader = (PLINK_HEADER)HeapAlloc(GetProcessHeap(), 0, LINK_HEADER_SIZE);
         ULONG   dwBytesRead;
         DWORD   ret = E_FAIL;
@@ -316 +317 @@
             if ((lpLinkHeader->MagicStr == 0x0000004CL) && IsEqualIID(&lpLinkHeader->MagicGuid, &CLSID_ShellLink))
             {
-              lpLinkHeader = HeapReAlloc(GetProcessHeap(), 0, lpLinkHeader, LINK_HEADER_SIZE+lpLinkHeader->PidlSize);
+              lpLinkHeader = (PLINK_HEADER)HeapReAlloc(GetProcessHeap(), 0, lpLinkHeader, LINK_HEADER_SIZE+lpLinkHeader->PidlSize);
               if (lpLinkHeader)
               {
@@ -404 +405 @@
 
 /**************************************************************************
- *        IShellLink_Constructor
- */
-IShellLink * IShellLink_Constructor(BOOL bUnicode)
-{       IShellLinkImpl * sl;
-
-        sl = (IShellLinkImpl *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IShellLinkImpl));
-        sl->ref = 1;
-        sl->lpvtbl = &slvt;
-        sl->lpvtblw = &slvtw;
-        sl->lpvtblPersistFile = &pfvt;
-        sl->lpvtblPersistStream = &psvt;
-        
-        TRACE("(%p)->()\n",sl);
-        shell32_ObjCount++;
-        return bUnicode ? (IShellLink *) &(sl->lpvtblw) : (IShellLink *)sl;
-}
-
-/**************************************************************************
  *  IShellLink_QueryInterface
  */
@@ -902 +885 @@
 };
 
+/**************************************************************************
+ *        IShellLink_Constructor
+ */
+IShellLink * IShellLink_Constructor(BOOL bUnicode)
+{       IShellLinkImpl * sl;
+
+        sl = (IShellLinkImpl *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IShellLinkImpl));
+        sl->ref = 1;
+        sl->lpvtbl = &slvt;
+        sl->lpvtblw = &slvtw;
+        sl->lpvtblPersistFile = &pfvt;
+        sl->lpvtblPersistStream = &psvt;
+        
+        TRACE("(%p)->()\n",sl);
+        shell32_ObjCount++;
+        return bUnicode ? (IShellLink *) &(sl->lpvtblw) : (IShellLink *)sl;
+}
+
+