AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-2030 WIndows build changes to allow apps to use static C runtime lib

Browse Source 
X-SVN-Rev: 9400
This commit is contained in:
Andy Heninger 2002-07-29 21:04:18 +00:00
parent c1a917468f
commit f0f44e915e
61 changed files with 4102 additions and 754 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
icu4c/source/common/cmemory.h
View File

@ -29,15 +29,25 @@
#include <string.h>
/*
#define uprv_malloc(size) U_STANDARD_CPP_NAMESPACE malloc(size)
#define uprv_realloc(buffer, size) U_STANDARD_CPP_NAMESPACE realloc(buffer, size)
#define uprv_free(buffer) U_STANDARD_CPP_NAMESPACE free(buffer)
*/
#define uprv_memcpy(dst, src, size) U_STANDARD_CPP_NAMESPACE memcpy(dst, src, size)
#define uprv_memmove(dst, src, size) U_STANDARD_CPP_NAMESPACE memmove(dst, src, size)
#define uprv_memset(buffer, mark, size) U_STANDARD_CPP_NAMESPACE memset(buffer, mark, size)
#define uprv_memcmp(buffer1, buffer2, size) U_STANDARD_CPP_NAMESPACE memcmp(buffer1, buffer2,size)
U_CAPI void * U_EXPORT2
uprv_malloc(size_t s);
U_CAPI void * U_EXPORT2
uprv_realloc(void *mem, size_t size);
U_CAPI void U_EXPORT2
uprv_free(void *mem);
/**
* This should align the memory properly on any machine.
* This is very useful for the safeClone functions.

1172
icu4c/source/common/common.dsp
View File

File diff suppressed because it is too large Load Diff

2
icu4c/source/common/unicode/uobject.h
View File

@ -65,6 +65,8 @@ public:
// (uprv_malloc(), uprv_free(), uprv_realloc());
// they or something else could be used here to implement C++ new/delete
// for ICU4C C++ classes
#define U_CPP_MEMORY_TEST
#ifdef U_CPP_MEMORY_TEST
void *operator new(size_t size);
void *operator new[](size_t size);

4
icu4c/source/extra/uconv/uconv.dsp
View File

@ -45,7 +45,7 @@ RSC=rc.exe
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UCONVMSG_STATIC" /FD /c
# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "UCONVMSG_STATIC" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -82,7 +82,7 @@ SOURCE="$(InputPath)"
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UCONVMSG_STATIC" /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UCONVMSG_STATIC" /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe

216
icu4c/source/extra/ustdio/ustdio.dsp
View File

@ -72,7 +72,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /FR /FD /GF /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /FR /FD /GF /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -99,7 +99,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\..\include" /I "..\..\common" /D"WIN64" /D"NDEBUG" /D"_WINDOWS" /D"_MBCS" /D"_USRDLL" /D"USTDIO_EXPORTS" /D"U_USTDIO_IMPLEMENTATION" /FD /GF /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\..\include" /I "..\..\common" /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /GF /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -108,9 +108,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IA64
# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:IA64 /out:"..\..\..\bin\icuio22.dll" /implib:"..\..\..\lib/icuio.lib" /libpath:"..\..\..\lib\\" /incremental:no
# SUBTRACT LINK32
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:IX86 /out:"..\..\..\bin\icuio22.dll" /implib:"..\..\..\lib/icuio.lib" /libpath:"..\..\..\lib\\" /machine:IA64
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
@ -126,7 +125,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\..\include" /I "..\..\common" /D"WIN64" /D"_DEBUG" /D"_WINDOWS" /D"_MBCS" /D"_USRDLL" /D"USTDIO_EXPORTS" /D"U_USTDIO_IMPLEMENTATION" /FR /FD /GF /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\common" /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GF /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win64
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win64
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -135,9 +134,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /debug /machine:IA64 /out:"..\..\..\bin\icuio22d.dll" /implib:"..\..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\..\lib\\" /incremental:no
# SUBTRACT LINK32
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /incremental:no /debug /machine:IX86 /out:"..\..\..\bin\icuio22d.dll" /implib:"..\..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\..\lib\\" /machine:IA64
!ENDIF
@ -153,63 +151,263 @@ LINK32=link.exe
# Begin Source File
SOURCE=.\locbund.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\loccache.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\sprintf.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\sprntf_p.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\sscanf.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\sscanf_p.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ufile.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ufmt_cmn.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\uprintf.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\uprntf_p.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\uscanf.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\uscanf_p.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\uscanset.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ustdio.c
!IF "$(CFG)" == "ustdio - Win32 Release"
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ustream.cpp
!IF "$(CFG)" == "ustdio - Win32 Release"
# ADD CPP /Ze
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
# ADD CPP /G6 /Ze
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
# ADD CPP /Ze
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
# ADD CPP /Ze
!ENDIF
# End Source File
# End Group
# Begin Group "Header Files"

984
icu4c/source/i18n/i18n.dsp
View File

File diff suppressed because it is too large Load Diff

4
icu4c/source/layout/layout.dsp
View File

@ -45,7 +45,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\include" /I "..\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /D "U_LAYOUT_IMPLEMENTATION" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\include" /I "..\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /D "U_LAYOUT_IMPLEMENTATION" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -72,7 +72,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /D "U_LAYOUT_IMPLEMENTATION" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LAYOUT_EXPORTS" /D "U_LAYOUT_IMPLEMENTATION" /FR /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"

10
icu4c/source/stubdata/stubdata.dsp
View File

@ -118,9 +118,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IA64
# ADD LINK32 kernel32.lib user32.lib /nologo /dll /machine:IA64 /out:"..\..\bin\icudt22l.dll" /implib:"..\..\lib\icudata.lib" /incremental:no
# SUBTRACT LINK32
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IX86 /machine:IA64
# ADD LINK32 kernel32.lib user32.lib /nologo /dll /machine:IX86 /out:"..\..\bin\icudt22l.dll" /implib:"..\..\lib\icudata.lib" /machine:IA64
# Begin Special Build Tool
ProjDir=.
SOURCE="$(InputPath)"
@ -150,9 +149,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib /nologo /dll /machine:IA64 /out:"..\..\bin\icudt22l.dll" /implib:"..\..\lib\icudata.lib" /pdbtype:sept /incremental:no
# SUBTRACT LINK32
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 kernel32.lib user32.lib /nologo /dll /incremental:no /machine:IX86 /out:"..\..\bin\icudt22l.dll" /implib:"..\..\lib\icudata.lib" /pdbtype:sept /machine:IA64
# Begin Special Build Tool
ProjDir=.
SOURCE="$(InputPath)"

6
icu4c/source/test/cintltst/capitst.c
View File

@ -167,7 +167,7 @@ void TestGetDefaultRules(){
log_err("Error: ucol_getDefaultRulesArray() failed\n");
}
uprv_free(binColData);
free(binColData);
ures_close(binColl);
ures_close(res);
ucol_close(coll);
@ -315,7 +315,7 @@ void TestProperty()
doAssert( tempLength != 0, "getRules() result incorrect" );
log_verbose("getRules tests end.\n");
{
UChar *buffer = (UChar *)uprv_malloc(200000*sizeof(UChar));
UChar *buffer = (UChar *)malloc(200000*sizeof(UChar));
int32_t bufLen = 200000;
buffer[0] = '\0';
log_verbose("ucol_getRulesEx() testing ...\n");
@ -327,7 +327,7 @@ void TestProperty()
tempLength=ucol_getRulesEx(col,UCOL_FULL_RULES,buffer,bufLen );
doAssert( tempLength != 0, "getRulesEx() result incorrect" );
log_verbose("getRules tests end.\n");
uprv_free(buffer);
free(buffer);
}
ucol_close(ruled);
ucol_close(col);

6
icu4c/source/test/cintltst/cbiapts.c
View File

@ -81,14 +81,14 @@ static UChar* toUChar(const char *src, void **freeHook) {
&status);
destSize = (numUChars+1) * sizeof(UChar) + sizeof(struct StringStruct);
dest = (StringStruct *)uprv_malloc(destSize);
dest = (StringStruct *)malloc(destSize);
if (dest != NULL) {
if (status == U_BUFFER_OVERFLOW_ERROR || status == U_STRING_NOT_TERMINATED_WARNING) {
ucnv_toUChars(cnv, dest->str, numUChars+1, src, -1, &status);
} else if (status == U_ZERO_ERROR) {
u_strcpy(dest->str, stackBuf);
} else {
uprv_free(dest);
free(dest);
dest = NULL;
}
}
@ -108,7 +108,7 @@ static void freeToUCharStrings(void **hook) {
StringStruct *s = *(StringStruct **)hook;
while (s != NULL) {
StringStruct *next = s->link;
uprv_free(s);
free(s);
s = next;
}
}

40
icu4c/source/test/cintltst/cbiditst.c
View File

@ -244,8 +244,8 @@ static void TestReorder(){
for(;i<(sizeof(logicalOrder)/sizeof(logicalOrder[0]));i++){
int32_t srcSize = (int32_t)uprv_strlen(logicalOrder[i]);
int32_t destSize = srcSize*2;
UChar* src = (UChar*) uprv_malloc(sizeof(UChar)*srcSize );
UChar* dest = (UChar*) uprv_malloc(sizeof(UChar)*destSize);
UChar* src = (UChar*) malloc(sizeof(UChar)*srcSize );
UChar* dest = (UChar*) malloc(sizeof(UChar)*destSize);
char* chars=NULL;
ec = U_ZERO_ERROR;
u_unescape(logicalOrder[i],src,srcSize);
@ -273,15 +273,15 @@ static void TestReorder(){
}
uprv_free(src);
uprv_free(dest);
free(src);
free(dest);
}
for(i=0;i<(sizeof(logicalOrder)/sizeof(logicalOrder[0]));i++){
int32_t srcSize = (int32_t)uprv_strlen(logicalOrder[i]);
int32_t destSize = srcSize*2;
UChar* src = (UChar*) uprv_malloc(sizeof(UChar)*srcSize );
UChar* dest = (UChar*) uprv_malloc(sizeof(UChar)*destSize);
UChar* src = (UChar*) malloc(sizeof(UChar)*srcSize );
UChar* dest = (UChar*) malloc(sizeof(UChar)*destSize);
char* chars=NULL;
ec = U_ZERO_ERROR;
u_unescape(logicalOrder[i],src,srcSize);
@ -310,15 +310,15 @@ static void TestReorder(){
}
uprv_free(src);
uprv_free(dest);
free(src);
free(dest);
}
for(i=0;i<(sizeof(logicalOrder)/sizeof(logicalOrder[0]));i++){
int32_t srcSize = (int32_t)uprv_strlen(logicalOrder[i]);
int32_t destSize = srcSize*2;
UChar* src = (UChar*) uprv_malloc(sizeof(UChar)*srcSize );
UChar* dest = (UChar*) uprv_malloc(sizeof(UChar)*destSize);
UChar* src = (UChar*) malloc(sizeof(UChar)*srcSize );
UChar* dest = (UChar*) malloc(sizeof(UChar)*destSize);
char* chars=NULL;
ec = U_ZERO_ERROR;
u_unescape(logicalOrder[i],src,srcSize);
@ -349,15 +349,15 @@ static void TestReorder(){
}
uprv_free(src);
uprv_free(dest);
free(src);
free(dest);
}
/* Max Explicit level */
for(i=0;i<(sizeof(logicalOrder)/sizeof(logicalOrder[0]));i++){
int32_t srcSize = (int32_t)uprv_strlen(logicalOrder[i]);
int32_t destSize = srcSize*2;
UChar* src = (UChar*) uprv_malloc(sizeof(UChar)*srcSize );
UChar* dest = (UChar*) uprv_malloc(sizeof(UChar)*destSize);
UChar* src = (UChar*) malloc(sizeof(UChar)*srcSize );
UChar* dest = (UChar*) malloc(sizeof(UChar)*destSize);
char* chars=NULL;
UBiDiLevel levels[UBIDI_MAX_EXPLICIT_LEVEL]={1,2,3,4,5,6,7,8,9,10};
ec = U_ZERO_ERROR;
@ -388,14 +388,14 @@ static void TestReorder(){
}
uprv_free(src);
uprv_free(dest);
free(src);
free(dest);
}
for(i=0;i<(sizeof(logicalOrder)/sizeof(logicalOrder[0]));i++){
int32_t srcSize = (int32_t)uprv_strlen(logicalOrder[i]);
int32_t destSize = srcSize*2;
UChar* src = (UChar*) uprv_malloc(sizeof(UChar)*srcSize );
UChar* dest = (UChar*) uprv_malloc(sizeof(UChar)*destSize);
UChar* src = (UChar*) malloc(sizeof(UChar)*srcSize );
UChar* dest = (UChar*) malloc(sizeof(UChar)*destSize);
char* chars=NULL;
UBiDiLevel levels[UBIDI_MAX_EXPLICIT_LEVEL]={1,2,3,4,5,6,7,8,9,10};
ec = U_ZERO_ERROR;
@ -425,8 +425,8 @@ static void TestReorder(){
log_err("ubidi_writeReordered() did not give expected results for UBIDI_DO_MIRRORING+UBIDI_REMOVE_BIDI_CONTROLS. Expected: %s Got: %s At Index: %d\n",visualOrder[i],chars,i);
}
uprv_free(src);
uprv_free(dest);
free(src);
free(dest);
}
ubidi_close(bidi);
}

36
icu4c/source/test/cintltst/ccaltst.c
View File

