Sorry about that I hit the send button to soon.
OK when I try build shlwapi.dll I'm getting this
Administrator@LAPTOP /cygdrive/d/src/winehq/wine/dlls/shlwapi $ make dllwrap --add-stdcall-alias --def shlwapi.spec.def --implib shlwapi.a -o shlwapi .dll ordinal.o path.o reg.o regstream.o shlwapi_main.o string.o url.o shlwa pi.dll.dbg.o -L../../dlls -luser32 -lgdi32 -ladvapi32 -lkernel32 -L../../library -lwine -L../../ole -lwine_uuid -L../../unicode -lwine_unicode -lm Warning: resolving ___wine_dbgstr_guid by linking to __imp____wine_dbgstr_guid ( auto-import) Warning: resolving ___wine_dbgstr_an by linking to __imp____wine_dbgstr_an (auto -import) Warning: resolving ___wine_dbgstr_wn by linking to __imp____wine_dbgstr_wn (auto -import) ordinal.o(.text+0x52d6):ordinal.c: undefined reference to `wctype_table' ordinal.o(.text+0x52eb):ordinal.c: undefined reference to `wctype_table' path.o(.text+0x74d6):path.c: undefined reference to `casemap_lower' path.o(.text+0x74eb):path.c: undefined reference to `casemap_lower' path.o(.text+0x751a):path.c: undefined reference to `casemap_upper' path.o(.text+0x752f):path.c: undefined reference to `casemap_upper' path.o(.text+0x7752):path.c: undefined reference to `wctype_table' path.o(.text+0x7767):path.c: undefined reference to `wctype_table' string.o(.text+0x1d2d):string.c: undefined reference to `wvsnprintfA@16' string.o(.text+0x1d61):string.c: undefined reference to `wvsnprintfW@16' string.o(.text+0x1d8e):string.c: undefined reference to `casemap_upper' string.o(.text+0x1da3):string.c: undefined reference to `casemap_upper' url.o(.text+0x4426):url.c: undefined reference to `wctype_table' url.o(.text+0x443b):url.c: undefined reference to `wctype_table' fu000001.o(.idata$3+0xc): undefined reference to `libwine_a_iname' fu000002.o(.idata$3+0xc): undefined reference to `libwine_a_iname' fu000004.o(.idata$3+0xc): undefined reference to `libwine_a_iname' fu000005.o(.idata$3+0xc): undefined reference to `libwine_a_iname' fu000006.o(.idata$3+0xc): undefined reference to `libwine_a_iname' fu000007.o(.idata$3+0xc): more undefined references to `libwine_a_iname' follow nmth000000.o(.idata$4+0x0): undefined reference to `_nm____wine_dbgstr_guid' nmth000003.o(.idata$4+0x0): undefined reference to `_nm____wine_dbgstr_an' nmth000009.o(.idata$4+0x0): undefined reference to `_nm____wine_dbgstr_wn' collect2: ld returned 1 exit status dllwrap: gcc exited with status 1 make: *** [shlwapi.dll] Error 1
"Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson
"Steven Edwards" Steven_Ed4153@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
Does it work better with this patch?
I'm having touble applying the patch, should it just be the standard Patch -p0../patch.diff
This is what happens on every part patching file `include/wine/debug.h' patch: **** malformed patch at line 17: @@ -102,11 +95,11 @@
Thanks Steven
"Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson
Does it work better with this patch?
Yes I have manualy applied the patch and my results are much better now. I have just done a rebuild of unicode and library with no problems other then the normal libwine.dll needing to be linked to msvcrt
Here is the output from building shlwapi dllwrap --add-stdcall-alias --def shlwapi.spec.def --implib shlwapi.a -o shlwapi .dll ordinal.o path.o reg.o regstream.o shlwapi_main.o string.o url.o shlwa pi.dll.dbg.o -L../../dlls -luser32 -lgdi32 -ladvapi32 -lkernel32 -L../../library -lwine -L../../ole -lwine_uuid -L../../unicode -lwine_unicode -lm string.o(.text+0x1d2d):string.c: undefined reference to `wvsnprintfA@16' string.o(.text+0x1d61):string.c: undefined reference to `wvsnprintfW@16' collect2: ld returned 1 exit status dllwrap: gcc exited with status 1 make: *** [shlwapi.dll] Error 1
I assume wvsnsprintf is a ntdll export?
"Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson
-
Alexandre Julliard -
Steven Edwards