Mingw devel stuff Part2

[Alexandre Julliard]

"Steven Edwards" <Steven_Ed4153 at yahoo.com> writes:

> Sorry about that I hit the send button to soon.
> 
> OK when I try build shlwapi.dll I'm getting this

Does it work better with this patch?

Index: include/wine/debug.h
===================================================================
RCS file: /opt/cvs-commit/wine/include/wine/debug.h,v
retrieving revision 1.3
diff -u -r1.3 debug.h
--- include/wine/debug.h	17 May 2002 02:55:48 -0000	1.3
+++ include/wine/debug.h	17 May 2002 18:50:54 -0000
@@ -87,13 +87,6 @@
 
 #endif  /* __GNUC__ */
 
-extern const char * (*__wine_dbgstr_an)( const char * s, int n );
-extern const char * (*__wine_dbgstr_wn)( const WCHAR *s, int n );
-extern const char * (*__wine_dbgstr_guid)( const struct _GUID *id );
-extern int (*__wine_dbg_vprintf)( const char *format, va_list args );
-extern int (*__wine_dbg_vlog)( int cls, const char *channel,
-                               const char *function, const char *format, va_list args );
-
 
 /*
  * Exported definitions and macros
@@ -102,11 +95,11 @@
 /* These function return a printable version of a string, including
    quotes.  The string will be valid for some time, but not indefinitely
    as strings are re-used.  */
-inline static const char *wine_dbgstr_guid( const struct _GUID *id ) { return __wine_dbgstr_guid(id); }
-inline static const char *wine_dbgstr_an( const char * s, int n ) { return __wine_dbgstr_an(s, n); }
-inline static const char *wine_dbgstr_wn( const WCHAR *s, int n ) { return __wine_dbgstr_wn(s, n); }
-inline static const char *wine_dbgstr_a( const char *s )  { return __wine_dbgstr_an( s, -1 ); }
-inline static const char *wine_dbgstr_w( const WCHAR *s ) { return __wine_dbgstr_wn( s, -1 ); }
+extern const char *wine_dbgstr_guid( const struct _GUID *id );
+extern const char *wine_dbgstr_an( const char * s, int n );
+extern const char *wine_dbgstr_wn( const WCHAR *s, int n );
+extern const char *wine_dbgstr_a( const char *s );
+extern const char *wine_dbgstr_w( const WCHAR *s );
 
 extern int wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2);
 extern int wine_dbg_log( int cls, const char *ch, const char *func,
@@ -140,11 +133,11 @@
 #ifdef __WINE__
 /* Wine uses shorter names that are very likely to conflict with other software */
 
-inline static const char *debugstr_an( const char * s, int n ) { return __wine_dbgstr_an( s, n ); }
-inline static const char *debugstr_wn( const WCHAR *s, int n ) { return __wine_dbgstr_wn( s, n ); }
-inline static const char *debugstr_guid( const struct _GUID *id ) { return __wine_dbgstr_guid(id); }
-inline static const char *debugstr_a( const char *s )  { return __wine_dbgstr_an( s, -1 ); }
-inline static const char *debugstr_w( const WCHAR *s ) { return __wine_dbgstr_wn( s, -1 ); }
+inline static const char *debugstr_an( const char * s, int n ) { return wine_dbgstr_an( s, n ); }
+inline static const char *debugstr_wn( const WCHAR *s, int n ) { return wine_dbgstr_wn( s, n ); }
+inline static const char *debugstr_guid( const struct _GUID *id ) { return wine_dbgstr_guid(id); }
+inline static const char *debugstr_a( const char *s )  { return wine_dbgstr_an( s, -1 ); }
+inline static const char *debugstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); }
 
 #define TRACE                      WINE_TRACE
 #define TRACE_(ch)                 WINE_TRACE_(ch)
Index: include/wine/library.h
===================================================================
RCS file: /opt/cvs-commit/wine/include/wine/library.h,v
retrieving revision 1.11
diff -u -r1.11 library.h
--- include/wine/library.h	16 May 2002 23:16:01 -0000	1.11
+++ include/wine/library.h	17 May 2002 18:50:54 -0000
@@ -43,6 +43,13 @@
 
 /* debugging */
 
+extern const char * (*__wine_dbgstr_an)( const char * s, int n );
+extern const char * (*__wine_dbgstr_wn)( const WCHAR *s, int n );
+extern const char * (*__wine_dbgstr_guid)( const struct _GUID *id );
+extern int (*__wine_dbg_vprintf)( const char *format, va_list args );
+extern int (*__wine_dbg_vlog)( int cls, const char *channel,
+                               const char *function, const char *format, va_list args );
+
 extern void wine_dbg_add_option( const char *name, unsigned char set, unsigned char clear );
 
 /* portability */
Index: library/debug.c
===================================================================
RCS file: /opt/cvs-commit/wine/library/debug.c,v
retrieving revision 1.6
diff -u -r1.6 debug.c
--- library/debug.c	17 May 2002 04:17:48 -0000	1.6
+++ library/debug.c	17 May 2002 18:50:55 -0000
@@ -337,3 +337,30 @@
 int (*__wine_dbg_vprintf)( const char *format, va_list args ) = default_dbg_vprintf;
 int (*__wine_dbg_vlog)( int cls, const char *channel, const char *function,
                         const char *format, va_list args ) = default_dbg_vlog;
+
+/* wrappers to use the function pointers */
+
+const char *wine_dbgstr_guid( const struct _GUID *id )
+{
+    return __wine_dbgstr_guid(id);
+}
+
+const char *wine_dbgstr_an( const char * s, int n )
+{
+    return __wine_dbgstr_an(s, n);
+}
+
+const char *wine_dbgstr_wn( const WCHAR *s, int n )
+{
+    return __wine_dbgstr_wn(s, n);
+}
+
+const char *wine_dbgstr_a( const char *s )
+{
+    return __wine_dbgstr_an( s, -1 );
+}
+
+const char *wine_dbgstr_w( const WCHAR *s )
+{
+    return __wine_dbgstr_wn( s, -1 );
+}
Index: unicode/wine_unicode.def
===================================================================
RCS file: /opt/cvs-commit/wine/unicode/wine_unicode.def,v
retrieving revision 1.1
diff -u -r1.1 wine_unicode.def
--- unicode/wine_unicode.def	22 Dec 2000 22:28:00 -0000	1.1
+++ unicode/wine_unicode.def	17 May 2002 18:50:58 -0000
@@ -1,10 +1,15 @@
 EXPORTS
+	casemap_lower
+	casemap_upper
+	cp_enum_table
+	cp_get_table
 	cp_mbstowcs
 	cp_wcstombs
-	utf8_wcstombs
-	utf8_mbstowcs
-	cp_get_table
-	cp_enum_table
 	strcmpiW
 	strncmpiW
 	strstrW
+	strtolW
+	strtoulW
+	utf8_mbstowcs
+	utf8_wcstombs
+	wctype_table

-- 
Alexandre Julliard
julliard at winehq.com