June 2015 - Wine-commits - list.winehq.org

Ken Thomases : dbghelp: Fix mapping of DWARF register numbers on x86 OS X.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 83c1255f660e13ee07d1529a7ef0dde7820ad808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c1255f660e13ee07d1529a7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jun 28 20:45:09 2015 -0500 dbghelp: Fix mapping of DWARF register numbers on x86 OS X. For backward compatibility with old, buggy GCC, Apple uses a different register numbering scheme for the eh_frame section. See, for reference, the comments near the top of this file from LLDB's source: https://github.com/llvm-mirror/lldb/blob/release_36/source/Plugins/Process/… --- dlls/dbghelp/cpu_arm.c | 2 +- dlls/dbghelp/cpu_arm64.c | 2 +- dlls/dbghelp/cpu_i386.c | 15 ++++++++++++--- dlls/dbghelp/cpu_ppc.c | 2 +- dlls/dbghelp/cpu_x86_64.c | 2 +- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/dwarf.c | 34 +++++++++++++++++----------------- 7 files changed, 34 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83c1255f660e13ee07d15…

1 0

Ken Thomases : dbghelp: Don' t parse the DWARF info from Mach-O files if we were requested to only provide public symbols.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 70565f1b8bd789412aad46743a6c3f9cab95f03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=70565f1b8bd789412aad46743… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jun 28 20:45:10 2015 -0500 dbghelp: Don't parse the DWARF info from Mach-O files if we were requested to only provide public symbols. This now works more like how the ELF and PE support works. --- dlls/dbghelp/macho_module.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index f39b4b6..6be0018 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1002,9 +1002,12 @@ BOOL macho_load_debug_info(struct module* module) macho_finish_stabs(module, &mdi.ht_symtab); - if (dwarf2_parse(module, module->reloc_delta, NULL /* FIXME: some thunks to deal with ? */, - &module->format_info[DFI_MACHO]->u.macho_info->file_map)) - ret = TRUE; + if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) + { + if (dwarf2_parse(module, module->reloc_delta, NULL /* FIXME: some thunks to deal with ? */, + &module->format_info[DFI_MACHO]->u.macho_info->file_map)) + ret = TRUE; + } pool_destroy(&mdi.pool); return ret;

1 0

Ken Thomases : dbghelp: Add support for loading an external DWARF debug info file associated with a Mach-O module.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 5c39776327c09cca39581c1ebab3d3f281685caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c39776327c09cca39581c1eb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jun 28 20:45:11 2015 -0500 dbghelp: Add support for loading an external DWARF debug info file associated with a Mach-O module. Such external debug info files are created by the dsymutil command. Usually, it creates a <name>.dSYM bundle directory but it can also produce a <name>.dwarf flat file. The code will find and use either. It first checks if such a bundle or file is adjacent to the module binary. If it's not, it uses Spotlight to search for a .dSYM bundle based on the binary's UUID, which is what gdb and lldb do, too. That way, it can find it anywhere on the system. --- dlls/dbghelp/Makefile.in | 2 +- dlls/dbghelp/image_private.h | 2 + dlls/dbghelp/macho_module.c | 241 +++++++++++++++++++++++++++++++++++++++---- 3 files changed, 223 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c39776327c09cca39581…

1 0

