From dcc0a8d477c65282b458e5ceef316e91c699a409 Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Mon, 10 Jan 2011 23:25:24 +0000
Subject: [PATCH] Delays the linking to the Microsoft Outlook API from compile
 to run time as much as possible in order to fix a crash on Windows XP without
 Microsoft Outlook (privately) reported by Damian Minkov.

---
 lib/native/windows-64/jmsoutlookaddrbook.dll  | Bin 0 -> 25600 bytes
 lib/native/windows/jmsoutlookaddrbook.dll     | Bin 0 -> 23552 bytes
 src/native/addrbook/msoutlook/Makefile        |   2 +-
 src/native/addrbook/msoutlook/MsOutlookMAPI.h |  12 +++
 ..._MsOutlookAddrBookContactSourceService.cxx | 100 ++++++++++++++++--
 5 files changed, 102 insertions(+), 12 deletions(-)
 create mode 100644 lib/native/windows-64/jmsoutlookaddrbook.dll
 create mode 100644 lib/native/windows/jmsoutlookaddrbook.dll

diff --git a/lib/native/windows-64/jmsoutlookaddrbook.dll b/lib/native/windows-64/jmsoutlookaddrbook.dll
new file mode 100644
index 0000000000000000000000000000000000000000..3eb9042a9a7cba9545ffd501b89cb9de08e946ef
GIT binary patch
literal 25600
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

literal 0
HcmV?d00001