@ -85,7 +85,7 @@ static void TestCalendar()
/*Testing the ucal_open() function*/
log_verbose("\nTesting the ucal_open()\n");
tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4);
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_uastrcpy(tzID, "PST");
caldef=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);
if(U_FAILURE(status)){
@ -153,7 +153,7 @@ static void TestCalendar()
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
ucal_getTimeZoneDisplayName(caldef, UCAL_DST, "en_US", result, resultlength, &status);
}
if(U_FAILURE(status)) {
@ -167,7 +167,7 @@ static void TestCalendar()
#define expectPDT "Pacific Daylight Time"
tzdname=(UChar*)uprv_malloc(sizeof(UChar) * (sizeof(expectPDT)+1));
tzdname=(UChar*)malloc(sizeof(UChar) * (sizeof(expectPDT)+1));
u_uastrcpy(tzdname, expectPDT);
if(u_strcmp(tzdname, result)==0){
log_verbose("PASS: got the correct time zone display name %s\n", u_austrcpy(tempMsgBuf, result) );
@ -259,9 +259,9 @@ static void TestCalendar()
ucal_close(calit);
/*closing the UDateFormat used */
udat_close(datdef);
uprv_free(tzID);
uprv_free(result);
uprv_free(tzdname);
free(tzID);
free(result);
free(tzdname);
}
@ -281,7 +281,7 @@ static void TestGetSetDateAPI()
UChar temp[30];
log_verbose("\nOpening the calendars()\n");
tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4);
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_strcpy(tzID, fgGMTID);
/*open the calendars used */
caldef=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);
@ -451,7 +451,7 @@ static void TestGetSetDateAPI()
ucal_close(caldef);
ucal_close(caldef2);
udat_close(datdef);
uprv_free(tzID);
free(tzID);
}
@ -467,7 +467,7 @@ static void TestFieldGetSet()
UDate d1;
UErrorCode status=U_ZERO_ERROR;
log_verbose("\nFetching pointer to UCalendar using the ucal_open()\n");
tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4);
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_strcpy(tzID, fgGMTID);
/*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);
@ -593,7 +593,7 @@ static void TestFieldGetSet()
ucal_close(cal);
udat_close(datdef);
uprv_free(tzID);
free(tzID);
}
@ -616,7 +616,7 @@ static void TestAddRollExtensive()
log_verbose("Testing add and roll extensively\n");
tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4);
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_uastrcpy(tzID, "PST");
/*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);;
@ -762,7 +762,7 @@ static void TestAddRollExtensive()
}
ucal_close(cal);
uprv_free(tzID);
free(tzID);
}
/*------------------------------------------------------ */
@ -775,7 +775,7 @@ static void TestGetLimits()
UErrorCode status = U_ZERO_ERROR;
tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4);
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_uastrcpy(tzID, "PST");
/*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);;
@ -854,7 +854,7 @@ static void TestGetLimits()
ucal_close(cal);
uprv_free(tzID);
free(tzID);
}
@ -875,7 +875,7 @@ static void TestDOWProgression()
UErrorCode status = U_ZERO_ERROR;
UChar* tzID = 0;
char tempMsgBuf[256];
tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4);
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_strcpy(tzID, fgGMTID);
/*open the calendar used */
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_TRADITIONAL, &status);;
@ -922,7 +922,7 @@ static void TestDOWProgression()
ucal_close(cal);
udat_close(datfor);
uprv_free(tzID);
free(tzID);
}
@ -952,7 +952,7 @@ static void testZones(int32_t yr, int32_t mo, int32_t dt, int32_t hr, int32_t mn
UChar* tzID = 0;
char tempMsgBuf[256];
tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4);
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_strcpy(tzID, fgGMTID);
gmtcal=ucal_open(tzID, 3, "en_US", UCAL_TRADITIONAL, &status);;
if (U_FAILURE(status)) {
@ -1020,7 +1020,7 @@ static void testZones(int32_t yr, int32_t mo, int32_t dt, int32_t hr, int32_t mn
ucal_close(gmtcal);
ucal_close(cal);
udat_close(datfor);
uprv_free(tzID);
free(tzID);
}
/* ------------------------------------- */

4
icu4c/source/test/cintltst/ccapitst.c
View File

@ -218,7 +218,7 @@ static void TestConvert()
if(U_SUCCESS(err)) {
/* try to fill an array with all aliases */
const char **aliases;
aliases=(const char **)uprv_malloc(count * sizeof(const char *));
aliases=(const char **)malloc(count * sizeof(const char *));
if(aliases != 0) {
ucnv_getAliases("utf-8", aliases, &err);
if(U_FAILURE(err)) {
@ -234,7 +234,7 @@ static void TestConvert()
}
}
}
uprv_free((char **)aliases);
free((char **)aliases);
}
}
}

11
icu4c/source/test/cintltst/ccolltst.c
View File

@ -71,8 +71,8 @@ void reportCResult( const UChar source[], const UChar target[],
UCollationResult expectedResult )
{
UChar *sResult, *sExpect;
sResult=(UChar*)uprv_malloc(sizeof(UChar) * 10);
sExpect=(UChar*)uprv_malloc(sizeof(UChar) * 10);
sResult=(UChar*)malloc(sizeof(UChar) * 10);
sExpect=(UChar*)malloc(sizeof(UChar) * 10);
if (expectedResult < -1 || expectedResult > 1)
{
log_err("***** invalid call to reportCResult ****\n");
@ -128,8 +128,8 @@ void reportCResult( const UChar source[], const UChar target[],
log_verbose("SortKey2: %s\n", dumpSk(targetKey, sk));
}
uprv_free(sExpect);
uprv_free(sResult);
free(sExpect);
free(sResult);
}
UChar* appendCompareResult(UCollationResult result, UChar* target)
@ -157,7 +157,8 @@ UChar* appendCompareResult(UCollationResult result, UChar* target)
UChar* CharsToUChars(const char* str) {
/* Might be faster to just use uprv_strlen() as the preflight len - liu */
int32_t len = u_unescape(str, 0, 0); /* preflight */
UChar *buf = (UChar*) uprv_malloc(sizeof(UChar) * len);
/* Do NOT use malloc() - we are supposed to be acting like user code! */
UChar *buf = (UChar*) malloc(sizeof(UChar) * len);
u_unescape(str, buf, len);
return buf;
}

64
icu4c/source/test/cintltst/cdattst.c
View File

@ -127,10 +127,10 @@ static void TestDateFormat()
status=U_ZERO_ERROR;
resultlength=resultlengthneeded+1;
if(result != NULL) {
uprv_free(result);
free(result);
result = NULL;
}
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_format(def, d, result, resultlength, NULL, &status);
}
if(U_FAILURE(status))
@ -147,7 +147,7 @@ static void TestDateFormat()
u_uastrcpy(temp, "10 juil. 96 16 h 05 GMT-07:00");
if(result != NULL) {
uprv_free(result);
free(result);
result = NULL;
}
result=myDateFormat(fr, d);
@ -210,7 +210,7 @@ static void TestDateFormat()
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded + 1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_toPattern(def1, FALSE, result, resultlength, &status);
}
if(U_FAILURE(status))
@ -224,7 +224,7 @@ static void TestDateFormat()
log_verbose("PASS: applyPattern and toPattern work fine\n");
if(result != NULL) {
uprv_free(result);
free(result);
result = NULL;
}
@ -299,7 +299,7 @@ static void TestDateFormat()
log_verbose("PASS: getting and setting calendar successful\n");
if(result!=NULL) {
uprv_free(result);
free(result);
}
/*Closing the UDateForamt */
@ -363,7 +363,7 @@ static void TestSymbols()
/*testing getSymbols*/
log_verbose("\nTesting getSymbols\n");
pattern=(UChar*)uprv_malloc(sizeof(UChar) * 10);
pattern=(UChar*)malloc(sizeof(UChar) * 10);
u_uastrcpy(pattern, "jeudi");
resultlength=0;
resultlengthout=udat_getSymbols(fr, UDAT_WEEKDAYS, 5 , NULL, resultlength, &status);
@ -372,10 +372,10 @@ static void TestSymbols()
status=U_ZERO_ERROR;
resultlength=resultlengthout+1;
if(result != NULL) {
uprv_free(result);
free(result);
result = NULL;
}
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_getSymbols(fr, UDAT_WEEKDAYS, 5, result, resultlength, &status);
}
@ -408,10 +408,10 @@ static void TestSymbols()
if(result != NULL) {
uprv_free(result);
free(result);
result = NULL;
}
uprv_free(pattern);
free(pattern);
log_verbose("\nTesting setSymbols\n");
/*applying the pattern so that setSymbolss works */
@ -421,7 +421,7 @@ uprv_free(pattern);
{
status=U_ZERO_ERROR;
resultlength=resultlengthout + 1;
pattern=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
pattern=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_toPattern(fr, FALSE, pattern, resultlength, &status);
}
if(U_FAILURE(status))
@ -438,10 +438,10 @@ uprv_free(pattern);
status=U_ZERO_ERROR;
resultlength=resultlengthout + 1;
if(result != NULL) {
uprv_free(result);
free(result);
result = NULL;
}
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_toPattern(fr, FALSE,result, resultlength, &status);
}
if(U_FAILURE(status))
@ -454,7 +454,7 @@ uprv_free(pattern);
else
log_err("pattern could not be applied properly\n");
uprv_free(pattern);
free(pattern);
/*testing set symbols */
resultlength=0;
resultlengthout=udat_getSymbols(fr, UDAT_MONTHS, 11 , NULL, resultlength, &status);
@ -462,10 +462,10 @@ uprv_free(pattern);
status=U_ZERO_ERROR;
resultlength=resultlengthout+1;
if(result != NULL) {
uprv_free(result);
free(result);
result = NULL;
}
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_getSymbols(fr, UDAT_MONTHS, 11, result, resultlength, &status);
}
@ -486,7 +486,7 @@ uprv_free(pattern);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
resultlength=resultlengthout+1;
value=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
value=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_getSymbols(def, UDAT_MONTHS, 11, value, resultlength, &status);
}
if(U_FAILURE(status))
@ -525,10 +525,10 @@ uprv_free(pattern);
udat_close(fr);
udat_close(def);
if(result != NULL) {
uprv_free(result);
free(result);
result = NULL;
}
uprv_free(value);
free(value);
}
@ -632,7 +632,7 @@ static void VerifygetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in
int32_t resultlength, resultlengthout;
pattern=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(expected)+1));
pattern=(UChar*)malloc(sizeof(UChar) * (strlen(expected)+1));
u_uastrcpy(pattern, expected);
resultlength=0;
resultlengthout=udat_getSymbols(datfor, type, index , NULL, resultlength, &status);
@ -640,7 +640,7 @@ static void VerifygetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in
{
status=U_ZERO_ERROR;
resultlength=resultlengthout+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_getSymbols(datfor, type, index, result, resultlength, &status);
}
@ -655,8 +655,8 @@ static void VerifygetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in
log_err("FAlL: getSymbols retrieved the wrong value\n Expected %s Got %s\n", austrdup(pattern),
austrdup(result) );
}
uprv_free(result);
uprv_free(pattern);
free(result);
free(pattern);
}
static void VerifysetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, int32_t index, const char* expected)
@ -666,7 +666,7 @@ static void VerifysetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in
int32_t resultlength, resultlengthout;
UErrorCode status = U_ZERO_ERROR;
value=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(expected) + 1));
value=(UChar*)malloc(sizeof(UChar) * (strlen(expected) + 1));
u_uastrcpy(value, expected);
udat_setSymbols(datfor, type, index, value, u_strlen(value), &status);
if(U_FAILURE(status))
@ -680,7 +680,7 @@ static void VerifysetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
resultlength=resultlengthout+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_getSymbols(datfor, type, index, result, resultlength, &status);
}
if(U_FAILURE(status)){
@ -696,8 +696,8 @@ static void VerifysetSymbols(UDateFormat* datfor, UDateFormatSymbolType type, in
else
log_verbose("PASS: setSymbols successful\n");
uprv_free(value);
uprv_free(result);
free(value);
free(result);
}
@ -713,7 +713,7 @@ static void VerifygetsetSymbols(UDateFormat* from, UDateFormat* to, UDateFormatS
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
resultlength=resultlengthout+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_getSymbols(from, type, index, result, resultlength, &status);
}
if(U_FAILURE(status)){
@ -734,7 +734,7 @@ static void VerifygetsetSymbols(UDateFormat* from, UDateFormat* to, UDateFormatS
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
resultlength=resultlengthout+1;
value=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
value=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_getSymbols(to, type, index, value, resultlength, &status);
}
if(U_FAILURE(status)){
@ -750,8 +750,8 @@ static void VerifygetsetSymbols(UDateFormat* from, UDateFormat* to, UDateFormatS
else
log_verbose("PASS: setSymbols successful\n");
uprv_free(value);
uprv_free(result);
free(value);
free(result);
}

44
icu4c/source/test/cintltst/cdtdptst.c
View File

@ -50,7 +50,7 @@ void TestTwoDigitYearDSTParse()
UChar *s;
int32_t pos;
pattern=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("EEE MMM dd HH:mm:ss.SSS zzz yyyy G")+1 ));
pattern=(UChar*)malloc(sizeof(UChar) * (strlen("EEE MMM dd HH:mm:ss.SSS zzz yyyy G")+1 ));
u_uastrcpy(pattern, "EEE MMM dd HH:mm:ss.SSS zzz yyyy G");
fullFmt= udat_open(UDAT_IGNORE, UDAT_IGNORE,"en_US",NULL,0,pattern, u_strlen(pattern),&status);
if(U_FAILURE(status)) {
@ -63,7 +63,7 @@ void TestTwoDigitYearDSTParse()
fmt= udat_open(UDAT_IGNORE,UDAT_IGNORE,"en_US", NULL, 0,pattern, u_strlen(pattern), &status);
s=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("03-Apr-04 2:20:47 o'clock AM PST")+1) );
s=(UChar*)malloc(sizeof(UChar) * (strlen("03-Apr-04 2:20:47 o'clock AM PST")+1) );
u_uastrcpy(s, "03-Apr-04 2:20:47 o'clock AM PST");
pos=0;
d = udat_parse(fmt, s, u_strlen(s), &pos, &status);
@ -89,8 +89,8 @@ void TestTwoDigitYearDSTParse()
udat_close(fullFmt);
udat_close(fmt);
uprv_free(pattern);
uprv_free(s);
free(pattern);
free(s);
}
@ -116,7 +116,7 @@ void TestPartialParse994()
log_err("FAIL: ErrorCode received during test: %s\n", myErrorName(status));
return;
}
s=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("01/01/1997 10:11:42 AM")+1) );
s=(UChar*)malloc(sizeof(UChar) * (strlen("01/01/1997 10:11:42 AM")+1) );
u_uastrcpy(s, "01/01/1997 10:11:42 AM");
pos=0;
d = udat_parse(f, s, u_strlen(s), &pos, &status);
@ -127,7 +127,7 @@ void TestPartialParse994()
tryPat994(f, "yy/MM/dd HH:mm:ss", "97/01/01 ", null);
tryPat994(f, "yy/MM/dd HH:mm:ss", "97/01/01", null);
udat_close(f);
uprv_free(s);
free(s);
}
@ -140,9 +140,9 @@ void tryPat994(UDateFormat* format, const char* pattern, const char* s, UDate ex
UDate null=0;
int32_t pos;
UErrorCode status = U_ZERO_ERROR;
str=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(s) + 1) );
str=(UChar*)malloc(sizeof(UChar) * (strlen(s) + 1) );
u_uastrcpy(str, s);
pat=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(pattern) + 1) );
pat=(UChar*)malloc(sizeof(UChar) * (strlen(pattern) + 1) );
u_uastrcpy(pat, pattern);
log_verbose("Pattern : %s ; String : %s\n", austrdup(pat), austrdup(str));
udat_applyPattern(format, FALSE, pat, u_strlen(pat));
@ -162,8 +162,8 @@ void tryPat994(UDateFormat* format, const char* pattern, const char* s, UDate ex
log_err("FAIL: Expected : %s\n", austrdup(str) );
}
uprv_free(str);
uprv_free(pat);
free(str);
free(pat);
}
@ -178,7 +178,7 @@ void TestRunTogetherPattern985()
UDateFormat *format;
UDate date1, date2;
UErrorCode status = U_ZERO_ERROR;
pattern=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("yyyyMMddHHmmssSSS")+1) );
pattern=(UChar*)malloc(sizeof(UChar) * (strlen("yyyyMMddHHmmssSSS")+1) );
u_uastrcpy(pattern, "yyyyMMddHHmmssSSS");
format = udat_open(UDAT_IGNORE, UDAT_IGNORE, NULL, NULL, 0,pattern, u_strlen(pattern), &status);
if(U_FAILURE(status)){
@ -196,7 +196,7 @@ void TestRunTogetherPattern985()
if (!(date2 == date1)) log_err("FAIL\n");
udat_close(format);
uprv_free(pattern);
free(pattern);
}
@ -225,11 +225,11 @@ void TestCzechMonths459()
lneed=udat_toPattern(fmt, TRUE, NULL, lneed, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
pattern=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
pattern=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
udat_toPattern(fmt, TRUE, pattern, lneed+1, &status);
}
if(U_FAILURE(status)){ log_err("Error in extracting the pattern\n"); }
tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4);
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_uastrcpy(tzID, "GMT");
cal=ucal_open(tzID, u_strlen(tzID), "cs", UCAL_GREGORIAN, &status);
if(U_FAILURE(status)){ log_err("error in ucal_open caldef : %s\n", myErrorName(status)); }
@ -261,8 +261,8 @@ void TestCzechMonths459()
udat_close(fmt);
ucal_close(cal);
uprv_free(pattern);
uprv_free(tzID);
free(pattern);
free(tzID);
}
/**
@ -277,7 +277,7 @@ void TestQuotePattern161()
UChar *dateString;
UErrorCode status = U_ZERO_ERROR;
const char* expStr = "04/13/1999 at 10:42:28 AM ";
pattern=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("MM/dd/yyyy 'at' hh:mm:ss a zzz")+1) );
pattern=(UChar*)malloc(sizeof(UChar) * (strlen("MM/dd/yyyy 'at' hh:mm:ss a zzz")+1) );
u_uastrcpy(pattern, "MM/dd/yyyy 'at' hh:mm:ss a zzz");
/* this is supposed to open default date format, but later on it treats it like it is "en_US"
@ -288,7 +288,7 @@ void TestQuotePattern161()
log_err("error in udat_open: %s\n", myErrorName(status));
return;
}
tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4);
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_uastrcpy(tzID, "PST");
/* this is supposed to open default date format, but later on it treats it like it is "en_US"
- very bad if you try to run the tests on machine where default locale is NOT "en_US" */
@ -300,7 +300,7 @@ void TestQuotePattern161()
currentTime_1 = ucal_getMillis(cal, &status);
dateString = myDateFormat(format, currentTime_1);
exp=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(expStr) + 1) );
exp=(UChar*)malloc(sizeof(UChar) * (strlen(expStr) + 1) );
u_uastrcpy(exp, expStr);
log_verbose("%s\n", austrdup(dateString) );
@ -309,8 +309,8 @@ void TestQuotePattern161()
udat_close(format);
ucal_close(cal);
uprv_free(exp);
uprv_free(tzID);
uprv_free(pattern);
free(exp);
free(tzID);
free(pattern);
}