Ken Thomases : Revert "configure: Prefer stabs debug info on Mac OS.".
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: a75f863a1405c1e6c72e6a59ae497dd67ab934e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a75f863a1405c1e6c72e6a59a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jun 28 20:45:12 2015 -0500 Revert "configure: Prefer stabs debug info on Mac OS.". This reverts commit f5bc7afe19763bf95cdff49645317d2d2ac0613d. --- configure | 31 ++----------------------------- configure.ac | 9 +++------ 2 files changed, 5 insertions(+), 35 deletions(-) diff --git a/configure b/configure index fd8ebc2..cb6afc1 100755 --- a/configure +++ b/configure @@ -14164,33 +14164,7 @@ fi for ac_flag in $CFLAGS; do case $ac_flag in - -g) case $host_os in - darwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstabs+" >&5 -$as_echo_n "checking whether the compiler supports -gstabs+... " >&6; } -if ${ac_cv_cflags__gstabsp+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -gstabs+" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__gstabsp=yes -else - ac_cv_cflags__gstabsp=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__gstabsp" >&5 -$as_echo "$ac_cv_cflags__gstabsp" >&6; } -if test "x$ac_cv_cflags__gstabsp" = xyes; then : - EXTRACFLAGS="$EXTRACFLAGS -gstabs+" -fi ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5 + -g) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5 $as_echo_n "checking whether the compiler supports -gdwarf-2... " >&6; } if ${ac_cv_cflags__gdwarf_2+:} false; then : $as_echo_n "(cached) " >&6 @@ -14215,7 +14189,7 @@ $as_echo "$ac_cv_cflags__gdwarf_2" >&6; } if test "x$ac_cv_cflags__gdwarf_2" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -gdwarf-2" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5 $as_echo_n "checking whether the compiler supports -gstrict-dwarf... " >&6; } if ${ac_cv_cflags__gstrict_dwarf+:} false; then : $as_echo_n "(cached) " >&6 @@ -14240,7 +14214,6 @@ $as_echo "$ac_cv_cflags__gstrict_dwarf" >&6; } if test "x$ac_cv_cflags__gstrict_dwarf" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -gstrict-dwarf" fi ;; - esac ;; esac done diff --git a/configure.ac b/configure.ac index 177d88a..cca4e0c 100644 --- a/configure.ac +++ b/configure.ac @@ -1839,14 +1839,11 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= CFLAGS=$saved_CFLAGS - dnl On Darwin, prefer stabs; everywhere else, default to dwarf-2 debug info + dnl Default to dwarf-2 debug info for ac_flag in $CFLAGS; do case $ac_flag in - -g) case $host_os in - darwin*) WINE_TRY_CFLAGS([-gstabs+]) ;; - *) WINE_TRY_CFLAGS([-gdwarf-2]) - WINE_TRY_CFLAGS([-gstrict-dwarf]) ;; - esac ;; + -g) WINE_TRY_CFLAGS([-gdwarf-2]) + WINE_TRY_CFLAGS([-gstrict-dwarf]) ;; esac done

1 0

