Base the new one on the libarm32 one, which has got more/newer functions.
Include functions that seem to be specific to 64 bit mode (*_UserFree64,
*_UserMarshal64, *_UserSize64, *_UserUnmarshal64) only when building for
win64.
Signed-off-by: Martin Storsjö <mar...@martin.st>
---
mingw-w64-crt/Makefile.am | 4 +-
.../ole32.def => lib-common/ole32.def.in} | 84 +++-
mingw-w64-crt/lib64/ole32.def | 467 ---------------------
3 files changed, 73 insertions(+), 482 deletions(-)
rename mingw-w64-crt/{libarm32/ole32.def => lib-common/ole32.def.in} (83%)
delete mode 100644 mingw-w64-crt/lib64/ole32.def
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 8638445..cd54a5f 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -896,7 +896,7 @@ lib64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
processed_defs += lib64/msvcrt.def lib64/msvcr80.def lib64/msvcr90.def
lib64/msvcr90d.def \
lib64/msvcr100.def lib64/msvcr110.def
lib64/msvcr120.def lib64/msvcr120d.def \
lib64/msvcr120_app.def lib64/msvcp120_app.def
\
- lib64/advapi32.def lib64/clbcatq.def
lib64/kernel32.def
+ lib64/advapi32.def lib64/clbcatq.def
lib64/kernel32.def lib64/ole32.def
endif
@@ -1191,7 +1191,7 @@ libarm32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
libarm32_libmingwthrd_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
processed_defs += libarm32/msvcrt.def libarm32/msvcr80.def
libarm32/msvcr90.def libarm32/msvcr90d.def libarm32/msvcr100.def
libarm32/msvcr110.def \
- libarm32/advapi32.def libarm32/clbcatq.def
libarm32/kernel32.def
+ libarm32/advapi32.def libarm32/clbcatq.def
libarm32/kernel32.def libarm32/ole32.def
endif
diff --git a/mingw-w64-crt/libarm32/ole32.def
b/mingw-w64-crt/lib-common/ole32.def.in
similarity index 83%
rename from mingw-w64-crt/libarm32/ole32.def
rename to mingw-w64-crt/lib-common/ole32.def.in
index b721181..757f82e 100644
--- a/mingw-w64-crt/libarm32/ole32.def
+++ b/mingw-w64-crt/lib-common/ole32.def.in
@@ -1,15 +1,8 @@
-;
-; Definition file of ole32.dll
-; Automatic generated by gendef
-; written by Kai Tietz 2008-2014
-;
+#include "func.def.in"
+
LIBRARY "ole32.dll"
EXPORTS
-ord_800 @800
-ord_801 @801
OleGetPackageClipboardOwner
-ord_803 @803
-ord_804 @804
CLIPFORMAT_UserFreeExt
CLIPFORMAT_UserMarshalExt
CLIPFORMAT_UserSizeExt
@@ -25,10 +18,6 @@ HPALETTE_UserFreeExt
HPALETTE_UserMarshalExt
HPALETTE_UserSizeExt
HPALETTE_UserUnmarshalExt
-ord_820 @820
-ord_821 @821
-ord_822 @822
-ord_823 @823
HRGN_UserFree
HRGN_UserMarshal
HRGN_UserSize
@@ -50,9 +39,13 @@ StdTypesRegisterServer
WriteStorageProperties
BindMoniker
CLIPFORMAT_UserFree
+F64(CLIPFORMAT_UserFree64)
CLIPFORMAT_UserMarshal
+F64(CLIPFORMAT_UserMarshal64)
CLIPFORMAT_UserSize
+F64(CLIPFORMAT_UserSize64)
CLIPFORMAT_UserUnmarshal
+F64(CLIPFORMAT_UserUnmarshal64)
CLSIDFromOle1Class
CLSIDFromProgID
CLSIDFromProgIDEx
@@ -113,6 +106,7 @@ CoGetObjectContext
CoGetPSClsid
CoGetProcessIdentifier
CoGetStandardMarshal
+CoGetState
CoGetStdMarshalEx
CoGetSystemSecurityPermissions
CoGetSystemWow64DirectoryW
@@ -215,57 +209,109 @@ GetHGlobalFromStream
GetHookInterface
GetRunningObjectTable
HACCEL_UserFree
+F64(HACCEL_UserFree64)
HACCEL_UserMarshal
+F64(HACCEL_UserMarshal64)
HACCEL_UserSize
+F64(HACCEL_UserSize64)
HACCEL_UserUnmarshal
+F64(HACCEL_UserUnmarshal64)
HBITMAP_UserFree
+F64(HBITMAP_UserFree64)
HBITMAP_UserMarshal
+F64(HBITMAP_UserMarshal64)
HBITMAP_UserSize
+F64(HBITMAP_UserSize64)
HBITMAP_UserUnmarshal
+F64(HBITMAP_UserUnmarshal64)
HBRUSH_UserFree
+F64(HBRUSH_UserFree64)
HBRUSH_UserMarshal
+F64(HBRUSH_UserMarshal64)
HBRUSH_UserSize
+F64(HBRUSH_UserSize64)
HBRUSH_UserUnmarshal
+F64(HBRUSH_UserUnmarshal64)
HDC_UserFree
+F64(HDC_UserFree64)
HDC_UserMarshal
+F64(HDC_UserMarshal64)
HDC_UserSize
+F64(HDC_UserSize64)
HDC_UserUnmarshal
+F64(HDC_UserUnmarshal64)
HENHMETAFILE_UserFree
+F64(HENHMETAFILE_UserFree64)
HENHMETAFILE_UserMarshal
+F64(HENHMETAFILE_UserMarshal64)
HENHMETAFILE_UserSize
+F64(HENHMETAFILE_UserSize64)
HENHMETAFILE_UserUnmarshal
+F64(HENHMETAFILE_UserUnmarshal64)
HGLOBAL_UserFree
+F64(HGLOBAL_UserFree64)
HGLOBAL_UserMarshal
+F64(HGLOBAL_UserMarshal64)
HGLOBAL_UserSize
+F64(HGLOBAL_UserSize64)
HGLOBAL_UserUnmarshal
+F64(HGLOBAL_UserUnmarshal64)
HICON_UserFree
+F64(HICON_UserFree64)
HICON_UserMarshal
+F64(HICON_UserMarshal64)
HICON_UserSize
+F64(HICON_UserSize64)
HICON_UserUnmarshal
+F64(HICON_UserUnmarshal64)
HMENU_UserFree
+F64(HMENU_UserFree64)
HMENU_UserMarshal
+F64(HMENU_UserMarshal64)
HMENU_UserSize
+F64(HMENU_UserSize64)
HMENU_UserUnmarshal
+F64(HMENU_UserUnmarshal64)
HMETAFILEPICT_UserFree
+F64(HMETAFILEPICT_UserFree64)
HMETAFILEPICT_UserMarshal
+F64(HMETAFILEPICT_UserMarshal64)
HMETAFILEPICT_UserSize
+F64(HMETAFILEPICT_UserSize64)
HMETAFILEPICT_UserUnmarshal
+F64(HMETAFILEPICT_UserUnmarshal64)
HMETAFILE_UserFree
+F64(HMETAFILE_UserFree64)
HMETAFILE_UserMarshal
+F64(HMETAFILE_UserMarshal64)
HMETAFILE_UserSize
+F64(HMETAFILE_UserSize64)
HMETAFILE_UserUnmarshal
+F64(HMETAFILE_UserUnmarshal64)
HMONITOR_UserFree
+F64(HMONITOR_UserFree64)
HMONITOR_UserMarshal
+F64(HMONITOR_UserMarshal64)
HMONITOR_UserSize
+F64(HMONITOR_UserSize64)
HMONITOR_UserUnmarshal
+F64(HMONITOR_UserUnmarshal64)
HPALETTE_UserFree
+F64(HPALETTE_UserFree64)
HPALETTE_UserMarshal
+F64(HPALETTE_UserMarshal64)
HPALETTE_UserSize
+F64(HPALETTE_UserSize64)
HPALETTE_UserUnmarshal
+F64(HPALETTE_UserUnmarshal64)
HWND_UserFree
+F64(HWND_UserFree64)
HWND_UserMarshal
+F64(HWND_UserMarshal64)
HWND_UserSize
+F64(HWND_UserSize64)
HWND_UserUnmarshal
+F64(HWND_UserUnmarshal64)
HkOleRegisterObject
IIDFromString
IsAccelerator
@@ -423,13 +469,21 @@ RevokeActiveObjectExt
RevokeDragDrop
RoGetAgileReference
SNB_UserFree
+F64(SNB_UserFree64)
SNB_UserMarshal
+F64(SNB_UserMarshal64)
SNB_UserSize
+F64(SNB_UserSize64)
SNB_UserUnmarshal
+F64(SNB_UserUnmarshal64)
STGMEDIUM_UserFree
+F64(STGMEDIUM_UserFree64)
STGMEDIUM_UserMarshal
+F64(STGMEDIUM_UserMarshal64)
STGMEDIUM_UserSize
+F64(STGMEDIUM_UserSize64)
STGMEDIUM_UserUnmarshal
+F64(STGMEDIUM_UserUnmarshal64)
SetConvertStg
SetDocumentBitStg
SetErrorInfo
@@ -463,9 +517,13 @@ UtConvertDvtd32toDvtd16
UtGetDvtd16Info
UtGetDvtd32Info
WdtpInterfacePointer_UserFree
+F64(WdtpInterfacePointer_UserFree64)
WdtpInterfacePointer_UserMarshal
+F64(WdtpInterfacePointer_UserMarshal64)
WdtpInterfacePointer_UserSize
+F64(WdtpInterfacePointer_UserSize64)
WdtpInterfacePointer_UserUnmarshal
+F64(WdtpInterfacePointer_UserUnmarshal64)
WriteClassStg
WriteClassStm
WriteFmtUserTypeStg
diff --git a/mingw-w64-crt/lib64/ole32.def b/mingw-w64-crt/lib64/ole32.def
deleted file mode 100644
index 95bc764..0000000
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
