February 2006 - Wine-commits

Detlef Riekenberg : winspool: Add documentation and a stub for SetDefaultPrinterA/W.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: e267ccfe6e6330cd701689cb1873e2556a22dd3d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e267ccfe6e6330cd701689c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 20 11:51:04 2006 +0100 winspool: Add documentation and a stub for SetDefaultPrinterA/W. --- dlls/winspool/info.c | 44 +++++++++++++++++++++++++++++++++++++++ dlls/winspool/winspool.drv.spec | 4 ++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 15f0c48..83ae8f7 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -4148,6 +4148,50 @@ end: /****************************************************************************** + * SetDefaultPrinterW (WINSPOOL.204) + * + * Set the Name of the Default Printer + * + * PARAMS + * pszPrinter [I] Name of the Printer or NULL + * + * RETURNS + * Success: True + * Failure: FALSE + * + * NOTES + * When the Parameter is NULL or points to an Empty String and + * a Default Printer was already present, then this Function changes nothing. + * Without a Default Printer and NULL (or an Empty String) as Parameter, + * the First enumerated local Printer is used. + * + */ +BOOL WINAPI SetDefaultPrinterW(LPCWSTR pszPrinter) +{ + + TRACE("(%s)\n", debugstr_w(pszPrinter)); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/****************************************************************************** + * SetDefaultPrinterA (WINSPOOL.202) + * + * See SetDefaultPrinterW. + * + */ +BOOL WINAPI SetDefaultPrinterA(LPCSTR pszPrinter) +{ + + TRACE("(%s)\n", debugstr_a(pszPrinter)); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/****************************************************************************** * SetPrinterDataExA (WINSPOOL.@) */ DWORD WINAPI SetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, diff --git a/dlls/winspool/winspool.drv.spec b/dlls/winspool/winspool.drv.spec index bc85e7d..cf965f6 100644 --- a/dlls/winspool/winspool.drv.spec +++ b/dlls/winspool/winspool.drv.spec @@ -6,9 +6,9 @@ 105 stub PerfCollect 106 stub PerfOpen 201 stdcall GetDefaultPrinterA(ptr ptr) -202 stub SetDefaultPrinterA +202 stdcall SetDefaultPrinterA(str) 203 stdcall GetDefaultPrinterW(ptr ptr) -204 stub SetDefaultPrinterW +204 stdcall SetDefaultPrinterW(wstr) 205 stub -noname SplReadPrinter 206 stub -noname AddPerMachineConnectionA 207 stub -noname AddPerMachineConnectionW

1 0

Martin Fuchs : shell32: Avoid recursing SHELL32_GetItemAttributes() calls.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 8167c415ab4e1f80f2d1240edc60a01b9a570845 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8167c415ab4e1f80f2d1240… Author: Martin Fuchs <martin-fuchs(a)gmx.net> Date: Mon Feb 20 11:50:56 2006 +0100 shell32: Avoid recursing SHELL32_GetItemAttributes() calls. --- dlls/shell32/shlfolder.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index e81056b..57bf5f6 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -425,11 +425,20 @@ HRESULT SHELL32_GetItemAttributes (IShel if (!dwAttributes && has_guid) { WCHAR path[MAX_PATH]; + STRRET strret; /* File attributes are not present in the internal PIDL structure, so get them from the file system. */ - if (SHGetPathFromIDListW(pidl, path)) - dwAttributes = GetFileAttributesW(path); - } + + HRESULT hr = IShellFolder_GetDisplayNameOf(psf, pidl, SHGDN_FORPARSING, &strret); + + if (SUCCEEDED(hr)) { + hr = StrRetToBufW(&strret, pidl, path, MAX_PATH); + + /* call GetFileAttributes() only for file system paths, not for parsing names like "::{...}" */ + if (SUCCEEDED(hr) && path[0]!=':') + dwAttributes = GetFileAttributesW(path); + } + } /* Set common attributes */ *pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE |

1 0

Alexandre Julliard : configure: Use --rpath if supported when building binaries to point to
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 5ed59015b290c7c1238c7d08cacc299f0aa151e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ed59015b290c7c1238c7d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 11:20:47 2006 +0100 configure: Use --rpath if supported when building binaries to point to the relative location of the wine libraries. --- configure | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 8 ++++++ loader/Makefile.in | 7 +++--- server/Makefile.in | 4 ++- 4 files changed, 79 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 7a16ba1..7ce6ed6 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS MAIN_BINARY EXTRA_BINARIES LDD LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDEXERPATH COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS MAIN_BINARY EXTRA_BINARIES LDD LIBOBJS LTLIBOBJS' ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_IMPLIB_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES' # Initialize some variables set by options. @@ -12712,6 +12712,68 @@ echo "${ECHO_T}$ac_cv_c_export_dynamic" fi + echo "$as_me:$LINENO: checking whether the linker accepts --rpath" >&5 +echo $ECHO_N "checking whether the linker accepts --rpath... $ECHO_C" >&6 +if test "${ac_cv_ld_rpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_ld_rpath="yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_ld_rpath="no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +echo "$as_me:$LINENO: result: $ac_cv_ld_rpath" >&5 +echo "${ECHO_T}$ac_cv_ld_rpath" >&6 + if test "$ac_cv_ld_rpath" = "yes" + then + LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" + + fi + case $host_cpu in *i[3456789]86*) echo "$as_me:$LINENO: checking whether we can relocate the executable to 0x7bf00000" >&5 @@ -19850,6 +19912,7 @@ s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t s,@DLLWRAP@,$DLLWRAP,;t t s,@ac_ct_DLLWRAP@,$ac_ct_DLLWRAP,;t t s,@LDEXECFLAGS@,$LDEXECFLAGS,;t t +s,@LDEXERPATH@,$LDEXERPATH,;t t s,@COREFOUNDATIONLIB@,$COREFOUNDATIONLIB,;t t s,@IOKITLIB@,$IOKITLIB,;t t s,@CROSSTEST@,$CROSSTEST,;t t diff --git a/configure.ac b/configure.ac index be2d693..2f2fcd5 100644 --- a/configure.ac +++ b/configure.ac @@ -987,6 +987,14 @@ case $host_os in AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"]) fi + AC_CACHE_CHECK([whether the linker accepts --rpath], ac_cv_ld_rpath, + [WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], + ac_cv_ld_rpath="yes",ac_cv_ld_rpath="no")]) + if test "$ac_cv_ld_rpath" = "yes" + then + AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"]) + fi + case $host_cpu in *i[[3456789]]86*) AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec, diff --git a/loader/Makefile.in b/loader/Makefile.in index 741fa65..f1cfd26 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -26,18 +26,19 @@ all: $(WINE_BINARIES) $(MODULE) $(MANPAG LIBPTHREAD = @LIBPTHREAD@ LDEXECFLAGS = @LDEXECFLAGS@ +LDEXERPATH = @LDEXERPATH@ wine-glibc: glibc.o Makefile.in - $(CC) -o $@ glibc.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) + $(CC) -o $@ glibc.o $(LDEXERPATH) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) wine-preloader: preloader.o Makefile.in $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS) wine-kthread: $(KTHREAD_OBJS) Makefile.in - $(CC) -o $@ $(LDEXECFLAGS) $(KTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) + $(CC) -o $@ $(LDEXECFLAGS) $(LDEXERPATH) $(KTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) wine-pthread: $(PTHREAD_OBJS) Makefile.in - $(CC) -o $@ $(LDEXECFLAGS) $(PTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) + $(CC) -o $@ $(LDEXECFLAGS) $(LDEXERPATH) $(PTHREAD_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(MODULE): $(MAIN_BINARY) $(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE) diff --git a/server/Makefile.in b/server/Makefile.in index 2b0e952..fbcc1ae 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -57,8 +57,10 @@ all: $(PROGRAMS) $(MANPAGES) @MAKE_RULES@ +LDEXERPATH = @LDEXERPATH@ + wineserver: $(OBJS) - $(CC) -o $(PROGRAMS) $(OBJS) $(LIBWINE) $(LIBUNICODE) $(LIBPORT) $(LDFLAGS) $(LIBS) + $(CC) -o $@ $(LDEXERPATH) $(OBJS) $(LIBWINE) $(LIBUNICODE) $(LIBPORT) $(LDFLAGS) $(LIBS) install:: $(PROGRAMS) $(MANPAGES) $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext)

1 0

Michael Stefaniuc : msvcrt: Misc cleanups in undname.c.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 4758df4687fdb1264ed22499a2deaefe2104f996 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4758df4687fdb1264ed2249… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 20 11:18:51 2006 +0100 msvcrt: Misc cleanups in undname.c. - remove unused argument from functions - print the pointer in the str_array_push TRACE to be able to distinguish the different arrays. - comment and white space cleanups --- dlls/msvcrt/undname.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index f879e49..d2e7668 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* TODO: - * - document a bit (grammar + fonctions) + * - document a bit (grammar + functions) * - back-port this new code into tools/winedump/msmangle.c */ @@ -201,7 +201,7 @@ static void str_array_push(struct parsed c = '>'; if (i < a->start) c = '-'; else if (i >= a->num) c = '}'; - TRACE("\t%d%c %s\n", i, c, a->elts[i]); + TRACE("%p\t%d%c %s\n", a, i, c, a->elts[i]); } } } @@ -497,15 +497,16 @@ static BOOL get_class(struct parsed_symb /****************************************************************** * get_class_string - * From an array collected by get_class, constructs the corresponding (allocated) - * string + * From an array collected by get_class in sym->stack, constructs the + * corresponding (allocated) string */ -static char* get_class_string(struct parsed_symbol* sym, /*const struct array* a, */int start) +static char* get_class_string(struct parsed_symbol* sym, int start) { int i; size_t len, sz; char* ret; struct array *a = &sym->stack; + for (len = 0, i = start; i < a->num; i++) { assert(a->elts[i]); @@ -547,9 +548,8 @@ static char* get_class_name(struct parse * Returns a static string corresponding to the calling convention described * by char 'ch'. Sets export to TRUE iff the calling convention is exported. */ -static BOOL get_calling_convention(struct parsed_symbol* sym, char ch, - const char** call_conv, const char** exported, - unsigned flags) +static BOOL get_calling_convention(char ch, const char** call_conv, + const char** exported, unsigned flags) { *call_conv = *exported = NULL; @@ -591,7 +591,7 @@ static BOOL get_calling_convention(struc * get_simple_type * Return a string containing an allocated string for a simple data type */ -static const char* get_simple_type(struct parsed_symbol* sym, char c) +static const char* get_simple_type(char c) { const char* type_string; @@ -615,11 +615,12 @@ static const char* get_simple_type(struc } return type_string; } + /******************************************************************* * get_extented_type * Return a string containing an allocated string for a simple data type */ -static const char* get_extended_type(struct parsed_symbol* sym, char c) +static const char* get_extended_type(char c) { const char* type_string; @@ -663,13 +664,13 @@ static BOOL demangle_datatype(struct par { case '_': /* MS type: __int8,__int16 etc */ - ct->left = get_extended_type(sym, *sym->current++); + ct->left = get_extended_type(*sym->current++); break; case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J': case 'K': case 'M': case 'N': case 'O': case 'X': case 'Z': /* Simple data types */ - ct->left = get_simple_type(sym, dt); + ct->left = get_simple_type(dt); add_pmt = FALSE; break; case 'T': /* union */ @@ -719,7 +720,7 @@ static BOOL demangle_datatype(struct par struct datatype_t sub_ct; unsigned mark = sym->stack.num; - if (!get_calling_convention(sym, *sym->current++, + if (!get_calling_convention(*sym->current++, &call_conv, &exported, sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE) || !demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) @@ -964,8 +965,8 @@ static BOOL handle_method(struct parsed_ name = get_class_string(sym, 0); - if (!get_calling_convention(sym, *sym->current++, - &call_conv, &exported, sym->flags)) + if (!get_calling_convention(*sym->current++, &call_conv, &exported, + sym->flags)) goto done; str_array_init(&array_pmt); @@ -1010,7 +1011,7 @@ done: } /******************************************************************* - * demangle_symbol + * symbol_demangle * Demangle a C++ linker symbol */ static BOOL symbol_demangle(struct parsed_symbol* sym)

1 0

Michael Stefaniuc : msvcrt: Add some tests for __unDName().
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 067be97852595ad6e7de6bae73fc5ecab8d2e1be URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=067be97852595ad6e7de6ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 20 11:18:25 2006 +0100 msvcrt: Add some tests for __unDName(). Add some tests for unDName() checking: - data type modifiers A,B,P,Q,R,S - literal strings - back references to names --- dlls/msvcrt/tests/cpp.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 14eae6d..8165ffd 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -963,6 +963,15 @@ static void test_demangle(void) {"??_V(a)YAXPAX@Z", "void __cdecl operator delete[](void *)"}, {"??X?$_Complex_base(a)M@std@@QAEAAV01(a)ABM@Z", "public: class std::_Complex_base<float> & __thiscall std::_Complex_base<float>::operator*=(float const &)"}, {"??Xstd@@YAAAV?$complex(a)M@0(a)AAV10@ABV10@@Z", "class std::complex<float> & __cdecl std::operator*=(class std::complex<float> &,class std::complex<float> const &)"}, +{"?aaa@@YAHAAUbbb@@@Z", "int __cdecl aaa(struct bbb &)"}, +{"?aaa@@YAHBAUbbb@@@Z", "int __cdecl aaa(struct bbb & volatile)"}, +{"?aaa@@YAHPAUbbb@@@Z", "int __cdecl aaa(struct bbb *)"}, +{"?aaa@@YAHQAUbbb@@@Z", "int __cdecl aaa(struct bbb * const)"}, +{"?aaa@@YAHRAUbbb@@@Z", "int __cdecl aaa(struct bbb * volatile)"}, +{"?aaa@@YAHSAUbbb@@@Z", "int __cdecl aaa(struct bbb * const volatile)"}, +{"??0aa.a@@QAE(a)XZ", "??0aa.a@@QAE(a)XZ"}, +{"??0aa$_3a@@QAE(a)XZ", "public: __thiscall aa$_3a::aa$_3a(void)"}, +{"??2?$aaa(a)AAUbbb@@AAUccc@@AAU2@@ddd(a)1eee@2(a)QAEHXZ", "public: int __thiscall eee::eee::ddd::ddd::aaa<struct bbb &,struct ccc &,struct ccc &>::operator new(void)"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name;

1 0

Michael Stefaniuc : msvcrt: Use a separate stack for back references to names
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 262a5eec7873a3890c044650b950cb532fa368a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=262a5eec7873a3890c04465… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 20 11:18:04 2006 +0100 msvcrt: Use a separate stack for back references to names Use a separate array/stack for the back references to names as sym->stack is used to push temporary strings to it which breaks back referencing in some occasions (26 symbols in the mfc42 dll). During this cleanup get_class() a little bit. --- dlls/msvcrt/undname.c | 47 +++++++++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index f5e3ecd..f879e49 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -91,6 +91,7 @@ struct parsed_symbol const char* current; /* pointer in input (mangled) string */ char* result; /* demangled string */ + struct array names; /* array of names for back reference */ struct array stack; /* stack of parsed strings */ void* alloc_list; /* linked list of allocated blocks */ @@ -420,9 +421,9 @@ static char* get_literal_string(struct p } } while (*++sym->current != '@'); sym->current++; - str_array_push(sym, ptr, sym->current - 1 - ptr, &sym->stack); + str_array_push(sym, ptr, sym->current - 1 - ptr, &sym->names); - return str_array_get_ref(&sym->stack, sym->stack.num - sym->stack.start - 1); + return str_array_get_ref(&sym->names, sym->names.num - sym->names.start - 1); } /****************************************************************** @@ -440,7 +441,7 @@ static char* get_literal_string(struct p */ static BOOL get_class(struct parsed_symbol* sym) { - const char* ptr; + const char* name = NULL; while (*sym->current != '@') { @@ -451,39 +452,44 @@ static BOOL get_class(struct parsed_symb case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': - ptr = str_array_get_ref(&sym->stack, *sym->current++ - '0'); - if (!ptr) return FALSE; - str_array_push(sym, ptr, -1, &sym->stack); + name = str_array_get_ref(&sym->names, *sym->current++ - '0'); break; case '?': if (*++sym->current == '$') { - const char* name; - char* full = NULL; + /* In a template argument list the back reference to names + table is separately created. '0' points to the class + component name with the template arguments. We use the same + stack array to hold the names but save/restore the stack + state before/after parsing the template argument list. */ char* args = NULL; - unsigned num_mark = sym->stack.num; - unsigned start_mark = sym->stack.start; + unsigned num_mark = sym->names.num; + unsigned start_mark = sym->names.start; + unsigned stack_mark = sym->stack.num; + sym->names.start = sym->names.num; sym->current++; - sym->stack.start = sym->stack.num; if (!(name = get_literal_string(sym))) return FALSE; args = get_args(sym, NULL, FALSE, '<', '>'); if (args != NULL) - { - full = str_printf(sym, "%s%s", name, args); - } - if (!full) return FALSE; - sym->stack.elts[num_mark] = full; - sym->stack.num = num_mark + 1; - sym->stack.start = start_mark; + name = str_printf(sym, "%s%s", name, args); + sym->names.num = num_mark; + sym->names.start = start_mark; + sym->stack.num = stack_mark; + /* Now that we are back to the standard name scope push + the class component with all its template arguments + to the names array for back reference. */ + str_array_push(sym, name, -1, &sym->names); } break; default: - if (!get_literal_string(sym)) - return FALSE; + name = get_literal_string(sym); break; } + if (!name) + return FALSE; + str_array_push(sym, name, -1, &sym->stack); } sym->current++; return TRUE; @@ -1027,6 +1033,7 @@ static BOOL symbol_demangle(struct parse /* MS mangled names always begin with '?' */ if (*sym->current != '?') return FALSE; + str_array_init(&sym->names); str_array_init(&sym->stack); sym->current++;

1 0

Michael Stefaniuc : msvcrt: Move code to parse a literal string out of get_class().
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: e367ebbf19d7d0531bbb28de9cf35d8aa46b5c2b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e367ebbf19d7d0531bbb28d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 20 11:17:41 2006 +0100 msvcrt: Move code to parse a literal string out of get_class(). unDName: Move the code to parse a literal string from get_class() to a separate function. Add some error handling to the new function. --- dlls/msvcrt/undname.c | 55 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 4318ca8..f5e3ecd 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -400,11 +400,43 @@ static const char* get_modified_type(str } /****************************************************************** + * get_literal_string + * Gets the literal name from the current position in the mangled + * symbol to the first '@' character. It pushes the parsed name to + * the symbol names stack and returns a pointer to it or NULL in + * case of an error. + */ +static char* get_literal_string(struct parsed_symbol* sym) +{ + const char *ptr = sym->current; + + do { + if (!((*sym->current >= 'A' && *sym->current <= 'Z') || + (*sym->current >= 'a' && *sym->current <= 'z') || + (*sym->current >= '0' && *sym->current <= '9') || + *sym->current == '_' || *sym->current == '$')) { + TRACE("Failed at '%c' in %s\n", *sym->current, ptr); + return NULL; + } + } while (*++sym->current != '@'); + sym->current++; + str_array_push(sym, ptr, sym->current - 1 - ptr, &sym->stack); + + return str_array_get_ref(&sym->stack, sym->stack.num - sym->stack.start - 1); +} + +/****************************************************************** * get_class - * Parses class as a list of parent-classes, separated by '@', terminated by '@@' - * and stores the result in 'a' array. Each parent-classes, as well as the inner - * element (either field/method name or class name), are stored as allocated - * strings in the array. + * Parses class as a list of parent-classes, terminated by '@' and stores the + * result in 'a' array. Each parent-classes, as well as the inner element + * (either field/method name or class name), are represented in the mangled + * name by a literal name ([a-zA-Z0-9_]+ terminated by '@') or a back reference + * ([0-9]) or a name with template arguments ('?$' literal name followed by the + * template argument list). The class name components appear in the reverse + * order in the mangled name, e.g aaa(a)bbb@ccc@@ will be demangled to + * ccc::bbb::aaa + * For each of this class name componets a string will be allocated in the + * array. */ static BOOL get_class(struct parsed_symbol* sym) { @@ -426,20 +458,20 @@ static BOOL get_class(struct parsed_symb case '?': if (*++sym->current == '$') { - const char* name = ++sym->current; + const char* name; char* full = NULL; char* args = NULL; unsigned num_mark = sym->stack.num; unsigned start_mark = sym->stack.start; - while (*sym->current++ != '@'); - + sym->current++; sym->stack.start = sym->stack.num; - str_array_push(sym, name, sym->current - name -1, &sym->stack); + if (!(name = get_literal_string(sym))) + return FALSE; args = get_args(sym, NULL, FALSE, '<', '>'); if (args != NULL) { - full = str_printf(sym, "%s%s", sym->stack.elts[num_mark], args); + full = str_printf(sym, "%s%s", name, args); } if (!full) return FALSE; sym->stack.elts[num_mark] = full; @@ -448,9 +480,8 @@ static BOOL get_class(struct parsed_symb } break; default: - ptr = sym->current; - while (*sym->current++ != '@'); - str_array_push(sym, ptr, sym->current - 1 - ptr, &sym->stack); + if (!get_literal_string(sym)) + return FALSE; break; } }

1 0

Michael Stefaniuc : msvcrt: Wrap get_class() and get_class_string() for unDName.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 538d1a1233aa8f7f4148d44d7c9a0ec65c3c3f8d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=538d1a1233aa8f7f4148d44… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 20 11:16:59 2006 +0100 msvcrt: Wrap get_class() and get_class_string() for unDName. --- dlls/msvcrt/undname.c | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 16e21d8..4318ca8 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -491,6 +491,21 @@ static char* get_class_string(struct par } /****************************************************************** + * get_class_name + * Wrapper around get_class and get_class_string. + */ +static char* get_class_name(struct parsed_symbol* sym) +{ + unsigned mark = sym->stack.num; + char* s = NULL; + + if (get_class(sym)) + s = get_class_string(sym, mark); + sym->stack.num = mark; + return s; +} + +/****************************************************************** * get_calling_convention * Returns a static string corresponding to the calling convention described * by char 'ch'. Sets export to TRUE iff the calling convention is exported. @@ -625,13 +640,11 @@ static BOOL demangle_datatype(struct par case 'V': /* class */ /* Class/struct/union */ { - unsigned mark = sym->stack.num; const char* struct_name = NULL; const char* type_name = NULL; - if (!get_class(sym) || - !(struct_name = get_class_string(sym, mark))) goto done; - sym->stack.num = mark; + if (!(struct_name = get_class_name(sym))) + goto done; if (!(sym->flags & UNDNAME_NO_COMPLEX_TYPE)) { switch (dt) @@ -691,11 +704,9 @@ static BOOL demangle_datatype(struct par if (*sym->current == '4') { char* enum_name; - unsigned mark = sym->stack.num; sym->current++; - if (!get_class(sym) || - !(enum_name = get_class_string(sym, mark))) goto done; - sym->stack.num = mark; + if (!(enum_name = get_class_name(sym))) + goto done; if (sym->flags & UNDNAME_NO_COMPLEX_TYPE) ct->left = enum_name; else @@ -813,12 +824,10 @@ static BOOL handle_data(struct parsed_sy if (!get_modifier(*sym->current++, &modifier)) goto done; if (*sym->current != '@') { - unsigned mark = sym->stack.num; char* cls = NULL; - if (!get_class(sym) || - !(cls = get_class_string(sym, mark))) goto done; - sym->stack.num = mark; + if (!(cls = get_class_name(sym))) + goto done; ct.right = str_printf(sym, "{for `%s'}", cls); } break;

1 0

Michael Stefaniuc : msvcrt: Fix 20 tests from demangle_test() on old Win versions.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 29fe8d02c7895a7d31b03a2032fe04d1d8a46fc2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29fe8d02c7895a7d31b03a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 20 11:16:27 2006 +0100 msvcrt: Fix 20 tests from demangle_test() on old Win versions. In test_demangle use a custom strcmp that treats multiple spaces as single space. __unDName() from older msvcrt (including W2K it seems) emit in some places 2 spaces instead of one. Fixes 20 failing tests on those old Windows versions. --- dlls/msvcrt/tests/cpp.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index a0e73ce..14eae6d 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -849,6 +849,26 @@ static void test_demangle_datatype(void) } } + +/* Compare two strings treating multiple spaces (' ', ascii 0x20) in s2 + as single space. Needed for test_demangle as __unDName() returns sometimes + two spaces instead of one in some older native msvcrt dlls. */ +static int strcmp_space(const char *s1, const char *s2) +{ + const char* s2start = s2; + do { + while (*s1 == *s2 && *s1) { + s1++; + s2++; + } + if (*s2 == ' ' && s2 > s2start && *(s2 - 1) == ' ') + s2++; + else + break; + } while (*s1 && *s2); + return *s1 - *s2; +} + static void test_demangle(void) { static struct {const char* in; const char* out;} test[] = { @@ -950,7 +970,8 @@ static void test_demangle(void) for (i = 0; i < num_test; i++) { name = p__unDName(0, test[i].in, 0, pmalloc, pfree, 0); - ok(name != NULL && !strcmp(name, test[i].out), "Got name \"%s\" for %d\n", name, i); + ok(name != NULL && !strcmp_space(test[i].out, name), + "Got name \"%s\" for %d\n", name, i); pfree(name); } }

1 0

Robert Shearman : ole: Test the behaviour of CoCreateInstance with an uninitialized apartment.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 023ad38914080453d0b2536d77ce36eb0152a7cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=023ad38914080453d0b2536… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Feb 20 11:16:08 2006 +0100 ole: Test the behaviour of CoCreateInstance with an uninitialized apartment. --- dlls/ole32/tests/compobj.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index ef043b1..8882d28 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "shlguid.h" #include "wine/test.h" @@ -81,9 +82,30 @@ static void test_CLSIDFromString(void) ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); } +static void test_CoCreateInstance(void) +{ + REFCLSID rclsid = &CLSID_MyComputer; + IUnknown *pUnk = (IUnknown *)0xdeadbeef; + HRESULT hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have return CO_E_NOTINITIALIZED instead of 0x%08lx", hr); + todo_wine { + ok(pUnk == NULL, "CoCreateInstance should have changed the passed in pointer to NULL, instead of %p\n", pUnk); + } + + OleInitialize(NULL); + hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + ok_ole_success(hr, "CoCreateInstance"); + IUnknown_Release(pUnk); + OleUninitialize(); + + hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have return CO_E_NOTINITIALIZED instead of 0x%08lx", hr); +} + START_TEST(compobj) { test_ProgIDFromCLSID(); test_CLSIDFromProgID(); test_CLSIDFromString(); + test_CoCreateInstance(); }

1 0