Remove all mentions of UnicoWS.

Also, get rid of "uniplt.c", and fix "src/racket/src/string.c" and
"src/gracket/grmain.c" to use CharLowerBuffW().

collects/compiler/distribute.rkt

@@ -148,10 +148,7 @@
 			     (if (file-exists? f)
 				 (format template filename-version-part)
 				 (format template "xxxxxxx"))))])
-	 (map copy-dll
+	 (map copy-dll '("iconv.dll"))
-	      (list
-	       "iconv.dll"
-	       "UnicoWS.dll"))
 	 (when (or (memq 'racketcgc types)
 		   (memq 'gracketcgc types))
 	   (map copy-dll

src/get-libs.rkt

@@ -17,7 +17,6 @@
   `(;; Core Libraries
     [core
      [win32/i386
-      ["UnicoWS.dll" 245408]
       ["iconv.dll" 892928]
       ["libeay32.dll" 1089536]
       ["ssleay32.dll" 237568]]]

src/gracket/grmain.c

@@ -710,14 +710,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR ignored
       } else if (l < name_len) {
 	a = wchar_to_char(my_name, l);
 	argv[0] = a;
-	{
+	CharLowerBuffW(my_name, l);
-	  /* CharLowerBuff doesn't work with unicows.dll -- strange. 
-	     So we use CharLower, instead. */
-	  int i;
-	  for (i = 0; i < l; i++) {
-	    CharLowerW(my_name XFORM_OK_PLUS i);
-	  }
-	}
 	normalized_path = wchar_to_char(my_name, l);
 	free(my_name);
 	break;

src/racket/src/string.c

@@ -3369,14 +3369,8 @@ mzchar *do_native_recase(int to_up, mzchar *in, int delta, int len, long *olen)
 
   if (to_up)
     CharUpperBuffW((wchar_t *)result, len);
-  else {
+  else
-    int i;
+    CharLowerBuffW((wchar_t *)result, len);
-    /* CharLowerBuff doesn't work with unicows.dll -- strange.
-       So we use CharLower, instead. */
-    for (i = 0; i < len; i++) {
-      CharLowerW(((wchar_t *)result) + i);
-    }
-  }
 
   *olen = len;
   return (mzchar *)result;

src/worksp/gc2/make.rkt

@@ -244,7 +244,7 @@
 	     (> (file-or-directory-modify-seconds f)
 		ms))
 	   objs)
-      (unless (system- (format "cl.exe ~a /MT /Zi /Fe~a unicows.lib ~a ~a /link ~a~a~a"
+      (unless (system- (format "cl.exe ~a /MT /Zi /Fe~a ~a ~a /link ~a~a~a"
 			       (if exe? "" "/LD /DLL")
 			       dll
 			       (let loop ([objs (append objs sys-libs)])
@@ -271,13 +271,7 @@
 				     ""))))
 	(error 'winmake "~a link failed" (if exe? "EXE" "DLL"))))))
 
-(c-compile "../racket/uniplt.c"
-	   "xsrc/uniplt.obj"
-	   null
-	   " -Dwx_msw")
-
 (let ([objs (list*
-	     "../libracket/Release/uniplt.obj"
 	     "xsrc/gc2.obj"
 	     "xsrc/mzsj86.obj"
 	     "xsrc/foreign.obj"
@@ -305,7 +299,6 @@
 (let ([objs (list
 	     "racket.res"
 	     "xsrc/main.obj"
-	     "xsrc/uniplt.obj"
 	     "../../../lib/msvc/libracket3mxxxxxxx.lib")])
   (link-dll objs 
 	    '("libracket3mxxxxxxx.dll")
@@ -337,7 +330,6 @@
 (let ([objs (list
 	     "gracket.res"
 	     "xsrc/grmain.obj"
-	     "xsrc/uniplt.obj"
 	     "../../../lib/msvc/libracket3mxxxxxxx.lib")])
   (link-dll objs 
 	    '("libracket3mxxxxxxx.dll")

src/worksp/gracket/gracket.vcproj

@@ -69,7 +69,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libracketxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll"
-				AdditionalDependencies="Unicows.lib WS2_32.lib User32.lib Advapi32.lib delayimp.lib"
+				AdditionalDependencies="WS2_32.lib User32.lib Advapi32.lib delayimp.lib"
 				OutputFile="..\..\..\GRacketCGC.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -155,7 +155,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libracketxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll"
-				AdditionalDependencies="Unicows.lib WS2_32.lib User32.lib Advapi32.lib delayimp.lib"
+				AdditionalDependencies="WS2_32.lib User32.lib Advapi32.lib delayimp.lib"
 				OutputFile="..\..\..\GRacketCGC.exe"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="libcd.lib"
@@ -204,10 +204,6 @@
 				RelativePath="..\..\gracket\grmain.c"
 				>
 			</File>
-			<File
-				RelativePath="..\racket\uniplt.c"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"

src/worksp/libmzgc/libmzgc.vcproj

@@ -65,7 +65,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="Unicows.lib User32.lib"
+				AdditionalDependencies="User32.lib"
 				OutputFile="..\..\..\lib\$(ProjectName)xxxxxxx.dll"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -151,7 +151,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="Unicows.lib User32.lib"
+				AdditionalDependencies="User32.lib"
 				OutputFile="..\..\..\lib\$(ProjectName)xxxxxxx.dll"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"

src/worksp/libracket/libracket.vcproj

@@ -66,7 +66,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="Unicows.lib WS2_32.lib Shell32.lib User32.lib"
+				AdditionalDependencies="WS2_32.lib Shell32.lib User32.lib"
 				OutputFile="..\..\..\lib\libracketxxxxxxx.dll"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -154,7 +154,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="Unicows.lib WS2_32.lib Shell32.lib User32.lib"
+				AdditionalDependencies="WS2_32.lib Shell32.lib User32.lib"
 				OutputFile="..\..\..\lib\libracketxxxxxxx.dll"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -374,10 +374,6 @@
 				RelativePath="..\..\foreign\libffi_msvc\types.c"
 				>
 			</File>
-			<File
-				RelativePath="..\racket\uniplt.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\Racket\Src\vector.c"
 				>

src/worksp/racket/racket.vcproj

@@ -65,7 +65,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libracketxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll"
-				AdditionalDependencies="unicows.lib delayimp.lib user32.lib"
+				AdditionalDependencies="delayimp.lib user32.lib"
 				OutputFile="..\..\..\RacketCGC.exe"
 				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
@@ -153,7 +153,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 /DELAYLOAD:libracketxxxxxxx.dll /DELAYLOAD:libmzgcxxxxxxx.dll"
-				AdditionalDependencies="unicows.lib delayimp.lib user32.lib"
+				AdditionalDependencies="delayimp.lib user32.lib"
 				OutputFile="..\..\..\RacketCGC.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -203,10 +203,6 @@
 				RelativePath=".\racket.rc"
 				>
 			</File>
-			<File
-				RelativePath="uniplt.c"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"

src/worksp/racket/uniplt.c

@@ -1,39 +0,0 @@
-#include <windows.h>
-
-static int warned;
-
-HMODULE LoadUnicowsProc(void)
-{
-  /* We can't use Unicode functions, so we can't
-     use the library path as returned by scheme_get_dll_path().
-     Instead, just search for UnicoWS.dll in the standard
-     place. */
-  HMODULE h;
-  char *name;
-  int i;
-
-  h = LoadLibrary("UnicoWS.dll");
-  if (h) return h;
-  
-  name = (char *)GlobalAlloc(GMEM_FIXED, 1050);
-  GetModuleFileName(NULL, name, 1024);
-  name[1023] = 0;
-  for (i = 0; name[i]; i++) { }
-  --i;
-  while (i && (name[i] != '\\')) {
-    --i;
-  }
-  memcpy(name + i, "\\lib\\UnicoWS.dll", 17);
-
-  h = LoadLibrary(name);
-  if (h) return h;
-  
-  if (!warned) {
-    warned = 1;
-    MessageBox(NULL, name, "Can't load UnicoWS", MB_OK);
-  }
-
-  return NULL;
-}
-
-extern FARPROC _PfnLoadUnicows = (FARPROC) &LoadUnicowsProc;