August 2016 - Wine-commits - list.winehq.org

Austin English : ntdll: Add NtSuspendProcess stub.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: bd6f749c169ff682f8d11542f66dcd7c354b0aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6f749c169ff682f8d11542f… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 22 03:00:47 2016 -0500 ntdll: Add NtSuspendProcess stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/process.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 717067f..7a3edfa 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -361,7 +361,7 @@ @ stdcall NtSignalAndWaitForSingleObject(long long long ptr) @ stub NtStartProfile @ stub NtStopProfile -# @ stub NtSuspendProcess +@ stdcall NtSuspendProcess(long) @ stdcall NtSuspendThread(long ptr) @ stdcall NtSystemDebugControl(long ptr long ptr long ptr) @ stdcall NtTerminateJobObject(long long) @@ -1286,7 +1286,7 @@ @ stdcall ZwSignalAndWaitForSingleObject(long long long ptr) NtSignalAndWaitForSingleObject @ stub ZwStartProfile @ stub ZwStopProfile -# @ stub ZwSuspendProcess +@ stdcall ZwSuspendProcess(long) NtSuspendProcess @ stdcall ZwSuspendThread(long ptr) NtSuspendThread @ stdcall ZwSystemDebugControl(long ptr long ptr long ptr) NtSystemDebugControl @ stdcall ZwTerminateJobObject(long long) NtTerminateJobObject diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index a93b8fb..54f8168 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -642,3 +642,13 @@ NTSTATUS WINAPI NtOpenProcess(PHANDLE handle, ACCESS_MASK access, SERVER_END_REQ; return status; } + +/****************************************************************************** + * NtSuspendProcess + * ZwSuspendProcess + */ +NTSTATUS WINAPI NtSuspendProcess( HANDLE handle ) +{ + FIXME("stub: %p\n", handle); + return STATUS_NOT_IMPLEMENTED; +}

1 0

Nikolay Sivov : winmm/tests: Fixed a buffer leak (Valgrind).
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 7deec68fd371aceecdfb4fa9f04fb4e4505441c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7deec68fd371aceecdfb4fa9f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 12:43:02 2016 +0300 winmm/tests: Fixed a buffer leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a2fe8bb..d6019f9 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1596,6 +1596,7 @@ static void test_fragmentsize(void) rc = waveOutClose(wout); ok(rc == MMSYSERR_NOERROR, "waveOutClose failed: %s\n", wave_out_error(rc)); + HeapFree(GetProcessHeap(), 0, hdr[0].lpData); CloseHandle(hevent); }

1 0

Nikolay Sivov : winmm: Free device format when closing a device (Valgrind) .
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 57612cdefce0a779a8db1f869b2cd8c9df575c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57612cdefce0a779a8db1f869… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 12:43:03 2016 +0300 winmm: Free device format when closing a device (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1915c21..7308519 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1418,6 +1418,8 @@ static HRESULT WINMM_CloseDevice(WINMM_Device *device) IAudioClock_Release(device->clock); device->clock = NULL; + HeapFree(GetProcessHeap(), 0, device->orig_fmt); + return S_OK; }

1 0

