July 2015 - Wine-Commits - list.winehq.org

Sebastian Lackner : vcomp: Implement _vcomp_for_static_init.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: c34c9b4f39ec11ca89f4fa3a0f61c4547f031fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34c9b4f39ec11ca89f4fa3a0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 20 05:17:47 2015 +0200 vcomp: Implement _vcomp_for_static_init. --- dlls/vcomp/main.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 4 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index c06625a..ae5623b 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -412,6 +412,69 @@ void CDECL _vcomp_for_static_simple_init(unsigned int first, unsigned int last, *end = *begin + (per_thread - 1) * step; } +void CDECL _vcomp_for_static_init(int first, int last, int step, int chunksize, unsigned int *loops, + int *begin, int *end, int *next, int *lastchunk) +{ + unsigned int iterations, num_chunks, per_thread, remaining; + struct vcomp_thread_data *thread_data = vcomp_init_thread_data(); + struct vcomp_team_data *team_data = thread_data->team; + int num_threads = team_data ? team_data->num_threads : 1; + int thread_num = thread_data->thread_num; + + TRACE("(%d, %d, %d, %d, %p, %p, %p, %p, %p)\n", + first, last, step, chunksize, loops, begin, end, next, lastchunk); + + if (num_threads == 1 && chunksize != 1) + { + *loops = 1; + *begin = first; + *end = last; + *next = 0; + *lastchunk = first; + return; + } + + if (first == last) + { + *loops = !thread_num; + if (!thread_num) + { + *begin = first; + *end = last; + *next = 0; + *lastchunk = first; + } + return; + } + + if (step <= 0) + { + *loops = 0; + return; + } + + if (first < last) + iterations = 1 + (last - first) / step; + else + { + iterations = 1 + (first - last) / step; + step *= -1; + } + + if (chunksize < 1) + chunksize = 1; + + num_chunks = ((DWORD64)iterations + chunksize - 1) / chunksize; + per_thread = num_chunks / num_threads; + remaining = num_chunks - per_thread * num_threads; + + *loops = per_thread + (thread_num < remaining); + *begin = first + thread_num * chunksize * step; + *end = *begin + (chunksize - 1) * step; + *next = chunksize * num_threads * step; + *lastchunk = first + (num_chunks - 1) * chunksize * step; +} + void CDECL _vcomp_for_static_end(void) { TRACE("()\n"); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index d6b8bf5..7083ce4 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -60,7 +60,7 @@ @ stub _vcomp_for_dynamic_next @ stub _vcomp_for_dynamic_next_i8 @ cdecl _vcomp_for_static_end() -@ stub _vcomp_for_static_init +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) @ stub _vcomp_for_static_init_i8 @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) @ stub _vcomp_for_static_simple_init_i8 diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index a6933c8..56c7ae3 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -60,7 +60,7 @@ @ stub _vcomp_for_dynamic_next @ stub _vcomp_for_dynamic_next_i8 @ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end -@ stub _vcomp_for_static_init +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init @ stub _vcomp_for_static_init_i8 @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index a6933c8..56c7ae3 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -60,7 +60,7 @@ @ stub _vcomp_for_dynamic_next @ stub _vcomp_for_dynamic_next_i8 @ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end -@ stub _vcomp_for_static_init +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init @ stub _vcomp_for_static_init_i8 @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_SetFillMode().
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 025c3201450eecc666465be73dd739077690be32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025c3201450eecc666465be73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 20 11:07:27 2015 +0200 d2d1: Implement d2d_geometry_sink_SetFillMode(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/geometry.c | 19 +++- dlls/d2d1/tests/d2d1.c | 246 ++++++++++++++++++++++++++--------------------- 3 files changed, 153 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=025c3201450eecc666465…

1 0

Iván Matellanes : msvcirt: Add ios instance counter.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 6812bb7469c95f21d13e52cc8a22b0edc7086f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6812bb7469c95f21d13e52cc8… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:37:24 2015 +0200 msvcirt: Add ios instance counter. --- dlls/msvcirt/msvcirt.c | 6 ++++++ dlls/msvcirt/msvcirt.spec | 2 +- dlls/msvcirt/tests/msvcirt.c | 10 ++++++++++ dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index eb4e3e4..1c26e1c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -38,6 +38,9 @@ const LONG ios_adjustfield = FLAGS_left | FLAGS_right | FLAGS_internal; const LONG ios_basefield = FLAGS_dec | FLAGS_oct | FLAGS_hex; /* ?floatfield(a)ios@@2JB */ const LONG ios_floatfield = FLAGS_scientific | FLAGS_fixed; +/* ?fLockcInit(a)ios@@0HA */ +/* FIXME: should be initialized to 0 and increased on construction of cin, cout, cerr and clog */ +int ios_fLockcInit = 4; /* ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A */ extern CRITICAL_SECTION ios_static_lock; CRITICAL_SECTION_DEBUG ios_static_lock_debug = @@ -741,6 +744,7 @@ DEFINE_THISCALL_WRAPPER(ios_copy_ctor, 8) ios* __thiscall ios_copy_ctor(ios *this, const ios *copy) { TRACE("(%p %p)\n", this, copy); + ios_fLockcInit++; this->vtable = &MSVCP_ios_vtable; this->sb = NULL; this->delbuf = 0; @@ -754,6 +758,7 @@ DEFINE_THISCALL_WRAPPER(ios_sb_ctor, 8) ios* __thiscall ios_sb_ctor(ios *this, streambuf *sb) { TRACE("(%p %p)\n", this, sb); + ios_fLockcInit++; this->vtable = &MSVCP_ios_vtable; this->sb = sb; this->state = sb ? IOSTATE_goodbit : IOSTATE_badbit; @@ -783,6 +788,7 @@ DEFINE_THISCALL_WRAPPER(ios_dtor, 4) void __thiscall ios_dtor(ios *this) { TRACE("(%p)\n", this); + ios_fLockcInit--; if (this->delbuf && this->sb) call_streambuf_vector_dtor(this->sb, 1); this->sb = NULL; diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 4d15bdb..2780ecf 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -465,7 +465,7 @@ @ cdecl -arch=win64 ?eof(a)ios@@QEBAHXZ(ptr) ios_eof @ thiscall -arch=win32 ?epptr(a)streambuf@@IBEPADXZ(ptr) streambuf_epptr @ cdecl -arch=win64 ?epptr(a)streambuf@@IEBAPEADXZ(ptr) streambuf_epptr -# @ extern ?fLockcInit(a)ios@@0HA # static int ios::fLockcInit +@ extern ?fLockcInit(a)ios@@0HA ios_fLockcInit @ thiscall -arch=win32 ?fail(a)ios@@QBEHXZ(ptr) ios_fail @ cdecl -arch=win64 ?fail(a)ios@@QEBAHXZ(ptr) ios_fail @ stub -arch=win32 ?fd(a)filebuf@@QBEHXZ # int __thiscall filebuf::fd(void)const diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index e1390b5..30941d5 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -154,6 +154,7 @@ static LONG *p_ios_statebuf; static LONG* (*__thiscall p_ios_iword)(const ios*, int); static void** (*__thiscall p_ios_pword)(const ios*, int); static int (*__cdecl p_ios_xalloc)(void); +static int *p_ios_fLockcInit; /* Emulate a __thiscall */ #ifdef __i386__ @@ -333,6 +334,7 @@ static BOOL init(void) SET(p_ios_curindex, "?x_curindex(a)ios@@0HA"); SET(p_ios_statebuf, "?x_statebuf(a)ios@@0PAJA"); SET(p_ios_xalloc, "?xalloc(a)ios@@SAHXZ"); + SET(p_ios_fLockcInit, "?fLockcInit(a)ios@@0HA"); init_thiscall_thunk(); return TRUE; @@ -916,6 +918,7 @@ static void test_ios(void) call_func1(p_streambuf_ctor, psb); /* constructor/destructor */ + ok(*p_ios_fLockcInit == 4, "expected 4 got %d\n", *p_ios_fLockcInit); call_func2(p_ios_sb_ctor, &ios_obj, NULL); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); @@ -929,23 +932,28 @@ static void test_ios(void) ok(ios_obj.width == 0, "expected 0 got %d\n", ios_obj.width); ok(ios_obj.do_lock == -1, "expected -1 got %d\n", ios_obj.do_lock); ok(ios_obj.lock.LockCount == -1, "expected -1 got %d\n", ios_obj.lock.LockCount); + ok(*p_ios_fLockcInit == 5, "expected 5 got %d\n", *p_ios_fLockcInit); ios_obj.state = 0x8; call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); + ok(*p_ios_fLockcInit == 4, "expected 4 got %d\n", *p_ios_fLockcInit); ios_obj.state = 0x8; call_func2(p_ios_sb_ctor, &ios_obj, psb); ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); ok(ios_obj.state == IOSTATE_goodbit, "expected %x got %x\n", IOSTATE_goodbit, ios_obj.state); ok(ios_obj.delbuf == 0, "expected 0 got %d\n", ios_obj.delbuf); + ok(*p_ios_fLockcInit == 5, "expected 5 got %d\n", *p_ios_fLockcInit); ios_obj.state = 0x8; call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); + ok(*p_ios_fLockcInit == 4, "expected 4 got %d\n", *p_ios_fLockcInit); ios_obj.sb = psb; ios_obj.state = 0x8; call_func1(p_ios_ctor, &ios_obj); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); + ok(*p_ios_fLockcInit == 5, "expected 5 got %d\n", *p_ios_fLockcInit); /* init */ ios_obj.state |= 0x8; @@ -973,6 +981,7 @@ static void test_ios(void) ok(ios_obj.fill == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.fill); ok(ios_obj.width == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.width); ok(ios_obj.do_lock == -1, "expected -1 got %d\n", ios_obj.do_lock); + ok(*p_ios_fLockcInit == 5, "expected 5 got %d\n", *p_ios_fLockcInit); /* assignment */ ios_obj.state = 0x8; @@ -1137,6 +1146,7 @@ static void test_ios(void) ios_obj.delbuf = 1; call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); + ok(*p_ios_fLockcInit == 4, "expected 4 got %d\n", *p_ios_fLockcInit); CloseHandle(lock_arg.lock); CloseHandle(lock_arg.release[0]); CloseHandle(lock_arg.release[1]); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index d110d28..45b7b02 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -453,7 +453,7 @@ @ cdecl -arch=win64 ?eof(a)ios@@QEBAHXZ(ptr) msvcirt.?eof(a)ios@@QEBAHXZ @ thiscall -arch=win32 ?epptr(a)streambuf@@IBEPADXZ(ptr) msvcirt.?epptr(a)streambuf@@IBEPADXZ @ cdecl -arch=win64 ?epptr(a)streambuf@@IEBAPEADXZ(ptr) msvcirt.?epptr(a)streambuf@@IEBAPEADXZ -# @ extern ?fLockcInit(a)ios@@0HA +@ extern ?fLockcInit(a)ios@@0HA msvcirt.?fLockcInit(a)ios@@0HA @ thiscall -arch=win32 ?fail(a)ios@@QBEHXZ(ptr) msvcirt.?fail(a)ios@@QBEHXZ @ cdecl -arch=win64 ?fail(a)ios@@QEBAHXZ(ptr) msvcirt.?fail(a)ios@@QEBAHXZ @ stub -arch=win32 ?fd(a)filebuf@@QBEHXZ diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index afd9894..7d02b2e 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -518,7 +518,7 @@ @ cdecl -arch=win64 ?eof(a)ios@@QEBAHXZ(ptr) msvcirt.?eof(a)ios@@QEBAHXZ @ thiscall -arch=win32 ?epptr(a)streambuf@@IBEPADXZ(ptr) msvcirt.?epptr(a)streambuf@@IBEPADXZ @ cdecl -arch=win64 ?epptr(a)streambuf@@IEBAPEADXZ(ptr) msvcirt.?epptr(a)streambuf@@IEBAPEADXZ -# @ extern ?fLockcInit(a)ios@@0HA +@ extern ?fLockcInit(a)ios@@0HA msvcirt.?fLockcInit(a)ios@@0HA @ thiscall -arch=win32 ?fail(a)ios@@QBEHXZ(ptr) msvcirt.?fail(a)ios@@QBEHXZ @ cdecl -arch=win64 ?fail(a)ios@@QEBAHXZ(ptr) msvcirt.?fail(a)ios@@QEBAHXZ @ stub -arch=win32 ?fd(a)filebuf@@QBEHXZ

1 0

Iván Matellanes : msvcirt: Add support for ios state variables.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: b6c5bd15c488bfb89f5f4b55721f5af87db49ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c5bd15c488bfb89f5f4b557… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:37:18 2015 +0200 msvcirt: Add support for ios state variables. --- dlls/msvcirt/msvcirt.c | 23 +++++++++++++++++------ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 33 ++++++++++++++++++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 5 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 0ce9fff..eb4e3e4 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt); #define RESERVE_SIZE 512 +#define STATEBUF_SIZE 8 /* ?adjustfield(a)ios@@2JB */ const LONG ios_adjustfield = FLAGS_left | FLAGS_right | FLAGS_internal; @@ -48,6 +49,10 @@ CRITICAL_SECTION_DEBUG ios_static_lock_debug = CRITICAL_SECTION ios_static_lock = { &ios_static_lock_debug, -1, 0, 0, 0, 0 }; /* ?x_maxbit(a)ios@@0JA */ LONG ios_maxbit = 0x8000; +/* ?x_curindex(a)ios@@0HA */ +int ios_curindex = -1; +/* ?x_statebuf(a)ios@@0PAJA */ +LONG ios_statebuf[STATEBUF_SIZE] = {0}; /* class streambuf */ typedef struct { @@ -1018,8 +1023,8 @@ void __thiscall ios_init(ios *this, streambuf *sb) DEFINE_THISCALL_WRAPPER(ios_iword, 8) LONG* __thiscall ios_iword(const ios *this, int index) { - FIXME("(%p %d) stub\n", this, index); - return NULL; + TRACE("(%p %d)\n", this, index); + return &ios_statebuf[index]; } /* ?lock(a)ios@@QAAXXZ */ @@ -1091,8 +1096,8 @@ int __thiscall ios_precision_get(const ios *this) DEFINE_THISCALL_WRAPPER(ios_pword, 8) void** __thiscall ios_pword(const ios *this, int index) { - FIXME("(%p %d) stub\n", this, index); - return NULL; + TRACE("(%p %d)\n", this, index); + return (void**)&ios_statebuf[index]; } /* ?rdbuf(a)ios@@QBEPAVstreambuf@@XZ */ @@ -1245,8 +1250,14 @@ int __thiscall ios_width_get(const ios *this) /* ?xalloc(a)ios@@SAHXZ */ int __cdecl ios_xalloc(void) { - FIXME("() stub\n"); - return 0; + int ret; + + TRACE("()\n"); + + ios_lockc(); + ret = (ios_curindex < STATEBUF_SIZE-1) ? ++ios_curindex : -1; + ios_unlockc(); + return ret; } /****************************************************************** diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index b4dcdc2..4d15bdb 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -776,10 +776,10 @@ @ stub -arch=win64 ?writepad(a)ostream@@AEAAAEAV1(a)PEBD0@Z @ stub -arch=win32 ?ws@@YAAAVistream@@AAV1@@Z # class istream & __cdecl ws(class istream &) @ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z -# @ extern ?x_curindex(a)ios@@0HA # static int ios::x_curindex +@ extern ?x_curindex(a)ios@@0HA ios_curindex @ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A ios_static_lock @ extern ?x_maxbit(a)ios@@0JA ios_maxbit -# @ extern ?x_statebuf(a)ios@@0PAJA # static long * ios::x_statebuf +@ extern ?x_statebuf(a)ios@@0PAJA ios_statebuf @ cdecl ?xalloc(a)ios@@SAHXZ() ios_xalloc @ thiscall -arch=win32 ?xsgetn(a)streambuf@@UAEHPADH(a)Z(ptr ptr long) streambuf_xsgetn @ cdecl -arch=win64 ?xsgetn(a)streambuf@@UEAAHPEADH(a)Z(ptr ptr long) streambuf_xsgetn diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 5fac801..e1390b5 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -149,6 +149,11 @@ static int (*__thiscall p_ios_fail)(const ios*); static void (*__thiscall p_ios_clear)(ios*, int); static LONG *p_ios_maxbit; static LONG (*__cdecl p_ios_bitalloc)(void); +static int *p_ios_curindex; +static LONG *p_ios_statebuf; +static LONG* (*__thiscall p_ios_iword)(const ios*, int); +static void** (*__thiscall p_ios_pword)(const ios*, int); +static int (*__cdecl p_ios_xalloc)(void); /* Emulate a __thiscall */ #ifdef __i386__ @@ -267,6 +272,8 @@ static BOOL init(void) SET(p_ios_eof, "?eof(a)ios@@QEBAHXZ"); SET(p_ios_fail, "?fail(a)ios@@QEBAHXZ"); SET(p_ios_clear, "?clear(a)ios@@QEAAXH(a)Z"); + SET(p_ios_iword, "?iword(a)ios@@QEBAAEAJH(a)Z"); + SET(p_ios_pword, "?pword(a)ios@@QEBAAEAPEAXH(a)Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); @@ -315,12 +322,17 @@ static BOOL init(void) SET(p_ios_eof, "?eof(a)ios@@QBEHXZ"); SET(p_ios_fail, "?fail(a)ios@@QBEHXZ"); SET(p_ios_clear, "?clear(a)ios@@QAEXH(a)Z"); + SET(p_ios_iword, "?iword(a)ios@@QBEAAJH(a)Z"); + SET(p_ios_pword, "?pword(a)ios@@QBEAAPAXH(a)Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); SET(p_ios_unlockc, "?unlockc(a)ios@@KAXXZ"); SET(p_ios_maxbit, "?x_maxbit(a)ios@@0JA"); SET(p_ios_bitalloc, "?bitalloc(a)ios@@SAJXZ"); + SET(p_ios_curindex, "?x_curindex(a)ios@@0HA"); + SET(p_ios_statebuf, "?x_statebuf(a)ios@@0PAJA"); + SET(p_ios_xalloc, "?xalloc(a)ios@@SAHXZ"); init_thiscall_thunk(); return TRUE; @@ -893,7 +905,8 @@ static void test_ios(void) struct ios_lock_arg lock_arg; HANDLE thread; BOOL locked; - LONG expected, ret; + LONG *pret, expected, ret; + void **pret2; int i; memset(&ios_obj, 0xab, sizeof(ios)); @@ -1099,6 +1112,24 @@ static void test_ios(void) expected <<= 1; } + /* xalloc/pword/iword */ + ok(*p_ios_curindex == -1, "expected -1 got %d\n", *p_ios_curindex); + expected = 0; + for (i = 0; i < 8; i++) { + ret = p_ios_xalloc(); + ok(ret == expected, "expected %d got %d\n", expected, ret); + ok(*p_ios_curindex == expected, "expected %d got %d\n", expected, *p_ios_curindex); + pret = (LONG*) call_func2(p_ios_iword, &ios_obj, ret); + ok(pret == &p_ios_statebuf[ret], "expected %p got %p\n", &p_ios_statebuf[ret], pret); + ok(*pret == 0, "expected 0 got %d\n", *pret); + pret2 = (void**) call_func2(p_ios_pword, &ios_obj, ret); + ok(pret2 == (void**)&p_ios_statebuf[ret], "expected %p got %p\n", (void**)&p_ios_statebuf[ret], pret2); + expected++; + } + ret = p_ios_xalloc(); + ok(ret == -1, "expected -1 got %d\n", ret); + ok(*p_ios_curindex == 7, "expected 7 got %d\n", *p_ios_curindex); + SetEvent(lock_arg.release[1]); SetEvent(lock_arg.release[2]); WaitForSingleObject(thread, INFINITE); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 529c0d9..d110d28 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -764,10 +764,10 @@ @ stub -arch=win64 ?writepad(a)ostream@@AEAAAEAV1(a)PEBD0@Z @ stub -arch=win32 ?ws@@YAAAVistream@@AAV1@@Z @ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z -# @ extern ?x_curindex(a)ios@@0HA +@ extern ?x_curindex(a)ios@@0HA msvcirt.?x_curindex(a)ios@@0HA @ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A msvcirt.?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A @ extern ?x_maxbit(a)ios@@0JA msvcirt.?x_maxbit(a)ios@@0JA -# @ extern ?x_statebuf(a)ios@@0QAJA +@ extern ?x_statebuf(a)ios@@0QAJA msvcrt40.?x_statebuf(a)ios@@0QAJA @ cdecl ?xalloc(a)ios@@SAHXZ() msvcirt.?xalloc(a)ios@@SAHXZ @ thiscall -arch=win32 ?xsgetn(a)streambuf@@UAEHPADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UAEHPADH(a)Z @ cdecl -arch=win64 ?xsgetn(a)streambuf@@UEAAHPEADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UEAAHPEADH(a)Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index e5a2852..afd9894 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -838,10 +838,10 @@ @ stub -arch=win64 ?writepad(a)ostream@@AEAAAEAV1(a)PEBD0@Z @ stub -arch=win32 ?ws@@YAAAVistream@@AAV1@@Z @ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z -# @ extern ?x_curindex(a)ios@@0HA +@ extern ?x_curindex(a)ios@@0HA msvcirt.?x_curindex(a)ios@@0HA @ extern ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A msvcirt.?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A @ extern ?x_maxbit(a)ios@@0JA msvcirt.?x_maxbit(a)ios@@0JA -# @ extern ?x_statebuf(a)ios@@0PAJA +@ extern ?x_statebuf(a)ios@@0QAJA msvcirt.?x_statebuf(a)ios@@0QAJA @ cdecl ?xalloc(a)ios@@SAHXZ() msvcirt.?xalloc(a)ios@@SAHXZ @ thiscall -arch=win32 ?xsgetn(a)streambuf@@UAEHPADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UAEHPADH(a)Z @ cdecl -arch=win64 ?xsgetn(a)streambuf@@UEAAHPEADH(a)Z(ptr ptr long) msvcirt.?xsgetn(a)streambuf@@UEAAHPEADH(a)Z

1 0

Iván Matellanes : msvcirt: Add ios format flag masks.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: bc90e1c8bc5ffaba64820724b0b4c53ba8fa8734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc90e1c8bc5ffaba64820724b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:37:05 2015 +0200 msvcirt: Add ios format flag masks. --- dlls/msvcirt/msvcirt.c | 6 ++++++ dlls/msvcirt/msvcirt.spec | 6 +++--- dlls/msvcrt20/msvcrt20.spec | 6 +++--- dlls/msvcrt40/msvcrt40.spec | 6 +++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6959db3..6dd650b 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -31,6 +31,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt); #define RESERVE_SIZE 512 +/* ?adjustfield(a)ios@@2JB */ +const LONG ios_adjustfield = FLAGS_left | FLAGS_right | FLAGS_internal; +/* ?basefield(a)ios@@2JB */ +const LONG ios_basefield = FLAGS_dec | FLAGS_oct | FLAGS_hex; +/* ?floatfield(a)ios@@2JB */ +const LONG ios_floatfield = FLAGS_scientific | FLAGS_fixed; /* ?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A */ extern CRITICAL_SECTION ios_static_lock; CRITICAL_SECTION_DEBUG ios_static_lock_debug = diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 8d26652..b64b41a 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -399,7 +399,7 @@ @ thiscall -arch=win32 ??_Gstreambuf@@UAEPAXI(a)Z(ptr long) streambuf_scalar_dtor @ stub -arch=win32 ??_Gstrstream@@UAEPAXI(a)Z # virtual void * __thiscall strstream::`scalar deleting destructor'(unsigned int) @ stub -arch=win32 ??_Gstrstreambuf@@UAEPAXI(a)Z # virtual void * __thiscall strstreambuf::`scalar deleting destructor'(unsigned int) -# @ extern ?adjustfield(a)ios@@2JB # static long const ios::adjustfield +@ extern ?adjustfield(a)ios@@2JB ios_adjustfield @ thiscall -arch=win32 ?allocate(a)streambuf@@IAEHXZ(ptr) streambuf_allocate @ cdecl -arch=win64 ?allocate(a)streambuf@@IEAAHXZ(ptr) streambuf_allocate @ stub -arch=win32 ?attach(a)filebuf@@QAEPAV1(a)H@Z # class filebuf * __thiscall filebuf::attach(int) @@ -414,7 +414,7 @@ @ cdecl -arch=win64 ?bad(a)ios@@QEBAHXZ(ptr) ios_bad @ thiscall -arch=win32 ?base(a)streambuf@@IBEPADXZ(ptr) streambuf_base @ cdecl -arch=win64 ?base(a)streambuf@@IEBAPEADXZ(ptr) streambuf_base -# @ extern ?basefield(a)ios@@2JB # static long const ios::basefield +@ extern ?basefield(a)ios@@2JB ios_basefield # @ extern ?binary(a)filebuf@@2HB # static int const filebuf::binary @ cdecl ?bitalloc(a)ios@@SAJXZ() ios_bitalloc @ thiscall -arch=win32 ?blen(a)streambuf@@IBEHXZ(ptr) streambuf_blen @@ -484,7 +484,7 @@ @ cdecl -arch=win64 ?flags(a)ios@@QEAAJJ(a)Z(ptr long) ios_flags_set @ thiscall -arch=win32 ?flags(a)ios@@QBEJXZ(ptr) ios_flags_get @ cdecl -arch=win64 ?flags(a)ios@@QEBAJXZ(ptr) ios_flags_get -# @ extern ?floatfield(a)ios@@2JB # static long const ios::floatfield +@ extern ?floatfield(a)ios@@2JB ios_floatfield @ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z # class ostream & __cdecl flush(class ostream &) @ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z @ stub -arch=win32 ?flush(a)ostream@@QAEAAV1(a)XZ # class ostream & __thiscall ostream::flush(void) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index b76b1d0..aa6f5bc 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -387,7 +387,7 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) msvcrt.?_set_new_mode@@YAHH(a)Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z -# @ extern ?adjustfield(a)ios@@2JB +@ extern ?adjustfield(a)ios@@2JB msvcirt.?adjustfield(a)ios@@2JB @ thiscall -arch=win32 ?allocate(a)streambuf@@IAEHXZ(ptr) msvcirt.?allocate(a)streambuf@@IAEHXZ @ cdecl -arch=win64 ?allocate(a)streambuf@@IEAAHXZ(ptr) msvcirt.?allocate(a)streambuf@@IEAAHXZ @ stub -arch=win32 ?attach(a)filebuf@@QAEPAV1(a)H@Z @@ -402,7 +402,7 @@ @ cdecl -arch=win64 ?bad(a)ios@@QEBAHXZ(ptr) msvcirt.?bad(a)ios@@QEBAHXZ @ thiscall -arch=win32 ?base(a)streambuf@@IBEPADXZ(ptr) msvcirt.?base(a)streambuf@@IBEPADXZ @ cdecl -arch=win64 ?base(a)streambuf@@IEBAPEADXZ(ptr) msvcirt.?base(a)streambuf@@IEBAPEADXZ -# @ extern ?basefield(a)ios@@2JB +@ extern ?basefield(a)ios@@2JB msvcirt.?basefield(a)ios@@2JB # @ extern ?binary(a)filebuf@@2HB @ cdecl ?bitalloc(a)ios@@SAJXZ() msvcirt.?bitalloc(a)ios@@SAJXZ @ thiscall -arch=win32 ?blen(a)streambuf@@IBEHXZ(ptr) msvcirt.?blen(a)streambuf@@IBEHXZ @@ -472,7 +472,7 @@ @ cdecl -arch=win64 ?flags(a)ios@@QEAAJJ(a)Z(ptr long) msvcirt.?flags(a)ios@@QEAAJJ(a)Z @ thiscall -arch=win32 ?flags(a)ios@@QBEJXZ(ptr) msvcirt.?flags(a)ios@@QBEJXZ @ cdecl -arch=win64 ?flags(a)ios@@QEBAJXZ(ptr) msvcirt.?flags(a)ios@@QEBAJXZ -# @ extern ?floatfield(a)ios@@2JB +@ extern ?floatfield(a)ios@@2JB msvcirt.?floatfield(a)ios@@2JB @ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z @ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z @ stub -arch=win32 ?flush(a)ostream@@QAEAAV1(a)XZ diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index cfe2fea..a80fd20 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -450,7 +450,7 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) msvcrt.?_set_new_mode@@YAHH(a)Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z -# @ extern ?adjustfield(a)ios@@2JB +@ extern ?adjustfield(a)ios@@2JB msvcirt.?adjustfield(a)ios@@2JB @ thiscall -arch=win32 ?allocate(a)streambuf@@IAEHXZ(ptr) msvcirt.?allocate(a)streambuf@@IAEHXZ @ cdecl -arch=win64 ?allocate(a)streambuf@@IEAAHXZ(ptr) msvcirt.?allocate(a)streambuf@@IEAAHXZ @ stub -arch=win32 ?attach(a)filebuf@@QAEPAV1(a)H@Z @@ -465,7 +465,7 @@ @ cdecl -arch=win64 ?bad(a)ios@@QEBAHXZ(ptr) msvcirt.?bad(a)ios@@QEBAHXZ @ thiscall -arch=win32 ?base(a)streambuf@@IBEPADXZ(ptr) msvcirt.?base(a)streambuf@@IBEPADXZ @ cdecl -arch=win64 ?base(a)streambuf@@IEBAPEADXZ(ptr) msvcirt.?base(a)streambuf@@IEBAPEADXZ -# @ extern ?basefield(a)ios@@2JB +@ extern ?basefield(a)ios@@2JB msvcirt.?basefield(a)ios@@2JB @ thiscall -arch=i386 ?before(a)type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before(a)type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before(a)type_info@@QEBAHAEBV1@@Z # @ extern ?binary(a)filebuf@@2HB @@ -537,7 +537,7 @@ @ cdecl -arch=win64 ?flags(a)ios@@QEAAJJ(a)Z(ptr long) msvcirt.?flags(a)ios@@QEAAJJ(a)Z @ thiscall -arch=win32 ?flags(a)ios@@QBEJXZ(ptr) msvcirt.?flags(a)ios@@QBEJXZ @ cdecl -arch=win64 ?flags(a)ios@@QEBAJXZ(ptr) msvcirt.?flags(a)ios@@QEBAJXZ -# @ extern ?floatfield(a)ios@@2JB +@ extern ?floatfield(a)ios@@2JB msvcirt.?floatfield(a)ios@@2JB @ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z @ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z @ stub -arch=win32 ?flush(a)ostream@@QAEAAV1(a)XZ

1 0

Iván Matellanes : msvcirt: Implement ios status-testing functions.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 8413edb6964e80fa505d90c4f215699b864c378e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8413edb6964e80fa505d90c4f… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:55 2015 +0200 msvcirt: Implement ios status-testing functions. --- dlls/msvcirt/msvcirt.c | 25 ++++++++++++---------- dlls/msvcirt/tests/msvcirt.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 11 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 5bae2c8..1397ccd 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -843,8 +843,8 @@ ios* __thiscall ios_scalar_dtor(ios *this, unsigned int flags) DEFINE_THISCALL_WRAPPER(ios_bad, 4) int __thiscall ios_bad(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return (this->state & IOSTATE_badbit); } /* ?bitalloc(a)ios@@SAJXZ */ @@ -859,7 +859,10 @@ LONG __cdecl ios_bitalloc(void) DEFINE_THISCALL_WRAPPER(ios_clear, 8) void __thiscall ios_clear(ios *this, int state) { - FIXME("(%p %d) stub\n", this, state); + TRACE("(%p %d)\n", this, state); + ios_lock(this); + this->state = state; + ios_unlock(this); } /* ?clrlock(a)ios@@QAAXXZ */ @@ -904,8 +907,8 @@ ios* __cdecl ios_dec(ios *this) DEFINE_THISCALL_WRAPPER(ios_eof, 4) int __thiscall ios_eof(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return (this->state & IOSTATE_eofbit); } /* ?fail(a)ios@@QBEHXZ */ @@ -913,8 +916,8 @@ int __thiscall ios_eof(const ios *this) DEFINE_THISCALL_WRAPPER(ios_fail, 4) int __thiscall ios_fail(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return (this->state & (IOSTATE_failbit|IOSTATE_badbit)); } /* ?fill(a)ios@@QAEDD(a)Z */ @@ -966,8 +969,8 @@ LONG __thiscall ios_flags_get(const ios *this) DEFINE_THISCALL_WRAPPER(ios_good, 4) int __thiscall ios_good(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->state == IOSTATE_goodbit; } /* ?hex@@YAAAVios@@AAV1@@Z */ @@ -1088,8 +1091,8 @@ streambuf* __thiscall ios_rdbuf(const ios *this) DEFINE_THISCALL_WRAPPER(ios_rdstate, 4) int __thiscall ios_rdstate(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->state; } /* ?setf(a)ios@@QAEJJ(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 1b730b9..c65d419 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -142,6 +142,11 @@ static LONG (*__thiscall p_ios_flags_get)(const ios*); static LONG (*__thiscall p_ios_setf)(ios*, LONG); static LONG (*__thiscall p_ios_setf_mask)(ios*, LONG, LONG); static LONG (*__thiscall p_ios_unsetf)(ios*, LONG); +static int (*__thiscall p_ios_good)(const ios*); +static int (*__thiscall p_ios_bad)(const ios*); +static int (*__thiscall p_ios_eof)(const ios*); +static int (*__thiscall p_ios_fail)(const ios*); +static void (*__thiscall p_ios_clear)(ios*, int); /* Emulate a __thiscall */ #ifdef __i386__ @@ -255,6 +260,11 @@ static BOOL init(void) SET(p_ios_setf, "?setf(a)ios@@QEAAJJ(a)Z"); SET(p_ios_setf_mask, "?setf(a)ios@@QEAAJJJ(a)Z"); SET(p_ios_unsetf, "?unsetf(a)ios@@QEAAJJ(a)Z"); + SET(p_ios_good, "?good(a)ios@@QEBAHXZ"); + SET(p_ios_bad, "?bad(a)ios@@QEBAHXZ"); + SET(p_ios_eof, "?eof(a)ios@@QEBAHXZ"); + SET(p_ios_fail, "?fail(a)ios@@QEBAHXZ"); + SET(p_ios_clear, "?clear(a)ios@@QEAAXH(a)Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); @@ -298,6 +308,11 @@ static BOOL init(void) SET(p_ios_setf, "?setf(a)ios@@QAEJJ(a)Z"); SET(p_ios_setf_mask, "?setf(a)ios@@QAEJJJ(a)Z"); SET(p_ios_unsetf, "?unsetf(a)ios@@QAEJJ(a)Z"); + SET(p_ios_good, "?good(a)ios@@QBEHXZ"); + SET(p_ios_bad, "?bad(a)ios@@QBEHXZ"); + SET(p_ios_eof, "?eof(a)ios@@QBEHXZ"); + SET(p_ios_fail, "?fail(a)ios@@QBEHXZ"); + SET(p_ios_clear, "?clear(a)ios@@QAEXH(a)Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -1033,6 +1048,41 @@ static void test_ios(void) ok(ios_obj.flags == 0x440, "expected %x got %x\n", 0x440, ios_obj.flags); ios_obj.do_lock = -1; + /* state */ + ios_obj.state = 0x8; + ret = (LONG) call_func1(p_ios_good, &ios_obj); + ok(ret == 0, "expected 0 got %d\n", ret); + ios_obj.state = IOSTATE_goodbit; + ret = (LONG) call_func1(p_ios_good, &ios_obj); + ok(ret == 1, "expected 1 got %d\n", ret); + ret = (LONG) call_func1(p_ios_bad, &ios_obj); + ok(ret == 0, "expected 0 got %d\n", ret); + ios_obj.state = (IOSTATE_eofbit|IOSTATE_badbit); + ret = (LONG) call_func1(p_ios_bad, &ios_obj); + ok(ret == IOSTATE_badbit, "expected 4 got %d\n", ret); + ret = (LONG) call_func1(p_ios_eof, &ios_obj); + ok(ret == IOSTATE_eofbit, "expected 1 got %d\n", ret); + ios_obj.state = 0x8; + ret = (LONG) call_func1(p_ios_eof, &ios_obj); + ok(ret == 0, "expected 0 got %d\n", ret); + ret = (LONG) call_func1(p_ios_fail, &ios_obj); + ok(ret == 0, "expected 0 got %d\n", ret); + ios_obj.state = IOSTATE_badbit; + ret = (LONG) call_func1(p_ios_fail, &ios_obj); + ok(ret == IOSTATE_badbit, "expected 4 got %d\n", ret); + ios_obj.state = (IOSTATE_eofbit|IOSTATE_failbit); + ret = (LONG) call_func1(p_ios_fail, &ios_obj); + ok(ret == IOSTATE_failbit, "expected 2 got %d\n", ret); + ios_obj.state = (IOSTATE_eofbit|IOSTATE_failbit|IOSTATE_badbit); + ret = (LONG) call_func1(p_ios_fail, &ios_obj); + ok(ret == (IOSTATE_failbit|IOSTATE_badbit), "expected 6 got %d\n", ret); + ios_obj.do_lock = 0; + call_func2(p_ios_clear, &ios_obj, 0); + ok(ios_obj.state == IOSTATE_goodbit, "expected 0 got %d\n", ios_obj.state); + call_func2(p_ios_clear, &ios_obj, 0x8|IOSTATE_eofbit); + ok(ios_obj.state == (0x8|IOSTATE_eofbit), "expected 9 got %d\n", ios_obj.state); + ios_obj.do_lock = -1; + SetEvent(lock_arg.release[0]); SetEvent(lock_arg.release[1]); SetEvent(lock_arg.release[2]);

1 0

Iván Matellanes : msvcirt: Implement ios::rdbuf.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 0fa257924dc8d092b14872e94babbc806acbc0fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa257924dc8d092b14872e94… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:46 2015 +0200 msvcirt: Implement ios::rdbuf. --- dlls/msvcirt/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index d1c5509..dbb2ea3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1078,8 +1078,8 @@ void** __thiscall ios_pword(const ios *this, int index) DEFINE_THISCALL_WRAPPER(ios_rdbuf, 4) streambuf* __thiscall ios_rdbuf(const ios *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return this->sb; } /* ?rdstate(a)ios@@QBEHXZ */

1 0

Sebastian Lackner : vcomp/tests: Add tests for _vcomp_for_static_init.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: a250c0b29f47aa6fe9c5d3ab12091d266475b9cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a250c0b29f47aa6fe9c5d3ab1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 20 05:18:45 2015 +0200 vcomp/tests: Add tests for _vcomp_for_static_init. --- dlls/vcomp/tests/vcomp.c | 220 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a250c0b29f47aa6fe9c5d…

1 0

Sebastian Lackner : vcomp/tests: Add tests for _vcomp_for_static_simple_init.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: 02054a75226f941c9f5c4f31d34db6423be3dca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02054a75226f941c9f5c4f31d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 20 05:17:05 2015 +0200 vcomp/tests: Add tests for _vcomp_for_static_simple_init. --- dlls/vcomp/tests/vcomp.c | 173 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 7346655..ec845c4 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -32,6 +32,9 @@ static BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); static VOID (WINAPI *pReleaseActCtx)(HANDLE); static void (CDECL *p_vcomp_barrier)(void); +static void (CDECL *p_vcomp_for_static_end)(void); +static void (CDECL *p_vcomp_for_static_simple_init)(unsigned int first, unsigned int last, int step, + BOOL increment, unsigned int *begin, unsigned int *end); static void (WINAPIV *p_vcomp_fork)(BOOL ifval, int nargs, void *wrapper, ...); static void (CDECL *p_vcomp_sections_init)(int n); static int (CDECL *p_vcomp_sections_next)(void); @@ -171,6 +174,8 @@ static BOOL init_vcomp(void) } VCOMP_GET_PROC(_vcomp_barrier); + VCOMP_GET_PROC(_vcomp_for_static_end); + VCOMP_GET_PROC(_vcomp_for_static_simple_init); VCOMP_GET_PROC(_vcomp_fork); VCOMP_GET_PROC(_vcomp_sections_init); VCOMP_GET_PROC(_vcomp_sections_next); @@ -458,6 +463,173 @@ if (0) pomp_set_num_threads(max_threads); } +static void my_for_static_simple_init(unsigned int first, unsigned int last, int step, + BOOL increment, unsigned int *begin, unsigned int *end) +{ + unsigned int iterations, per_thread, remaining; + int num_threads = pomp_get_num_threads(); + int thread_num = pomp_get_thread_num(); + + if (num_threads == 1) + { + *begin = first; + *end = last; + return; + } + + if (step <= 0) + { + *begin = 0; + *end = increment ? -1 : 1; + return; + } + + if (increment) + iterations = 1 + (last - first) / step; + else + { + iterations = 1 + (first - last) / step; + step *= -1; + } + + per_thread = iterations / num_threads; + remaining = iterations - per_thread * num_threads; + + if (thread_num < remaining) + per_thread++; + else if (per_thread) + first += remaining * step; + else + { + *begin = first; + *end = first - step; + return; + } + + *begin = first + per_thread * thread_num * step; + *end = *begin + (per_thread - 1) * step; +} + + +static void CDECL for_static_simple_cb(void) +{ + static const struct + { + unsigned int first; + unsigned int last; + int step; + } + tests[] = + { + { 0, 0, 1 }, /* 0 */ + { 0, 1, 1 }, + { 0, 2, 1 }, + { 0, 3, 1 }, + { 0, 100, 0 }, + { 0, 100, 1 }, + { 0, 100, 2 }, + { 0, 100, 3 }, + { 0, 100, -1 }, + { 0, 100, -2 }, + { 0, 100, -3 }, /* 10 */ + { 0, 100, 10 }, + { 0, 100, 50 }, + { 0, 100, 100 }, + { 0, 100, 150 }, + { 0, 0x80000000, 1 }, + { 0, 0xfffffffe, 1 }, + { 0, 0xffffffff, 1 }, + { 50, 50, 0 }, + { 50, 50, 1 }, + { 50, 50, 2 }, /* 20 */ + { 50, 50, 3 }, + { 50, 50, -1 }, + { 50, 50, -2 }, + { 50, 50, -3 }, + { 100, 200, 1 }, + { 100, 200, 5 }, + { 100, 200, 10 }, + { 100, 200, 50 }, + { 100, 200, 100 }, + { 100, 200, 150 }, /* 30 */ + }; + int num_threads = pomp_get_num_threads(); + int thread_num = pomp_get_thread_num(); + int i; + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + unsigned int my_begin, my_end, begin, end; + + begin = end = 0xdeadbeef; + my_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, FALSE, &my_begin, &my_end); + p_vcomp_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, FALSE, &begin, &end); + + ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", + i, thread_num, num_threads, my_begin, end); + ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", + i, thread_num, num_threads, my_end, end); + + p_vcomp_for_static_end(); + p_vcomp_barrier(); + + begin = end = 0xdeadbeef; + my_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, TRUE, &my_begin, &my_end); + p_vcomp_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, TRUE, &begin, &end); + + ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", + i, thread_num, num_threads, my_begin, end); + ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", + i, thread_num, num_threads, my_end, end); + + p_vcomp_for_static_end(); + p_vcomp_barrier(); + + if (tests[i].first == tests[i].last) continue; + + begin = end = 0xdeadbeef; + my_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, FALSE, &my_begin, &my_end); + p_vcomp_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, FALSE, &begin, &end); + + ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", + i, thread_num, num_threads, my_begin, end); + ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", + i, thread_num, num_threads, my_end, end); + + p_vcomp_for_static_end(); + p_vcomp_barrier(); + + begin = end = 0xdeadbeef; + my_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, TRUE, &my_begin, &my_end); + p_vcomp_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, TRUE, &begin, &end); + + ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", + i, thread_num, num_threads, my_begin, end); + ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", + i, thread_num, num_threads, my_end, end); + + p_vcomp_for_static_end(); + p_vcomp_barrier(); + } +} + +static void test_vcomp_for_static_simple_init(void) +{ + int max_threads = pomp_get_max_threads(); + int i; + + for_static_simple_cb(); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + p_vcomp_fork(TRUE, 0, for_static_simple_cb); + p_vcomp_fork(FALSE, 0, for_static_simple_cb); + } + + pomp_set_num_threads(max_threads); +} + START_TEST(vcomp) { if (!init_vcomp()) @@ -467,6 +639,7 @@ START_TEST(vcomp) test_omp_get_num_threads(TRUE); test_vcomp_fork(); test_vcomp_sections_init(); + test_vcomp_for_static_simple_init(); release_vcomp(); }

