1. Sync ICU implementation with Apple patches (VS2005 versions).

2. Provide full stub of hyphenation functions in CFString.


git-svn-id: http://svn.code.sf.net/p/opencflite/code/trunk@241 e824114e-66b8-4a2a-92bd-c737042b8df8

Author: bfulgham

BuildCFLite.windows

@@ -70,7 +70,7 @@ Build () {
 	done
 	echo "Linking $STYLE ..."
 	echo $CC $STYLE_LFLAGS $ARCHFLAGS $OBJBASE/$STYLE/*.o $LFLAGS -licuuc -licuin -lobjc -o $OBJBASE/CoreFoundation_$STYLE
-	$CC -shared $STYLE_LFLAGS $ARCHFLAGS $OBJBASE/$STYLE/*.o $LFLAGS lib/icuuc.lib lib/icuin.lib -lobjc -o $OBJBASE/libCFlite_476_19.dll
+	$CC -shared $STYLE_LFLAGS $ARCHFLAGS $OBJBASE/$STYLE/*.o $LFLAGS lib/libicuuc.lib lib/libicuin.lib -lobjc -o $OBJBASE/libCFlite_635_0.dll
 	if [ $? -ne 0 ]; then
 		echo "*** Linking $STYLE failed ***"
 		exit 1

CFString.c

@@ -6053,6 +6053,14 @@ void CFShowStr(CFStringRef str) {
     fprintf(stdout, "Contents %p\n", (void *)__CFStrContents(str));
 }
 
+CFIndex CFStringGetHyphenationLocationBeforeIndex(CFStringRef string, CFIndex location, CFRange limitRange, CFOptionFlags options, CFLocaleRef locale, UTF32Char *character) {
+    return kCFNotFound;
+}
+
+Boolean CFStringIsHyphenationAvailableForLocale(CFLocaleRef locale) {
+    /* Not supplied by Apple! */
+    return false;
+}
 
 
 #undef HANGUL_SBASE

examples/StringExample/StringExample.c

@@ -289,9 +289,10 @@ void stringManipulation(void) {
    CFStringRef strOuter, find, replace, find2, replace2, find3, replace3, bigger, smaller, result;
    CFComparisonResult comp;
    CFLocaleRef curLocale;
+   Boolean isHyphenationSupported = false;
 
    show(CFSTR("------------------String Manipulations---------------"));
-   
+
    // Create a simple immutable string from a Pascal string and convert it to Unicode
    strOuter = CFStringCreateWithCString(NULL, "Hello Cruel World", kCFStringEncodingASCII);
    strChange = CFStringCreateMutableCopy(NULL, CFStringGetLength(strOuter), strOuter);
@@ -319,6 +320,9 @@ void stringManipulation(void) {
 
    curLocale = CFLocaleCopyCurrent ();
 
+   isHyphenationSupported = CFStringIsHyphenationAvailableForLocale(curLocale);
+   show(CFSTR("Is Hyphenation supported for this locale? %@"), ((isHyphenationSupported) ? CFSTR ("Yes") : CFSTR("No")));
+
    CFStringUppercase(strChange, curLocale);
 
    show(CFSTR("Upper Cased        : %@"), strChange);

icu/bin_vc2005/icudt46.dll

@@ -220,7 +220,7 @@ Intel can define _M_IX86 or _M_X64
 /** Determine whether to disable renaming or not. This overrides the
    setting in umachine.h which is for all platforms. */
 #ifndef U_DISABLE_RENAMING
-#define U_DISABLE_RENAMING 0
+#define U_DISABLE_RENAMING 1
 #endif
 
 /** Determine whether to override new and delete. */

icu/bin_vc2005/icuin46.dll

@@ -225,7 +225,7 @@
  * @stable ICU 3.2
  */
 #ifndef UCONFIG_NO_SERVICE
-#   define UCONFIG_NO_SERVICE 0
+#   define UCONFIG_NO_SERVICE 1
 #endif
 
 #endif

icu/bin_vc2005/icuuc46.dll

@@ -23,7 +23,7 @@
 
 /* Uncomment the following line to disable renaming on platforms
    that do not use Autoconf. */
-/* #define U_DISABLE_RENAMING 1 */
+#define U_DISABLE_RENAMING 1
 
 #if !U_DISABLE_RENAMING
 

icu/bin_vc2005/libicuin.dll

@@ -234,7 +234,7 @@
  */
 #define U_ICUDATA_NAME    "icudt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER  /**< @internal */
 #define U_USRDATA_NAME    "usrdt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER  /**< @internal */
-#define U_USE_USRDATA     1  /**< @internal */
+#define U_USE_USRDATA     0  /**< @internal */
 
 /**
  *  U_ICU_ENTRY_POINT is the name of the DLL entry point to the ICU data library.

icu/bin_vc2005/libicuuc.dll

@@ -67,7 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="netapi32.lib ole32.lib ws2_32.lib kernel32.lib icuuc.lib icuin.lib rpcrt4.lib msvcrt.lib pthreadVC2.lib"
+				AdditionalDependencies="netapi32.lib ole32.lib ws2_32.lib kernel32.lib libicuuc.lib libicuin.lib rpcrt4.lib msvcrt.lib pthreadVC2.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_$(ConfigurationName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)\icu\lib&quot;;&quot;$(SolutionDir)\pthreads\lib&quot;;&quot;$(SolutionDir)\dist\lib&quot;"
@@ -153,7 +153,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="netapi32.lib ole32.lib ws2_32.lib kernel32.lib icuuc.lib icuin.lib rpcrt4.lib msvcrt.lib pthreadVC2.lib"
+				AdditionalDependencies="netapi32.lib ole32.lib ws2_32.lib kernel32.lib libicuuc.lib libicuin.lib rpcrt4.lib msvcrt.lib pthreadVC2.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)\icu\lib&quot;;&quot;$(SolutionDir)\pthreads\lib&quot;;&quot;$(SolutionDir)\dist\lib&quot;"
 				IgnoreAllDefaultLibraries="false"

icu/lib_vc2005/icudt.lib

@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="netapi32.lib ole32.lib ws2_32.lib kernel32.lib icuuc.lib icuin.lib rpcrt4.lib msvcrt.lib pthreadVC2.lib"
+				AdditionalDependencies="netapi32.lib ole32.lib ws2_32.lib kernel32.lib libicuuc.lib libicuin.lib rpcrt4.lib msvcrt.lib pthreadVC2.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_$(ConfigurationName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)\icu\lib_vc2005&quot;;&quot;$(SolutionDir)\pthreads\lib_vc2005&quot;;&quot;$(SolutionDir)\dist\lib&quot;"
@@ -153,7 +153,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="netapi32.lib ole32.lib ws2_32.lib kernel32.lib icuuc.lib icuin.lib rpcrt4.lib msvcrt.lib pthreadVC2.lib"
+				AdditionalDependencies="netapi32.lib ole32.lib ws2_32.lib kernel32.lib libicuuc.lib libicuin.lib rpcrt4.lib msvcrt.lib pthreadVC2.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)\icu\lib_vc2005&quot;;&quot;$(SolutionDir)\pthreads\lib_vc2005&quot;;&quot;$(SolutionDir)\dist\lib&quot;"
 				IgnoreAllDefaultLibraries="false"