File inkscape-0.47-win64.patch of Package mingw32-inkscape

Overview Repositories Revisions Requests Users Attributes Meta

File inkscape-0.47-win64.patch of Package mingw32-inkscape (Revision 30f481b2daa24d549eca9b8ad06c42f4)

Currently displaying revision 30f481b2daa24d549eca9b8ad06c42f4 , Show latest

--- inkscape-0.47/src/extension/implementation/script.cpp	2009-11-16 18:29:18.000000000 +0100
+++ inkscape-0.47/src/extension/implementation/script.cpp	2009-12-07 16:15:51.000000000 +0100
@@ -156,7 +156,11 @@
     char szExePath[MAX_PATH];
     char szCurrentDir[MAX_PATH];
     GetCurrentDirectory(sizeof(szCurrentDir), szCurrentDir);
+#ifdef _WIN64
+    unsigned long long ret = (unsigned long long)FindExecutable(
+#else
     unsigned int ret = (unsigned int)FindExecutable(
+#endif
                   interpName.c_str(), szCurrentDir, szExePath);
     if (ret > 32) {
         interpName = szExePath;
--- inkscape-0.47/src/verbs.cpp	2009-11-16 18:29:45.000000000 +0100
+++ inkscape-0.47/src/verbs.cpp	2009-12-07 16:13:48.000000000 +0100
@@ -767,7 +767,7 @@
     Gtk::Window *parent = desktop->getToplevel();
     g_assert(parent != NULL);
 
-    switch ((long) data) {
+    switch ((long) ((size_t)data)) {
         case SP_VERB_FILE_NEW:
             sp_file_new_default();
             break;
@@ -2072,7 +2072,7 @@
     if (effect == NULL) return;
     if (current_view == NULL) return;
 
-    switch ((long) data) {
+    switch ((long)((size_t)data)) {
         case SP_VERB_EFFECT_LAST_PREF:
             effect->prefs(current_view);
             break;
@@ -2137,7 +2137,7 @@
     SPDocument *doc = sp_desktop_document(dt);
     if (!doc) return;
 
-    switch ((long) data) {
+    switch ((long)((size_t)data)) {
         case SP_VERB_FIT_CANVAS_TO_SELECTION:
             verb_fit_canvas_to_selection(dt);
             break;
@@ -2206,7 +2206,7 @@
     SPDocument *doc = sp_desktop_document(dt);
     if (!doc) return;
 
-    switch ((long) data) {
+    switch ((long)((size_t)data)) {
         case SP_VERB_UNLOCK_ALL:
             unlock_all(dt);
             sp_document_done(doc, SP_VERB_UNLOCK_ALL, _("Unlock all objects in the current layer"));
--- inkscape-0.47/src/io/sys.cpp	2009-11-16 18:29:45.000000000 +0100
+++ inkscape-0.47/src/io/sys.cpp	2009-12-07 22:05:49.000000000 +0100
@@ -36,6 +36,7 @@
 
 #include <process.h>	// declares spawn functions
 #include <wchar.h>	// declares _wspawn functions
+#ifndef __MINGW32__
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -50,6 +51,9 @@
 #ifdef __cplusplus
 }
 #endif
+#else
+#include <wchar.h>
+#endif
 #include <unistd.h>
 #include <glibmm/i18n.h>
 #include <fcntl.h>
@@ -409,7 +413,7 @@
 		   GetCurrentProcess (), &filehandle,
 		   0, FALSE, DUPLICATE_SAME_ACCESS);
   close (fd);
-  return _open_osfhandle ((long) filehandle, mode | _O_NOINHERIT);
+  return _open_osfhandle ((LONG_PTR) filehandle, mode | _O_NOINHERIT);
 }
 
 
--- inkscape-0.47/src/ui/dialog/filedialogimpl-win32.cpp	2009-12-07 20:08:04.000000000 +0100
+++ inkscape-0.47/src/ui/dialog/filedialogimpl-win32.cpp	2009-12-07 22:21:12.000000000 +0100
@@ -454,15 +454,15 @@
             pImpl = (FileOpenDialogImplWin32*)ofn->lCustData;
 
             // Subclass the parent
-            pImpl->_base_window_proc = (WNDPROC)GetWindowLongPtr(hParentWnd, GWL_WNDPROC);
-            SetWindowLongPtr(hParentWnd, GWL_WNDPROC, (LONG_PTR)file_dialog_subclass_proc);
+            pImpl->_base_window_proc = (WNDPROC)GetWindowLongPtr(hParentWnd, GWLP_WNDPROC);
+            SetWindowLongPtr(hParentWnd, GWLP_WNDPROC, (LONG_PTR)file_dialog_subclass_proc);
 
             // Add a button to the toolbar
             pImpl->_toolbar_wnd = FindWindowEx(hParentWnd, NULL, "ToolbarWindow32", NULL);
 
             pImpl->_show_preview_button_bitmap = LoadBitmap(
                 hInstance, MAKEINTRESOURCE(IDC_SHOW_PREVIEW));
-            TBADDBITMAP tbAddBitmap = {NULL, (UINT)pImpl->_show_preview_button_bitmap};
+            TBADDBITMAP tbAddBitmap = {NULL, (UINT_PTR)pImpl->_show_preview_button_bitmap};
             const int iBitmapIndex = SendMessage(pImpl->_toolbar_wnd,
                 TB_ADDBITMAP, 1, (LPARAM)&tbAddBitmap);

Places

File inkscape-0.47-win64.patch of Package mingw32-inkscape (Revision 30f481b2daa24d549eca9b8ad06c42f4)

Places