suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all mentions of UnicoWS.

Browse Source 
Also, get rid of "uniplt.c", and fix "src/racket/src/string.c" and
"src/gracket/grmain.c" to use CharLowerBuffW().
This commit is contained in:
Eli Barzilay 2010-11-10 22:47:53 -05:00
parent d58395cd0b
commit e3592e10a8
10 changed files with 13 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
collects/compiler/distribute.rkt
View File

@ -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

1
src/get-libs.rkt
View File

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

9
src/gracket/grmain.c
View File

@ -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;

10
src/racket/src/string.c
View File

@ -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;

10
src/worksp/gc2/make.rkt
View File

@ -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")

8
src/worksp/gracket/gracket.vcproj
View File

@ -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"

4
src/worksp/libmzgc/libmzgc.vcproj
View File

@ -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"

8
src/worksp/libracket/libracket.vcproj
View File

@ -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"
>

8
src/worksp/racket/racket.vcproj
View File

@ -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"

39
src/worksp/racket/uniplt.c
View File

@ -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;