32
icu4c/source/test/cintltst/cdtrgtst.c
View File

@ -68,7 +68,7 @@ void Test4029195()
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded + 1;
pat=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
pat=(UChar*)malloc(sizeof(UChar) * resultlength);
udat_toPattern(df, TRUE, pat, resultlength, &status);
}
@ -78,7 +78,7 @@ void Test4029195()
fmdt = myFormatit(df, today);
log_verbose("today: %s\n", austrdup(fmdt));
temp=(UChar*)uprv_malloc(sizeof(UChar) * 10);
temp=(UChar*)malloc(sizeof(UChar) * 10);
u_uastrcpy(temp, "M yyyy dd");
udat_applyPattern(df, TRUE, temp, u_strlen(temp));
@ -102,9 +102,9 @@ void Test4029195()
else
log_verbose("Pass: parse and format working fine\n");
udat_close(df);
uprv_free(temp);
free(temp);
if(pat != NULL) {
uprv_free(pat);
free(pat);
}
}
@ -133,7 +133,7 @@ void Test4056591()
};
log_verbose("Testing s[get] 2 digit year start regressively\n");
tzID=(UChar*)uprv_malloc(sizeof(UChar) * 4);
tzID=(UChar*)malloc(sizeof(UChar) * 4);
u_uastrcpy(tzID, "PST");
cal=ucal_open(tzID, u_strlen(tzID), "en_US", UCAL_GREGORIAN, &status);
if(U_FAILURE(status)){
@ -182,7 +182,7 @@ void Test4056591()
udat_close(def);
ucal_close(cal);
uprv_free(tzID);
free(tzID);
}
@ -196,7 +196,7 @@ void Test4059917()
UErrorCode status = U_ZERO_ERROR;
UChar *pattern;
log_verbose("Testing apply pattern and to pattern regressively\n");
pattern=(UChar*)uprv_malloc(sizeof(UChar) * 11);
pattern=(UChar*)malloc(sizeof(UChar) * 11);
u_uastrcpy(pattern, "yyyy/MM/dd");
log_verbose("%s\n", austrdup(pattern) );
def = udat_open(UDAT_IGNORE,UDAT_IGNORE,NULL,NULL,0,pattern, u_strlen(pattern),&status);
@ -205,7 +205,7 @@ void Test4059917()
log_err("FAIL: error in creating the dateformat using openPattern: %s\n", myErrorName(status));
return;
}
myDate=(UChar*)uprv_malloc(sizeof(UChar) * 11);
myDate=(UChar*)malloc(sizeof(UChar) * 11);
u_uastrcpy(myDate, "1970/01/12");
aux917( def, myDate );
@ -221,8 +221,8 @@ void Test4059917()
u_uastrcpy(myDate, "19700112");
aux917( def, myDate );
udat_close(def);
uprv_free(pattern);
uprv_free(myDate);
free(pattern);
free(myDate);
}
@ -240,7 +240,7 @@ void aux917( UDateFormat *fmt, UChar* str)
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded + 1;
pat=(UChar*)uprv_malloc(sizeof(UChar) * (resultlength));
pat=(UChar*)malloc(sizeof(UChar) * (resultlength));
udat_toPattern(fmt, TRUE, pat, resultlength, &status);
}
if(U_FAILURE(status)){
@ -253,7 +253,7 @@ void aux917( UDateFormat *fmt, UChar* str)
if( u_strcmp(formatted,str)!=0) {
log_err("Fail: Want %s Got: %s\n", austrdup(str), austrdup(formatted) );
}
uprv_free(pat);
free(pat);
}
/**
@ -385,7 +385,7 @@ void Test4073003()
for(i= 0; i < 4; i+=2) {
status=U_ZERO_ERROR;
datestr=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(tests[i])+1));
datestr=(UChar*)malloc(sizeof(UChar) * (strlen(tests[i])+1));
u_uastrcpy(datestr, tests[i]);
pos=0;
@ -394,8 +394,8 @@ void Test4073003()
log_err("ERROR : in test 4073003: %s\n", myErrorName(status));
}
uprv_free(datestr);
datestr=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(tests[i+1])+1));
free(datestr);
datestr=(UChar*)malloc(sizeof(UChar) * (strlen(tests[i+1])+1));
u_uastrcpy(datestr, tests[i+1]);
pos=0;
@ -404,7 +404,7 @@ void Test4073003()
if(U_FAILURE(status)){
log_err("ERROR : in test 4073003: %s\n", myErrorName(status));
}
uprv_free(datestr);
free(datestr);
result =myFormatit(fmt, d);
result2 =myFormatit(fmt, dd);

3
icu4c/source/test/cintltst/cintltst.c
View File

@ -97,8 +97,7 @@ int main(int argc, const char* const argv[])
}
/* If no ICU_DATA environment was set, try to fake up one. */
fprintf(stdout, "u_getDataDirectory() = %s\n", u_getDataDirectory());
/* fprintf(stderr, "u_getDataDirectory() = %s\n", u_getDataDirectory()); */
#ifdef XP_MAC_CONSOLE
argc = ccommand((char***)&argv);

956
icu4c/source/test/cintltst/cintltst.dsp
View File

File diff suppressed because it is too large Load Diff

14
icu4c/source/test/cintltst/citertst.c
View File

