[Libreoffice-commits] .: salhelper/source

[Tor Lillqvist]

 salhelper/source/makefile.mk |    2 +
 salhelper/source/mscx.map    |   50 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

New commits:
commit 40773f5b34b6e8776e0733a9c6d3ce2504f9645d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun Jan 16 22:13:31 2011 +0200

    Use mscx.map for 64-bit MSVC build
    
    Unfortunately the C++ name mangling in a 64-bit MSVC compilation is
    slightly different from that in a 32-bit one:
    
    -- An 'E' is inserted for pointers to indicate that they are 64
    bits. I don't fully understand the rationale for this; isn't that the
    only kind of pointer in 64-bit code produced by a C++ compiler anyway?
    
    -- As there is only one calling convention on x64 Windows, __cdecl,
    the indications for other calling conventions (here, especially
    __thiscall) change to that for __cdecl.
    
    It should be possible to write a tool to at least partially automate
    conversion of 32-bit mangled names to 64-bit ones, and thus make it
    easy to create mscx map files from the corresponding msci ones in
    LibreOffice. Sure, it probably wouldn't work 100% correctly in all
    cases, but it would help a lot.

diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
index 26acb2e..f4e54ea 100644
--- a/salhelper/source/makefile.mk
+++ b/salhelper/source/makefile.mk
@@ -69,6 +69,8 @@ DEF1NAME=	$(SHL1TARGET)
 
 .IF "$(COMNAME)"=="msci"
 SHL1VERSIONMAP=msci.map
+.ELIF "$(COMNAME)"=="mscx"
+SHL1VERSIONMAP=mscx.map
 .ELIF "$(GUI)"=="OS2"
 SHL1VERSIONMAP=gcc3os2.map
 .ELIF "$(COMNAME)"=="sunpro5"
diff --git a/salhelper/source/mscx.map b/salhelper/source/mscx.map
new file mode 100644
index 0000000..58f26e9
--- /dev/null
+++ b/salhelper/source/mscx.map
@@ -0,0 +1,50 @@
+UDK_3_0_0 {
+    global:
+GetVersionInfo
+??0ORealDynamicLoader at salhelper@@IEAA at PEAPEAV01@AEBVOUString at rtl@@1PEAX2 at Z
+??1ORealDynamicLoader at salhelper@@MEAA at XZ
+??_7ORealDynamicLoader at salhelper@@6B@
+?acquire at ORealDynamicLoader@salhelper@@QEAAKXZ
+?getApi at ORealDynamicLoader@salhelper@@QEBAPEAXXZ
+?newInstance at ORealDynamicLoader@salhelper@@SAPEAV12 at PEAPEAV12@AEBVOUString at rtl@@1 at Z
+?release at ORealDynamicLoader@salhelper@@QEAAKXZ
+??1SimpleReferenceObject at salhelper@@MEAA at XZ
+??2SimpleReferenceObject at salhelper@@SAPEAX_K at Z
+??2SimpleReferenceObject at salhelper@@SAPEAX_KAEBUnothrow_t at std@@@Z
+??3SimpleReferenceObject at salhelper@@SAXPEAX at Z
+??3SimpleReferenceObject at salhelper@@SAXPEAXAEBUnothrow_t at std@@@Z
+    local:
+        *;
+};
+
+UDK_3.1 {
+    global:
+        ??_VSimpleReferenceObject at salhelper@@KAXPEAX at Z;
+        ??_7SimpleReferenceObject at salhelper@@6B@;
+
+        ??0Condition at salhelper@@QEAA at AEAVMutex@osl@@@Z;
+        ??1Condition at salhelper@@UEAA at XZ;
+
+        ??0ConditionModifier at salhelper@@QEAA at AEAVCondition@1@@Z;
+        ??1ConditionModifier at salhelper@@QEAA at XZ;
+
+        ??0ConditionWaiter at salhelper@@QEAA at AEAVCondition@1@@Z;
+        ??0ConditionWaiter at salhelper@@QEAA at AEAVCondition@1 at K@Z;
+        ??1ConditionWaiter at salhelper@@QEAA at XZ;
+
+        ??0timedout at ConditionWaiter@salhelper@@QEAA at XZ;
+        ??0timedout at ConditionWaiter@salhelper@@QEAA at AEBU012@@Z;
+        ??1timedout at ConditionWaiter@salhelper@@UEAA at XZ;
+        ??4timedout at ConditionWaiter@salhelper@@QEAAAEAU012 at AEBU012@@Z;
+
+        ??0Timer at salhelper@@QEAA at XZ;
+        ??0Timer at salhelper@@QEAA at AEBUTTimeValue@1@@Z;
+        ??0Timer at salhelper@@QEAA at AEBUTTimeValue@1 at 0@Z;
+        ??1Timer at salhelper@@MEAA at XZ;
+
+        ?isExpired at Timer@salhelper@@QEBAEXZ;
+        ?isTicking at Timer@salhelper@@QEBAEXZ;
+        ?setRemainingTime at Timer@salhelper@@QEAAXAEBUTTimeValue at 2@@Z;
+        ?start at Timer@salhelper@@QEAAXXZ;
+        ?stop at Timer@salhelper@@QEAAXXZ;
+} UDK_3_0_0;