[ros-diffs] [gvg] 12628: Import and merge Wine-20041201

Import and merge Wine-20041201
Added: trunk/reactos/lib/unicode/
Added: trunk/reactos/lib/unicode/Makefile.ros-template
Added: trunk/reactos/lib/unicode/makefile
Modified: trunk/reactos/lib/unicode/string.c
Modified: trunk/reactos/lib/unicode/wine_unicode.def
  _____  

Copied: trunk/reactos/lib/unicode (from rev 12626,
vendor/wine/libs/unicode/current)
  _____  

Added: trunk/reactos/lib/unicode/Makefile.ros-template
--- vendor/wine/libs/unicode/current/Makefile.ros-template
2004-12-31 16:20:50 UTC (rev 12626)
+++ trunk/reactos/lib/unicode/Makefile.ros-template	2004-12-31
16:21:45 UTC (rev 12628)
@@ -0,0 +1,36 @@

+# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $
+
+TARGET_NAME = wine_unicode
+
+CODEPAGES = @CODEPAGES@
+
+TARGET_OBJECTS = casemap.o \
+	collation.o \
+	compose.o \
+	cptable.o \
+	fold.o \
+	mbtowc.o \
+	sortkey.o \
+	string.o \
+	utf8.o \
+	wctomb.o \
+	wctype.o \
+	$(CODEPAGES:%=c_%.o)
+
+TARGET_CFLAGS = @EXTRADEFS@ -DWCHAR=wchar_t
+
+TARGET_SDKLIBS = @IMPORTS@
+
+TARGET_NORC = yes
+
+TARGET_BASE = $(TARGET_BASE_LIB_UNICODE)
+
+TARGET_DEFNAME = wine_unicode
+
+TARGET_STUBS = no
+
+default: all
+
+DEP_OBJECTS = $(TARGET_OBJECTS)
+
+include $(TOOLS_PATH)/depend.mk
  _____  

Added: trunk/reactos/lib/unicode/makefile
--- vendor/wine/libs/unicode/current/makefile	2004-12-31 16:20:50 UTC
(rev 12626)
+++ trunk/reactos/lib/unicode/makefile	2004-12-31 16:21:45 UTC (rev
12628)
@@ -0,0 +1,9 @@

+# $Id: makefile 7409 2004-01-02 19:49:47Z gvg $
+
+PATH_TO_TOP = ../..
+
+TARGET_TYPE = winedll
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
  _____  

Modified: trunk/reactos/lib/unicode/string.c
--- vendor/wine/libs/unicode/current/string.c	2004-12-31 16:20:50 UTC
(rev 12626)
+++ trunk/reactos/lib/unicode/string.c	2004-12-31 16:21:45 UTC (rev
12628)
@@ -23,6 +23,21 @@

 
 #include "wine/unicode.h"
 
+#undef strlenW
+#undef strcpyW
+#undef strcatW
+#undef strstrW
+#undef strtolW
+#undef strchrW
+#undef strrchrW
+#undef strncmpW
+#undef strncpyW
+#undef strcmpW
+#undef strcmpiW
+#undef strncmpiW
+#undef sprintfW
+#undef snprintfW
+
 int strcmpiW( const WCHAR *str1, const WCHAR *str2 )
 {
     for (;;)
  _____  

Modified: trunk/reactos/lib/unicode/wine_unicode.def
--- vendor/wine/libs/unicode/current/wine_unicode.def	2004-12-31
16:20:50 UTC (rev 12626)
+++ trunk/reactos/lib/unicode/wine_unicode.def	2004-12-31 16:21:45 UTC
(rev 12628)
@@ -1,4 +1,4 @@

-LIBRARY libwine_unicode.dll
+LIBRARY wine_unicode.dll
 
 EXPORTS
     memicmpW