Nikolay Sivov : qmgr: Fix WINHTTP_OPTION_CONTEXT_VALUE data pointer ( Coverity).
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: c3e4dff9f7cb8aaab6c1bb3cfcc17408ddff4cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e4dff9f7cb8aaab6c1bb3cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 27 10:50:01 2015 +0300 qmgr: Fix WINHTTP_OPTION_CONTEXT_VALUE data pointer (Coverity). --- dlls/qmgr/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index c132c7e..4dccbfd 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -378,7 +378,7 @@ static BOOL transfer_file_http(BackgroundCopyFileImpl *file, URL_COMPONENTSW *uc if (!(ses = WinHttpOpen(NULL, 0, NULL, NULL, WINHTTP_FLAG_ASYNC))) return FALSE; WinHttpSetStatusCallback(ses, progress_callback_http, WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS, 0); - if (!WinHttpSetOption(ses, WINHTTP_OPTION_CONTEXT_VALUE, file, sizeof(file))) goto done; + if (!WinHttpSetOption(ses, WINHTTP_OPTION_CONTEXT_VALUE, &file, sizeof(file))) goto done; if (!(con = WinHttpConnect(ses, uc->lpszHostName, uc->nPort, 0))) goto done; if (!(req = WinHttpOpenRequest(con, NULL, uc->lpszUrlPath, NULL, NULL, NULL, flags))) goto done;

1 0

Daniel Lehman : msvcp90: Copy name in _Getctype (Valgrind).
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: ec6859f7e82f8148e465307358a43062e80a10e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6859f7e82f8148e46530735… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jun 22 17:44:44 2015 -0700 msvcp90: Copy name in _Getctype (Valgrind). --- dlls/msvcp90/locale.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 9b85322..b3275c1 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -682,6 +682,10 @@ _Collvec* __thiscall _Locinfo__Getcoll(const _Locinfo *this, _Collvec *ret) _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) { short *table; +#if _MSVCP_VER >= 110 + wchar_t *name; + MSVCP_size_t size; +#endif TRACE("\n"); @@ -689,7 +693,14 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) #if _MSVCP_VER < 110 ret->handle = ___lc_handle_func()[LC_COLLATE]; #else - ret->name = ___lc_locale_name_func()[LC_COLLATE]; + if((name = ___lc_locale_name_func()[LC_COLLATE])) { + size = wcslen(name)+1; + ret->name = malloc(size*sizeof(*name)); + if(!ret->name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); + memcpy(ret->name, name, size*sizeof(*name)); + } else { + ret->name = NULL; + } #endif ret->delfl = TRUE; table = malloc(sizeof(short[256]));

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::pbackfail.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 6cca77bf2a9b26fc0496876699b0f9b75d8e28bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cca77bf2a9b26fc049687669… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 29 10:01:48 2015 +0200 msvcirt: Add implementation of streambuf::pbackfail. --- dlls/msvcirt/msvcirt.c | 6 ++++-- dlls/msvcirt/tests/msvcirt.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 66858de..70e92e7 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -367,8 +367,10 @@ int __thiscall streambuf_overflow(streambuf *this, int c) DEFINE_THISCALL_WRAPPER(streambuf_pbackfail, 8) int __thiscall streambuf_pbackfail(streambuf *this, int c) { - FIXME("(%p %d): stub\n", this, c); - return 0; + TRACE("(%p %d)\n", this, c); + if (this->gptr <= this->eback) + return EOF; + return *--this->gptr = c; } /* ?seekoff(a)streambuf@@UAEJJW4seek_dir(a)ios@@H(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 42c0e3a..eca0304 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -57,6 +57,7 @@ static void (*__thiscall p_streambuf_clrclock)(streambuf*); static int (*__thiscall p_streambuf_doallocate)(streambuf*); static void (*__thiscall p_streambuf_gbump)(streambuf*, int); static void (*__thiscall p_streambuf_lock)(streambuf*); +static int (*__thiscall p_streambuf_pbackfail)(streambuf*, int); static void (*__thiscall p_streambuf_pbump)(streambuf*, int); static int (*__thiscall p_streambuf_sbumpc)(streambuf*); static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); @@ -148,6 +149,7 @@ static BOOL init(void) SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MEAAHXZ"); SET(p_streambuf_gbump, "?gbump(a)streambuf@@IEAAXH(a)Z"); SET(p_streambuf_lock, "?lock(a)streambuf@@QEAAXXZ"); + SET(p_streambuf_pbackfail, "?pbackfail(a)streambuf@@UEAAHH(a)Z"); SET(p_streambuf_pbump, "?pbump(a)streambuf@@IEAAXH(a)Z"); SET(p_streambuf_sbumpc, "?sbumpc(a)streambuf@@QEAAHXZ"); SET(p_streambuf_setb, "?setb(a)streambuf@@IEAAXPEAD0H(a)Z"); @@ -170,6 +172,7 @@ static BOOL init(void) SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MAEHXZ"); SET(p_streambuf_gbump, "?gbump(a)streambuf@@IAEXH(a)Z"); SET(p_streambuf_lock, "?lock(a)streambuf@@QAEXXZ"); + SET(p_streambuf_pbackfail, "?pbackfail(a)streambuf@@UAEHH(a)Z"); SET(p_streambuf_pbump, "?pbump(a)streambuf@@IAEXH(a)Z"); SET(p_streambuf_sbumpc, "?sbumpc(a)streambuf@@QAEHXZ"); SET(p_streambuf_setb, "?setb(a)streambuf@@IAEXPAD0H(a)Z"); @@ -689,6 +692,30 @@ static void test_streambuf(void) ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); ok(underflow_count == 57, "no call to underflow expected\n"); + /* pbackfail */ + ret = (int) call_func2(p_streambuf_pbackfail, &sb, 'A'); + ok(ret == 'A', "expected 'A' got '%c'\n", ret); + ok(sb.gptr == sb.eback + 2, "wrong get pointer, expected %p got %p\n", sb.eback + 2, sb.gptr); + ok(*sb.gptr == 'A', "expected 'A' in the get area, got %c\n", *sb.gptr); + ret = (int) call_func2(p_streambuf_pbackfail, &sb, EOF); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb.gptr == sb.eback + 1, "wrong get pointer, expected %p got %p\n", sb.eback + 1, sb.gptr); + ok(*sb.gptr == EOF, "expected EOF in the get area, got %c\n", *sb.gptr); + sb.gptr = sb.eback; + ret = (int) call_func2(p_streambuf_pbackfail, &sb, 'Z'); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb.gptr == sb.eback, "wrong get pointer, expected %p got %p\n", sb.eback, sb.gptr); + ok(*sb.gptr == 'T', "expected 'T' in the get area, got %c\n", *sb.gptr); + ret = (int) call_func2(p_streambuf_pbackfail, &sb, EOF); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb.gptr == sb.eback, "wrong get pointer, expected %p got %p\n", sb.eback, sb.gptr); + ok(*sb.gptr == 'T', "expected 'T' in the get area, got %c\n", *sb.gptr); + sb2.gptr = sb2.egptr + 1; + ret = (int) call_func2(p_streambuf_pbackfail, &sb2, 'X'); + ok(ret == 'X', "expected 'X' got '%c'\n", ret); + ok(sb2.gptr == sb2.egptr, "wrong get pointer, expected %p got %p\n", sb2.egptr, sb2.gptr); + ok(*sb2.gptr == 'X', "expected 'X' in the get area, got %c\n", *sb2.gptr); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE);

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::sputbackc.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 56f150b1c47c9781275b01543fd78fdffac273d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f150b1c47c9781275b01543… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 29 10:01:53 2015 +0200 msvcirt: Add implementation of streambuf::sputbackc. --- dlls/msvcirt/msvcirt.c | 10 ++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 70e92e7..a56fd61 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -365,6 +365,7 @@ int __thiscall streambuf_overflow(streambuf *this, int c) /* ?pbackfail(a)streambuf@@UAEHH(a)Z */ /* ?pbackfail(a)streambuf@@UEAAHH(a)Z */ DEFINE_THISCALL_WRAPPER(streambuf_pbackfail, 8) +#define call_streambuf_pbackfail(this, c) CALL_VTBL_FUNC(this, 36, int, (streambuf*, int), (this, c)) int __thiscall streambuf_pbackfail(streambuf *this, int c) { TRACE("(%p %d)\n", this, c); @@ -657,6 +658,15 @@ void __thiscall streambuf_stossc(streambuf *this) } } +/* ?sputbackc(a)streambuf@@QAEHD(a)Z */ +/* ?sputbackc(a)streambuf@@QEAAHD(a)Z */ +DEFINE_THISCALL_WRAPPER(streambuf_sputbackc, 8) +int __thiscall streambuf_sputbackc(streambuf *this, char ch) +{ + TRACE("(%p %d)\n", this, ch); + return call_streambuf_pbackfail(this, ch); +} + /****************************************************************** * ??1ios@@UAE(a)XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 913f186..f14821e 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -702,8 +702,8 @@ # @ extern ?sh_write(a)filebuf@@2HB # static int const filebuf::sh_write @ thiscall -arch=win32 ?snextc(a)streambuf@@QAEHXZ(ptr) streambuf_snextc @ cdecl -arch=win64 ?snextc(a)streambuf@@QEAAHXZ(ptr) streambuf_snextc -@ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z # int __thiscall streambuf::sputbackc(char) -@ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z +@ thiscall -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z(ptr long) streambuf_sputbackc +@ cdecl -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z(ptr long) streambuf_sputbackc @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) streambuf_sputc @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) streambuf_sputc @ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) streambuf_sputn diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index f37d876..c7dd035 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -690,8 +690,8 @@ # @ extern ?sh_write(a)filebuf@@2HB @ thiscall -arch=win32 ?snextc(a)streambuf@@QAEHXZ(ptr) msvcirt.?snextc(a)streambuf@@QAEHXZ @ cdecl -arch=win64 ?snextc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?snextc(a)streambuf@@QEAAHXZ -@ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z -@ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z +@ thiscall -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z(ptr long) msvcirt.?sputbackc(a)streambuf@@QAEHD(a)Z +@ cdecl -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z(ptr long) msvcirt.?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QEAAHH(a)Z @ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QAEHPBDH(a)Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 9173aef..bda6e2c 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -762,8 +762,8 @@ # @ extern ?sh_write(a)filebuf@@2HB @ thiscall -arch=win32 ?snextc(a)streambuf@@QAEHXZ(ptr) msvcirt.?snextc(a)streambuf@@QAEHXZ @ cdecl -arch=win64 ?snextc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?snextc(a)streambuf@@QEAAHXZ -@ stub -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z -@ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z +@ thiscall -arch=win32 ?sputbackc(a)streambuf@@QAEHD(a)Z(ptr long) msvcirt.?sputbackc(a)streambuf@@QAEHD(a)Z +@ cdecl -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z(ptr long) msvcirt.?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QEAAHH(a)Z @ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QAEHPBDH(a)Z

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::dbp.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 6096dfe6d9c6568a15e8f22c3b59ac8d6570bb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6096dfe6d9c6568a15e8f22c3… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 29 10:01:58 2015 +0200 msvcirt: Add implementation of streambuf::dbp. --- dlls/msvcirt/msvcirt.c | 16 ++++++++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a56fd61..0979673 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -667,6 +667,22 @@ int __thiscall streambuf_sputbackc(streambuf *this, char ch) return call_streambuf_pbackfail(this, ch); } +/* ?dbp(a)streambuf@@QAEXXZ */ +/* ?dbp(a)streambuf@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_dbp, 4) +void __thiscall streambuf_dbp(streambuf *this) +{ + printf("\nSTREAMBUF DEBUG INFO: this=%p, ", this); + if (this->unbuffered) { + printf("unbuffered\n"); + } else { + printf("_fAlloc=%d\n", this->allocated); + printf(" base()=%p, ebuf()=%p, blen()=%d\n", this->base, this->ebuf, streambuf_blen(this)); + printf("pbase()=%p, pptr()=%p, epptr()=%d\n", this->pbase, this->pptr, this->epptr); + printf("eback()=%p, gptr()=%p, egptr()=%d\n", this->eback, this->gptr, this->egptr); + } +} + /****************************************************************** * ??1ios@@UAE(a)XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index f14821e..0c9e520 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -437,8 +437,8 @@ @ thiscall -arch=win32 ?clrlock(a)streambuf@@QAEXXZ(ptr) streambuf_clrlock @ cdecl -arch=win64 ?clrlock(a)streambuf@@QEAAXXZ(ptr) streambuf_clrlock @ stub ?cout@@3Vostream_withassign@@A # class ostream_withassign cout -@ stub -arch=win32 ?dbp(a)streambuf@@QAEXXZ # void __thiscall streambuf::dbp(void) -@ stub -arch=win64 ?dbp(a)streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?dbp(a)streambuf@@QAEXXZ(ptr) streambuf_dbp +@ cdecl -arch=win64 ?dbp(a)streambuf@@QEAAXXZ(ptr) streambuf_dbp @ stub -arch=win32 ?dec@@YAAAVios@@AAV1@@Z # class ios & __cdecl dec(class ios &) @ stub -arch=win64 ?dec@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?delbuf(a)ios@@QAEXH(a)Z # void __thiscall ios::delbuf(int) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index c7dd035..c7b28bd 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -425,8 +425,8 @@ @ thiscall -arch=win32 ?clrlock(a)streambuf@@QAEXXZ(ptr) msvcirt.?clrlock(a)streambuf@@QAEXXZ @ cdecl -arch=win64 ?clrlock(a)streambuf@@QEAAXXZ(ptr) msvcirt.?clrlock(a)streambuf@@QEAAXXZ @ stub ?cout@@3Vostream_withassign@@A -@ stub -arch=win32 ?dbp(a)streambuf@@QAEXXZ -@ stub -arch=win64 ?dbp(a)streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?dbp(a)streambuf@@QAEXXZ(ptr) msvcirt.?dbp(a)streambuf@@QAEXXZ +@ cdecl -arch=win64 ?dbp(a)streambuf@@QEAAXXZ(ptr) msvcirt.?dbp(a)streambuf@@QEAAXXZ @ stub -arch=win32 ?dec@@YAAAVios@@AAV1@@Z @ stub -arch=win64 ?dec@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?delbuf(a)ios@@QAEXH(a)Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index bda6e2c..49df71c 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -490,8 +490,8 @@ @ thiscall -arch=win32 ?clrlock(a)streambuf@@QAEXXZ(ptr) msvcirt.?clrlock(a)streambuf@@QAEXXZ @ cdecl -arch=win64 ?clrlock(a)streambuf@@QEAAXXZ(ptr) msvcirt.?clrlock(a)streambuf@@QEAAXXZ @ stub ?cout@@3Vostream_withassign@@A -@ stub -arch=win32 ?dbp(a)streambuf@@QAEXXZ -@ stub -arch=win64 ?dbp(a)streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?dbp(a)streambuf@@QAEXXZ(ptr) msvcirt.?dbp(a)streambuf@@QAEXXZ +@ cdecl -arch=win64 ?dbp(a)streambuf@@QEAAXXZ(ptr) msvcirt.?dbp(a)streambuf@@QEAAXXZ @ stub -arch=win32 ?dec@@YAAAVios@@AAV1@@Z @ stub -arch=win64 ?dec@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?delbuf(a)ios@@QAEXH(a)Z

1 0

Jacek Caban : mshtml: Initialize output paramter before test call.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 069599135ba7d4b1f160e76349d02e2d32b8aee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=069599135ba7d4b1f160e7634… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 29 10:05:30 2015 +0200 mshtml: Initialize output paramter before test call. --- dlls/mshtml/tests/xmlhttprequest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index a1ca9a5..abfba57 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -485,6 +485,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); todo_wine ok(val == 0, "Expect 0, got %d\n", val); + text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); todo_wine ok(text == NULL, "Expect NULL, got %p\n", text);

1 0