Export the debug API as functions instead of pointers.

A few other import fixes for Mingw.

dlls/ntdll/debugtools.c

@@ -27,6 +27,7 @@
 
 #include "wine/debug.h"
 #include "wine/exception.h"
+#include "wine/library.h"
 #include "wine/unicode.h"
 #include "thread.h"
 #include "winbase.h"

include/wine/debug.h

@@ -87,13 +87,6 @@ enum __WINE_DEBUG_CLASS {
 
 #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 @@ extern int (*__wine_dbg_vlog)( int cls, const char *channel,
 /* 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); }
+extern const char *wine_dbgstr_guid( const struct _GUID *id );
-inline static const char *wine_dbgstr_an( const char * s, int n ) { return __wine_dbgstr_an(s, n); }
+extern const char *wine_dbgstr_an( const char * s, int n );
-inline static const char *wine_dbgstr_wn( const WCHAR *s, int n ) { return __wine_dbgstr_wn(s, n); }
+extern const char *wine_dbgstr_wn( const WCHAR *s, int n );
-inline static const char *wine_dbgstr_a( const char *s )  { return __wine_dbgstr_an( s, -1 ); }
+extern const char *wine_dbgstr_a( const char *s );
-inline static const char *wine_dbgstr_w( const WCHAR *s ) { return __wine_dbgstr_wn( s, -1 ); }
+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 @@ extern int wine_dbg_log( int cls, const char *ch, const char *func,
 #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_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_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_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_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_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); }
 
 #define TRACE                      WINE_TRACE
 #define TRACE_(ch)                 WINE_TRACE_(ch)

include/wine/library.h

@@ -43,6 +43,13 @@ extern WCHAR **__wine_main_wargv;
 
 /* 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 */

library/Makefile.in

@@ -32,7 +32,7 @@ libwine.a: $(OBJS)
 	$(RANLIB) $@
 
 libwine.dll: $(OBJS)
-	$(DLLWRAP) $(DLLWRAPFLAGS) --export-all --implib libwine.a -o libwine.dll $(OBJS)
+	$(DLLWRAP) $(DLLWRAPFLAGS) --export-all --implib libwine.a -o libwine.dll $(OBJS) -lmsvcrt
 
 install_so: libwine.so.$(SOVERSION)
 	$(MKINSTALLDIRS) $(libdir)

library/debug.c

@@ -337,3 +337,30 @@ const char * (*__wine_dbgstr_guid)( const struct _GUID *id ) = default_dbgstr_gu
 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 );
+}

unicode/wine_unicode.def

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