Help developers debugging the office presence integration

src/native/windows/msofficecomm/msofficecomm.vcxproj

@@ -74,11 +74,13 @@
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>C:\Program Files (x86)\Microsoft Office Communicator\SDK;C:\Java\jdk8\include;C:\Java\jdk8\include\win32;$(IncludePath)</IncludePath>
     <TargetName>j$(ProjectName)</TargetName>
+    <OutDir>..\..\..\..\lib\native\windows\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <TargetName>j$(ProjectName)</TargetName>
     <IncludePath>C:\Program Files %28x86%29\Microsoft Office Communicator\SDK;C:\Java\JDK8x64\include;C:\Java\JDK8x64\include\win32;$(IncludePath)</IncludePath>
+    <OutDir>..\..\..\..\lib\native\windows-64\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>

src/net/java/sip/communicator/plugin/msofficecomm/Messenger.java

@@ -168,18 +168,16 @@ public void serviceChanged(ServiceEvent event)
 
     static
     {
-        String lib = "jmsofficecomm";
-
         try
         {
-            System.loadLibrary(lib);
+            System.loadLibrary("jmsofficecomm");
         }
         catch (Throwable t)
         {
-            logger.error(
-                    "Failed to load native library " + lib + ": "
-                        + t.getMessage());
-            RegistryHandler.checkRegistryKeys();
+            logger.error("Couldn't load jmsofficecomm. If you are debugging,"
+                + " make sure that HKLM\\SOFTWARE[\\Wow6432Node]\\Microsoft\\"
+                + "Office\\Outlook\\Call Integration\\IMApplication is set to"
+                + " javaw.exe; " + t.getMessage());
             throw new RuntimeException(t);
         }
     }

src/net/java/sip/communicator/plugin/msofficecomm/OutOfProcessServer.java

@@ -25,11 +25,6 @@
  */
 class OutOfProcessServer
 {
-    static
-    {
-        System.loadLibrary("jmsofficecomm");
-    }
-
     static native int start();
 
     static native int stop();