@ -1195,9 +1195,9 @@ getSingleCEValue(char *primary, char *secondary, char *tertiary,
*terend = '\0';
}
primvalue = (*primary!='\0')?strtoul(primary, &primend, 16):0;
secvalue = (*secondary!='\0')?strtoul(secondary, &secend, 16):0;
tervalue = (*tertiary!='\0')?strtoul(tertiary, &terend, 16):0;
primvalue = (*primary!='\0')?uprv_strtoul(primary, &primend, 16):0;
secvalue = (*secondary!='\0')?uprv_strtoul(secondary, &secend, 16):0;
tervalue = (*tertiary!='\0')?uprv_strtoul(tertiary, &terend, 16):0;
if(primvalue <= 0xFF) {
primvalue <<= 8;
}
@ -1767,7 +1767,7 @@ static void TestCEValidity()
rules = ucol_getRules(coll, &ruleLen);
if (ruleLen > 0) {
rulesCopy = (UChar *)uprv_malloc((ruleLen +
rulesCopy = (UChar *)malloc((ruleLen +
UCOL_TOK_EXTRA_RULE_SPACE_SIZE) * sizeof(UChar));
uprv_memcpy(rulesCopy, rules, ruleLen * sizeof(UChar));
src.source = src.current = rulesCopy;
@ -1791,7 +1791,7 @@ static void TestCEValidity()
codepoints[chLen] = 0;
checkCEValidity(coll, codepoints, chLen, 4, 85);
}
uprv_free(rulesCopy);
free(rulesCopy);
}
ucol_close(coll);
@ -1947,7 +1947,7 @@ static void TestSortKeyValidity(void)
rules = ucol_getRules(coll, &ruleLen);
if (ruleLen > 0) {
rulesCopy = (UChar *)uprv_malloc((ruleLen +
rulesCopy = (UChar *)malloc((ruleLen +
UCOL_TOK_EXTRA_RULE_SPACE_SIZE) * sizeof(UChar));
uprv_memcpy(rulesCopy, rules, ruleLen * sizeof(UChar));
src.source = src.current = rulesCopy;
@ -1971,7 +1971,7 @@ static void TestSortKeyValidity(void)
codepoints[chLen] = 0;
checkSortKeyValidity(coll, codepoints, chLen);
}
uprv_free(rulesCopy);
free(rulesCopy);
}
ucol_close(coll);

70
icu4c/source/test/cintltst/cmsccoll.c
View File

@ -199,7 +199,7 @@ static void IncompleteCntTest(void)
break;
}
backAndForth(iter);
free(iter);
ucol_closeElements(iter);
}
}
}
@ -226,7 +226,7 @@ static void IncompleteCntTest(void)
break;
}
backAndForth(iter);
free(iter);
ucol_closeElements(iter);
}
}
}
@ -646,7 +646,7 @@ static void testCollator(UCollator *coll, UErrorCode *status) {
rules = ucol_getRules(coll, &ruleLen);
if(U_SUCCESS(*status) && ruleLen > 0) {
rulesCopy = (UChar *)uprv_malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar));
rulesCopy = (UChar *)malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar));
uprv_memcpy(rulesCopy, rules, ruleLen*sizeof(UChar));
src.source = src.current = rulesCopy;
src.end = rulesCopy+ruleLen;
@ -730,7 +730,7 @@ static void testCollator(UCollator *coll, UErrorCode *status) {
u_strcpy(first, second);
}
}
uprv_free(rulesCopy);
free(rulesCopy);
}
}
@ -1011,7 +1011,7 @@ static void testAgainstUCA(UCollator *coll, UCollator *UCA, const char *refName,
/*printOutRules(rules);*/
if(U_SUCCESS(*status) && ruleLen > 0) {
rulesCopy = (UChar *)uprv_malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar));
rulesCopy = (UChar *)malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar));
uprv_memcpy(rulesCopy, rules, ruleLen*sizeof(UChar));
src.source = src.current = rulesCopy;
src.end = rulesCopy+ruleLen;
@ -1064,7 +1064,7 @@ static void testAgainstUCA(UCollator *coll, UCollator *UCA, const char *refName,
if(Windiff == 0) {
log_verbose("No immediate difference with Win32!\n");
}
uprv_free(rulesCopy);
free(rulesCopy);
}
}
@ -1109,7 +1109,7 @@ static void testCEs(UCollator *coll, UErrorCode *status) {
ucol_initInverseUCA(status);
if(U_SUCCESS(*status) && ruleLen > 0) {
rulesCopy = (UChar *)uprv_malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar));
rulesCopy = (UChar *)malloc((ruleLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar));
uprv_memcpy(rulesCopy, rules, ruleLen*sizeof(UChar));
src.source = src.current = rulesCopy;
src.end = rulesCopy+ruleLen;
@ -1202,7 +1202,7 @@ static void testCEs(UCollator *coll, UErrorCode *status) {
lastCE = currCE & 0xFFFFFF3F;
lastContCE = currContCE & 0xFFFFFFBF;
}
uprv_free(rulesCopy);
free(rulesCopy);
}
ucol_close(UCA);
}
@ -1631,8 +1631,8 @@ static void TestComposeDecompose(void) {
noOfLoc = uloc_countAvailable();
t = uprv_malloc(0x30000 * sizeof(tester *));
t[0] = (tester *)uprv_malloc(sizeof(tester));
t = malloc(0x30000 * sizeof(tester *));
t[0] = (tester *)malloc(sizeof(tester));
for(u = 0; u < 0x30000; u++) {
len = 0;
@ -1648,7 +1648,7 @@ static void TestComposeDecompose(void) {
t[noCases]->NFC[len] = 0;
}
noCases++;
t[noCases] = (tester *)uprv_malloc(sizeof(tester));
t[noCases] = (tester *)malloc(sizeof(tester));
uprv_memset(t[noCases], 0, sizeof(tester));
}
}
@ -1708,9 +1708,9 @@ static void TestComposeDecompose(void) {
}
}
for(u = 0; u <= noCases; u++) {
uprv_free(t[u]);
free(t[u]);
}
uprv_free(t);
free(t);
}
static void TestEmptyRule(void) {
@ -2151,8 +2151,8 @@ static void TestIncrementalNormalize(void) {
UChar *strA;
UChar *strB;
strA = uprv_malloc((maxSLen+1) * sizeof(UChar));
strB = uprv_malloc((maxSLen+1) * sizeof(UChar));
strA = malloc((maxSLen+1) * sizeof(UChar));
strB = malloc((maxSLen+1) * sizeof(UChar));
coll = ucol_open("en_US", &status);
ucol_setNormalization(coll, UNORM_NFD);
@ -2173,8 +2173,8 @@ static void TestIncrementalNormalize(void) {
ucol_setStrength(coll, UCOL_IDENTICAL); /* Do again with the slow, general impl.*/
doTest(coll, strA, strB, UCOL_EQUAL);
}
uprv_free(strA);
uprv_free(strB);
free(strA);
free(strB);
}
@ -2836,7 +2836,7 @@ static void TestVariableTopSetting(void) {
log_verbose("Slide variable top over UCARules\n");
rulesLen = ucol_getRulesEx(coll, UCOL_FULL_RULES, rulesCopy, 0);
rulesCopy = (UChar *)uprv_malloc((rulesLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar));
rulesCopy = (UChar *)malloc((rulesLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE)*sizeof(UChar));
rulesLen = ucol_getRulesEx(coll, UCOL_FULL_RULES, rulesCopy, rulesLen+UCOL_TOK_EXTRA_RULE_SPACE_SIZE);
if(U_SUCCESS(status) && rulesLen > 0) {
@ -2994,7 +2994,7 @@ static void TestVariableTopSetting(void) {
if(status != U_INTERNAL_PROGRAM_ERROR) {
log_err("Bad reaction to passed error!\n");
}
uprv_free(rulesCopy);
free(rulesCopy);
ucol_close(coll);
}
@ -3038,7 +3038,7 @@ static void TestExtremeCompression(void) {
int32_t i = 0;
for(i = 0; i<4; i++) {
test[i] = (char *)uprv_malloc(2048*sizeof(char));
test[i] = (char *)malloc(2048*sizeof(char));
uprv_memset(test[i], 'a', 2046*sizeof(char));
test[i][2046] = (char)('a'+i);
test[i][2047] = 0;
@ -3047,7 +3047,7 @@ static void TestExtremeCompression(void) {
genericLocaleStarter("en_US", (const char **)test, 4);
for(i = 0; i<4; i++) {
uprv_free(test[i]);
free(test[i]);
}
}
@ -3409,10 +3409,10 @@ static void TestMergeSortKeys(void) {
const char* suffix = "egg";
char outBuff1[256], outBuff2[256];
uint8_t **sortkeys = (uint8_t **)uprv_malloc(casesSize*sizeof(uint8_t *));
uint8_t **mergedPrefixkeys = (uint8_t **)uprv_malloc(casesSize*sizeof(uint8_t *));
uint8_t **mergedSuffixkeys = (uint8_t **)uprv_malloc(casesSize*sizeof(uint8_t *));
uint32_t *sortKeysLen = (uint32_t *)uprv_malloc(casesSize*sizeof(uint32_t));
uint8_t **sortkeys = (uint8_t **)malloc(casesSize*sizeof(uint8_t *));
uint8_t **mergedPrefixkeys = (uint8_t **)malloc(casesSize*sizeof(uint8_t *));
uint8_t **mergedSuffixkeys = (uint8_t **)malloc(casesSize*sizeof(uint8_t *));
uint32_t *sortKeysLen = (uint32_t *)malloc(casesSize*sizeof(uint32_t));
uint8_t prefixKey[256], suffixKey[256];
uint32_t prefixKeyLen = 0, suffixKeyLen = 0, i = 0;
UChar buffer[256];
@ -3425,9 +3425,9 @@ static void TestMergeSortKeys(void) {
genericLocaleStarter("en", cases, casesSize);
for(i = 0; i<casesSize; i++) {
sortkeys[i] = (uint8_t *)uprv_malloc(256*sizeof(uint8_t));
mergedPrefixkeys[i] = (uint8_t *)uprv_malloc(256*sizeof(uint8_t));
mergedSuffixkeys[i] = (uint8_t *)uprv_malloc(256*sizeof(uint8_t));
sortkeys[i] = (uint8_t *)malloc(256*sizeof(uint8_t));
mergedPrefixkeys[i] = (uint8_t *)malloc(256*sizeof(uint8_t));
mergedSuffixkeys[i] = (uint8_t *)malloc(256*sizeof(uint8_t));
}
unescapedLen = u_unescape(prefix, buffer, 256);
@ -3480,14 +3480,14 @@ static void TestMergeSortKeys(void) {
for(i = 0; i<casesSize; i++) {
uprv_free(sortkeys[i]);
uprv_free(mergedPrefixkeys[i]);
uprv_free(mergedSuffixkeys[i]);
free(sortkeys[i]);
free(mergedPrefixkeys[i]);
free(mergedSuffixkeys[i]);
}
uprv_free(sortkeys);
uprv_free(mergedPrefixkeys);
uprv_free(mergedSuffixkeys);
uprv_free(sortKeysLen);
free(sortkeys);
free(mergedPrefixkeys);
free(mergedSuffixkeys);
free(sortKeysLen);
ucol_close(coll);
/* need to finish this up */
}

10
icu4c/source/test/cintltst/cmsgtst.c
View File

@ -139,7 +139,7 @@ static void MessageFormatTest( void )
{
status=U_ZERO_ERROR;
resultlength=resultLengthOut+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
u_formatMessage( "en_US",testCasePatterns[i], patternlength, result, resultlength,
&status, 1, 3456.00, d1);
}
@ -154,7 +154,7 @@ static void MessageFormatTest( void )
log_err("FAIL: Error in MessageFormat on testcase : %d\n GOT %s EXPECTED %s\n", i,
austrdup(result), austrdup(testResultStrings[i]) );
}
uprv_free(result);
free(result);
result=NULL;
}
}
@ -187,11 +187,11 @@ static void MessageFormatTest( void )
resultLength = umsg_format(formatter,result,resultLength,&ec,1,3456.00,d1);
if(ec==U_BUFFER_OVERFLOW_ERROR){
ec=U_ZERO_ERROR;
result = (UChar*) uprv_malloc(U_SIZEOF_UCHAR*resultLength+2);
result = (UChar*) malloc(U_SIZEOF_UCHAR*resultLength+2);
resultLength = umsg_format(formatter,result,resultLength+2,&ec,1,3456.00,d1);
if(U_FAILURE(ec)){
log_err("ERROR: failure in message format on testcase %d: %s\n", i, u_errorName(status) );
uprv_free(result);
free(result);
return;
}
@ -221,7 +221,7 @@ static void MessageFormatTest( void )
if(U_FAILURE(ec)){
log_err("umsg_parse could not parse the pattern. Error: %s.\n",u_errorName(ec));
}
uprv_free(result);
free(result);
}else{
log_err("FAIL: Expected U_BUFFER_OVERFLOW error while preflighting got: %s for testCasePatterns[%d]",u_errorName(ec),i);
}

84
icu4c/source/test/cintltst/cnmdptst.c
View File

@ -77,7 +77,7 @@ static void TestPatterns(void)
lneed=unum_toPattern(fmt, FALSE, NULL, lneed, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status= U_ZERO_ERROR;
unewp=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
unewp=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
unum_toPattern(fmt, FALSE, unewp, lneed+1, &status);
}
if(U_FAILURE(status)){
@ -91,7 +91,7 @@ static void TestPatterns(void)
lneed=unum_format(fmt, 0, NULL, lneed, NULL, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
str=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
unum_format(fmt, 0, str, lneed+1, NULL, &status);
}
if(U_FAILURE(status)) {
@ -103,8 +103,8 @@ static void TestPatterns(void)
log_err("FAIL: Pattern %s should format zero as %s; %s Seen instead\n", pat[i], num[i], austrdup(str) );
}
uprv_free(unewp);
uprv_free(str);
free(unewp);
free(str);
unum_close(fmt);
}
}
@ -129,7 +129,7 @@ static void TestQuotes(void)
lneed=unum_format(fmt, 123, NULL, lneed, NULL, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
str=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
unum_format(fmt, 123, str, lneed+1, NULL, &status);
}
if(U_FAILURE(status)) {
@ -141,7 +141,7 @@ static void TestQuotes(void)
if(u_strcmp(str, res) != 0)
log_err("FAIL: Expected afo'ob123");
uprv_free(str);
free(str);
unum_close(fmt);
@ -157,7 +157,7 @@ static void TestQuotes(void)
lneed=unum_format(fmt, 123, NULL, lneed, NULL, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
str=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
unum_format(fmt, 123, str, lneed+1, NULL, &status);
}
if(U_FAILURE(status)) {
@ -170,7 +170,7 @@ static void TestQuotes(void)
if(u_strcmp(str, res) != 0)
log_err("FAIL: Expected a'b123\n");
uprv_free(str);
free(str);
unum_close(fmt);
}
@ -240,7 +240,7 @@ static void TestExponential(void)
ilval = 0;
for (p=0; p < pat_length; ++p)
{
upat=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(pat[p])+1) );
upat=(UChar*)malloc(sizeof(UChar) * (strlen(pat[p])+1) );
u_uastrcpy(upat, pat[p]);
fmt=unum_open(UNUM_IGNORE,upat, u_strlen(upat), "en_US",NULL, &status);
if (U_FAILURE(status)) {
@ -257,7 +257,7 @@ static void TestExponential(void)
lneed=unum_formatDouble(fmt, val[v], NULL, lneed, NULL, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
str=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
unum_formatDouble(fmt, val[v], str, lneed+1, NULL, &status);
}
if(U_FAILURE(status)) {
@ -280,7 +280,7 @@ static void TestExponential(void)
else
log_err(" FAIL: Partial parse ( %d chars ) -> %e\n", ppos, a);
uprv_free(str);
free(str);
}
for (v=0; v<lval_length; ++v)
{
@ -289,7 +289,7 @@ static void TestExponential(void)
lneed=unum_formatDouble(fmt, lval[v], NULL, lneed, NULL, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
str=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
unum_formatDouble(fmt, lval[v], str, lneed+1, NULL, &status);
}
if(U_FAILURE(status)) {
@ -311,13 +311,13 @@ static void TestExponential(void)
else
log_err(" FAIL: Partial parse ( %d chars ) -> %e\n", ppos, a);
uprv_free(str);
free(str);
}
ival += val_length;
ilval += lval_length;
unum_close(fmt);
uprv_free(upat);
free(upat);
}
}
@ -335,7 +335,7 @@ static void TestCurrencySign(void)
UErrorCode status = U_ZERO_ERROR;
char tempBuf[256];
pattern=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("*#,##0.00;-*#,##0.00") + 1) );
pattern=(UChar*)malloc(sizeof(UChar) * (strlen("*#,##0.00;-*#,##0.00") + 1) );
u_uastrcpy(pattern, "*#,##0.00;-*#,##0.00");
pattern[0]=pattern[11]=0xa4; /* insert latin-1 currency symbol */
fmt = unum_open(UNUM_IGNORE,pattern, u_strlen(pattern), "en_US",NULL, &status);
@ -346,7 +346,7 @@ static void TestCurrencySign(void)
lneed=unum_formatDouble(fmt, 1234.56, NULL, lneed, NULL, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
str=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
unum_formatDouble(fmt, 1234.56, str, lneed+1, NULL, &status);
}
if(U_FAILURE(status)) {
@ -356,37 +356,37 @@ static void TestCurrencySign(void)
lneed=unum_toPattern(fmt, FALSE, NULL, lneed, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
pat=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
pat=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
unum_formatDouble(fmt, FALSE, pat, lneed+1, NULL, &status);
}
log_verbose("Pattern \" %s \" \n", u_austrcpy(tempBuf, pat));
log_verbose("Format 1234.56 -> %s\n", u_austrcpy(tempBuf, str) );
res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("$1,234.56")+1) );
res=(UChar*)malloc(sizeof(UChar) * (strlen("$1,234.56")+1) );
u_uastrcpy(res, "$1,234.56");
if (u_strcmp(str, res) !=0) log_err("FAIL: Expected $1,234.56\n");
uprv_free(str);
uprv_free(res);
uprv_free(pat);
free(str);
free(res);
free(pat);
lneed=0;
lneed=unum_formatDouble(fmt, -1234.56, NULL, lneed, NULL, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
str=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
unum_formatDouble(fmt, -1234.56, str, lneed+1, NULL, &status);
}
if(U_FAILURE(status)) {
log_err("Error in formatting using unum_format(.....): %s\n", myErrorName(status) );
}
res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen("-$1,234.56")+1) );
res=(UChar*)malloc(sizeof(UChar) * (strlen("-$1,234.56")+1) );
u_uastrcpy(res, "-$1,234.56");
if (u_strcmp(str, res) != 0) log_err("FAIL: Expected -$1,234.56\n");
uprv_free(str);
uprv_free(res);
free(str);
free(res);
unum_close(fmt);
uprv_free(pattern);
free(pattern);
}
/**
@ -415,22 +415,22 @@ static void TestCurrency(void)
lneed= unum_formatDouble(currencyFmt, 1.50, NULL, lneed, NULL, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
str=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
pos.field = 0;
unum_formatDouble(currencyFmt, 1.50, str, lneed+1, &pos, &status);
}
if(U_FAILURE(status)) {
log_err("Error in formatting using unum_formatDouble(.....): %s\n", myErrorName(status) );
}
res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(result[i])+1) );
res=(UChar*)malloc(sizeof(UChar) * (strlen(result[i])+1) );
u_uastrcpy(res, result[i]);
u_UCharsToChars(str,cStr,u_strlen(res));
if (u_strcmp(str, res) != 0){
log_err("FAIL: Expected %s Got: %s for locale: %s\n", result[i],cStr,locale[i]);
}
unum_close(currencyFmt);
uprv_free(str);
uprv_free(res);
free(str);
free(res);
}
}
/**
@ -471,14 +471,14 @@ static void TestCurrencyPreEuro(void)
lneed= unum_formatDouble(currencyFmt, 1.50, NULL, lneed, NULL, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
str=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
pos.field = 0;
unum_formatDouble(currencyFmt, 1.50, str, lneed+1, &pos, &status);
}
if(U_FAILURE(status)) {
log_err("Error in formatting using unum_formatDouble(.....): %s\n", myErrorName(status) );
}
res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(result[i])+1) );
res=(UChar*)malloc(sizeof(UChar) * (strlen(result[i])+1) );
u_unescape(result[i],res,(int32_t)(strlen(result[i])+1));
u_UCharsToChars(str,cStr,u_strlen(str));
if (u_strcmp(str, res) != 0){
@ -486,8 +486,8 @@ static void TestCurrencyPreEuro(void)
}
unum_close(currencyFmt);
uprv_free(str);
uprv_free(res);
free(str);
free(res);
}
}
@ -552,14 +552,14 @@ static void TestCurrencyObject(void)
lneed= unum_formatDouble(currencyFmt, 1234.56, NULL, lneed, NULL, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
str=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
str=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
pos.field = 0;
unum_formatDouble(currencyFmt, 1234.56, str, lneed+1, &pos, &status);
}
if(U_FAILURE(status)) {
log_err("Error in formatting using unum_formatDouble(.....): %s\n", myErrorName(status) );
}
res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(result[i])+1) );
res=(UChar*)malloc(sizeof(UChar) * (strlen(result[i])+1) );
u_unescape(result[i],res, (int32_t)(strlen(result[i])+1));
u_UCharsToChars(str,cStr,u_strlen(str));
if (u_strcmp(str, res) != 0){
@ -567,8 +567,8 @@ static void TestCurrencyObject(void)
}
unum_close(currencyFmt);
uprv_free(str);
uprv_free(res);
free(str);
free(res);
}
}
@ -611,7 +611,7 @@ static void roundingTest(UNumberFormat* nf, double x, int32_t maxFractionDigits,
lneed=unum_formatDouble(nf, x, NULL, lneed, NULL, &status);
if(status==U_BUFFER_OVERFLOW_ERROR){
status=U_ZERO_ERROR;
out=(UChar*)uprv_malloc(sizeof(UChar) * (lneed+1) );
out=(UChar*)malloc(sizeof(UChar) * (lneed+1) );
pos.field=0;
unum_formatDouble(nf, x, out, lneed+1, &pos, &status);
}
@ -620,13 +620,13 @@ static void roundingTest(UNumberFormat* nf, double x, int32_t maxFractionDigits,
}
/*Need to use log_verbose here. Problem with the float*/
/*printf("%f format with %d fraction digits to %s\n", x, maxFractionDigits, austrdup(out) );*/
res=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(expected)+1) );
res=(UChar*)malloc(sizeof(UChar) * (strlen(expected)+1) );
u_uastrcpy(res, expected);
if (u_strcmp(out, res) != 0)
log_err("FAIL: Expected: %s or %s\n", expected, austrdup(res) );
uprv_free(res);
free(res);
if(out != NULL) {
uprv_free(out);
free(out);
}
}

