From e3592e10a8f503bbedeb6cb254719f5e4b169ff4 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Wed, 10 Nov 2010 22:47:53 -0500 Subject: [PATCH] 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 | 5 +--- src/get-libs.rkt | 1 - src/gracket/grmain.c | 9 +------ src/racket/src/string.c | 10 ++----- src/worksp/gc2/make.rkt | 10 +------ src/worksp/gracket/gracket.vcproj | 8 ++---- src/worksp/libmzgc/libmzgc.vcproj | 4 +-- src/worksp/libracket/libracket.vcproj | 8 ++---- src/worksp/racket/racket.vcproj | 8 ++---- src/worksp/racket/uniplt.c | 39 --------------------------- 10 files changed, 13 insertions(+), 89 deletions(-) delete mode 100644 src/worksp/racket/uniplt.c diff --git a/collects/compiler/distribute.rkt b/collects/compiler/distribute.rkt index 1e941045ae..f31c28b119 100644 --- a/collects/compiler/distribute.rkt +++ b/collects/compiler/distribute.rkt @@ -148,10 +148,7 @@ (if (file-exists? f) (format template filename-version-part) (format template "xxxxxxx"))))]) - (map copy-dll - (list - "iconv.dll" - "UnicoWS.dll")) + (map copy-dll '("iconv.dll")) (when (or (memq 'racketcgc types) (memq 'gracketcgc types)) (map copy-dll diff --git a/src/get-libs.rkt b/src/get-libs.rkt index 7f37de938c..368fee40b8 100644 --- a/src/get-libs.rkt +++ b/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]]] diff --git a/src/gracket/grmain.c b/src/gracket/grmain.c index d65a10ae3d..a11825dc18 100644 --- a/src/gracket/grmain.c +++ b/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; - { - /* 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); - } - } + CharLowerBuffW(my_name, l); normalized_path = wchar_to_char(my_name, l); free(my_name); break; diff --git a/src/racket/src/string.c b/src/racket/src/string.c index b321ad7299..5c22b161de 100644 --- a/src/racket/src/string.c +++ b/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 { - int i; - /* CharLowerBuff doesn't work with unicows.dll -- strange. - So we use CharLower, instead. */ - for (i = 0; i < len; i++) { - CharLowerW(((wchar_t *)result) + i); - } - } + else + CharLowerBuffW((wchar_t *)result, len); *olen = len; return (mzchar *)result; diff --git a/src/worksp/gc2/make.rkt b/src/worksp/gc2/make.rkt index 782dc25bb8..2ae2621469 100644 --- a/src/worksp/gc2/make.rkt +++ b/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") diff --git a/src/worksp/gracket/gracket.vcproj b/src/worksp/gracket/gracket.vcproj index c21b1e7d83..16c9f5732b 100644 --- a/src/worksp/gracket/gracket.vcproj +++ b/src/worksp/gracket/gracket.vcproj @@ -69,7 +69,7 @@ - - - - diff --git a/src/worksp/racket/racket.vcproj b/src/worksp/racket/racket.vcproj index 42ac06d76b..a4c0988df5 100644 --- a/src/worksp/racket/racket.vcproj +++ b/src/worksp/racket/racket.vcproj @@ -65,7 +65,7 @@ - - - -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;