1 0

Sebastian Lackner : vcomp: Implement omp_in_parallel and add tests.
by Alexandre Julliard July 20, 2015

July 20, 2015

Module: wine Branch: master Commit: bc10d127b472d456e5308903e3556b72d8c80fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc10d127b472d456e5308903e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 20 05:16:12 2015 +0200 vcomp: Implement omp_in_parallel and add tests. --- dlls/vcomp/main.c | 6 +++++ dlls/vcomp/tests/vcomp.c | 61 +++++++++++++++++++++++++++++++++------------ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 5 files changed, 54 insertions(+), 19 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 1dad029..d76df1e 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -361,6 +361,12 @@ int CDECL _vcomp_sections_next(void) return i; } +int CDECL omp_in_parallel(void) +{ + TRACE("()\n"); + return vcomp_init_thread_data()->parallel; +} + static DWORD WINAPI _vcomp_fork_worker(void *param) { struct vcomp_thread_data *thread_data = param; diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index dd91b4f..7346655 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -40,6 +40,7 @@ static int (CDECL *pomp_get_max_threads)(void); static int (CDECL *pomp_get_nested)(void); static int (CDECL *pomp_get_num_threads)(void); static int (CDECL *pomp_get_thread_num)(void); +static int (CDECL *pomp_in_parallel)(void); static void (CDECL *pomp_set_nested)(int nested); static void (CDECL *pomp_set_num_threads)(int num_threads); @@ -178,6 +179,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(omp_get_nested); VCOMP_GET_PROC(omp_get_num_threads); VCOMP_GET_PROC(omp_get_thread_num); + VCOMP_GET_PROC(omp_in_parallel); VCOMP_GET_PROC(omp_set_nested); VCOMP_GET_PROC(omp_set_num_threads); @@ -186,14 +188,17 @@ static BOOL init_vcomp(void) #undef VCOMP_GET_PROC -static void CDECL num_threads_cb2(LONG *count) +static void CDECL num_threads_cb2(int parallel, LONG *count) { + int is_parallel = pomp_in_parallel(); + ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); + InterlockedIncrement(count); } -static void CDECL num_threads_cb(BOOL nested, int nested_threads, LONG *count) +static void CDECL num_threads_cb(BOOL nested, int parallel, int nested_threads, LONG *count) { - int num_threads, thread_num; + int is_parallel, num_threads, thread_num; LONG thread_count; InterlockedIncrement(count); @@ -205,29 +210,41 @@ static void CDECL num_threads_cb(BOOL nested, int nested_threads, LONG *count) ok(thread_num >= 0 && thread_num < num_threads, "expected thread_num in range [0, %d], got %d\n", num_threads - 1, thread_num); + is_parallel = pomp_in_parallel(); + ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); + thread_count = 0; - p_vcomp_fork(TRUE, 1, num_threads_cb2, &thread_count); + p_vcomp_fork(TRUE, 2, num_threads_cb2, TRUE, &thread_count); if (nested) ok(thread_count == nested_threads, "expected %d threads, got %d\n", nested_threads, thread_count); else ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + is_parallel = pomp_in_parallel(); + ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); + thread_count = 0; - p_vcomp_fork(FALSE, 1, num_threads_cb2, &thread_count); + p_vcomp_fork(FALSE, 2, num_threads_cb2, parallel, &thread_count); ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + is_parallel = pomp_in_parallel(); + ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); + p_vcomp_set_num_threads(4); thread_count = 0; - p_vcomp_fork(TRUE, 1, num_threads_cb2, &thread_count); + p_vcomp_fork(TRUE, 2, num_threads_cb2, TRUE, &thread_count); if (nested) ok(thread_count == 4, "expected 4 threads, got %d\n", thread_count); else ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + + is_parallel = pomp_in_parallel(); + ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); } static void test_omp_get_num_threads(BOOL nested) { - int is_nested, max_threads, num_threads, thread_num; + int is_nested, is_parallel, max_threads, num_threads, thread_num; LONG thread_count; pomp_set_nested(nested); @@ -239,61 +256,73 @@ static void test_omp_get_num_threads(BOOL nested) thread_num = pomp_get_thread_num(); ok(thread_num == 0, "expected thread_num == 0, got %d\n", thread_num); + is_parallel = pomp_in_parallel(); + ok(is_parallel == FALSE, "expected FALSE, got %d\n", is_parallel); + num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, max_threads, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, max_threads, &thread_count); ok(thread_count == max_threads, "expected %d threads, got %d\n", max_threads, thread_count); + is_parallel = pomp_in_parallel(); + ok(is_parallel == FALSE, "expected FALSE, got %d\n", is_parallel); + num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(FALSE, 3, num_threads_cb, TRUE, max_threads, &thread_count); + p_vcomp_fork(FALSE, 4, num_threads_cb, TRUE, FALSE, max_threads, &thread_count); ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + is_parallel = pomp_in_parallel(); + ok(is_parallel == FALSE, "expected FALSE, got %d\n", is_parallel); + pomp_set_num_threads(1); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 1, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 1, &thread_count); ok(thread_count == 1, "expected 1 thread, got %d\n", thread_count); + is_parallel = pomp_in_parallel(); + ok(is_parallel == FALSE, "expected FALSE, got %d\n", is_parallel); + pomp_set_num_threads(2); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 2, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 2, &thread_count); ok(thread_count == 2, "expected 2 threads, got %d\n", thread_count); pomp_set_num_threads(4); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 4, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 4, &thread_count); ok(thread_count == 4, "expected 4 threads, got %d\n", thread_count); p_vcomp_set_num_threads(8); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 4, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 4, &thread_count); ok(thread_count == 8, "expected 8 threads, got %d\n", thread_count); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 4, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 4, &thread_count); ok(thread_count == 4, "expected 4 threads, got %d\n", thread_count); p_vcomp_set_num_threads(0); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 4, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 4, &thread_count); ok(thread_count == 4, "expected 4 threads, got %d\n", thread_count); pomp_set_num_threads(0); num_threads = pomp_get_num_threads(); ok(num_threads == 1, "expected num_threads == 1, got %d\n", num_threads); thread_count = 0; - p_vcomp_fork(TRUE, 3, num_threads_cb, nested, 4, &thread_count); + p_vcomp_fork(TRUE, 4, num_threads_cb, nested, TRUE, 4, &thread_count); ok(thread_count == 4, "expected 4 threads, got %d\n", thread_count); pomp_set_num_threads(max_threads); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index dfbd184..5a5b114 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -98,7 +98,7 @@ @ cdecl omp_get_thread_num() @ stub omp_get_wtick @ cdecl omp_get_wtime() -@ stub omp_in_parallel +@ cdecl omp_in_parallel() @ stub omp_init_lock @ stub omp_init_nest_lock @ cdecl omp_set_dynamic(long) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 6eb6ae5..debc5ff 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -98,7 +98,7 @@ @ cdecl omp_get_thread_num() vcomp.omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime -@ stub omp_in_parallel +@ cdecl omp_in_parallel() vcomp.omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 6eb6ae5..debc5ff 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -98,7 +98,7 @@ @ cdecl omp_get_thread_num() vcomp.omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime -@ stub omp_in_parallel +@ cdecl omp_in_parallel() vcomp.omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock @ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic

1 0