32
icu4c/source/test/cintltst/cnumtst.c
View File

@ -188,7 +188,7 @@ static void TestNumberFormat()
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
/* for (i = 0; i < 100000; i++) */
{
unum_format(cur_def, l, result, resultlength, &pos1, &status);
@ -209,7 +209,7 @@ static void TestNumberFormat()
log_err("Fail: Error in complete number Formatting using unum_format()\nGot: b=%d end=%d\nExpected: b=1 end=12\n",
pos1.beginIndex, pos1.endIndex);
uprv_free(result);
free(result);
result = 0;
log_verbose("\nTesting unum_formatDouble()\n");
@ -221,7 +221,7 @@ uprv_free(result);
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
/* for (i = 0; i < 100000; i++) */
{
unum_formatDouble(cur_def, d, result, resultlength, &pos2, &status);
@ -277,7 +277,7 @@ uprv_free(result);
else
log_verbose("Pass: parsing successful\n");
uprv_free(result);
free(result);
u_uastrcpy(temp1, "($10,456.3E1])");
parsepos=0;
@ -297,7 +297,7 @@ uprv_free(result);
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
/* for (i = 0; i < 100000; i++)*/
{
unum_format(per_fr, l, result, resultlength, &pos1, &status);
@ -325,7 +325,7 @@ uprv_free(result);
else
log_verbose("Pass: parsing successful\n");
uprv_free(result);
free(result);
/* create a number format using unum_openPattern(....)*/
log_verbose("\nTesting unum_openPattern()\n");
@ -346,7 +346,7 @@ uprv_free(result);
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
unum_toPattern(pattern, FALSE, result, resultlength, &status);
}
if(U_FAILURE(status))
@ -359,7 +359,7 @@ uprv_free(result);
log_err("FAIL: Error in extracting the pattern using unum_toPattern()\n");
else
log_verbose("Pass: extracted the pattern correctly using unum_toPattern()\n");
uprv_free(result);
free(result);
}
/*Testing unum_getSymbols() and unum_setSymbols()*/
@ -371,7 +371,7 @@ uprv_free(result);
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
unum_toPattern(cur_def, FALSE, result, resultlength, &status);
}
if(U_FAILURE(status))
@ -386,7 +386,7 @@ uprv_free(result);
log_err("error in unum_openPattern(): %s\n", myErrorName(status));
}
uprv_free(result);
free(result);
/*getting the symbols of cur_def */
/*set the symbols of cur_frpattern to cur_def */
@ -407,7 +407,7 @@ uprv_free(result);
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
unum_format(cur_def, l, result, resultlength, &pos1, &status);
}
if(U_FAILURE(status))
@ -462,7 +462,7 @@ uprv_free(result);
/*----------- */
uprv_free(result);
free(result);
/* Testing unum_get/setSymbol() */
for(i = 0; i < UNUM_FORMAT_SYMBOL_COUNT; ++i) {
@ -719,7 +719,7 @@ static void TestNumberFormatPadding()
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
unum_toPattern(pattern, FALSE, result, resultlength, &status);
}
if(U_FAILURE(status))
@ -732,7 +732,7 @@ static void TestNumberFormatPadding()
log_err("FAIL: Error in extracting the padding pattern using unum_toPattern()\n");
else
log_verbose("Pass: extracted the padding pattern correctly using unum_toPattern()\n");
uprv_free(result);
free(result);
}
/* u_uastrcpy(temp1, "(xxxxxxx10,456.37)"); */
u_uastrcpy(temp1, "xxxxx(10,456.37)");
@ -743,7 +743,7 @@ uprv_free(result);
{
status=U_ZERO_ERROR;
resultlength=resultlengthneeded+1;
result=(UChar*)uprv_malloc(sizeof(UChar) * resultlength);
result=(UChar*)malloc(sizeof(UChar) * resultlength);
unum_formatDouble(pattern, d, result, resultlength, NULL, &status);
}
if(U_FAILURE(status))
@ -776,7 +776,7 @@ uprv_free(result);
log_err("Fail: Error in padding parsing\n");
else
log_verbose("Pass: padding parsing successful\n");
uprv_free(result);
free(result);
}
}

8
icu4c/source/test/cintltst/creststn.c
View File

@ -1292,7 +1292,7 @@ static UBool testTag(const char* frag,
free(base);
base = NULL;
}
base=(UChar*)uprv_malloc(sizeof(UChar)*(strlen(NAME[j]) + 1));
base=(UChar*)malloc(sizeof(UChar)*(strlen(NAME[j]) + 1));
u_uastrcpy(base,NAME[j]);
break;
@ -1302,7 +1302,7 @@ static UBool testTag(const char* frag,
free(base);
base = NULL;
}
base = (UChar*) uprv_malloc(sizeof(UChar) * 1);
base = (UChar*) malloc(sizeof(UChar) * 1);
*base = 0x0000;
}
}
@ -1323,11 +1323,11 @@ static UBool testTag(const char* frag,
string=ures_getStringByKey(theBundle, tag, &len, &status);
if(U_SUCCESS(status)) {
expected_string=(UChar*)uprv_malloc(sizeof(UChar)*(u_strlen(base) + 4));
expected_string=(UChar*)malloc(sizeof(UChar)*(u_strlen(base) + 4));
u_strcpy(expected_string,base);
CONFIRM_INT_EQ(len, u_strlen(expected_string));
}else{
expected_string = (UChar*)uprv_malloc(sizeof(UChar)*(u_strlen(kERROR) + 1));
expected_string = (UChar*)malloc(sizeof(UChar)*(u_strlen(kERROR) + 1));
u_strcpy(expected_string,kERROR);
string=kERROR;
}

4
icu4c/source/test/cintltst/ctstdep.c
View File

@ -111,7 +111,7 @@ TestDeprecatedCollationAPI(void)
log_err("Creation of iterator failed\n");
break;
}
free(iter);
ucol_closeElements(iter);
}
}
}
@ -134,7 +134,7 @@ TestDeprecatedCollationAPI(void)
log_err("Creation of iterator failed\n");
break;
}
free(iter);
ucol_closeElements(iter);
}
}
}

43
icu4c/source/test/cintltst/cucdtst.c
View File

