Code

noop: rename a local var
[inkscape.git] / src / ui / dialog / filedialogimpl-win32.cpp
index e47154649abdf8476361843a3c538f9aa865f387..5b2acc1decbb591df29425d49782d61812fd8e95 100644 (file)
@@ -1,7 +1,7 @@
-/**
- * Implementation of the file dialog interfaces defined in filedialog.h for Win32
- *
- * Authors:
+/** @file
+ * @brief Implementation of native file dialogs for Win32
+ */
+/* Authors:
  *   Joel Holdsworth
  *   The Inkscape Organization
  *
@@ -9,13 +9,12 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+#ifdef WIN32
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#ifdef WIN32
-
 //General includes
 #include <list>
 #include <unistd.h>
@@ -29,7 +28,6 @@
 
 //Inkscape includes
 #include "inkscape.h"
-#include "prefs-utils.h"
 #include <dialogs/dialog-events.h>
 #include <extension/input.h>
 #include <extension/output.h>
@@ -40,7 +38,7 @@
 #include <display/nr-arena-item.h>
 #include <display/nr-arena.h>
 #include "sp-item.h"
-#include "canvas-arena.h"
+#include "display/canvas-arena.h"
 
 #include "filedialog.h"
 #include "filedialogimpl-win32.h"
@@ -104,10 +102,13 @@ FileDialogBaseWin32::FileDialogBaseWin32(Gtk::Window &parent,
         parent(parent),
         _current_directory(dir)
 {
-    //_mutex = NULL;
     _main_loop = NULL;
 
+       _filter_index = 1;
+       _filter_count = 0;
+
     _title = (wchar_t*)g_utf8_to_utf16(title, -1, NULL, NULL, NULL);
+       g_assert(_title != NULL);
 
     Glib::RefPtr<const Gdk::Window> parentWindow = parent.get_window();
     g_assert(parentWindow->gobj() != NULL);
@@ -162,6 +163,9 @@ FileOpenDialogImplWin32::FileOpenDialogImplWin32(Gtk::Window &parent,
     _preview_document_height = 0;
     _preview_image_width = 0;
     _preview_image_height = 0;
+    _preview_emf_image = false;
+
+       _mutex = NULL;
 
     createFilterMenu();
 }
@@ -189,9 +193,9 @@ void FileOpenDialogImplWin32::createFilterMenu()
     ustring all_inkscape_files_filter, all_image_files_filter;
     Filter all_files, all_inkscape_files, all_image_files;
 
-    const gchar *all_files_filter_name = _("All Files");
-    const gchar *all_inkscape_files_filter_name = ("All Inkscape Files");
-    const gchar *all_image_files_filter_name = _("All Image Files");
+    const gchar *all_files_filter_name = N_("All Files");
+    const gchar *all_inkscape_files_filter_name = N_("All Inkscape Files");
+    const gchar *all_image_files_filter_name = N_("All Image Files");
 
     // Calculate the amount of memory required
     int filter_count = 3;       // 3 - one for All Files, All Images and All Inkscape Files
@@ -206,7 +210,7 @@ void FileOpenDialogImplWin32::createFilterMenu()
         if (imod->deactivated()) continue;
 
         // Type
-        filter.name = g_utf8_to_utf16(imod->get_filetypename(),
+        filter.name = g_utf8_to_utf16(_(imod->get_filetypename()),
             -1, NULL, &filter.name_length, NULL);
 
         // Extension
@@ -243,24 +247,24 @@ void FileOpenDialogImplWin32::createFilterMenu()
         -1, NULL, &all_image_files.name_length, NULL);
     all_image_files.filter = g_utf8_to_utf16(all_image_files_filter.data(),
             -1, NULL, &all_image_files.filter_length, NULL);
+       all_image_files.mod = NULL;
     filter_list.push_front(all_image_files);
-    _extension_map[extension_index++] = NULL;
 
     // Filter Inkscape Files
     all_inkscape_files.name = g_utf8_to_utf16(all_inkscape_files_filter_name,
         -1, NULL, &all_inkscape_files.name_length, NULL);
     all_inkscape_files.filter = g_utf8_to_utf16(all_inkscape_files_filter.data(),
             -1, NULL, &all_inkscape_files.filter_length, NULL);
+       all_inkscape_files.mod = NULL;
     filter_list.push_front(all_inkscape_files);
-    _extension_map[extension_index++] = NULL;
 
     // Filter All Files
     all_files.name = g_utf8_to_utf16(all_files_filter_name,
         -1, NULL, &all_files.name_length, NULL);
     all_files.filter = NULL;
     all_files.filter_length = 0;
+       all_files.mod = NULL;
     filter_list.push_front(all_files);
-    _extension_map[extension_index++] = NULL;
 
     filter_length += all_files.name_length + 3 +
                     all_inkscape_files.filter_length +
@@ -269,8 +273,7 @@ void FileOpenDialogImplWin32::createFilterMenu()
                     all_image_files.name_length + 3 + 1;
      // Add 3 for 2*2 \0s and a *, and 1 for a trailing \0
 
-
-    _filter = new wchar_t[filter_length];
+       _filter = new wchar_t[filter_length];
     wchar_t *filterptr = _filter;
 
     for(list<Filter>::iterator filter_iterator = filter_list.begin();
@@ -278,7 +281,7 @@ void FileOpenDialogImplWin32::createFilterMenu()
     {
         const Filter &filter = *filter_iterator;
 
-        memcpy(filterptr, filter.name, filter.name_length * 2);
+        wcsncpy(filterptr, (wchar_t*)filter.name, filter.name_length);
         filterptr += filter.name_length;
         g_free(filter.name);
 
@@ -287,7 +290,7 @@ void FileOpenDialogImplWin32::createFilterMenu()
 
         if(filter.filter != NULL)
         {
-            memcpy(filterptr, filter.filter, filter.filter_length * 2);
+            wcsncpy(filterptr, (wchar_t*)filter.filter, filter.filter_length);
             filterptr += filter.filter_length;
             g_free(filter.filter);
         }
@@ -299,7 +302,8 @@ void FileOpenDialogImplWin32::createFilterMenu()
     }
     *(filterptr++) = L'\0';
 
-    _filterIndex = 2;
+       _filter_count = extension_index;
+    _filter_index = 2; // Select the 2nd filter in the list - 2 is NOT the 3rd
 }
 
 void FileOpenDialogImplWin32::GetOpenFileName_thread()
@@ -307,11 +311,11 @@ void FileOpenDialogImplWin32::GetOpenFileName_thread()
     OPENFILENAMEEXW ofn;
 
     g_assert(this != NULL);
-    //g_assert(_mutex != NULL);
-    g_assert(_main_loop != NULL);
+       g_assert(_mutex != NULL);
 
     WCHAR* current_directory_string = (WCHAR*)g_utf8_to_utf16(
-        _current_directory.data(), -1, NULL, NULL, NULL);
+        _current_directory.data(), _current_directory.length(),
+               NULL, NULL, NULL);
 
     memset(&ofn, 0, sizeof(ofn));
 
@@ -332,16 +336,15 @@ void FileOpenDialogImplWin32::GetOpenFileName_thread()
     ofn.lpstrTitle = _title;
     ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_EXPLORER | OFN_ENABLEHOOK | OFN_HIDEREADONLY | OFN_ENABLESIZING;
     ofn.lpstrFilter = _filter;
-    ofn.nFilterIndex = _filterIndex;
+    ofn.nFilterIndex = _filter_index;
     ofn.lpfnHook = GetOpenFileName_hookproc;
     ofn.lCustData = (LPARAM)this;
 
     _result = GetOpenFileNameW(&ofn) != 0;
 
-    _filterIndex = ofn.nFilterIndex;
-    _extension = _extension_map[ofn.nFilterIndex];
-
-    myFilename = utf16_to_ustring(_path_string, _MAX_PATH);
+       g_assert(ofn.nFilterIndex >= 1 && ofn.nFilterIndex <= _filter_count);
+    _filter_index = ofn.nFilterIndex;
+    _extension = _extension_map[ofn.nFilterIndex - 1];
 
     // Copy the selected file name, converting from UTF-16 to UTF-8
     myFilename = utf16_to_ustring(_path_string, _MAX_PATH);
@@ -352,9 +355,6 @@ void FileOpenDialogImplWin32::GetOpenFileName_thread()
     _mutex->lock();
     _finished = true;
     _mutex->unlock();
-    //g_main_loop_quit(_main_loop);
-
-
 }
 
 void FileOpenDialogImplWin32::register_preview_wnd_class()
@@ -435,7 +435,7 @@ UINT_PTR CALLBACK FileOpenDialogImplWin32::GetOpenFileName_hookproc(
                 pImpl->_file_dialog_wnd = hParentWnd;
 
                 pImpl->_preview_wnd =
-                    CreateWindow(PreviewWindowClassName, "",
+                    CreateWindowA(PreviewWindowClassName, "",
                         WS_CHILD | WS_VISIBLE,
                         0, 0, 100, 100, hParentWnd, NULL, hInstance, NULL);
                 SetWindowLongPtr(pImpl->_preview_wnd, GWLP_USERDATA, ofn->lCustData);
@@ -466,8 +466,6 @@ UINT_PTR CALLBACK FileOpenDialogImplWin32::GetOpenFileName_hookproc(
                     pImpl->_file_selected = true;
 
                     pImpl->_mutex->unlock();
-
-                    //pImpl->file_selected();
                 }
             }
             break;
@@ -559,7 +557,6 @@ LRESULT CALLBACK FileOpenDialogImplWin32::preview_wnd_proc(HWND hwnd, UINT uMsg,
 
             pImpl->_mutex->lock();
 
-            //FillRect(dc, &client_rect, (HBRUSH)(COLOR_HOTLIGHT+1));
             if(pImpl->_path_string[0] == 0)
             {
                 FillRect(dc, &rcClient, (HBRUSH)(COLOR_3DFACE + 1));
@@ -792,6 +789,8 @@ void FileOpenDialogImplWin32::load_preview()
     // Prepare to render a preview
     const Glib::ustring svg = ".svg";
     const Glib::ustring svgz = ".svgz";
+    const Glib::ustring emf = ".emf";
+    const Glib::ustring wmf = ".wmf";
     const Glib::ustring path = utf16_to_ustring(_path_string);
 
     bool success = false;
@@ -801,6 +800,8 @@ void FileOpenDialogImplWin32::load_preview()
     if ((dialogType == SVG_TYPES || dialogType == IMPORT_TYPES) &&
             (hasSuffix(path, svg) || hasSuffix(path, svgz)))
         success = set_svg_preview();
+    else if (hasSuffix(path, emf) || hasSuffix(path, wmf))
+        success = set_emf_preview();
     else if (isValidImageFile(path))
         success = set_image_preview();
     else {
@@ -824,6 +825,7 @@ void FileOpenDialogImplWin32::free_preview()
     _preview_file_icon = NULL;
 
     _preview_bitmap_image.clear();
+    _preview_emf_image = false;
     _mutex->unlock();
 }
 
@@ -857,15 +859,15 @@ bool FileOpenDialogImplWin32::set_svg_preview()
     const double scaledSvgWidth  = scaleFactor * svgWidth;
     const double scaledSvgHeight = scaleFactor * svgHeight;
 
-    NR::Rect area(NR::Point(0, 0), NR::Point(scaledSvgWidth, scaledSvgHeight));
+    Geom::Rect area(Geom::Point(0, 0), Geom::Point(scaledSvgWidth, scaledSvgHeight));
     NRRectL areaL = {0, 0, scaledSvgWidth, scaledSvgHeight};
     NRRectL bbox = {0, 0, scaledSvgWidth, scaledSvgHeight};
 
     // write object bbox to area
-    NR::Maybe<NR::Rect> maybeArea(area);
+    Geom::OptRect maybeArea(area);
     sp_document_ensure_up_to_date (svgDoc);
-    sp_item_invoke_bbox((SPItem *) svgDoc->root, &maybeArea,
-        sp_item_i2r_affine((SPItem *)(svgDoc->root)), TRUE);
+    sp_item_invoke_bbox((SPItem *) svgDoc->root, maybeArea,
+        sp_item_i2d_affine((SPItem *)(svgDoc->root)), TRUE);
 
     NRArena *const arena = NRArena::create();
 
@@ -875,7 +877,7 @@ bool FileOpenDialogImplWin32::set_svg_preview()
         arena, key, SP_ITEM_SHOW_DISPLAY);
 
     NRGC gc(NULL);
-    nr_matrix_set_scale(&gc.transform, scaleFactor, scaleFactor);
+    gc.transform = Geom::Matrix(Geom::Scale(scaleFactor, scaleFactor));
 
     nr_arena_item_invoke_update (root, NULL, &gc,
         NR_ARENA_ITEM_STATE_ALL, NR_ARENA_ITEM_STATE_NONE);
@@ -909,7 +911,6 @@ bool FileOpenDialogImplWin32::set_svg_preview()
     // Tidy up
     sp_document_unref(svgDoc);
     sp_item_invoke_hide((SPItem*)(svgDoc->root), key);
-    nr_arena_item_unref(root);
     nr_object_unref((NRObject *) arena);
 
     // Create the GDK pixbuf
@@ -940,18 +941,192 @@ bool FileOpenDialogImplWin32::set_image_preview()
 {
     const Glib::ustring path = utf16_to_ustring(_path_string, _MAX_PATH);
 
+    bool successful = false;
+
     _mutex->lock();
-    _preview_bitmap_image = Gdk::Pixbuf::create_from_file(path);
-    if(!_preview_bitmap_image) return false;
 
-    _preview_image_width = _preview_bitmap_image->get_width();
-    _preview_document_width = _preview_image_width;
-    _preview_image_height = _preview_bitmap_image->get_height();
-    _preview_document_height = _preview_image_height;
+    try {
+        _preview_bitmap_image = Gdk::Pixbuf::create_from_file(path);
+        if (_preview_bitmap_image) {
+            _preview_image_width = _preview_bitmap_image->get_width();
+            _preview_document_width = _preview_image_width;
+            _preview_image_height = _preview_bitmap_image->get_height();
+            _preview_document_height = _preview_image_height;
+            successful = true;
+        }
+    }
+    catch (const Gdk::PixbufError&) {}
+    catch (const Glib::FileError&) {}
 
     _mutex->unlock();
 
-    return true;
+    return successful;
+}
+
+// Aldus Placeable Header ===================================================
+// Since we are a 32bit app, we have to be sure this structure compiles to
+// be identical to a 16 bit app's version. To do this, we use the #pragma
+// to adjust packing, we use a WORD for the hmf handle, and a SMALL_RECT
+// for the bbox rectangle.
+#pragma pack( push )
+#pragma pack( 2 )
+typedef struct
+{
+    DWORD       dwKey;
+    WORD        hmf;
+    SMALL_RECT  bbox;
+    WORD        wInch;
+    DWORD       dwReserved;
+    WORD        wCheckSum;
+} APMHEADER, *PAPMHEADER;
+#pragma pack( pop )
+
+
+static HENHMETAFILE
+MyGetEnhMetaFileW( const WCHAR *filename )
+{
+    // Try open as Enhanced Metafile
+    HENHMETAFILE hemf = GetEnhMetaFileW(filename);
+
+    if (!hemf) {
+        // Try open as Windows Metafile
+        HMETAFILE hmf = GetMetaFileW(filename);
+
+        METAFILEPICT mp;
+        HDC hDC;
+
+        if (!hmf) {
+            WCHAR szTemp[MAX_PATH];
+
+            DWORD dw = GetShortPathNameW( filename, szTemp, MAX_PATH );
+            if (dw) {
+                hmf = GetMetaFileW( szTemp );
+            }
+        }
+
+        if (hmf) {
+            // Convert Windows Metafile to Enhanced Metafile
+            DWORD nSize = GetMetaFileBitsEx( hmf, 0, NULL );
+
+            if (nSize) {
+                BYTE *lpvData = new BYTE[nSize];
+                if (lpvData) {
+                    DWORD dw = GetMetaFileBitsEx( hmf, nSize, lpvData );
+                    if (dw) {
+                        // Fill out a METAFILEPICT structure
+                        mp.mm = MM_ANISOTROPIC;
+                        mp.xExt = 1000;
+                        mp.yExt = 1000;
+                        mp.hMF = NULL;
+                        // Get a reference DC
+                        hDC = GetDC( NULL );
+                        // Make an enhanced metafile from the windows metafile
+                        hemf = SetWinMetaFileBits( nSize, lpvData, hDC, &mp );
+                        // Clean up
+                        ReleaseDC( NULL, hDC );
+                        DeleteMetaFile( hmf );
+                    }
+                    delete[] lpvData;
+                }
+                else {
+                    DeleteMetaFile( hmf );
+                }
+            }
+            else {
+                DeleteMetaFile( hmf );
+            }
+        }
+        else {
+            // Try open as Aldus Placeable Metafile
+            HANDLE hFile;
+            hFile = CreateFileW( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );
+
+            if (hFile != INVALID_HANDLE_VALUE) {
+                DWORD nSize = GetFileSize( hFile, NULL );
+                if (nSize) {
+                    BYTE *lpvData = new BYTE[nSize];
+                    if (lpvData) {
+                        DWORD dw = ReadFile( hFile, lpvData, nSize, &nSize, NULL );
+                        if (dw) {
+                            if ( ((PAPMHEADER)lpvData)->dwKey == 0x9ac6cdd7l ) {
+                                // Fill out a METAFILEPICT structure
+                                mp.mm = MM_ANISOTROPIC;
+                                mp.xExt = ((PAPMHEADER)lpvData)->bbox.Right - ((PAPMHEADER)lpvData)->bbox.Left;
+                                mp.xExt = ( mp.xExt * 2540l ) / (DWORD)(((PAPMHEADER)lpvData)->wInch);
+                                mp.yExt = ((PAPMHEADER)lpvData)->bbox.Bottom - ((PAPMHEADER)lpvData)->bbox.Top;
+                                mp.yExt = ( mp.yExt * 2540l ) / (DWORD)(((PAPMHEADER)lpvData)->wInch);
+                                mp.hMF = NULL;
+                                // Get a reference DC
+                                hDC = GetDC( NULL );
+                                // Create an enhanced metafile from the bits
+                                hemf = SetWinMetaFileBits( nSize, lpvData+sizeof(APMHEADER), hDC, &mp );
+                                // Clean up
+                                ReleaseDC( NULL, hDC );
+                            }
+                        }
+                        delete[] lpvData;
+                    }
+                }
+                CloseHandle( hFile );
+            }
+        }
+    }
+
+    return hemf;
+}
+
+
+bool FileOpenDialogImplWin32::set_emf_preview()
+{
+    _mutex->lock();
+
+    BOOL ok = FALSE;
+
+    DWORD w = 0;
+    DWORD h = 0;
+
+    HENHMETAFILE hemf = MyGetEnhMetaFileW( _path_string );
+
+    if (hemf)
+    {
+        ENHMETAHEADER emh;
+        ZeroMemory(&emh, sizeof(emh));
+        ok = GetEnhMetaFileHeader(hemf, sizeof(emh), &emh) != 0;
+
+        w = (emh.rclFrame.right - emh.rclFrame.left);
+        h = (emh.rclFrame.bottom - emh.rclFrame.top);
+
+        DeleteEnhMetaFile(hemf);
+    }
+
+    if (ok)
+    {
+        const int PreviewSize = 512;
+
+        // Get the size of the document
+        const double emfWidth = w;
+        const double emfHeight = h;
+
+        // Find the minimum scale to fit the image inside the preview area
+        const double scaleFactorX =    PreviewSize / emfWidth;
+        const double scaleFactorY =    PreviewSize / emfHeight;
+        const double scaleFactor = (scaleFactorX > scaleFactorY) ? scaleFactorY : scaleFactorX;
+
+        // Now get the resized values
+        const double scaledEmfWidth  = scaleFactor * emfWidth;
+        const double scaledEmfHeight = scaleFactor * emfHeight;
+
+        _preview_document_width = scaledEmfWidth;
+        _preview_document_height = scaledEmfHeight;
+        _preview_image_width = emfWidth;
+        _preview_image_height = emfHeight;
+
+        _preview_emf_image = true;
+    }
+
+    _mutex->unlock();
+
+    return ok;
 }
 
 void FileOpenDialogImplWin32::render_preview()
@@ -971,7 +1146,7 @@ void FileOpenDialogImplWin32::render_preview()
     // Do we have anything to render?
     _mutex->lock();
 
-    if(!_preview_bitmap_image)
+    if(!_preview_bitmap_image && !_preview_emf_image)
     {
         _mutex->unlock();
         return;
@@ -1143,7 +1318,6 @@ void FileOpenDialogImplWin32::render_preview()
     context->stroke_preserve();
 
     // Draw the image
-
     if(_preview_bitmap_image)    // Is the image a pixbuf?
     {
         // Set the transformation
@@ -1170,6 +1344,20 @@ void FileOpenDialogImplWin32::render_preview()
 
     // Finish drawing
     surface->finish();
+
+    if (_preview_emf_image) {
+        HENHMETAFILE hemf = MyGetEnhMetaFileW(_path_string);
+        if (hemf) {
+            RECT rc;
+            rc.top = svgY+2;
+            rc.left = svgX+2;
+            rc.bottom = scaledSvgHeight-2;
+            rc.right = scaledSvgWidth-2;
+            PlayEnhMetaFile(hMemDC, hemf, &rc);
+            DeleteEnhMetaFile(hemf);
+        }
+    }
+
     SelectObject(hMemDC, hOldBitmap) ;
     DeleteDC(hMemDC);
 
@@ -1194,7 +1382,7 @@ bool
 FileOpenDialogImplWin32::show()
 {
     // We can only run one worker thread at a time
-    //if(_mutex != NULL) return false;
+    if(_mutex != NULL) return false;
 
     if(!Glib::thread_supported())
         Glib::thread_init();
@@ -1225,7 +1413,6 @@ FileOpenDialogImplWin32::show()
 
             Sleep(10);
         }
-        //g_main_loop_run(_main_loop);
     }
 
     // Tidy up
@@ -1257,11 +1444,13 @@ FileSaveDialogImplWin32::FileSaveDialogImplWin32(Gtk::Window &parent,
             const Glib::ustring &dir,
             FileDialogType fileTypes,
             const char *title,
-            const Glib::ustring &/*default_key*/) :
-    FileDialogBaseWin32(parent, dir, title, fileTypes, "dialogs.save_as")
+            const Glib::ustring &/*default_key*/,
+            const char *docTitle) :
+    FileDialogBaseWin32(parent, dir, title, fileTypes, "dialogs.save_as"),
+        _title_label(NULL),
+        _title_edit(NULL)
 {
-    _main_loop = NULL;
-
+    FileSaveDialog::myDocTitle = docTitle;
     createFilterMenu();
 }
 
