Activates the implementation of searching in the Address Book of Microsoft Outlook committed in r8114.

build.xml

@@ -726,7 +726,15 @@
              <os arch="i386" />
         </condition>
 
-         <!-- forking prevents from debugging -->
+        <!-- Start the OS-specific Address Book ContactSourceService
+             implementations. -->
+        <condition property="felix.auto.start.addrbookcontactsrc"
+                value="reference:file:sc-bundles/msoutlook.jar"
+                else="">
+            <isset property="is.running.windows" />
+        </condition>
+
+        <!-- forking prevents from debugging -->
         <java classname="net.java.sip.communicator.launcher.SIPCommunicator"
             fork="true"
             failonerror="true"
@@ -788,6 +796,11 @@
               -client ${jvm.maxheapsize}"/>
 
             <sysproperty key="apple.laf.useScreenMenuBar" value="true" />
+
+            <!-- Start the OS-specific Address Book ContactSourceService
+                 implementations. -->
+            <sysproperty key="felix.auto.start.69"
+                value="${felix.auto.start.addrbookcontactsrc}"/>
         </java>
     </target>
 
@@ -922,7 +935,7 @@
         bundle-twitpic,bundle-directimage,bundle-bliptv,bundle-viddler,
         bundle-plugin-chatconfig,bundle-certificate,bundle-packetlogging,
         bundle-provdisc,bundle-provdisc-dhcp,bundle-provdisc-mdns,
-        bundle-provisioning"/>
+        bundle-provisioning,bundle-msoutlook"/>
 
     <!--BUNDLE-SC-LAUNCHER-->
     <target name="bundle-sc-launcher">
@@ -2582,7 +2595,7 @@ org.apache.http.util"/>
     <!-- BUNDLE-PLUGIN-MSOUTLOOK -->
     <target name="bundle-msoutlook">
         <!-- Creates a bundle which provides support for Microsoft Outlook. -->
-        <jar compress="false" destfile="${bundles.dest}/msoutlook.jar"
+        <jar compress="false" destfile="${bundles.dest.win}/msoutlook.jar"
             manifest="${src}/net/java/sip/communicator/plugin/msoutlook/msoutlook.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/plugin/msoutlook"
                 prefix="net/java/sip/communicator/plugin/msoutlook" />

lib/felix.client.run.properties

@@ -145,7 +145,12 @@ felix.auto.start.67= \
  reference:file:sc-bundles/chatconfig.jar
 
 
-#level 68 is for profiler, don't use it or change the build.xml file accordingly
+# Level 68 is for profiler4j. Either don't use it or change the build.xml file
+# accordingly.
+
+# Level 69 is for the OS-specific Address Book ContactSourceService
+# implementations. Either don't use it or change the build.xml file accordingly.
+#felix.auto.start.69=
 
 felix.auto.start.70= \
  reference:file:sc-bundles/simpleaccreg.jar \
@@ -159,12 +164,11 @@ felix.auto.start.75= \
 felix.auto.start.80= \
  reference:file:sc-bundles/shutdown-timeout.jar
 
-# Uncomment the following lines if you want to run the architect viewer
-# bundle.
+# Uncomment the following lines if you want to run the architect viewer bundle.
 #oscar.auto.start.100= \
 # file:lib/bundle/architectureviewer1.1.jar
 
-#Specify the directory where oscar should deploy its bundles
+# Specify the directory where oscar should deploy its bundles
 org.osgi.framework.storage=${net.java.sip.communicator.SC_HOME_DIR_LOCATION}/${net.java.sip.communicator.SC_HOME_DIR_NAME}/sip-communicator.bin
 
 org.osgi.framework.startlevel.beginning=100

resources/install/build.xml

@@ -498,6 +498,15 @@
             </fileset>
         </copy>
 
+        <!--
+            Start OS-specific bundles in felix.client.run.properties such as the
+            Address Book ContactSourceService implementations at level 69.
+        -->
+        <replace file="${light.dir}/lib/felix.client.run.properties"
+                token="#felix.auto.start.69=">
+            <replacevalue><![CDATA[felix.auto.start.69=reference:file:sc-bundles/msoutlook.jar]]></replacevalue>
+        </replace>
+
         <!--
             This update-location.properties file is the only of interest to the
             MSI i.e. it gets installed on the user machine.

src/net/java/sip/communicator/plugin/msoutlook/MsOutlookAddressBookContactQuery.java

@@ -38,6 +38,12 @@ public class MsOutlookAddressBookContactQuery
             0x3A1C /* PR_MOBILE_TELEPHONE_NUMBER */
         };
 
+    /**
+     * The flag which signals that MAPI strings should be returned in the
+     * Unicode character set.
+     */
+    private static final long MAPI_UNICODE = 0x80000000;
+
     /**
      * The index of the id of the <tt>PR_BUSINESS_TELEPHONE_NUMBER</tt> property
      * in {@link #MAPI_MAILUSER_PROP_IDS}.
@@ -211,7 +217,10 @@ private boolean onMailUser(long iUnknown)
         throws MsOutlookMAPIHResultException
     {
         Object[] props
-            = IMAPIProp_GetProps(iUnknown, MAPI_MAILUSER_PROP_IDS, 0);
+            = IMAPIProp_GetProps(
+                    iUnknown,
+                    MAPI_MAILUSER_PROP_IDS,
+                    MAPI_UNICODE);
         boolean matches = false;
 
         for (Object prop : props)