Merge 4ded318 into 7b4dedb

Author: nicolas-cellier-aka-nice

platforms/win32/plugins/DropPlugin/sqWin32Drop.c

@@ -212,19 +212,26 @@ HANDLE DibFromBitmap (
 }
 
 BOOL WriteDIB (
-    LPSTR szFile,
+    LPCWSTR szFile,
     HANDLE hdib)
 {
     BITMAPFILEHEADER    hdr;
     LPBITMAPINFOHEADER  lpbi;
-    HFILE               fh;
-    OFSTRUCT            of;
+    HANDLE              fh;
+	DWORD               nbwritten;
 
     if (!hdib)
         return FALSE;
 
-    fh = OpenFile(szFile, &of, (UINT)OF_CREATE|OF_READWRITE);
-    if (fh == -1)
+	fh = CreateFileW(szFile,
+		(GENERIC_READ | GENERIC_WRITE) ,
+		FILE_SHARE_READ ,
+		NULL, /* No security descriptor */
+		OPEN_ALWAYS ,
+		FILE_ATTRIBUTE_NORMAL,
+		NULL /* No template */);
+
+    if (fh == INVALID_HANDLE_VALUE)
         return FALSE;
 
     lpbi = (VOID FAR *)GlobalLock (hdib);
@@ -240,16 +247,16 @@ BOOL WriteDIB (
     /* Write the file header */
 
     /* write bfType*/
-    _lwrite(fh, (LPSTR)&hdr.bfType, (UINT)sizeof (WORD));
+    WriteFile(fh, (LPSTR)&hdr.bfType, (UINT)sizeof (WORD),&nbwritten,NULL);
     /* now pass over extra word, and only write next 3 DWORDS!*/
-    _lwrite(fh, (LPSTR)&hdr.bfSize, sizeof(DWORD) * 3);
+	WriteFile(fh, (LPSTR)&hdr.bfSize, sizeof(DWORD) * 3, &nbwritten, NULL);
 
     /* this struct already DWORD aligned!*/
     /* Write the DIB header and the bits */
-    _lwrite (fh, (LPSTR)lpbi, GlobalSize (hdib));
+	WriteFile(fh, (LPSTR)lpbi, GlobalSize (hdib), &nbwritten, NULL);
 
     GlobalUnlock (hdib);
-    _lclose(fh);
+    CloseHandle(fh);
     return TRUE;
 }
 
@@ -509,7 +516,7 @@ STDMETHODIMP DropTarget_Drop(DropTarget *dt,
     DWORD i;
 
     DPRINTF(("Success\n"));
-    numDropFiles = DragQueryFile(hDrop, -1, NULL, 0);
+    numDropFiles = DragQueryFileW(hDrop, -1, NULL, 0);
     dropFiles = calloc(numDropFiles, sizeof(char*));
     for(i=0; i<numDropFiles; i++) {
       WCHAR *tmpPath;
@@ -546,17 +553,20 @@ STDMETHODIMP DropTarget_Drop(DropTarget *dt,
 
   hRes = ido->lpVtbl->GetData(ido, &fmtetc, &medium);
   if(hRes == S_OK) {
-    TCHAR tmpName[MAX_PATH+1];
+    WCHAR tmpNameW[MAX_PATH+1];
     HANDLE hDib = medium.hGlobal;
 
     DPRINTF(("Success\n"));
 
-    GetTempPath(MAX_PATH,tmpName);
-    strcat(tmpName,"$$squeak$$.bmp");
-    if(WriteDIB(tmpName, hDib)) {
-      numDropFiles = 1;
-      dropFiles = calloc(1, sizeof(void*));
-      dropFiles[0] = _strdup(tmpName);
+    GetTempPathW(MAX_PATH,tmpNameW);
+    wcscat(tmpNameW,L"$$squeak$$.bmp");
+    if(WriteDIB(tmpNameW, hDib)) {
+      char tmpNameA[MAX_PATH_UTF8 + 1];
+	  if(WideCharToMultiByte(CP_UTF8, 0, tmpNameW, -1, tmpNameA, MAX_PATH_UTF8, NULL, NULL)) {
+        numDropFiles = 1;
+        dropFiles = calloc(1, sizeof(void*));
+        dropFiles[0] = _strdup(tmpNameA);
+	  }
     }
     if(medium.pUnkForRelease == NULL) {
       GlobalFree(hDib);
@@ -580,20 +590,23 @@ STDMETHODIMP DropTarget_Drop(DropTarget *dt,
 
   hRes = ido->lpVtbl->GetData(ido, &fmtetc, &medium);
   if(hRes == S_OK) {
-    TCHAR tmpName[MAX_PATH+1];
+    WCHAR tmpNameW[MAX_PATH+1];
     HANDLE hDib;
     HBITMAP hBM = medium.hBitmap;
 
     DPRINTF(("Success\n"));
 
-    GetTempPath(MAX_PATH,tmpName);
-    strcat(tmpName,"$$squeak$$.bmp");
+    GetTempPathW(MAX_PATH,tmpNameW);
+    wcscat(tmpNameW,L"$$squeak$$.bmp");
     hDib = DibFromBitmap(hBM, BI_RGB, 0, NULL);
     if(hDib) {
-      if(WriteDIB(tmpName, hDib)) {
-	numDropFiles = 1;
-	dropFiles = calloc(1, sizeof(void*));
-	dropFiles[0] = _strdup(tmpName);
+      if(WriteDIB(tmpNameW, hDib)) {
+        char tmpNameA[MAX_PATH_UTF8 + 1];
+        if (WideCharToMultiByte(CP_UTF8, 0, tmpNameW, -1, tmpNameA, MAX_PATH_UTF8, NULL, NULL)) {
+          numDropFiles = 1;
+          dropFiles = calloc(1, sizeof(void*));
+          dropFiles[0] = _strdup(tmpNameA);
+        }
       }
       DeleteObject(hDib);
     }
@@ -618,7 +631,7 @@ STDMETHODIMP DropTarget_Drop(DropTarget *dt,
 
   hRes = ido->lpVtbl->GetData(ido, &fmtetc, &medium);
   if(hRes == S_OK) {
-    TCHAR tmpName[MAX_PATH+1];
+    WCHAR tmpNameW[MAX_PATH+1];
     HANDLE hMF = medium.hGlobal;
     HANDLE hDib;
     BITMAPINFO bmi;
@@ -661,12 +674,15 @@ STDMETHODIMP DropTarget_Drop(DropTarget *dt,
       DeleteObject(hBM);
     }
 
-    GetTempPath(MAX_PATH,tmpName);
-    strcat(tmpName,"$$squeak$$.bmp");
-    if(WriteDIB(tmpName, hDib)) {
-      numDropFiles = 1;
-      dropFiles = calloc(1, sizeof(void*));
-      dropFiles[0] = _strdup(tmpName);
+    GetTempPathW(MAX_PATH,tmpNameW);
+    wcscat(tmpNameW,L"$$squeak$$.bmp");
+    if(WriteDIB(tmpNameW, hDib)) {
+      char tmpNameA[MAX_PATH_UTF8 + 1];
+      if (WideCharToMultiByte(CP_UTF8, 0, tmpNameW, -1, tmpNameA, MAX_PATH_UTF8, NULL, NULL)) {
+        numDropFiles = 1;
+        dropFiles = calloc(1, sizeof(void*));
+        dropFiles[0] = _strdup(tmpNameA);
+      }
     }
     GlobalFree(hDib);
     if(medium.pUnkForRelease == NULL) {

platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c

@@ -517,7 +517,7 @@ size_t sqImageFileRead(void *ptr, size_t sz, size_t count, sqImageFile h)
   ReadFile((HANDLE)(h-1), (LPVOID) ptr, count*sz, &dwReallyRead, NULL);
   while(dwReallyRead != (DWORD)(count*sz)) {
     DWORD err = GetLastError();
-    if(sqMessageBox(MB_ABORTRETRYIGNORE, TEXT("Squeak Warning"),"Image file read problem (%d out of %d bytes read)", dwReallyRead, count*sz)
+    if(sqMessageBox(MB_ABORTRETRYIGNORE, TEXT("Squeak Warning"),TEXT("Image file read problem (%d out of %d bytes read)"), dwReallyRead, count*sz)
        == IDABORT) return (dwReallyRead / sz);
     sqImageFileSeek(h, position);
     ReadFile((HANDLE)(h-1), (LPVOID) ptr, count*sz, &dwReallyRead, NULL);

platforms/win32/plugins/HostWindowPlugin/sqWin32HostWindowPlugin.c

@@ -415,12 +415,17 @@ sqInt ioSetTitleOfWindow(sqInt windowIndex, char * newTitle, sqInt sizeOfTitle)
  * int size of new logo path. If one of the function is failing, the logo is not set.
  */
 sqInt ioSetIconOfWindow(sqInt windowIndex, char * iconPath, sqInt sizeOfPath) {
+	WCHAR iconPathW[MAX_PATH + 1];
 	HWND hwnd = (windowIndex == 1 ? stWindow : ((HWND)windowIndex));
+	int len;
 	if (!IsWindow(hwnd)) return 0;
+	len = MultiByteToWideChar(CP_UTF8, 0, iconPath, sizeOfPath, iconPathW, MAX_PATH);
+	if(len <= 0) return -1; /* invalid UTF8 ? */
+	iconPathW[len] = 0;
 	//Check if file exists and have read rights
-	if (access(iconPath, 4) == -1) { return -1; }; 
+	if (_waccess(iconPath, 4) == -1) { return -1; }; 
 	//Load the image into an icon
-	HICON hIcon = (HICON)LoadImage(NULL, iconPath, IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
+	HICON hIcon = (HICON)LoadImageW(NULL, iconPathW, IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
 	if (hIcon == 0)
 		return -2;
 	SendMessage(hwnd, WM_SETICON, ICON_BIG, (LONG_PTR)hIcon); 

platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c

@@ -2179,7 +2179,7 @@ void sqResolverGetAddressInfoHostSizeServiceSizeFlagsFamilyTypeProtocol(char *ho
 
   if (gaiError)
     {
-      fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(gaiError));
+      fwprintf(stderr, L"getaddrinfo: %s\n", gai_strerrorW(gaiError));
       addrList= 0;	/* succeed with zero results for impossible constraints */
     }
 
@@ -2349,7 +2349,7 @@ void sqResolverGetNameInfoSizeFlags(char *addr, sqInt addrSize, sqInt flags)
 
   if (gaiError)
     {
-      fprintf(stderr, "getnameinfo: %s\n", gai_strerror(gaiError));
+      fwprintf(stderr, L"getnameinfo: %s\n", gai_strerrorW(gaiError));
       lastError= gaiError;
       goto fail;
     }

platforms/win32/vm/sqPlatformSpecific.h

@@ -30,6 +30,7 @@
 
 #ifdef WIN32_FILE_SUPPORT
 
+#define NO_STD_FILE_SUPPORT /* STD_FILE or WIN32_FILE are mutually exclusive options */
 #undef sqImageFile
 #undef sqImageFileClose
 #undef sqImageFileOpen

platforms/win32/vm/sqWin32.h

@@ -104,7 +104,7 @@
 /* Definition for Intel Processors */
 #if defined(_M_IX86) || defined(i386)
 # define WIN32_NAME "Win32"
-# define WIN32_OS_NAME (fWindows95 ? "95" : "NT")
+# define WIN32_OS_NAME "NT"
 # define WIN32_PROCESSOR_NAME "IX86"
 
 # if defined(X86)
@@ -143,16 +143,6 @@
 
 #endif /* (_WIN32_WCE) */
 
-/* THE FOLLOWING IS WRONG (& HENCE I'VE IF 0'ed IT OUT.  WE CAN'T MERELY DEFINE
- * WIN32 BECAUSE WE MAY BE ON WIN64. eem 2017/05/16
- */
-#if 0
-/* due to weird include orders, make sure WIN32 is defined */
-# if !defined(WIN32)
-#  define WIN32 1
-# endif
-#endif
-
 /* Experimental */
 #ifdef MINIMAL
   /* The hardcoded defs:
@@ -189,7 +179,6 @@ void SetupKeymap();
 void SetupWindows();
 void SetupPixmaps();
 void SetupPrinter();
-void SetupPreferences();
 void SetupMIDI();
 
 /********************************************************/
@@ -259,21 +248,46 @@ int reverse_image_words(unsigned int *dst, unsigned int *src,int depth, int widt
 /********************************************************/
 /* Declarations we may need by other modules            */
 /********************************************************/
-extern char imageName[];		/* full path and name to image */
-extern TCHAR imagePath[];		/* full path to image */
-extern TCHAR vmPath[];		    /* full path to interpreter's directory */
-extern TCHAR vmName[];		    /* name of the interpreter's executable */
-extern char windowTitle[];             /* window title string */
-extern char vmBuildString[];            /* the vm build string */
-extern TCHAR windowClassName[];    /* class name for the window */
+
+/* Note: a character can require up to 4 bytes in UTF8 encoding
+   But the expansion from UTF16 -> UTF8 is never more than 3 bytes for 1 short
+   U+ 0000-U+  007F - 1byte in utf8, 1 short in utf16.
+   U+ 0080-U+  07FF - 2byte in utf8, 1 short in utf16.
+   U+ 0800-U+  FFFF - 3byte in utf8, 1 short in utf16.
+   U+10000-U+10FFFF - 4byte in utf8, 2 short in utf16.
+*/
+#define MAX_PATH_UTF8 (MAX_PATH*3)
+
+extern char  imageName [];       /* full path and name to image - UTF8 */
+extern WCHAR imageNameW[];       /* full path and name to image - UTF16 */
+extern char  imagePathA[];       /* full path to image - UTF8 */
+extern WCHAR imagePathW[];       /* full path to image - UTF16 */
+extern char  vmPathA[];          /* full path to interpreter's directory - UTF8 */
+extern WCHAR vmPathW[];          /* full path to interpreter's directory - UTF16 */
+extern char  vmNameA[];          /* name of the interpreter's executable - UTF8 */
+extern WCHAR vmNameW[];          /* name of the interpreter's executable - UTF16 */
+extern char windowTitle[];       /* window title string - UTF8 */
+extern char vmBuildString[];     /* the vm build string */
+extern TCHAR windowClassName[];  /* class name for the window */
+
+#ifdef UNICODE
+#define imageNameT imageNameW /* define the generic TCHAR* version */
+#define imagePath  imagePathW
+#define vmName vmNameW
+#define vmPath vmPathW
+#else
+#define imageNameT imageName
+#define imagePath  imagePathA
+#define vmName vmNameA
+#define vmPath vmPathA
+#endif
 
 extern UINT SQ_LAUNCH_DROP;
 
 extern const TCHAR U_ON[];
 extern const TCHAR U_OFF[];
 extern const TCHAR U_GLOBAL[];
-extern const TCHAR U_SLASH[];
-extern const TCHAR U_BACKSLASH[];
+extern const WCHAR W_BACKSLASH[];
 
 #ifndef NO_PREFERENCES
 extern HMENU vmPrefsMenu;         /* preferences menu */
@@ -293,7 +307,6 @@ extern BITMAPINFO *bmi4;	     /*	4 bit depth bitmap info */
 extern BITMAPINFO *bmi8;	     /*	8 bit depth bitmap info */
 extern BITMAPINFO *bmi16;	     /*	16 bit depth bitmap info */
 extern BITMAPINFO *bmi32;	     /*	32 bit depth bitmap info */
-extern BOOL fWindows95;          /* Are we running on Win95 or NT? */
 extern BOOL fIsConsole;          /* Are we running as a console app? */
 
 /* Startup options */
@@ -332,32 +345,11 @@ extern BOOL f3ButtonMouse;   /* Should we use a real 3 button mouse mapping? */
 extern BOOL fBufferMouse;    /* Should we buffer mouse input? */
 
 
-/******************************************************/
-/* String conversions between Unicode / Ansi / Squeak */
-/******************************************************/
-/* Note: fromSqueak() and fromSqueak2() are inline conversions
-         but operate on two different buffers. The maximum length
-         of strings that can be converted is MAX_PATH */
-TCHAR*  fromSqueak(const char *sqPtr, int sqLen);   /* Inline Squeak -> C */
-TCHAR*  fromSqueak2(const char *sqPtr, int sqLen);  /* 2nd inline conversion */
-/* Note: toUnicode() and fromUnicode() are inline conversions
-         with for at most MAX_PATH sized strings. If the VM
-         is not compiled with UNICODE defined they just return
-         the input strings. Also, toUnicode operates on the
-         same buffer as fromSqueak() */
-TCHAR*  toUnicode(const char *ptr);                 /* Inline Ansi -> Unicode */
-char*   fromUnicode(const TCHAR *ptr);              /* Inline Unicode -> Ansi */
-/* Note: toUnicodeNew and fromUnicodeNew malloc() new strings.
-         It is up to the caller to free these! */
-TCHAR*  toUnicodeNew(const char *ptr);                 /* Inline Ansi -> Unicode */
-char*   fromUnicodeNew(const TCHAR *ptr);              /* Inline Unicode -> Ansi */
-TCHAR *lstrrchr(TCHAR *source, TCHAR c);
-
 /******************************************************/
 /* Output stuff                                       */
 /******************************************************/
 #ifndef sqMessageBox
-int __cdecl sqMessageBox(DWORD dwFlags, const TCHAR *titleString, const char* fmt, ...);
+int __cdecl sqMessageBox(DWORD dwFlags, const TCHAR *titleString, const TCHAR* fmt, ...);
 #endif
 
 #ifndef warnPrintf
@@ -380,7 +372,7 @@ void vprintLastError(TCHAR *fmt, ...);
 /******************************************************/
 /* Misc functions                                     */
 /******************************************************/
-DWORD SqueakImageLength(TCHAR *fileName);
+DWORD SqueakImageLength(WCHAR *fileName);
 int isLocalFileName(TCHAR *fileName);
 
 #ifndef NO_PLUGIN_SUPPORT

platforms/win32/vm/sqWin32Alloc.c

@@ -76,15 +76,15 @@ void *sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize)
   } while(!pageBase);
   if(!pageBase) {
     sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"),
-		 "Unable to allocate memory (%d bytes requested)",
+		 TEXT("Unable to allocate memory (%d bytes requested)"),
 		 maxReserved);
     return pageBase;
   }
   /* commit initial memory as requested */
   commit = nowReserved;
   if(!VirtualAlloc(pageBase, commit, MEM_COMMIT, PAGE_READWRITE)) {
     sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"),
-		 "Unable to commit memory (%d bytes requested)",
+		 TEXT("Unable to commit memory (%d bytes requested)"),
 		 commit);
     return NULL;
   }