@@ -1281,7 +1470,7 @@ void FileSaveDialogImplWin32::createFilterMenu()
     Inkscape::Extension::db.get_output_list(extension_list);
 
     int filter_count = 0;
-    int filter_length = 0;
+    int filter_length = 1;
 
     for (Inkscape::Extension::DB::OutputList::iterator current_item = extension_list.begin();
          current_item != extension_list.end(); current_item++)
@@ -1301,7 +1490,7 @@ void FileSaveDialogImplWin32::createFilterMenu()
 
         // Type
         filter.name = g_utf8_to_utf16(
-            omod->get_filetypename(), -1, NULL, &filter.name_length, NULL);
+            _(omod->get_filetypename()), -1, NULL, &filter.name_length, NULL);
 
         filter.mod = omod;
 
@@ -1322,14 +1511,14 @@ void FileSaveDialogImplWin32::createFilterMenu()
     {
         const Filter &filter = *filter_iterator;
 
-        memcpy(filterptr, filter.name, filter.name_length * 2);
+        wcsncpy(filterptr, (wchar_t*)filter.name, filter.name_length);
         filterptr += filter.name_length;
         g_free(filter.name);
 
         *(filterptr++) = L'\0';
         *(filterptr++) = L'*';
 
-        memcpy(filterptr, filter.filter, filter.filter_length * 2);
+        wcsncpy(filterptr, (wchar_t*)filter.filter, filter.filter_length);
         filterptr += filter.filter_length;
         g_free(filter.filter);
 
@@ -1340,7 +1529,8 @@ void FileSaveDialogImplWin32::createFilterMenu()
     }
     *(filterptr++) = 0;
 
