Changeset 5026 for trunk/src

Timestamp:

Jan 25, 2001, 9:17:26 PM (25 years ago)

Author:

sandervl

Message:

Wine resync

Location:

trunk/src/ole32

Files:

• ole32.h (modified) (2 diffs)
• ole32.mak (modified) (2 diffs)
• oleClip.cpp (modified) (3 diffs)
• oleMenu.cpp (modified) (2 diffs)
• stg_bigblockfile.c (added)
• stg_bigblockfile.cpp (deleted)
• stg_stream.c (added)
• stg_stream.cpp (deleted)
• storage.cpp (deleted)
• storage.h (deleted)
• storage32.c (added)
• storage32.h (added)

trunk/src/ole32/ole32.h

@@ -1 @@
-/* $Id: ole32.h,v 1.13 2000-12-24 14:41:15 sandervl Exp $ */
+/* $Id: ole32.h,v 1.14 2001-01-25 20:17:23 sandervl Exp $ */
 /*
  *
@@ -33 +33 @@
 #undef CALLCONV
 
+#ifdef __cplusplus
 #include <os2win.h>
+#endif
 #include <ole2ver.h>
 #include <ole.h>

trunk/src/ole32/ole32.mak

@@ -1 @@
-# $Id: ole32.mak,v 1.3 2000-12-02 23:40:43 bird Exp $
+# $Id: ole32.mak,v 1.4 2001-01-25 20:17:23 sandervl Exp $
 
 #
@@ -50 +50 @@
 $(OBJDIR)\stg_bigblockfile.obj \
 $(OBJDIR)\stg_stream.obj \
-$(OBJDIR)\storage.obj \
+$(OBJDIR)\storage32.obj \
 $(OBJDIR)\stubs.obj \
 $(OBJDIR)\taskmem.obj \

trunk/src/ole32/oleClip.cpp

@@ -1 @@
-/* $Id: oleClip.cpp,v 1.5 2000-11-24 10:29:40 sandervl Exp $ */
+/* $Id: oleClip.cpp,v 1.6 2001-01-25 20:17:23 sandervl Exp $ */
 /* 
  * 
@@ -60 +60 @@
 #include "oString.h"
 #include "heapstring.h"
-#include "storage.h"
+#include "storage32.h"
 #include <assert.h>
 
@@ -1010 +1010 @@
 
         lstrcpyWtoA(strOleTypeName, strProgID);
-        OLECONVERT_CreateEmbeddedOleStream(std.u.pstg);
+        OLECONVERT_CreateOleStream(std.u.pstg);
         OLECONVERT_CreateCompObjStream(std.u.pstg, strOleTypeName);
       }

trunk/src/ole32/oleMenu.cpp

@@ -1 @@
-/* $Id: oleMenu.cpp,v 1.3 2000-09-17 10:31:06 davidr Exp $ */
+/* $Id: oleMenu.cpp,v 1.4 2001-01-25 20:17:24 sandervl Exp $ */
 /* 
  * 
@@ -22 +22 @@
 #include "oString.h"
 #include <assert.h>
+#include "storage32.h"
 
 // ======================================================================