diff --git a/lib/native/windows/jmsoutlookaddrbook.dll b/lib/native/windows/jmsoutlookaddrbook.dll
new file mode 100644
index 0000000000000000000000000000000000000000..7a1f48bf977be6bc89fcbf6326cdde7b024e2c72
GIT binary patch
literal 23552
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
J{F`XtzW`v(#a{pb

literal 0
HcmV?d00001

diff --git a/src/native/addrbook/msoutlook/Makefile b/src/native/addrbook/msoutlook/Makefile
index 2f5362dd0..a971bbeb3 100644
--- a/src/native/addrbook/msoutlook/Makefile
+++ b/src/native/addrbook/msoutlook/Makefile
@@ -11,7 +11,7 @@ endif
 
 CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/win32 -I$(OUTLOOK_MAPI_HEADERS) -I..
 LDFLAGS = -shared -Wl,--kill-at
-LIBS = -lmapi32 -luuid -ladvapi32
+LIBS = -luuid -ladvapi32
 TARGET = ../../../../lib/native/windows$(ARCH)/$(TARGET_BASENAME).dll
 
 $(TARGET): \
diff --git a/src/native/addrbook/msoutlook/MsOutlookMAPI.h b/src/native/addrbook/msoutlook/MsOutlookMAPI.h
index 1fcba9252..6dcc0b042 100644
--- a/src/native/addrbook/msoutlook/MsOutlookMAPI.h
+++ b/src/native/addrbook/msoutlook/MsOutlookMAPI.h
@@ -18,4 +18,16 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+
+SCODE MsOutlookAddrBook_MAPIAllocateBuffer(ULONG size, LPVOID FAR *buffer);
+#define MAPIAllocateBuffer MsOutlookAddrBook_MAPIAllocateBuffer
+ULONG MsOutlookAddrBook_MAPIFreeBuffer(LPVOID buffer);
+#define MAPIFreeBuffer MsOutlookAddrBook_MAPIFreeBuffer
+HRESULT MsOutlookAddrBook_MAPILogonEx
+    (ULONG_PTR uiParam,
+    LPSTR profileName, LPSTR password,
+    FLAGS flags,
+    LPMAPISESSION FAR *mapiSession);
+#define MAPILogonEx MsOutlookAddrBook_MAPILogonEx
+
 #endif /* #ifndef _NET_JAVA_SIP_COMMUNICATOR_PLUGIN_ADDRBOOK_MSOUTLOOK_MSOUTLOOKMAPI_H_ */
diff --git a/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx b/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx
index 14446b0aa..3db6812ad 100644
--- a/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx
+++ b/src/native/addrbook/msoutlook/net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService.cxx
@@ -14,6 +14,14 @@
 #include <stdlib.h>
 #include <string.h>
 
+static LPMAPIALLOCATEBUFFER
+    MsOutlookAddrBookContactSourceService_MAPIAllocateBuffer;
+static LPMAPIFREEBUFFER MsOutlookAddrBookContactSourceService_MAPIFreeBuffer;
+static LPMAPIINITIALIZE MsOutlookAddrBookContactSourceService_MAPIInitialize;
+static LPMAPILOGONEX MsOutlookAddrBookContactSourceService_MAPILogonEx;
+static LPMAPIUNINITIALIZE
+    MsOutlookAddrBookContactSourceService_MAPIUninitialize;
+
 JNIEXPORT void JNICALL
 Java_net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService_MAPIInitialize
     (JNIEnv *jniEnv, jclass clazz, jlong version, jlong flags)
@@ -31,7 +39,7 @@ Java_net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContac
     if (ERROR_SUCCESS
             == RegOpenKeyEx(
                     HKEY_LOCAL_MACHINE,
-                    _TEXT("Software\\Microsoft\\Office"),
+                    _T("Software\\Microsoft\\Office"),
                     0,
                     KEY_ENUMERATE_SUB_KEYS,
                     &officeKey))
@@ -67,7 +75,7 @@ Java_net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContac
                 continue;
 
             str = installRootKeyName + subkeyNameLength;
-            memcpy(str, _TEXT("\\Outlook\\InstallRoot"), 20 * sizeof(TCHAR));
+            memcpy(str, _T("\\Outlook\\InstallRoot"), 20 * sizeof(TCHAR));
             *(str + 20) = 0;
             if ((ERROR_SUCCESS
                     == RegOpenKeyEx(
@@ -79,7 +87,7 @@ Java_net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContac
                 && (ERROR_SUCCESS
                     == RegQueryValueEx(
                             installRootKey,
-                            _TEXT("Path"),
+                            _T("Path"),
                             NULL,
                             &pathValueType,
                             NULL, &pathValueSize))
@@ -109,7 +117,7 @@ Java_net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContac
                 if (ERROR_SUCCESS
                         == RegQueryValueEx(
                                 installRootKey,
-                                _TEXT("Path"),
+                                _T("Path"),
                                 NULL,
                                 NULL,
                                 (LPBYTE) pathValue, &pathValueSize))
@@ -128,12 +136,7 @@ Java_net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContac
 
                         fileAttributes = GetFileAttributes(pathValue);
                         if (INVALID_FILE_ATTRIBUTES != fileAttributes)
-                        {
-                            MAPIINIT_0 mapiInit
-                                = { (ULONG) version, (ULONG) flags };
-
-                            hResult = MAPIInitialize(&mapiInit);
-                        }
+                            hResult = S_OK;
                     }
                 }
 
@@ -143,6 +146,53 @@ Java_net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContac
         }
     }
 
+    /* If we've determined that we'd like to go on with MAPI, try to load it. */
+    if (HR_SUCCEEDED(hResult))
+    {
+        HMODULE lib = LoadLibrary(_T("mapi32.dll"));
+
+        if (lib)
+        {
+            MsOutlookAddrBookContactSourceService_MAPIInitialize
+                = (LPMAPIINITIALIZE) GetProcAddress(lib, "MAPIInitialize");
+            MsOutlookAddrBookContactSourceService_MAPIUninitialize
+                = (LPMAPIUNINITIALIZE) GetProcAddress(lib, "MAPIUninitialize");
+
+            if (MsOutlookAddrBookContactSourceService_MAPIInitialize
+                    && MsOutlookAddrBookContactSourceService_MAPIUninitialize)
+            {
+                MAPIINIT_0 mapiInit = { (ULONG) version, (ULONG) flags };
+
+                hResult
+                    = MsOutlookAddrBookContactSourceService_MAPIInitialize(
+                            &mapiInit);
+                if (HR_SUCCEEDED(hResult))
+                {
+                    MsOutlookAddrBookContactSourceService_MAPIAllocateBuffer
+                        = (LPMAPIALLOCATEBUFFER)
+                            GetProcAddress(lib, "MAPIAllocateBuffer");
+                    MsOutlookAddrBookContactSourceService_MAPIFreeBuffer
+                        = (LPMAPIFREEBUFFER)
+                            GetProcAddress(lib, "MAPIFreeBuffer");
+                    MsOutlookAddrBookContactSourceService_MAPILogonEx
+                        = (LPMAPILOGONEX) GetProcAddress(lib, "MAPILogonEx");
+                    if (!MsOutlookAddrBookContactSourceService_MAPIAllocateBuffer
+                            || !MsOutlookAddrBookContactSourceService_MAPIFreeBuffer
+                            || !MsOutlookAddrBookContactSourceService_MAPILogonEx)
+                    {
+                        MsOutlookAddrBookContactSourceService_MAPIUninitialize();
+                        hResult = MAPI_E_NOT_FOUND;
+                    }
+                }
+            }
+            else
+                hResult = MAPI_E_NOT_FOUND;
+            if (HR_FAILED(hResult))
+                FreeLibrary(lib);
+        }
+    }
+
+    /* Report any possible error regardless of where it has come from. */
     if (HR_FAILED(hResult))
     {
         MsOutlookMAPIHResultException_throwNew(
@@ -156,5 +206,33 @@ JNIEXPORT void JNICALL
 Java_net_java_sip_communicator_plugin_addrbook_msoutlook_MsOutlookAddrBookContactSourceService_MAPIUninitialize
     (JNIEnv *jniEnv, jclass clazz)
 {
-    MAPIUninitialize();
+    MsOutlookAddrBookContactSourceService_MAPIUninitialize();
+}
+
+SCODE
+MsOutlookAddrBook_MAPIAllocateBuffer(ULONG size, LPVOID FAR *buffer)
+{
+    return
+        MsOutlookAddrBookContactSourceService_MAPIAllocateBuffer(size, buffer);
+}
+
+ULONG
+MsOutlookAddrBook_MAPIFreeBuffer(LPVOID buffer)
+{
+    return MsOutlookAddrBookContactSourceService_MAPIFreeBuffer(buffer);
+}
+
+HRESULT
+MsOutlookAddrBook_MAPILogonEx
+    (ULONG_PTR uiParam,
+    LPSTR profileName, LPSTR password,
+    FLAGS flags,
+    LPMAPISESSION FAR *mapiSession)
+{
+    return
+        MsOutlookAddrBookContactSourceService_MAPILogonEx(
+                uiParam,
+                profileName, password,
+                flags,
+                mapiSession);
 }