-    _filterIndex = 0;
+       _filter_count = extension_index;
+    _filter_index = 1; // A value of 1 selects the 1st filter - NOT the 2nd
 }
 
 void FileSaveDialogImplWin32::GetSaveFileName_thread()
@@ -1348,11 +1538,11 @@ void FileSaveDialogImplWin32::GetSaveFileName_thread()
     OPENFILENAMEEXW ofn;
 
     g_assert(this != NULL);
-    //g_assert(_mutex != NULL);
     g_assert(_main_loop != NULL);
 
-    gunichar2* current_directory_string = g_utf8_to_utf16(
-        _current_directory.data(), -1, NULL, NULL, NULL);
+    WCHAR* current_directory_string = (WCHAR*)g_utf8_to_utf16(
+        _current_directory.data(), _current_directory.length(),
+               NULL, NULL, NULL);
 
     // Copy the selected file name, converting from UTF-8 to UTF-16
     memset(_path_string, 0, sizeof(_path_string));
@@ -1366,28 +1556,26 @@ void FileSaveDialogImplWin32::GetSaveFileName_thread()
     ofn.hwndOwner = _ownerHwnd;
     ofn.lpstrFile = _path_string;
     ofn.nMaxFile = _MAX_PATH;
-    ofn.nFilterIndex = _filterIndex;
+    ofn.nFilterIndex = _filter_index;
     ofn.lpstrFileTitle = NULL;
     ofn.nMaxFileTitle = 0;