@ -18,14 +18,17 @@
#include "unicode/putil.h"
#include "unicode/ustring.h"
#include "unicode/uloc.h"
#include "cstring.h"
#include "cmemory.h"
#include "cintltst.h"
#include "cucdtst.h"
#include "uparse.h"
#include "unicode/uscript.h"
#include "usc_impl.h"
#include <string.h>
#include <math.h>
#include <stdlib.h>
/* prototypes --------------------------------------------------------------- */
static void setUpDataTable(void);
@ -422,7 +425,6 @@ static void TestMisc()
}
}
/* Tests for isControl(u_iscntrl()) and isPrintable(u_isprint()) */
static void TestControlPrint()
{
@ -554,7 +556,7 @@ static void TestIdentifier()
* Then it should check that the areas contain all the same properties except where overridden.
* For this, it would have had to set a flag for which code points were listed explicitly.
*/
static void U_CALLCONV
void U_CALLCONV
unicodeDataLineFn(void *context,
char *fields[][2], int32_t fieldCount,
UErrorCode *pErrorCode)
@ -567,7 +569,7 @@ unicodeDataLineFn(void *context,
int8_t type;
/* get the character code, field 0 */
c=uprv_strtoul(fields[0][0], &end, 16);
c=strtoul(fields[0][0], &end, 16);
if(end<=fields[0][0] || end!=fields[0][1]) {
log_err("error: syntax error in field 0 at %s\n", fields[0][0]);
return;
@ -585,7 +587,7 @@ unicodeDataLineFn(void *context,
}
/* get canonical combining class, field 3 */
value=uprv_strtoul(fields[3][0], &end, 10);
value=strtoul(fields[3][0], &end, 10);
if(end<=fields[3][0] || end!=fields[3][1]) {
log_err("error: syntax error in field 3 at code 0x%lx\n", c);
return;
@ -608,7 +610,7 @@ unicodeDataLineFn(void *context,
/* get ISO Comment, field 11 */
*fields[11][1]=0;
i=u_getISOComment(c, buffer, sizeof(buffer), pErrorCode);
if(U_FAILURE(*pErrorCode) || 0!=uprv_strcmp(fields[11][0], buffer)) {
if(U_FAILURE(*pErrorCode) || 0!=strcmp(fields[11][0], buffer)) {
log_err("error: u_getISOComment(U+%04lx) wrong (%s): \"%s\" should be \"%s\"\n",
c, u_errorName(*pErrorCode),
U_FAILURE(*pErrorCode) ? buffer : "[error]",
@ -617,7 +619,7 @@ unicodeDataLineFn(void *context,
/* get uppercase mapping, field 12 */
if(fields[12][0]!=fields[12][1]) {
value=uprv_strtoul(fields[12][0], &end, 16);
value=strtoul(fields[12][0], &end, 16);
if(end!=fields[12][1]) {
log_err("error: syntax error in field 12 at code 0x%lx\n", c);
return;
@ -634,7 +636,7 @@ unicodeDataLineFn(void *context,
/* get lowercase mapping, field 13 */
if(fields[13][0]!=fields[13][1]) {
value=uprv_strtoul(fields[13][0], &end, 16);
value=strtoul(fields[13][0], &end, 16);
if(end!=fields[13][1]) {
log_err("error: syntax error in field 13 at code 0x%lx\n", c);
return;
@ -651,7 +653,7 @@ unicodeDataLineFn(void *context,
/* get titlecase mapping, field 14 */
if(fields[14][0]!=fields[14][1]) {
value=uprv_strtoul(fields[14][0], &end, 16);
value=strtoul(fields[14][0], &end, 16);
if(end!=fields[14][1]) {
log_err("error: syntax error in field 14 at code 0x%lx\n", c);
return;
@ -693,7 +695,7 @@ enumTypeRange(const void *context, UChar32 start, UChar32 limit, UCharCategory t
UChar32 c;
int i, count;
if(0!=uprv_strcmp((const char *)context, "a1")) {
if(0!=strcmp((const char *)context, "a1")) {
log_err("error: u_enumCharTypes() passes on an incorrect context pointer\n");
return FALSE;
}
@ -816,7 +818,7 @@ static void TestUnicodeData()
u_parseDelimitedFile(newPath, ';', fields, 15, unicodeDataLineFn, NULL, &errorCode);
if(errorCode==U_FILE_ACCESS_ERROR) {
errorCode=U_ZERO_ERROR;
u_parseDelimitedFile(backupPath, ';', fields, 15, unicodeDataLineFn, NULL, &errorCode);
// u_parseDelimitedFile(backupPath, ';', fields, 15, unicodeDataLineFn, NULL, &errorCode);
}
if(U_FAILURE(errorCode)) {
log_err("error parsing UnicodeData.txt: %s\n", u_errorName(errorCode));
@ -855,6 +857,7 @@ static void TestUnicodeData()
u_enumCharTypes(enumTypeRange, "a1");
}
/*internal functions ----*/
static int32_t MakeProp(char* str)
{
@ -1618,7 +1621,7 @@ enumCharNamesFn(void *context,
int32_t *pCount=(int32_t *)context;
int i;
if(length<=0 || length!=(int32_t)uprv_strlen(name)) {
if(length<=0 || length!=(int32_t)strlen(name)) {
/* should not be called with an empty string or invalid length */
log_err("u_enumCharName(0x%lx)=%s but length=%ld\n", name, length);
return TRUE;
@ -1629,17 +1632,17 @@ enumCharNamesFn(void *context,
if(code==names[i].code) {
switch (nameChoice) {
case U_EXTENDED_CHAR_NAME:
if(0!=uprv_strcmp(name, names[i].extName)) {
if(0!=strcmp(name, names[i].extName)) {
log_err("u_enumCharName(0x%lx - Extended)=%s instead of %s\n", code, name, names[i].extName);
}
break;
case U_UNICODE_CHAR_NAME:
if(0!=uprv_strcmp(name, names[i].name)) {
if(0!=strcmp(name, names[i].name)) {
log_err("u_enumCharName(0x%lx)=%s instead of %s\n", code, name, names[i].name);
}
break;
case U_UNICODE_10_CHAR_NAME:
if(names[i].oldName[0]==0 || 0!=uprv_strcmp(name, names[i].oldName)) {
if(names[i].oldName[0]==0 || 0!=strcmp(name, names[i].oldName)) {
log_err("u_enumCharName(0x%lx - 1.0)=%s instead of %s\n", code, name, names[i].oldName);
}
break;
@ -1696,7 +1699,7 @@ TestCharNames() {
log_err("u_charName(0x%lx) error %s\n", names[i].code, u_errorName(errorCode));
return;
}
if(length<0 || 0!=uprv_strcmp(name, names[i].name) || length!=(uint16_t)uprv_strlen(name)) {
if(length<0 || 0!=strcmp(name, names[i].name) || length!=(uint16_t)strlen(name)) {
log_err("u_charName(0x%lx) gets: %s (length %ld) instead of: %s\n", names[i].code, name, length, names[i].name);
}
@ -1718,7 +1721,7 @@ TestCharNames() {
log_err("u_charName(0x%lx - 1.0) error %s\n", names[i].code, u_errorName(errorCode));
return;
}
if(length<0 || (length>0 && 0!=uprv_strcmp(name, names[i].oldName)) || length!=(uint16_t)uprv_strlen(name)) {
if(length<0 || (length>0 && 0!=strcmp(name, names[i].oldName)) || length!=(uint16_t)strlen(name)) {
log_err("u_charName(0x%lx - 1.0) gets %s length %ld instead of nothing or %s\n", names[i].code, name, length, names[i].oldName);
}
@ -2535,7 +2538,7 @@ TestAdditionalProperties() {
/* test u_charAge() */
for(i=0; i<sizeof(charAges)/sizeof(charAges[0]); ++i) {
u_charAge(charAges[i].c, version);
if(0!=uprv_memcmp(version, charAges[i].version, sizeof(UVersionInfo))) {
if(0!=memcmp(version, charAges[i].version, sizeof(UVersionInfo))) {
log_err("error: u_charAge(U+%04lx)={ %u, %u, %u, %u } instead of { %u, %u, %u, %u }\n",
charAges[i].c,
version[0], version[1], version[2], version[3],
@ -2678,7 +2681,7 @@ TestNumericProperties(void) {
if(type!=values[i].type) {
log_err("UCHAR_NUMERIC_TYPE(U+%04lx)=%d should be %d\n", c, type, values[i].type);
}
if(0.000001 <= uprv_fabs(nv - values[i].numValue)) {
if(0.000001 <= fabs(nv - values[i].numValue)) {
log_err("u_getNumericValue(U+%04lx)=%g should be %g\n", c, nv, values[i].numValue);
}
}

24
icu4c/source/test/cintltst/custrtrn.c
View File

@ -458,7 +458,7 @@ static void Test_UChar_WCHART_API(void){
if(err == U_BUFFER_OVERFLOW_ERROR){
err=U_ZERO_ERROR;
wDest =(wchar_t*) uprv_malloc(sizeof(wchar_t) * (reqLen+1));
wDest =(wchar_t*) malloc(sizeof(wchar_t) * (reqLen+1));
wDestLen = reqLen+1;
u_strToWCS(wDest,wDestLen,&reqLen,uSrc,uSrcLen-1,&err);
}
@ -469,7 +469,7 @@ static void Test_UChar_WCHART_API(void){
if(err == U_BUFFER_OVERFLOW_ERROR){
err =U_ZERO_ERROR;
uDest = (UChar*) uprv_malloc(sizeof(UChar) * (reqLen+1));
uDest = (UChar*) malloc(sizeof(UChar) * (reqLen+1));
uDestLen = reqLen + 1;
u_strFromWCS(uDest, uDestLen,&reqLen,wDest,reqLen,&err);
}else if(U_FAILURE(err)){
@ -491,8 +491,8 @@ static void Test_UChar_WCHART_API(void){
if(failed){
log_err("u_strToWCS() failed \n");
}
uprv_free(wDest);
uprv_free(uDest);
free(wDest);
free(uDest);
/* test with embeded nulls */
@ -507,7 +507,7 @@ static void Test_UChar_WCHART_API(void){
if(err == U_BUFFER_OVERFLOW_ERROR){
err=U_ZERO_ERROR;
wDest =(wchar_t*) uprv_malloc(sizeof(wchar_t) * (reqLen+1));
wDest =(wchar_t*) malloc(sizeof(wchar_t) * (reqLen+1));
wDestLen = reqLen+1;
u_strToWCS(wDest,wDestLen,&reqLen,uSrc,uSrcLen-1,&err);
}
@ -517,7 +517,7 @@ static void Test_UChar_WCHART_API(void){
if(err == U_BUFFER_OVERFLOW_ERROR){
err =U_ZERO_ERROR;
uDest = (UChar*) uprv_malloc(sizeof(UChar) * (reqLen+1));
uDest = (UChar*) malloc(sizeof(UChar) * (reqLen+1));
uDestLen = reqLen + 1;
u_strFromWCS(uDest, uDestLen,&reqLen,wDest,reqLen,&err);
}
@ -536,8 +536,8 @@ static void Test_UChar_WCHART_API(void){
if(failed){
log_err("u_strToWCS() failed \n");
}
uprv_free(wDest);
uprv_free(uDest);
free(wDest);
free(uDest);
}
@ -555,7 +555,7 @@ static void Test_UChar_WCHART_API(void){
if(err == U_BUFFER_OVERFLOW_ERROR){
err=U_ZERO_ERROR;
wDest =(wchar_t*) uprv_malloc(sizeof(wchar_t) * (reqLen+1));
wDest =(wchar_t*) malloc(sizeof(wchar_t) * (reqLen+1));
wDestLen = reqLen+1;
u_strToWCS(wDest,wDestLen,&reqLen,uSrc,-1,&err);
}
@ -565,7 +565,7 @@ static void Test_UChar_WCHART_API(void){
if(err == U_BUFFER_OVERFLOW_ERROR){
err =U_ZERO_ERROR;
uDest = (UChar*) uprv_malloc(sizeof(UChar) * (reqLen+1));
uDest = (UChar*) malloc(sizeof(UChar) * (reqLen+1));
uDestLen = reqLen + 1;
u_strFromWCS(uDest, uDestLen,&reqLen,wDest,-1,&err);
}
@ -584,8 +584,8 @@ static void Test_UChar_WCHART_API(void){
if(failed){
log_err("u_strToWCS() failed \n");
}
uprv_free(wDest);
uprv_free(uDest);
free(wDest);
free(uDest);
}
}

16
icu4c/source/test/cintltst/ncnvtst.c
View File

@ -745,8 +745,8 @@ static void TestRegressionUTF8(){
UChar32 currCh = 0;
int32_t offset8;
int32_t offset16;
UChar *standardForm = (UChar*)uprv_malloc(MAX_LENGTH*sizeof(UChar));
uint8_t *utf8 = (uint8_t*)uprv_malloc(MAX_LENGTH);
UChar *standardForm = (UChar*)malloc(MAX_LENGTH*sizeof(UChar));
uint8_t *utf8 = (uint8_t*)malloc(MAX_LENGTH);
while (currCh <= UNICODE_LIMIT) {
offset16 = 0;
@ -771,8 +771,8 @@ static void TestRegressionUTF8(){
log_err("UTF8->Unicode did not match.\n");
}
}
uprv_free(standardForm);
uprv_free(utf8);
free(standardForm);
free(utf8);
}
#define MAX_UTF32_LEN 1
@ -781,8 +781,8 @@ static void TestRegressionUTF32(){
UChar32 currCh = 0;
int32_t offset32;
int32_t offset16;
UChar *standardForm = (UChar*)uprv_malloc(MAX_LENGTH*sizeof(UChar));
UChar32 *utf32 = (UChar32*)uprv_malloc(MAX_LENGTH*sizeof(UChar32));
UChar *standardForm = (UChar*)malloc(MAX_LENGTH*sizeof(UChar));
UChar32 *utf32 = (UChar32*)malloc(MAX_LENGTH*sizeof(UChar32));
while (currCh <= UNICODE_LIMIT) {
offset16 = 0;
@ -807,8 +807,8 @@ static void TestRegressionUTF32(){
log_err("UTF32->Unicode did not match.\n");
}
}
uprv_free(standardForm);
uprv_free(utf32);
free(standardForm);
free(utf32);
}
/*Walk through the available converters*/

12
icu4c/source/test/cintltst/nucnvtst.c
View File

@ -1058,11 +1058,11 @@ static void TestCoverageMBCS(){
#if 0
char* tdpath = NULL;
char* saveDirectory = (char*)uprv_malloc(sizeof(char) *(strlen(u_getDataDirectory())+1));
char* saveDirectory = (char*)malloc(sizeof(char) *(strlen(u_getDataDirectory())+1));
int len = strlen(directory);
char* index=NULL;
tdpath = (char*) uprv_malloc(sizeof(char) * (len * 2));
tdpath = (char*) malloc(sizeof(char) * (len * 2));
uprv_strcpy(saveDirectory,u_getDataDirectory());
log_verbose("Retrieved data directory %s \n",saveDirectory);
uprv_strcpy(tdpath,directory);
@ -1150,11 +1150,11 @@ static void TestCoverageMBCS(){
}
#if 0
uprv_free(tdpath);
free(tdpath);
/* restore the original data directory */
log_verbose("Setting the data directory to %s \n", saveDirectory);
u_setDataDirectory(saveDirectory);
uprv_free(saveDirectory);
free(saveDirectory);
#endif
}
@ -3397,11 +3397,11 @@ TestSCSU() {
UChar* src;
/* UConverter* cnv = ucnv_open("SCSU",&status); */
cSrcLen= srcLen = uprv_strlen(fTestCases[i]);
src = (UChar*) uprv_malloc((sizeof(UChar) * srcLen) + sizeof(UChar));
src = (UChar*) malloc((sizeof(UChar) * srcLen) + sizeof(UChar));
srcLen=unescape(src,srcLen,cSrc,cSrcLen,&status);
log_verbose("Testing roundtrip for src: %s at index :%d\n",cSrc,i);
TestConv(src,srcLen,"SCSU","Coverage",NULL,0);
uprv_free(src);
free(src);
}
TestConv(allFeaturesUTF16,(sizeof(allFeaturesUTF16)/2),"SCSU","all features", (char *)allFeaturesSCSU,sizeof(allFeaturesSCSU));
TestConv(allFeaturesUTF16,(sizeof(allFeaturesUTF16)/2),"SCSU","all features",(char *)allFeaturesSCSU,sizeof(allFeaturesSCSU));

8
icu4c/source/test/cintltst/putiltst.c
View File

@ -215,7 +215,7 @@ static void TestPUtilAPI(void){
/*dataDirectory=u_getDataDirectory();*/
dataDirectory="directory1"; /*no backslashes*/
udataDir=(UChar*)uprv_malloc(sizeof(UChar) * (strlen(dataDirectory) + 1));
udataDir=(UChar*)malloc(sizeof(UChar) * (strlen(dataDirectory) + 1));
u_charsToUChars(dataDirectory, udataDir, (strlen(dataDirectory)+1));
u_uastrcpy(temp, dataDirectory);
@ -223,14 +223,14 @@ static void TestPUtilAPI(void){
log_err("ERROR: u_charsToUChars failed. Expected %s, Got %s\n", austrdup(temp), austrdup(udataDir));
}
log_verbose("Testing UChars to chars\n");
charvalue=(char*)uprv_malloc(sizeof(char) * (u_strlen(udataDir) + 1));
charvalue=(char*)malloc(sizeof(char) * (u_strlen(udataDir) + 1));
u_UCharsToChars(udataDir, charvalue, (u_strlen(udataDir)+1));
if(strcmp(charvalue, dataDirectory) != 0){
log_err("ERROR: u_UCharsToChars failed. Expected %s, Got %s\n", charvalue, dataDirectory);
}
uprv_free(charvalue);
uprv_free(udataDir);
free(charvalue);
free(udataDir);
}
log_verbose("Testing uprv_timezone()....\n");

12
icu4c/source/test/cintltst/ucmptst.c
View File

@ -165,9 +165,9 @@ openAdopt, initAdopt, openAlias, initAlias
int32_t count = ucmp8_getCount(&ucmp8Array1);
const uint16_t *tIndex = ucmp8_getIndex(&ucmp8Array1);
const int8_t *tValues = ucmp8_getArray(&ucmp8Array1);
uint16_t *index = (uint16_t *)malloc(UCMP8_kIndexCount*sizeof(uint16_t));
uint16_t *index = (uint16_t *)uprv_malloc(UCMP8_kIndexCount*sizeof(uint16_t));
values = (int8_t *)malloc(count);
values = (int8_t *)uprv_malloc(count);
memcpy(index, tIndex, UCMP8_kIndexCount*sizeof(uint16_t));
memcpy(values, tValues, count);
@ -180,17 +180,17 @@ openAdopt, initAdopt, openAlias, initAlias
query(pAliaser);
ucmp8_close(pAliaser);
ucmp8_initAdopt(&adopter, index, values, count);
ucmp8_initAdopt(&adopter, index, values, count); /* TODO: BAD API. Adopted memory MUST be allocated with uprv_malloc */
query(&adopter);
ucmp8_close(&adopter);
index = (uint16_t *)malloc(UCMP8_kIndexCount*sizeof(uint16_t));
values = (int8_t *)malloc(count);
index = (uint16_t *)uprv_malloc(UCMP8_kIndexCount*sizeof(uint16_t));
values = (int8_t *)uprv_malloc(count);
memcpy(index, tIndex, UCMP8_kIndexCount*sizeof(uint16_t));
memcpy(values, tValues, count);
pAdopter = ucmp8_openAdopt(index, values, count);
pAdopter = ucmp8_openAdopt(index, values, count); /* TODO: BAD API */
query(pAdopter);
ucmp8_close(pAdopter);

8
icu4c/source/test/cintltst/uenumtst.c
View File

@ -41,9 +41,9 @@ typedef struct chArrayContext chArrayContext;
static void U_CALLCONV
chArrayClose(UEnumeration *en) {
if(cont->currUChar != NULL) {
uprv_free(cont->currUChar);
free(cont->currUChar);
}
uprv_free(en);
free(en);
}
static int32_t U_CALLCONV
@ -58,7 +58,7 @@ chArrayUNext(UEnumeration *en, int32_t *resultLength, UErrorCode *status) {
}
if(cont->currUChar == NULL) {
cont->currUChar = (UChar *)uprv_malloc(1024*sizeof(UChar));
cont->currUChar = (UChar *)malloc(1024*sizeof(UChar));
}
cont->currChar = (cont->array)[cont->currIndex];
@ -101,7 +101,7 @@ UEnumeration chEnum = {
};
static UEnumeration *getchArrayEnum(const char** source, int32_t size) {
UEnumeration *en = (UEnumeration *)uprv_malloc(sizeof(UEnumeration));
UEnumeration *en = (UEnumeration *)malloc(sizeof(UEnumeration));
memcpy(en, &chEnum, sizeof(UEnumeration));
cont->array = (char **)source;
cont->maxIndex = size;

12
icu4c/source/test/cintltst/utransts.c
View File

@ -54,13 +54,13 @@ typedef struct XReplaceable {
} XReplaceable;
static void InitXReplaceable(XReplaceable* rep, const char* cstring) {
rep->text = uprv_malloc(sizeof(UChar) * (uprv_strlen(cstring)+1));
rep->text = malloc(sizeof(UChar) * (uprv_strlen(cstring)+1));
u_uastrcpy(rep->text, cstring);
}
static void FreeXReplaceable(XReplaceable* rep) {
if (rep->text != NULL) {
uprv_free(rep->text);
free(rep->text);
rep->text = NULL;
}
}
@ -88,11 +88,11 @@ static void Xreplace(UReplaceable* rep, int32_t start, int32_t limit,
const UChar* text, int32_t textLength) {
XReplaceable* x = (XReplaceable*)rep;
int32_t newLen = Xlength(rep) + limit - start + textLength;
UChar* newText = (UChar*) uprv_malloc(sizeof(UChar) * (newLen+1));
UChar* newText = (UChar*) malloc(sizeof(UChar) * (newLen+1));
u_strncpy(newText, x->text, start);
u_strncpy(newText + start, text, textLength);
u_strcpy(newText + start + textLength, x->text + limit);
uprv_free(x->text);
free(x->text);
x->text = newText;
}
@ -100,11 +100,11 @@ static void Xreplace(UReplaceable* rep, int32_t start, int32_t limit,
static void Xcopy(UReplaceable* rep, int32_t start, int32_t limit, int32_t dest) {
XReplaceable* x = (XReplaceable*)rep;
int32_t newLen = Xlength(rep) + limit - start;
UChar* newText = (UChar*) uprv_malloc(sizeof(UChar) * (newLen+1));
UChar* newText = (UChar*) malloc(sizeof(UChar) * (newLen+1));
u_strncpy(newText, x->text, dest);
u_strncpy(newText + dest, x->text + start, limit - start);
u_strcpy(newText + dest + limit - start, x->text + dest);
uprv_free(x->text);
free(x->text);
x->text = newText;
}

16
icu4c/source/test/collperf/collperf.dsp
View File

@ -43,6 +43,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
@ -68,6 +69,7 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -92,8 +94,9 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /W3 /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Op /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@ -101,8 +104,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib icuin.lib ctestfw.lib icutu.lib kernel32.lib user32.lib advapi32.lib shell32.lib winmm.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib\\" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icuin.lib ctestfw.lib icutu.lib kernel32.lib user32.lib advapi32.lib shell32.lib winmm.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib\\" /machine:IA64
!ELSEIF "$(CFG)" == "collperf - Win64 Debug"
@ -117,16 +120,17 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Op /I "..\..\..\include" /I "..\..\tools\ctestfw" /I "..\..\common" /I "..\..\i18n" /I "..\..\tools\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icuind.lib icutud.lib winmm.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib\\" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icuind.lib icutud.lib winmm.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib\\" /machine:IA64
!ENDIF

20
icu4c/source/test/ieeetest/ieeetest.dsp
View File

@ -42,8 +42,9 @@ RSC=rc.exe
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MT /Za /W3 /GX /O2 /I "..\..\include" /I "..\..\source\common" /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\include" /I "..\..\source\common" /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -65,8 +66,9 @@ LINK32=link.exe
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -88,16 +90,17 @@ LINK32=link.exe
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MT /Za /W3 /I "..\..\include" /I "..\..\source\common" /I "..\..\..\include" /I "..\..\common" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MT /Za /W3 /GX /Zi /O2 /I "..\..\include" /I "..\..\source\common" /I "..\..\..\include" /I "..\..\common" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib" /machine:IA64
!ELSEIF "$(CFG)" == "ieeetest - Win64 Debug"
@ -111,16 +114,17 @@ LINK32=link.exe
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MTd /Za /W3 /Gm /I "..\..\..\include" /I "..\..\common" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MTd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\common" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib" /machine:IA64
!ENDIF

5
icu4c/source/test/intltest/apicoll.cpp
View File

@ -324,7 +324,10 @@ CollationAPITest::TestRuleBasedColl()
return;
}
free(clonedrule4);
// free(clonedrule4); BAD API!!!!
uprv_free(clonedrule4);
delete col1;
delete col2;
delete col3;

7
icu4c/source/test/intltest/calregts.cpp
View File

@ -9,6 +9,7 @@
#include "unicode/gregocal.h"
#include "unicode/simpletz.h"
#include "unicode/smpdtfmt.h"
#include "cmemory.h"
#include <float.h>
@ -207,7 +208,8 @@ CalendarRegressionTest::test4031502()
}
if (bad)
errln("TimeZone problems with GC");
delete [] ids;
// delete [] ids; // TODO: bad APIs
uprv_free(ids);
}
/**
@ -267,7 +269,8 @@ CalendarRegressionTest::test4031502()
errln(UnicodeString("Fail: Calendar::add misbehaves"));
delete calendar;
delete ids;
uprv_free(ids);
// delete ids; // TODO: BAD API
}
/**

4
icu4c/source/test/intltest/dtfmttst.cpp
View File

@ -10,6 +10,7 @@
#include "unicode/smpdtfmt.h"
#include "unicode/datefmt.h"
#include "unicode/simpletz.h"
#include "cmemory.h"
// *****************************************************************************
// class DateFormatTest
@ -130,7 +131,8 @@ void DateFormatTest::TestWallyWedel()
delete fmtDstOffset;
}
delete cal;
delete ids;
// delete ids; // TODO: BAD API
uprv_free(ids);
delete sdf;
delete tz;
}

24
icu4c/source/test/intltest/intltest.dsp
View File

@ -45,7 +45,7 @@ RSC=rc.exe
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /Ox /Ob0 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\..\..\source\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MT /Za /W3 /GX /Zi /Ox /Ob0 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\..\..\source\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -53,7 +53,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 icuuc.lib icuin.lib icutu.lib /nologo /subsystem:console /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib"
# ADD LINK32 /nologo /subsystem:console /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "intltest - Win32 Debug"
@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\..\..\source\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UDATA_MAP_DLL" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\..\..\source\i18n" /I "..\..\tools\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "UDATA_MAP_DLL" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -79,7 +79,8 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib\\"
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib" /warn:3
# SUBTRACT LINK32 /pdb:none /map
!ELSEIF "$(CFG)" == "intltest - Win64 Release"
@ -129,7 +130,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib\\" /machine:IA64
# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib\\" /libpath:"..\..\..\lib" /machine:IA64
!ENDIF
@ -149,6 +150,19 @@ SOURCE=.\allcoll.cpp
# Begin Source File
SOURCE=.\apicoll.cpp
!IF "$(CFG)" == "intltest - Win32 Release"
!ELSEIF "$(CFG)" == "intltest - Win32 Debug"
# ADD CPP /MTd
!ELSEIF "$(CFG)" == "intltest - Win64 Release"
!ELSEIF "$(CFG)" == "intltest - Win64 Debug"
!ENDIF
# End Source File
# Begin Source File

4
icu4c/source/test/intltest/tzregts.cpp
View File

@ -8,6 +8,7 @@
#include "unicode/smpdtfmt.h"
#include "tzregts.h"
#include "calregts.h"
#include "cmemory.h"
// *****************************************************************************
// class TimeZoneRegressionTest
@ -471,7 +472,8 @@ void TimeZoneRegressionTest:: Test4151406() {
max = count;
logln(hname + ' ' + count +
((count > 0) ? (" e.g. " + *ids[0]) : UnicodeString("")));
delete [] ids;
// delete [] ids;
uprv_free(ids);
/*} catch (Exception e) {
errln(hname + ' ' + "Fail: " + e);
}*/

14
icu4c/source/test/intltest/tztest.cpp
View File

@ -10,6 +10,7 @@
#include "unicode/gregocal.h"
#include "unicode/resbund.h"
#include "tztest.h"
#include "cmemory.h"
#define CASE(id,test) case id: \
name = #test; \
@ -312,7 +313,8 @@ TimeZoneTest::TestGetAvailableIDs913()
}
delete z;
}
delete [] s;
// delete [] s; ****BAD API ***
uprv_free(s);
buf->truncate(0);
*buf += "TimeZone.getAvailableIDs(GMT+02:00) = { ";
@ -343,8 +345,8 @@ TimeZoneTest::TestGetAvailableIDs913()
delete tz;
delete buf;
delete [] s;
// delete [] s; // BAD API !!!!
uprv_free(s);
}
@ -1005,7 +1007,8 @@ void TimeZoneTest::TestCountries() {
errln("FAIL: " + laZone + " in US = " + la);
errln("FAIL: " + tokyoZone + " in US = " + tokyo);
}
delete[] s;
// delete[] s; // TODO: BAD API
uprv_free(s);
s = TimeZone::createAvailableIDs("JP", n);
la = FALSE; tokyo = FALSE;
@ -1022,5 +1025,6 @@ void TimeZoneTest::TestCountries() {
errln("FAIL: " + laZone + " in JP = " + la);
errln("FAIL: " + tokyoZone + " in JP = " + tokyo);
}
delete[] s;
// delete[] s; // TODO: bad API
uprv_free(s);
}

20
icu4c/source/test/utfperf/utfperf.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -67,8 +68,9 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -91,16 +93,17 @@ LINK32=link.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /W3 /I "..\..\..\include" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Op /I "..\..\..\include" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib kernel32.lib user32.lib gdi32.lib winmm.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib kernel32.lib user32.lib gdi32.lib winmm.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib" /machine:IA64
!ELSEIF "$(CFG)" == "utfperf - Win64 Debug"
@ -115,16 +118,17 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /I "..\..\..\include" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Op /I "..\..\..\include" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib" /machine:IA64
!ENDIF

29
icu4c/source/tools/ctestfw/ctestfw.dsp
View File

@ -45,7 +45,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /FR /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -97,7 +97,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\..\include" /D"WIN64" /D"NDEBUG" /D"_WINDOWS" /D"_MBCS" /D"_USRDLL" /D"CTESTFW_EXPORTS" /D"T_CTEST_IMPLEMENTATION" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\..\include" /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -106,8 +106,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IA64
# ADD LINK32 /nologo /dll /machine:IA64 /out:"..\..\..\bin\ctestfw.dll" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IX86 /machine:IA64
# ADD LINK32 /nologo /dll /machine:IX86 /out:"..\..\..\bin\ctestfw.dll" /machine:IA64
!ELSEIF "$(CFG)" == "ctestfw - Win64 Debug"
@ -123,7 +123,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\..\include" /D"WIN64" /D"_DEBUG" /D"_WINDOWS" /D"_MBCS" /D"_USRDLL" /D"CTESTFW_EXPORTS" /D"T_CTEST_IMPLEMENTATION" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CTESTFW_EXPORTS" /D "T_CTEST_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win64
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win64
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -132,8 +132,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 /nologo /dll /debug /machine:IA64 /out:"..\..\..\bin\ctestfwd.dll" /pdbtype:sept /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 /nologo /dll /incremental:no /debug /machine:IX86 /out:"..\..\..\bin\ctestfwd.dll" /pdbtype:sept /machine:IA64
!ENDIF
@ -149,6 +149,19 @@ LINK32=link.exe
# Begin Source File
SOURCE=.\ctest.c
!IF "$(CFG)" == "ctestfw - Win32 Release"
!ELSEIF "$(CFG)" == "ctestfw - Win32 Debug"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "ctestfw - Win64 Release"
!ELSEIF "$(CFG)" == "ctestfw - Win64 Debug"
!ENDIF
# End Source File
# End Group
# Begin Group "Header Files"

20
icu4c/source/tools/genccode/genccode.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -110,16 +112,17 @@ SOURCE="$(InputPath)"
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /W3 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Op /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\genccode.exe
InputPath=.\Release\genccode.exe
@ -144,16 +147,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Op /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\genccode.exe
InputPath=.\Debug\genccode.exe

16
icu4c/source/tools/gencmn/decmn.dsp
View File

@ -43,6 +43,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W4 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@ -77,6 +78,7 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W4 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -110,16 +112,17 @@ SOURCE="$(InputPath)"
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W4 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W4 /GX /Zi /O2 /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\decmn.exe
InputPath=.\Release\decmn.exe
@ -144,16 +147,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W4 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W4 /Gm /GX /Zi /Od /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icutud.lib kernel32.lib user32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icutud.lib kernel32.lib user32.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\decmn.exe
InputPath=.\Debug\decmn.exe

20
icu4c/source/tools/gencmn/gencmn.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -111,16 +113,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\gencmn.exe
InputPath=.\Release\gencmn.exe
@ -145,16 +148,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\gencmn.exe
InputPath=.\Debug\gencmn.exe

20
icu4c/source/tools/gencnval/gencnval.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -111,16 +113,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\gencnval.exe
InputPath=.\Release\gencnval.exe
@ -145,16 +148,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\gencnval.exe
InputPath=.\Debug\gencnval.exe

20
icu4c/source/tools/gennames/gennames.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -111,16 +113,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\gennames.exe
InputPath=.\Release\gennames.exe
@ -145,16 +148,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\gennames.exe
InputPath=.\Debug\gennames.exe

20
icu4c/source/tools/gennorm/gennorm.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -111,16 +113,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\toolutil" /I "..\..\common" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\toolutil" /I "..\..\common" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\gennorm.exe
InputPath=.\Release\gennorm.exe
@ -145,16 +148,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\toolutil" /I "..\..\common" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\toolutil" /I "..\..\common" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\gennorm.exe
InputPath=.\Debug\gennorm.exe

20
icu4c/source/tools/genprops/genprops.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\toolutil" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -111,16 +113,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\toolutil" /I "..\..\common" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\toolutil" /I "..\..\common" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib\Release" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\genprops.exe
InputPath=.\Release\genprops.exe
@ -145,16 +148,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\toolutil" /I "..\..\common" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\toolutil" /I "..\..\common" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib\Debug" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\genprops.exe
InputPath=.\Debug\genprops.exe

16
icu4c/source/tools/genrb/derb.dsp
View File

@ -47,7 +47,7 @@ MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -84,7 +84,7 @@ MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -121,15 +121,15 @@ MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_WINDOWS" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\derb_Win64_Release\derb.exe
InputPath=.\derb_Win64_Release\derb.exe
@ -158,15 +158,15 @@ MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win64
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win64
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_WINDOWS" /D"_MBCS" /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\derb_Win64_Debug\derb.exe
InputPath=.\derb_Win64_Debug\derb.exe

20
icu4c/source/tools/genrb/genrb.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -111,16 +113,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\genrb.exe
InputPath=.\Release\genrb.exe
@ -145,16 +148,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /I "..\..\..\source\i18n" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuind.lib icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuind.lib icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\genrb.exe
InputPath=.\Debug\genrb.exe

20
icu4c/source/tools/gentest/gentest.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -111,16 +113,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\gentest.exe
InputPath=.\Release\gentest.exe
@ -145,16 +148,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\debug\\" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\debug\\" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\gentest.exe
InputPath=.\Debug\gentest.exe

20
icu4c/source/tools/gentz/gentz.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -111,16 +113,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\gentz.exe
InputPath=.\Release\gentz.exe
@ -145,16 +148,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\gentz.exe
InputPath=.\Debug\gentz.exe

22
icu4c/source/tools/genuca/genuca.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -86,7 +88,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib"
# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib"
# SUBTRACT LINK32 /nodefaultlib
# Begin Custom Build
TargetPath=.\Debug\genuca.exe
@ -112,16 +114,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\genuca.exe
InputPath=.\Release\genuca.exe
@ -146,16 +149,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\common" /I "..\..\i18n" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icuind.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64
# SUBTRACT LINK32 /nodefaultlib
# Begin Custom Build
TargetPath=.\Debug\genuca.exe

20
icu4c/source/tools/makeconv/makeconv.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@ -111,16 +113,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\makeconv.exe
InputPath=.\Release\makeconv.exe
@ -145,16 +148,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\..\source\common" /I "..\toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\makeconv.exe
InputPath=.\Debug\makeconv.exe

20
icu4c/source/tools/pkgdata/pkgdata.dsp
View File

@ -43,8 +43,9 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x411 /d "NDEBUG"
# ADD RSC /l 0x411 /d "NDEBUG"
BSC32=bscmake.exe
@ -77,8 +78,9 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x411 /d "_DEBUG"
# ADD RSC /l 0x411 /d "_DEBUG"
BSC32=bscmake.exe
@ -111,16 +113,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "../../../include" /I "../../common" /I "../toolutil" /D"WIN64" /D"NDEBUG" /D"_CONSOLE" /D"_MBCS" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x411 /d "NDEBUG"
# ADD RSC /l 0x411 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IA64
# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IA64 /libpath:"../../../lib/release" /libpath:"../toolutil/release" /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:IX86 /machine:IA64
# ADD LINK32 icuin.lib icuuc.lib icutu.lib /nologo /subsystem:console /machine:IX86 /libpath:"../../../lib/release" /libpath:"../toolutil/release" /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Release\pkgdata.exe
InputPath=.\Release\pkgdata.exe
@ -145,16 +148,17 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "../../../include" /I "../../common" /I "../toolutil" /D"WIN64" /D"_DEBUG" /D"_CONSOLE" /D"_MBCS" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "../../../include" /I "../../common" /I "../toolutil" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GZ /QIA64_fmaopt /Wp64 /Zm600 /c
# ADD BASE RSC /l 0x411 /d "_DEBUG"
# ADD RSC /l 0x411 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept
# ADD LINK32 icuind.lib icuucd.lib icutud.lib /nologo /subsystem:console /debug /machine:IA64 /pdbtype:sept /libpath:"../../../lib/debug" /libpath:"../toolutil/debug" /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /incremental:no
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /machine:IA64
# ADD LINK32 icuind.lib icuucd.lib icutud.lib /nologo /subsystem:console /incremental:no /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib/debug" /libpath:"../toolutil/debug" /libpath:"..\toolutil\Debug" /libpath:"..\..\..\lib" /machine:IA64
# Begin Custom Build
TargetPath=.\Debug\pkgdata.exe
InputPath=.\Debug\pkgdata.exe

4
icu4c/source/tools/toolutil/toolutil.c
View File

@ -32,7 +32,7 @@
#include "cstring.h"
#include "toolutil.h"
U_CFUNC const char *
U_CAPI const char * U_EXPORT2
getLongPathname(const char *pathname) {
#ifdef WIN32
/* anticipate problems with "short" pathnames */
@ -55,7 +55,7 @@ getLongPathname(const char *pathname) {
return pathname;
}
U_CFUNC const char *
U_CAPI const char * U_EXPORT2
findBasename(const char *filename) {
const char *basename=uprv_strrchr(filename, U_FILE_SEP_CHAR);
if(basename!=NULL) {

158
icu4c/source/tools/toolutil/toolutil.dsp
View File

@ -2,7 +2,7 @@
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=toolutil - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@ -17,10 +17,8 @@ CFG=toolutil - Win32 Debug
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "toolutil - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "toolutil - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "toolutil - Win64 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "toolutil - Win64 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "toolutil - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "toolutil - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@ -28,6 +26,7 @@ CFG=toolutil - Win32 Debug
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "toolutil - Win32 Release"
@ -41,17 +40,22 @@ RSC=rc.exe
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\..\lib"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# ADD CPP /nologo /MD /Za /W3 /GX /O2 /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TOOLUTIL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "..\..\common" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\lib\icutu.lib"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\icutu22.dll" /implib:"..\..\..\lib/icutu.lib" /libpath:"..\..\..\lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "toolutil - Win32 Debug"
@ -64,63 +68,22 @@ LIB32=link.exe -lib
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\..\lib"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TOOLUTIL_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\common" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\lib\icutud.lib"
!ELSEIF "$(CFG)" == "toolutil - Win64 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "..\..\..\lib"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# ADD CPP /nologo /MD /Za /W3 /I "..\..\common" /D"WIN64" /D"NDEBUG" /D"_MBCS" /D"_LIB" /FD /c /O2 /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\lib\icutu.lib"
!ELSEIF "$(CFG)" == "toolutil - Win64 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "..\..\..\lib"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
# ADD CPP /nologo /MDd /Za /W3 /Gm /I "..\..\common" /D"WIN64" /D"_DEBUG" /D"_MBCS" /D"_LIB" /FR /FD /GZ /c /Od /GX /Op /QIA64_fmaopt /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\..\..\lib\icutud.lib"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\icutu22d.dll" /implib:"..\..\..\lib/icutud.lib" /pdbtype:sept /libpath:"..\..\..\lib"
# SUBTRACT LINK32 /pdb:none
!ENDIF
@ -128,35 +91,98 @@ LIB32=link.exe -lib
# Name "toolutil - Win32 Release"
# Name "toolutil - Win32 Debug"
# Name "toolutil - Win64 Release"
# Name "toolutil - Win64 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\toolutil.c
# ADD CPP /Ze
!IF "$(CFG)" == "toolutil - Win32 Release"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "toolutil - Win32 Debug"
# ADD CPP /G6 /MDd
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ucbuf.c
!IF "$(CFG)" == "toolutil - Win32 Release"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "toolutil - Win32 Debug"
# ADD CPP /G6 /MDd
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ucmpwrit.c
!IF "$(CFG)" == "toolutil - Win32 Release"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "toolutil - Win32 Debug"
# ADD CPP /G6 /MDd
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\unewdata.c
!IF "$(CFG)" == "toolutil - Win32 Release"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "toolutil - Win32 Debug"
# ADD CPP /G6 /MDd
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\uoptions.c
!IF "$(CFG)" == "toolutil - Win32 Release"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "toolutil - Win32 Debug"
# ADD CPP /G6 /MDd
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\uparse.c
!IF "$(CFG)" == "toolutil - Win32 Release"
# ADD CPP /G6
!ELSEIF "$(CFG)" == "toolutil - Win32 Debug"
# ADD CPP /G6 /MDd
!ENDIF
# End Source File
# End Group
# Begin Group "Header Files"
@ -187,5 +213,9 @@ SOURCE=.\uoptions.h
SOURCE=.\uparse.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

6
icu4c/source/tools/toolutil/toolutil.h
View File

@ -21,6 +21,8 @@
#include "unicode/utypes.h"
/*
* For Windows, a path/filename may be the short (8.3) version
* of the "real", long one. In this case, the short one
@ -36,7 +38,7 @@
* This function is especially useful in tools that are called
* by a batch file for loop, which yields short pathnames on Win9x.
*/
U_CFUNC const char *
U_CAPI const char * U_EXPORT2
getLongPathname(const char *pathname);
/*
@ -46,7 +48,7 @@ getLongPathname(const char *pathname);
* If the pathname only contains a basename and no file separator,
* then the pathname pointer itself is returned.
*/
U_CFUNC const char *
U_CAPI const char * U_EXPORT2
findBasename(const char *filename);
#endif