Changeset 21494 for trunk/src/ole32

Timestamp:

Dec 2, 2010, 1:19:12 AM (15 years ago)

Author:

dmik

Message:

Fixed broken build after r21492 by sorting out a huuuuge wagon of duplicates, wrong include order and other dirty mess.

Location:

trunk/src/ole32

Files:

• old/ole32.h (modified) (2 diffs)
• ole32.h (modified) (2 diffs)
• storage32.c (modified) (2 diffs)
• stubs.cpp (modified) (1 diff)

trunk/src/ole32/old/ole32.h

@@ -17 +17 @@
 #define NONAMELESSUNION
 // ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
-#define CINTERFACE 1
+#define CINTERFACE
 
 // ><DJR 17.05.99 Move standard includes to before os2win.h [memcmp]
@@ -37 +37 @@
 #endif
 #include <ole2ver.h>
-#include <ole.h>
 #include <ole2.h>
 #include <winreg.h>

trunk/src/ole32/ole32.h

@@ -17 +17 @@
 #define NONAMELESSUNION
 // ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
-#define CINTERFACE 1
+#define CINTERFACE
 
 // ><DJR 17.05.99 Move standard includes to before os2win.h [memcmp]
@@ -37 +37 @@
 #endif
 #include <ole2ver.h>
-#include <ole.h>
 #include <ole2.h>
 #include <winreg.h>

trunk/src/ole32/storage32.c

@@ -24 +24 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "ole.h"
+
 #ifdef __WIN32OS2__
 #include "ole32.h"
 #include "heapstring.h"
 #endif
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "winbase.h" /* for lstrlenW() and the likes */
@@ -7205 +7208 @@
  * StgIsStorageFile [OLE32.146]
  */
-HRESULT WINAPI 
-StgIsStorageFile(LPCOLESTR fn) 
+HRESULT WINAPI
+StgIsStorageFile(LPCOLESTR fn)
 {
     HRESULT ret;

trunk/src/ole32/stubs.cpp

@@ -13 +13 @@
  */
 
+#include "ole.h"
 #include "ole32.h"