[Libreoffice-commits] core.git: 3 commits - accessibility/bridge bean/native external/CustomTarget_jawt.mk include/wntgcci include/wntgccx

[Fridrich Å trba]

 accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx |    2 +-
 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c   |    5 ++---
 external/CustomTarget_jawt.mk                                   |    7 +++++++
 include/wntgcci/jni_md.h                                        |    2 +-
 include/wntgccx/jni_md.h                                        |    2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 41660feef6095f6d9510d11c99376652b41a504b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Jun 7 16:25:31 2013 +0200

    Let us cast pointers to pointer-sized integers
    
    Change-Id: I0c68293d454917bbc5ed6df51a57e6b809d4b8c6

diff --git a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
index 096138a..2f0b451 100644
--- a/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
+++ b/accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
@@ -268,7 +268,7 @@ void handleWindowEvent(Window * pWindow, bool bShow)
                     // the event listener would not have been attached.
                     pJNIEnv->CallStaticVoidMethod(g_jcWindowsAccessBridgeAdapter,
                         (bShow) ? g_jmRegisterTopWindow : g_jmRevokeTopWindow,
-                        (jint) GetHWND(pWindow), joXAccessible );
+                        (jlong) GetHWND(pWindow), joXAccessible );
 
                     // Clear any exception that might have been occurred.
                     if (pJNIEnv->ExceptionCheck()) {
commit e704c34ba1ef09f0abd0ad38c79245385f714dc4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Jun 7 15:44:45 2013 +0200

    In real jni_md.h, jint is 32bits and jlong is pointer width
    
    Change-Id: I17b8918ddc530fd28c5549e3e78d041dc6c867bc

diff --git a/include/wntgcci/jni_md.h b/include/wntgcci/jni_md.h
index e77438d..92ce634 100644
--- a/include/wntgcci/jni_md.h
+++ b/include/wntgcci/jni_md.h
@@ -27,7 +27,7 @@
 #define JNICALL   __stdcall
 
 typedef long jint;
-typedef __int64 jlong;
+typedef long jlong;
 typedef char jbyte;
 
 #endif /* JNI_MD_H_INCLUDED */
commit abd89db2a9c1aee6f7a7f39374db7bc6d92e60c6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Jun 7 13:43:22 2013 +0200

    Fix bean linking on wntgccx
    
    Change-Id: I8d5d62be630f85e9a807dc108baca8be2930224e

diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index b4e7d82..c666f8a 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -25,7 +25,6 @@
 #pragma warning(pop)
 #endif
 
-#include <windows.h>
 #define JAWT_GetAWT hidden_JAWT_GetAWT
 #include "jawt.h"
 #undef JAWT_GetAWT
@@ -51,7 +50,7 @@ typedef struct jawt_Win32DrawingSurfaceInfo {
     HPALETTE hpalette;
 } JAWT_Win32DrawingSurfaceInfo;
 
-extern __declspec(dllimport) unsigned char __stdcall JAWT_GetAWT(JNIEnv *, JAWT *);
+JNIIMPORT unsigned char JNICALL JAWT_GetAWT(JNIEnv *, JAWT *);
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
@@ -157,7 +156,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
         SetProp( hWnd, OLD_PROC_KEY, (HANDLE)hFuncPtr );
     }
 
-    return ((jlong)(LONG)hWnd);
+    return ((jlong)hWnd);
 }
 
 
diff --git a/external/CustomTarget_jawt.mk b/external/CustomTarget_jawt.mk
index ac3ef62..2d35d93 100644
--- a/external/CustomTarget_jawt.mk
+++ b/external/CustomTarget_jawt.mk
@@ -14,10 +14,17 @@ $(eval $(call gb_CustomTarget_register_targets,external/jawt,\
 	libjawt.dll.a \
 ))
 
+ifeq ($(OS)$(CPU),WNTX)
+$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	echo EXPORTS > $@
+	echo "JAWT_GetAWT" >> $@
+else
 $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	echo EXPORTS > $@
 	echo "JAWT_GetAWT at 8" >> $@
+endif
 
 $(call gb_CustomTarget_get_workdir,external/jawt)/libjawt.dll.a: $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1)
diff --git a/include/wntgccx/jni_md.h b/include/wntgccx/jni_md.h
index e77438d..4d80f38 100644
--- a/include/wntgccx/jni_md.h
+++ b/include/wntgccx/jni_md.h
@@ -24,7 +24,7 @@
 
 #define JNIEXPORT __declspec (dllexport)
 #define JNIIMPORT __declspec (dllimport)
-#define JNICALL   __stdcall
+#define JNICALL
 
 typedef long jint;
 typedef __int64 jlong;