Some more win64 "fixes"

Change-Id: Id3de720a7ab28499644881e628a18f99121cb3c9

configure.ac

@@ -3831,19 +3831,21 @@ mingw*)
             RTL_ARCH=X86_84
             PLATFORMID=windows_x86_64
             OUTPATH=wntgccx$COMEX
+            SOLARINC="$SOLARINC -I$SRC_ROOT/include/wntgccx"
         else
             CPU=I
             CPUNAME=INTEL
             RTL_ARCH=x86
             PLATFORMID=windows_x86
             OUTPATH=wntgcci$COMEX
+            SOLARINC="$SOLARINC -I$SRC_ROOT/include/wntgcci"
         fi
         ;;
     *)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARINC="$SOLARINC -I$SRC_ROOT/include/wntgcci"
+    
     SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 

dtrans/source/win32/misc/ImplHelper.cxx

@@ -30,7 +30,7 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
 #include <sehandler.hxx>
 #endif
 
@@ -195,7 +195,7 @@ OUString SAL_CALL cptostr( sal_uInt32 codepage )
 
 void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )
 {
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     jmp_buf jmpbuf;
     __SEHandler han;
     if (__builtin_setjmp(jmpbuf) == 0)
@@ -207,7 +207,7 @@ void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )
 #endif
         CoTaskMemFree( ptd );
     }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     else
 #else
     __except( EXCEPTION_EXECUTE_HANDLER )
@@ -215,7 +215,7 @@ void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )
     {
         OSL_FAIL( "Error DeleteTargetDevice" );
     }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     han.Reset();
 #endif
 }
@@ -244,7 +244,7 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc )
 {
     DVTARGETDEVICE* ptdDest = NULL;
 
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     jmp_buf jmpbuf;
     __SEHandler han;
     if (__builtin_setjmp(jmpbuf) == 0)
@@ -260,7 +260,7 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc )
             memcpy( ptdDest, ptdSrc, static_cast< size_t >( ptdSrc->tdSize ) );
         }
     }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     han.Reset();
 #else
     __except( EXCEPTION_EXECUTE_HANDLER )
@@ -302,7 +302,7 @@ sal_Bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
 {
     sal_Bool bRet = sal_False;
 
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     jmp_buf jmpbuf;
     __SEHandler han;
     if (__builtin_setjmp(jmpbuf) == 0)
@@ -328,7 +328,7 @@ sal_Bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
         bRet = sal_True;
         }
     }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     else
 #else
     __except( EXCEPTION_EXECUTE_HANDLER )
@@ -336,7 +336,7 @@ sal_Bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
     {
         OSL_FAIL( "Error CopyFormatEtc" );
     }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     han.Reset();
 #endif
 
@@ -355,7 +355,7 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC*
 {
     sal_Int32 nMatch = FORMATETC_EXACT_MATCH;
 
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     jmp_buf jmpbuf;
     __SEHandler han;
     if (__builtin_setjmp(jmpbuf) == 0)
@@ -402,7 +402,7 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC*
             }
         }
     }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     else
 #else
     __except( EXCEPTION_EXECUTE_HANDLER )
@@ -411,7 +411,7 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC*
         OSL_FAIL( "Error CompareFormatEtc" );
         nMatch = FORMATETC_NO_MATCH;
     }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     han.Reset();
 #endif
 
@@ -427,7 +427,7 @@ sal_Bool SAL_CALL CompareTargetDevice( DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE*
 {
     sal_Bool bRet = sal_False;
 
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     jmp_buf jmpbuf;
     __SEHandler han;
     if (__builtin_setjmp(jmpbuf) == 0)
@@ -451,7 +451,7 @@ sal_Bool SAL_CALL CompareTargetDevice( DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE*
         if ( memcmp( ptdLeft, ptdRight, ptdLeft->tdSize ) == 0 )
             bRet = sal_True;
     }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     else
 #else
     __except( EXCEPTION_EXECUTE_HANDLER )
@@ -460,7 +460,7 @@ sal_Bool SAL_CALL CompareTargetDevice( DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE*
         OSL_FAIL( "Error CompareTargetDevice" );
         bRet = sal_False;
     }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     han.Reset();
 #endif
 

extensions/source/nsplugin/source/npshell.cxx

@@ -506,7 +506,7 @@ NPP_New(NPMIMEType pluginType,
     This->fWindow = (NPWindow*)NPN_MemAlloc(sizeof(NPWindow));
     memset(This->fWindow, 0, sizeof (NPWindow));
     This->fMode = mode;
-  #endif //end of WNT
+#endif //end of WNT
     PLUGIN_MSG msg;
     memset((char*)&msg, 0, sizeof(PLUGIN_MSG));
     msg.msg_id = SO_NEW_INSTANCE;
@@ -823,7 +823,7 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname)
     sprintf(msg.url, "file://%s", localPathNew);
 #endif //end of UNIX
 #ifdef WNT
-    msg.wnd_id =(int)(This->fhWnd);
+    msg.wnd_id =(plugin_Int32)(This->fhWnd);
     sprintf(msg.url, "file:///%s", localPathNew);
     DosToUnixPath(msg.url);
 #endif //endof WNT

extensions/source/nsplugin/source/so_msg.hxx

@@ -39,7 +39,11 @@ enum msg_type
     SO_PRINT         // 6
 };
 
+#ifdef _WIN64
+#define plugin_Int32 unsigned __int64
+#else
 #define plugin_Int32 unsigned long int
+#endif
 
 typedef struct _PLUGIN_MSG {
     plugin_Int32 msg_id;

vcl/win/source/app/saltimer.cxx

@@ -22,10 +22,11 @@
 #include <win/saltimer.h>
 #include <win/salinst.h>
 
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
 #include <sehandler.hxx>
 #endif
 
+
 // =======================================================================
 
 // Maximale Periode
@@ -93,7 +94,7 @@ void WinSalTimer::Stop()
 
 void CALLBACK SalTimerProc( HWND, UINT, UINT_PTR nId, DWORD )
 {
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     jmp_buf jmpbuf;
     __SEHandler han;
     if (__builtin_setjmp(jmpbuf) == 0)
@@ -135,7 +136,7 @@ void CALLBACK SalTimerProc( HWND, UINT, UINT_PTR nId, DWORD )
                 ImplSalStartTimer( 10, TRUE );
         }
     }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     han.Reset();
 #else
     __except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation()))

vcl/win/source/gdi/salprn.cxx

@@ -49,11 +49,11 @@
 
 #include <malloc.h>
 
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
 #include <sehandler.hxx>
 #endif
 
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
 #define CATCH_DRIVER_EX_BEGIN                                               \
     jmp_buf jmpbuf;                                                         \
     __SEHandler han;                                                        \

vcl/win/source/window/salframe.cxx

@@ -86,7 +86,7 @@ using ::std::max;
 
 #include <time.h>
 
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
 #include <sehandler.hxx>
 #endif
 
@@ -6059,7 +6059,7 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l
 {
     int bDef = TRUE;
     LRESULT nRet = 0;
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     jmp_buf jmpbuf;
     __SEHandler han;
     if (__builtin_setjmp(jmpbuf) == 0)
@@ -6071,7 +6071,7 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l
 #endif
         nRet = SalFrameWndProc( hWnd, nMsg, wParam, lParam, bDef );
     }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
     han.Reset();
 #else
     __except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation()))