Nikolay Sivov : msvcp140: Added __crtCreateEventExW().
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 1b8eb25ff293660b46a10b431256d745aa9e710a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8eb25ff293660b46a10b431… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 7 12:22:15 2016 +0300 msvcp140: Added __crtCreateEventExW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index fedb05f..f4fdc8a 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3757,7 +3757,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ stub __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW -@ stub __crtCreateEventExW +@ cdecl __crtCreateEventExW(ptr wstr long long) MSVCP__crtCreateEventExW @ stub __crtCreateSemaphoreExW @ stub __crtCreateSymbolicLinkW @ stub __crtCreateThreadpoolTimer diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 322e937..71a664e 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1122,6 +1122,16 @@ BOOL CDECL MSVCP__crtInitializeCriticalSectionEx( return InitializeCriticalSectionEx(cs, spin_count, flags); } +/********************************************************************* + * __crtCreateEventExW (MSVCP140.@) + */ +HANDLE CDECL MSVCP__crtCreateEventExW( + SECURITY_ATTRIBUTES *attribs, LPCWSTR name, DWORD flags, DWORD access) +{ + TRACE("(%p %s 0x%08x 0x%08x)\n", attribs, debugstr_w(name), flags, access); + return CreateEventExW(attribs, name, flags, access); +} + void init_misc(void *base) { #ifdef __x86_64__

1 0

Nikolay Sivov : msvcp140: Added __crtGetTickCount64().
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 7e485ea87b5b5d7cbb3704a2a0ec707eb52bcd5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e485ea87b5b5d7cbb3704a2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 7 12:22:16 2016 +0300 msvcp140: Added __crtGetTickCount64(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index f4fdc8a..588551b 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3768,7 +3768,7 @@ @ stub __crtGetFileInformationByHandleEx @ stub __crtGetLocaleInfoEx @ stub __crtGetSystemTimePreciseAsFileTime -@ stub __crtGetTickCount64 +@ cdecl -ret64 __crtGetTickCount64() MSVCP__crtGetTickCount64 @ stub __crtInitOnceExecuteOnce @ cdecl __crtInitializeCriticalSectionEx(ptr long long) MSVCP__crtInitializeCriticalSectionEx @ stub __crtIsPackagedApp diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 71a664e..758e449 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1132,6 +1132,14 @@ HANDLE CDECL MSVCP__crtCreateEventExW( return CreateEventExW(attribs, name, flags, access); } +/********************************************************************* + * __crtGetTickCount64 (MSVCP140.@) + */ +ULONGLONG CDECL MSVCP__crtGetTickCount64(void) +{ + return GetTickCount64(); +} + void init_misc(void *base) { #ifdef __x86_64__

1 0

Nikolay Sivov : msvcp140: Added __crtCreateSemaphoreExW().
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: fd10b07782998712a380bf3c8ea6a592f3edc37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd10b07782998712a380bf3c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 7 12:22:17 2016 +0300 msvcp140: Added __crtCreateSemaphoreExW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 588551b..2a3e5a9 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3758,7 +3758,7 @@ @ stub __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtCreateEventExW(ptr wstr long long) MSVCP__crtCreateEventExW -@ stub __crtCreateSemaphoreExW +@ cdecl __crtCreateSemaphoreExW(ptr long long wstr long long) MSVCP__crtCreateSemaphoreExW @ stub __crtCreateSymbolicLinkW @ stub __crtCreateThreadpoolTimer @ stub __crtCreateThreadpoolWait diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 758e449..418f42b 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1140,6 +1140,18 @@ ULONGLONG CDECL MSVCP__crtGetTickCount64(void) return GetTickCount64(); } +/********************************************************************* + * __crtCreateSemaphoreExW (MSVCP140.@) + */ +HANDLE CDECL MSVCP__crtCreateSemaphoreExW( + SECURITY_ATTRIBUTES *attribs, LONG initial_count, LONG max_count, LPCWSTR name, + DWORD flags, DWORD access) +{ + TRACE("(%p %d %d %s 0x%08x 0x%08x)\n", attribs, initial_count, max_count, debugstr_w(name), + flags, access); + return CreateSemaphoreExW(attribs, initial_count, max_count, name, flags, access); +} + void init_misc(void *base) { #ifdef __x86_64__

1 0

Huw Davies : ucrtbase: Add support for natural string widths.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 10eb6fa7180e4d762bb55603a987ee142021aa0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=10eb6fa7180e4d762bb55603a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 8 13:43:04 2016 +0100 ucrtbase: Add support for natural string widths. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 11 +++++++---- dlls/ucrtbase/tests/printf.c | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index ce7a70e..6c9eeeb 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -35,7 +35,7 @@ typedef struct FUNC_NAME(pf_flags_t) APICHAR Sign, LeftAlign, Alternate, PadZero; int FieldLength, Precision; APICHAR IntegerLength, IntegerDouble, IntegerNative; - APICHAR WideString; + APICHAR WideString, NaturalString; APICHAR Format; } FUNC_NAME(pf_flags); @@ -208,7 +208,8 @@ static inline int FUNC_NAME(pf_output_format_str)(FUNC_NAME(puts_clbk) pf_puts, static inline int FUNC_NAME(pf_handle_string)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const void *str, int len, FUNC_NAME(pf_flags) *flags, MSVCRT_pthreadlocinfo locinfo, BOOL legacy_wide) { - BOOL complement_is_narrow = legacy_wide ? (sizeof(APICHAR)==sizeof(MSVCRT_wchar_t)) : FALSE; + BOOL api_is_wide = sizeof(APICHAR) == sizeof(MSVCRT_wchar_t); + BOOL complement_is_narrow = legacy_wide ? api_is_wide : FALSE; #ifdef PRINTF_WIDE static const MSVCRT_wchar_t nullW[] = {'(','n','u','l','l',')',0}; @@ -219,9 +220,9 @@ static inline int FUNC_NAME(pf_handle_string)(FUNC_NAME(puts_clbk) pf_puts, void return FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, "(null)", 6, flags, locinfo); #endif - if(flags->WideString || flags->IntegerLength=='l') + if((flags->NaturalString && api_is_wide) || flags->WideString || flags->IntegerLength=='l') return FUNC_NAME(pf_output_format_wstr)(pf_puts, puts_ctx, str, len, flags, locinfo); - if(flags->IntegerLength == 'h') + if((flags->NaturalString && !api_is_wide) || flags->IntegerLength == 'h') return FUNC_NAME(pf_output_format_str)(pf_puts, puts_ctx, str, len, flags, locinfo); if((flags->Format=='S' || flags->Format=='C') == complement_is_narrow) @@ -476,6 +477,8 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API #if _MSVCR_VER >= 140 else if(*p == 'z') flags.IntegerNative = *p++; + else if(*p == 'T') + flags.NaturalString = *p++; #endif else if((*p == 'F' || *p == 'N') && legacy_msvcrt_compat) p++; /* ignore */ diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 973217e..ae5ce8a 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -660,6 +660,24 @@ static void test_printf_c99(void) } } +static void test_printf_natural_string(void) +{ + const wchar_t wide[] = {'A','B','C','D',0}; + const char narrow[] = "abcd"; + const char narrow_fmt[] = "%s %Ts"; + const char narrow_out[] = "abcd abcd"; + const wchar_t wide_fmt[] = {'%','s',' ','%','T','s',0}; + const wchar_t wide_out[] = {'a','b','c','d',' ','A','B','C','D',0}; + char buffer[20]; + wchar_t wbuffer[20]; + + vsprintf_wrapper(0, buffer, sizeof(buffer), narrow_fmt, narrow, narrow); + ok(!strcmp(buffer, narrow_out), "buffer wrong, got=%s\n", buffer); + + vswprintf_wrapper(0, wbuffer, sizeof(wbuffer), wide_fmt, narrow, wide); + ok(!lstrcmpW(wbuffer, wide_out), "buffer wrong, got=%s\n", wine_dbgstr_w(wbuffer)); +} + START_TEST(printf) { if (!init()) return; @@ -674,4 +692,5 @@ START_TEST(printf) test_printf_legacy_msvcrt(); test_printf_legacy_three_digit_exp(); test_printf_c99(); + test_printf_natural_string(); }

1 0

Iván Matellanes : msvcirt: Add a partial implementation of class istream_withassign.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 3ecb295e4289f724cd4d962d7e7176d45f349cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ecb295e4289f724cd4d962d7… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 8 19:58:26 2016 +0100 msvcirt: Add a partial implementation of class istream_withassign. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 40 +++++++++++++++++++------------------- dlls/msvcrt20/msvcrt20.spec | 40 +++++++++++++++++++------------------- dlls/msvcrt40/msvcrt40.spec | 40 +++++++++++++++++++------------------- 4 files changed, 107 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ecb295e4289f724cd4d9…

1 0

Iván Matellanes : msvcirt: Implement istream_withassign copy constructor.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 4b603251b2ce8d7d23ac60b92cc6f41e25d7a94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b603251b2ce8d7d23ac60b92… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 8 19:58:27 2016 +0100 msvcirt: Implement istream_withassign copy constructor. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 33 ++++++++- dlls/msvcirt/tests/msvcirt.c | 167 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b603251b2ce8d7d23ac6…

1 0

Iván Matellanes : msvcirt/tests: Add tests of istream_withassign assignment operators.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 281878ab1c1a5f4cb865b7284cb6d50053e3454c URL: http://source.winehq.org/git/wine.git/?a=commit;h=281878ab1c1a5f4cb865b7284… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 8 19:58:28 2016 +0100 msvcirt/tests: Add tests of istream_withassign assignment operators. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index fafa03f..61de0b6 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -356,6 +356,9 @@ static istream* (*__thiscall p_istream_withassign_copy_ctor)(istream*, const ist static istream* (*__thiscall p_istream_withassign_ctor)(istream*, BOOL); static void (*__thiscall p_istream_withassign_dtor)(ios*); static void (*__thiscall p_istream_withassign_vbase_dtor)(istream*); +static istream* (*__thiscall p_istream_withassign_assign_sb)(istream*, streambuf*); +static istream* (*__thiscall p_istream_withassign_assign_is)(istream*, const istream*); +static istream* (*__thiscall p_istream_withassign_assign)(istream*, const istream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -598,6 +601,9 @@ static BOOL init(void) SET(p_istream_withassign_ctor, "??0istream_withassign@@QEAA(a)XZ"); SET(p_istream_withassign_dtor, "??1ostream_withassign@@UEAA(a)XZ"); SET(p_istream_withassign_vbase_dtor, "??_Distream_withassign@@QEAAXXZ"); + SET(p_istream_withassign_assign_sb, "??4istream_withassign@@QEAAAEAVistream@@PEAVstreambuf@@@Z"); + SET(p_istream_withassign_assign_is, "??4istream_withassign@@QEAAAEAVistream@@AEBV1@@Z"); + SET(p_istream_withassign_assign, "??4istream_withassign@@QEAAAEAV0(a)AEBV0@@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -762,6 +768,9 @@ static BOOL init(void) SET(p_istream_withassign_ctor, "??0istream_withassign@@QAE(a)XZ"); SET(p_istream_withassign_dtor, "??1istream_withassign@@UAE(a)XZ"); SET(p_istream_withassign_vbase_dtor, "??_Distream_withassign@@QAEXXZ"); + SET(p_istream_withassign_assign_sb, "??4istream_withassign@@QAEAAVistream@@PAVstreambuf@@@Z"); + SET(p_istream_withassign_assign_is, "??4istream_withassign@@QAEAAVistream@@ABV1@@Z"); + SET(p_istream_withassign_assign, "??4istream_withassign@@QAEAAV0(a)ABV0@@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -5594,6 +5603,72 @@ todo_wine ok(isa2.base_ios.width == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.width); ok(isa2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.do_lock); call_func1(p_istream_withassign_dtor, &isa2.base_ios); + + /* assignment */ + isa2.extract_delim = isa2.count = 0xabababab; + isa2.base_ios.delbuf = 0xabababab; + pisa = call_func2(p_istream_withassign_assign_sb, &isa2, &sb); + ok(pisa == &isa2, "wrong return, expected %p got %p\n", &isa2, pisa); + ok(isa2.extract_delim == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.extract_delim); + ok(isa2.count == 0, "expected 0 got %d\n", isa2.count); + ok(isa2.base_ios.sb == &sb, "expected %p got %p\n", &sb, isa2.base_ios.sb); + ok(isa2.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, isa2.base_ios.state); + ok(isa2.base_ios.delbuf == 0, "expected 0 got %d\n", isa2.base_ios.delbuf); + ok(isa2.base_ios.tie == NULL, "expected %p got %p\n", NULL, isa2.base_ios.tie); + ok(isa2.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, isa2.base_ios.flags); + ok(isa2.base_ios.precision == 6, "expected 6 got %d\n", isa2.base_ios.precision); + ok(isa2.base_ios.fill == ' ', "expected 32 got %d\n", isa2.base_ios.fill); + ok(isa2.base_ios.width == 0, "expected 0 got %d\n", isa2.base_ios.width); + ok(isa2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.do_lock); + isa2.count = 0xabababab; + memset(&isa2.base_ios, 0xab, sizeof(ios)); + isa2.base_ios.delbuf = 0; + pisa = call_func2(p_istream_withassign_assign_sb, &isa2, NULL); + ok(pisa == &isa2, "wrong return, expected %p got %p\n", &isa2, pisa); + ok(isa2.extract_delim == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.extract_delim); + ok(isa2.count == 0, "expected 0 got %d\n", isa2.count); + ok(isa2.base_ios.sb == NULL, "expected %p got %p\n", NULL, isa2.base_ios.sb); + ok(isa2.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, isa2.base_ios.state); + ok(isa2.base_ios.delbuf == 0, "expected 0 got %d\n", isa2.base_ios.delbuf); + ok(isa2.base_ios.tie == NULL, "expected %p got %p\n", NULL, isa2.base_ios.tie); + ok(isa2.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, isa2.base_ios.flags); + ok(isa2.base_ios.precision == 6, "expected 6 got %d\n", isa2.base_ios.precision); + ok(isa2.base_ios.fill == ' ', "expected 32 got %d\n", isa2.base_ios.fill); + ok(isa2.base_ios.width == 0, "expected 0 got %d\n", isa2.base_ios.width); + ok(isa2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.do_lock); + isa2.count = 0xabababab; + memset(&isa2.base_ios, 0xab, sizeof(ios)); + isa2.base_ios.delbuf = 0; + pisa = call_func2(p_istream_withassign_assign_is, &isa2, &isa1); + ok(pisa == &isa2, "wrong return, expected %p got %p\n", &isa2, pisa); + ok(isa2.extract_delim == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.extract_delim); + ok(isa2.count == 0, "expected 0 got %d\n", isa2.count); + ok(isa2.base_ios.sb == NULL, "expected %p got %p\n", NULL, isa2.base_ios.sb); + ok(isa2.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, isa2.base_ios.state); + ok(isa2.base_ios.delbuf == 0, "expected 0 got %d\n", isa2.base_ios.delbuf); + ok(isa2.base_ios.tie == NULL, "expected %p got %p\n", NULL, isa2.base_ios.tie); + ok(isa2.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, isa2.base_ios.flags); + ok(isa2.base_ios.precision == 6, "expected 6 got %d\n", isa2.base_ios.precision); + ok(isa2.base_ios.fill == ' ', "expected 32 got %d\n", isa2.base_ios.fill); + ok(isa2.base_ios.width == 0, "expected 0 got %d\n", isa2.base_ios.width); + ok(isa2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.do_lock); + isa1.base_ios.sb = &sb; + isa2.count = 0xabababab; + memset(&isa2.base_ios, 0xab, sizeof(ios)); + isa2.base_ios.delbuf = 0; + pisa = call_func2(p_istream_withassign_assign, &isa2, &isa1); + ok(pisa == &isa2, "wrong return, expected %p got %p\n", &isa2, pisa); + ok(isa2.extract_delim == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.extract_delim); + ok(isa2.count == 0, "expected 0 got %d\n", isa2.count); + ok(isa2.base_ios.sb == &sb, "expected %p got %p\n", &sb, isa2.base_ios.sb); + ok(isa2.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, isa2.base_ios.state); + ok(isa2.base_ios.delbuf == 0, "expected 0 got %d\n", isa2.base_ios.delbuf); + ok(isa2.base_ios.tie == NULL, "expected %p got %p\n", NULL, isa2.base_ios.tie); + ok(isa2.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, isa2.base_ios.flags); + ok(isa2.base_ios.precision == 6, "expected 6 got %d\n", isa2.base_ios.precision); + ok(isa2.base_ios.fill == ' ', "expected 32 got %d\n", isa2.base_ios.fill); + ok(isa2.base_ios.width == 0, "expected 0 got %d\n", isa2.base_ios.width); + ok(isa2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.do_lock); } START_TEST(msvcirt)

1 0