-    ofn.lpstrInitialDir = (wchar_t*)current_directory_string;
+    ofn.lpstrInitialDir = current_directory_string;
     ofn.lpstrTitle = _title;
-    ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
+    ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_EXPLORER | OFN_ENABLEHOOK;
     ofn.lpstrFilter = _filter;
-    ofn.nFilterIndex = _filterIndex;
+    ofn.nFilterIndex = _filter_index;
+    ofn.lpfnHook = GetSaveFileName_hookproc;
+    ofn.lCustData = (LPARAM)this;
 
     _result = GetSaveFileNameW(&ofn) != 0;
 
-    _filterIndex = ofn.nFilterIndex;
-    _extension = _extension_map[ofn.nFilterIndex];
+       g_assert(ofn.nFilterIndex >= 1 && ofn.nFilterIndex <= _filter_count);
+    _filter_index = ofn.nFilterIndex;
+    _extension = _extension_map[ofn.nFilterIndex - 1];
 
     // Copy the selected file name, converting from UTF-16 to UTF-8
     myFilename = utf16_to_ustring(_path_string, _MAX_PATH);
 
-    //_mutex->lock();
-    //_finished = true;
-    //_mutex->unlock();
-
-
     // Tidy up
     g_free(current_directory_string);
 
@@ -1400,39 +1588,20 @@ void FileSaveDialogImplWin32::GetSaveFileName_thread()
 bool
 FileSaveDialogImplWin32::show()
 {
-    // We can only run one worker thread at a time
-    //if(_mutex != NULL) return false;
-
     if(!Glib::thread_supported())
         Glib::thread_init();
 
     _result = false;
-    //_finished = false;
-    //_mutex = new Glib::Mutex();
     _main_loop = g_main_loop_new(g_main_context_default(), FALSE);
 
-    if(Glib::Thread::create(sigc::mem_fun(*this, &FileSaveDialogImplWin32::GetSaveFileName_thread), true))
-    {
-        /*while(1)
-        {
-            // While the dialog runs - keep the main UI alive
-            g_main_context_iteration(g_main_context_default(), FALSE);
-
-            if(_mutex->trylock())
-            {
-                if(_finished) break;
-                _mutex->unlock();
-            }
-
-            Sleep(10);
-        }*/
-        g_main_loop_run(_main_loop);
-    }
-    //delete _mutex;
-    //_mutex = NULL;
+       if(_main_loop != NULL)
+       {
+           if(Glib::Thread::create(sigc::mem_fun(*this, &FileSaveDialogImplWin32::GetSaveFileName_thread), true))
+               g_main_loop_run(_main_loop);
 
-    if(_result)
-        appendExtension(myFilename, (Inkscape::Extension::Output*)_extension);
+           if(_result)
+               appendExtension(myFilename, (Inkscape::Extension::Output*)_extension);
+       }
 
     return _result;
 }
