Moved all windows implementations in utility-private to nt-base-private.

Author: dlemstra

coders/dng.c

@@ -488,7 +488,7 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
       wchar_t
         *path;
 
-      path=create_wchar_path(image->filename);
+      path=NTCreateWidePath(image->filename);
       if (path != (wchar_t *) NULL)
         {
           errcode=libraw_open_wfile(raw_info,path);

coders/emf.c

@@ -702,7 +702,7 @@ static Image *ReadEMFImage(const ImageInfo *image_info,
     *p;
 
   wchar_t
-    fileName[MaxTextExtent];
+    *path;
 
   assert(image_info != (const ImageInfo *) NULL);
   assert(image_info->signature == MagickCoreSignature);
@@ -714,14 +714,18 @@ static Image *ReadEMFImage(const ImageInfo *image_info,
   if (Gdiplus::GdiplusStartup(&token,&startup_input,NULL) != 
     Gdiplus::Status::Ok)
     ThrowReaderException(CoderError, "GdiplusStartupFailed");
-  MultiByteToWideChar(CP_UTF8,0,image->filename,-1,fileName,MaxTextExtent);
-  source=Gdiplus::Image::FromFile(fileName);
+  source=(Gdiplus::Image *) NULL;
+  path=NTCreateWidePath(image->filename);
+  if (path != (wchar_t *) NULL)
+    {
+      source=Gdiplus::Image::FromFile(path);
+      path=(wchar_t *) RelinquishMagickMemory(path);
+    }
   if (source == (Gdiplus::Image *) NULL)
     {
       Gdiplus::GdiplusShutdown(token);
       ThrowReaderException(FileOpenError,"UnableToOpenFile");
     }
-
   image->x_resolution=source->GetHorizontalResolution();
   image->y_resolution=source->GetVerticalResolution();
   image->columns=(size_t) source->GetWidth();

magick/blob.c

@@ -2624,7 +2624,7 @@ static inline gzFile gzopen_utf8(const char *path,const char *mode)
    wchar_t
      *path_wide;
 
-   path_wide=create_wchar_path(path);
+   path_wide=NTCreateWidePath(path);
    if (path_wide == (wchar_t *) NULL)
      return((gzFile) NULL);
    file=gzopen_w(path_wide,mode);

magick/nt-base-private.h

@@ -62,6 +62,9 @@ struct timezone
     tz_minuteswest,
     tz_dsttime;
 };
+
+typedef int
+  mode_t;
 #endif
 
 #endif
@@ -86,6 +89,9 @@ static inline void *NTAcquireQuantumMemory(const size_t count,
   return(AcquireMagickMemory(size));
 }
 
+extern MagickExport char
+  *NTRealPathWide(const char *);
+
 extern MagickPrivate char
   *NTGetEnvironmentValue(const char *);
 
@@ -105,6 +111,18 @@ extern MagickPrivate double
   NTElapsedTime(void),
   NTUserTime(void);
 
+extern MagickExport FILE
+  *NTOpenFileWide(const char *,const char *),
+  *NTOpenPipeWide(const char *,const char *);
+
+extern MagickExport int
+  NTAccessWide(const char *,int),
+  NTOpenWide(const char *,int,mode_t),
+  NTRemoveWide(const char *),
+  NTRenameWide(const char *, const char *),
+  NTSetFileTimestamp(const char *,struct stat *),
+  NTStatWide(const char *,struct stat *);
+
 extern MagickPrivate int
 #if !defined(__MINGW32__)
   gettimeofday(struct timeval *,struct timezone *),
@@ -148,6 +166,9 @@ extern MagickPrivate void
   NTWindowsGenesis(void),
   NTWindowsTerminus(void);
 
+extern MagickExport wchar_t
+  *NTCreateWidePath(const char *);
+
 #endif /* !XS_VERSION */
 
 #endif /* MAGICKCORE_WINDOWS_SUPPORT */