@@ -1443,11 +1612,90 @@ void FileSaveDialogImplWin32::setSelectionType( Inkscape::Extension::Extension *
 
 }
 
-}
-}
+UINT_PTR CALLBACK FileSaveDialogImplWin32::GetSaveFileName_hookproc(
+    HWND hdlg, UINT uiMsg, WPARAM, LPARAM lParam)
+{
+    FileSaveDialogImplWin32 *pImpl = (FileSaveDialogImplWin32*)
+        GetWindowLongPtr(hdlg, GWLP_USERDATA);
+
+    switch(uiMsg)
+    {
+    case WM_INITDIALOG:
+        {
+            HWND hParentWnd = GetParent(hdlg);
+            HINSTANCE hInstance = GetModuleHandle(NULL);
+
+            // get size/pos of typical combo box
+            RECT rEDT1, rCB1, rROOT, rST;
+            GetWindowRect(GetDlgItem(hParentWnd, cmb1), &rCB1);
+            GetWindowRect(GetDlgItem(hParentWnd, cmb13), &rEDT1);
+            GetWindowRect(GetDlgItem(hParentWnd, stc2), &rST);
+            GetWindowRect(hdlg, &rROOT);
+            int ydelta = rCB1.top - rEDT1.top;
+
+            // Make the window a bit longer
+            RECT rcRect;
+            GetWindowRect(hParentWnd, &rcRect);
+            MoveWindow(hParentWnd, rcRect.left, rcRect.top, rcRect.right - rcRect.left,
+                       rcRect.bottom - rcRect.top + ydelta, FALSE);
+
+            // It is not necessary to delete stock objects by calling DeleteObject
+            HGDIOBJ dlgFont = GetStockObject(DEFAULT_GUI_FONT);
+
+            // Set the pointer to the object
+            OPENFILENAMEW *ofn = (OPENFILENAMEW*)lParam;
+            SetWindowLongPtr(hdlg, GWLP_USERDATA, ofn->lCustData);
+            SetWindowLongPtr(hParentWnd, GWLP_USERDATA, ofn->lCustData);
+            pImpl = (FileSaveDialogImplWin32*)ofn->lCustData;
+
+            // Create the Title label and edit control
+            pImpl->_title_label = CreateWindowEx(NULL, "STATIC", "Title:",
+                                        WS_VISIBLE|WS_CHILD,
+                                        CW_USEDEFAULT, CW_USEDEFAULT, rCB1.left-rST.left, rST.bottom-rST.top,
+                                        hParentWnd, NULL, hInstance, NULL);
+            if(pImpl->_title_label) {
+              if(dlgFont) SendMessage(pImpl->_title_label, WM_SETFONT, (WPARAM)dlgFont, MAKELPARAM(FALSE, 0));
+              SetWindowPos(pImpl->_title_label, NULL, rST.left-rROOT.left, rST.top+ydelta-rROOT.top,
+                           rCB1.left-rST.left, rST.bottom-rST.top, SWP_SHOWWINDOW|SWP_NOZORDER);
+            }
+
+            pImpl->_title_edit = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "",
+                                        WS_VISIBLE|WS_CHILD|WS_TABSTOP|ES_AUTOHSCROLL,
+                                        CW_USEDEFAULT, CW_USEDEFAULT, rCB1.right-rCB1.left, rCB1.bottom-rCB1.top,
+                                        hParentWnd, NULL, hInstance, NULL);
+            if(pImpl->_title_edit) {
+              if(dlgFont) SendMessage(pImpl->_title_edit, WM_SETFONT, (WPARAM)dlgFont, MAKELPARAM(FALSE, 0));
+              SetWindowPos(pImpl->_title_edit, NULL, rCB1.left-rROOT.left, rCB1.top+ydelta-rROOT.top,
+                           rCB1.right-rCB1.left, rCB1.bottom-rCB1.top, SWP_SHOWWINDOW|SWP_NOZORDER);
+              // TODO: make sure this works for Unicode
+              SetWindowText(pImpl->_title_edit, pImpl->myDocTitle.c_str());
+            }
+        }
+        break;
+    case WM_DESTROY:
+      {
+        if(pImpl->_title_edit) {
+          int length = GetWindowTextLength(pImpl->_title_edit)+1;
+          char* temp_title = new char[length];
+          GetWindowText(pImpl->_title_edit, temp_title, length);
+          pImpl->myDocTitle = temp_title;
+          delete[] temp_title;
+          DestroyWindow(pImpl->_title_label);
+          pImpl->_title_label = NULL;
+          DestroyWindow(pImpl->_title_edit);
+          pImpl->_title_edit = NULL;
+        }
+      }
+      break;
+    }
+
+    // Use default dialog behaviour
+    return 0;
 }
 
-#endif
+} } } // namespace Dialog, UI, Inkscape
+
+#endif // ifdef WIN32
 
 /*
   Local Variables:
@@ -1458,4 +1706,4 @@ void FileSaveDialogImplWin32::setSelectionType( Inkscape::Extension::Extension *
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :