wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Iván Matellanes : msvcirt: Implement ios manipulators.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 3c5328dca83bde9536df4ee6c3efd21deb7fa716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5328dca83bde9536df4ee6c… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:37:09 2015 +0200 msvcirt: Implement ios manipulators. --- dlls/msvcirt/msvcirt.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6dd650b..bbcefbf 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -90,6 +90,7 @@ typedef struct { ios* __thiscall ios_assign(ios*, const ios*); int __thiscall ios_fail(const ios*); void __cdecl ios_lock(ios*); +LONG __thiscall ios_setf_mask(ios*, LONG, LONG); void __cdecl ios_unlock(ios*); /* class ostream */ @@ -905,7 +906,8 @@ int __thiscall ios_delbuf_get(const ios *this) /* ?dec@@YAAEAVios@@AEAV1@@Z */ ios* __cdecl ios_dec(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + ios_setf_mask(this, FLAGS_dec, ios_basefield); return this; } @@ -984,7 +986,8 @@ int __thiscall ios_good(const ios *this) /* ?hex@@YAAEAVios@@AEAV1@@Z */ ios* __cdecl ios_hex(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + ios_setf_mask(this, FLAGS_hex, ios_basefield); return this; } @@ -1049,7 +1052,8 @@ CRITICAL_SECTION* __thiscall ios_lockptr(ios *this) /* ?oct@@YAAEAVios@@AEAV1@@Z */ ios* __cdecl ios_oct(ios *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + ios_setf_mask(this, FLAGS_oct, ios_basefield); return this; }

1 0

Iván Matellanes : msvcirt: Add ios format flag masks.
by Alexandre Julliard 20 Jul '15

20 Jul '15

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@ios@@2JB */ +const LONG ios_adjustfield = FLAGS_left | FLAGS_right | FLAGS_internal; +/* ?basefield@ios@@2JB */ +const LONG ios_basefield = FLAGS_dec | FLAGS_oct | FLAGS_hex; +/* ?floatfield@ios@@2JB */ +const LONG ios_floatfield = FLAGS_scientific | FLAGS_fixed; /* ?x_lockc@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@Z(ptr long) streambuf_scalar_dtor @ stub -arch=win32 ??_Gstrstream@@UAEPAXI@Z # virtual void * __thiscall strstream::`scalar deleting destructor'(unsigned int) @ stub -arch=win32 ??_Gstrstreambuf@@UAEPAXI@Z # virtual void * __thiscall strstreambuf::`scalar deleting destructor'(unsigned int) -# @ extern ?adjustfield@ios@@2JB # static long const ios::adjustfield +@ extern ?adjustfield@ios@@2JB ios_adjustfield @ thiscall -arch=win32 ?allocate@streambuf@@IAEHXZ(ptr) streambuf_allocate @ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) streambuf_allocate @ stub -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z # class filebuf * __thiscall filebuf::attach(int) @@ -414,7 +414,7 @@ @ cdecl -arch=win64 ?bad@ios@@QEBAHXZ(ptr) ios_bad @ thiscall -arch=win32 ?base@streambuf@@IBEPADXZ(ptr) streambuf_base @ cdecl -arch=win64 ?base@streambuf@@IEBAPEADXZ(ptr) streambuf_base -# @ extern ?basefield@ios@@2JB # static long const ios::basefield +@ extern ?basefield@ios@@2JB ios_basefield # @ extern ?binary@filebuf@@2HB # static int const filebuf::binary @ cdecl ?bitalloc@ios@@SAJXZ() ios_bitalloc @ thiscall -arch=win32 ?blen@streambuf@@IBEHXZ(ptr) streambuf_blen @@ -484,7 +484,7 @@ @ cdecl -arch=win64 ?flags@ios@@QEAAJJ@Z(ptr long) ios_flags_set @ thiscall -arch=win32 ?flags@ios@@QBEJXZ(ptr) ios_flags_get @ cdecl -arch=win64 ?flags@ios@@QEBAJXZ(ptr) ios_flags_get -# @ extern ?floatfield@ios@@2JB # static long const ios::floatfield +@ extern ?floatfield@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@ostream@@QAEAAV1@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@Z(long) msvcrt.?_set_new_mode@@YAHH@Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z -# @ extern ?adjustfield@ios@@2JB +@ extern ?adjustfield@ios@@2JB msvcirt.?adjustfield@ios@@2JB @ thiscall -arch=win32 ?allocate@streambuf@@IAEHXZ(ptr) msvcirt.?allocate@streambuf@@IAEHXZ @ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) msvcirt.?allocate@streambuf@@IEAAHXZ @ stub -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z @@ -402,7 +402,7 @@ @ cdecl -arch=win64 ?bad@ios@@QEBAHXZ(ptr) msvcirt.?bad@ios@@QEBAHXZ @ thiscall -arch=win32 ?base@streambuf@@IBEPADXZ(ptr) msvcirt.?base@streambuf@@IBEPADXZ @ cdecl -arch=win64 ?base@streambuf@@IEBAPEADXZ(ptr) msvcirt.?base@streambuf@@IEBAPEADXZ -# @ extern ?basefield@ios@@2JB +@ extern ?basefield@ios@@2JB msvcirt.?basefield@ios@@2JB # @ extern ?binary@filebuf@@2HB @ cdecl ?bitalloc@ios@@SAJXZ() msvcirt.?bitalloc@ios@@SAJXZ @ thiscall -arch=win32 ?blen@streambuf@@IBEHXZ(ptr) msvcirt.?blen@streambuf@@IBEHXZ @@ -472,7 +472,7 @@ @ cdecl -arch=win64 ?flags@ios@@QEAAJJ@Z(ptr long) msvcirt.?flags@ios@@QEAAJJ@Z @ thiscall -arch=win32 ?flags@ios@@QBEJXZ(ptr) msvcirt.?flags@ios@@QBEJXZ @ cdecl -arch=win64 ?flags@ios@@QEBAJXZ(ptr) msvcirt.?flags@ios@@QEBAJXZ -# @ extern ?floatfield@ios@@2JB +@ extern ?floatfield@ios@@2JB msvcirt.?floatfield@ios@@2JB @ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z @ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z @ stub -arch=win32 ?flush@ostream@@QAEAAV1@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@Z(long) msvcrt.?_set_new_mode@@YAHH@Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z -# @ extern ?adjustfield@ios@@2JB +@ extern ?adjustfield@ios@@2JB msvcirt.?adjustfield@ios@@2JB @ thiscall -arch=win32 ?allocate@streambuf@@IAEHXZ(ptr) msvcirt.?allocate@streambuf@@IAEHXZ @ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) msvcirt.?allocate@streambuf@@IEAAHXZ @ stub -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z @@ -465,7 +465,7 @@ @ cdecl -arch=win64 ?bad@ios@@QEBAHXZ(ptr) msvcirt.?bad@ios@@QEBAHXZ @ thiscall -arch=win32 ?base@streambuf@@IBEPADXZ(ptr) msvcirt.?base@streambuf@@IBEPADXZ @ cdecl -arch=win64 ?base@streambuf@@IEBAPEADXZ(ptr) msvcirt.?base@streambuf@@IEBAPEADXZ -# @ extern ?basefield@ios@@2JB +@ extern ?basefield@ios@@2JB msvcirt.?basefield@ios@@2JB @ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z # @ extern ?binary@filebuf@@2HB @@ -537,7 +537,7 @@ @ cdecl -arch=win64 ?flags@ios@@QEAAJJ@Z(ptr long) msvcirt.?flags@ios@@QEAAJJ@Z @ thiscall -arch=win32 ?flags@ios@@QBEJXZ(ptr) msvcirt.?flags@ios@@QBEJXZ @ cdecl -arch=win64 ?flags@ios@@QEBAJXZ(ptr) msvcirt.?flags@ios@@QEBAJXZ -# @ extern ?floatfield@ios@@2JB +@ extern ?floatfield@ios@@2JB msvcirt.?floatfield@ios@@2JB @ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z @ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z @ stub -arch=win32 ?flush@ostream@@QAEAAV1@XZ

1 0

Iván Matellanes : msvcirt: Implement ios operators.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 19bce9272c947b396f825683145f55bb2f9208a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19bce9272c947b396f8256831… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:37:00 2015 +0200 msvcirt: Implement ios operators. --- dlls/msvcirt/msvcirt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1397ccd..6959db3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -82,6 +82,7 @@ typedef struct { } ios; ios* __thiscall ios_assign(ios*, const ios*); +int __thiscall ios_fail(const ios*); void __cdecl ios_lock(ios*); void __cdecl ios_unlock(ios*); @@ -795,8 +796,8 @@ ios* __thiscall ios_assign(ios *this, const ios *rhs) DEFINE_THISCALL_WRAPPER(ios_op_not, 4) int __thiscall ios_op_not(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return ios_fail(this); } /* ??Bios@@QBEPAXXZ */ @@ -804,8 +805,8 @@ int __thiscall ios_op_not(const ios *this) DEFINE_THISCALL_WRAPPER(ios_op_void, 4) void* __thiscall ios_op_void(const ios *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return ios_fail(this) ? NULL : (void*)this; } /* ??_Eios@@UAEPAXI@Z */

1 0

Iván Matellanes : msvcirt: Implement ios status-testing functions.
by Alexandre Julliard 20 Jul '15

20 Jul '15

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@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@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@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@ios@@QAEDD@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@ios@@QAEJJ@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@ios@@QEAAJJ@Z"); SET(p_ios_setf_mask, "?setf@ios@@QEAAJJJ@Z"); SET(p_ios_unsetf, "?unsetf@ios@@QEAAJJ@Z"); + SET(p_ios_good, "?good@ios@@QEBAHXZ"); + SET(p_ios_bad, "?bad@ios@@QEBAHXZ"); + SET(p_ios_eof, "?eof@ios@@QEBAHXZ"); + SET(p_ios_fail, "?fail@ios@@QEBAHXZ"); + SET(p_ios_clear, "?clear@ios@@QEAAXH@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); @@ -298,6 +308,11 @@ static BOOL init(void) SET(p_ios_setf, "?setf@ios@@QAEJJ@Z"); SET(p_ios_setf_mask, "?setf@ios@@QAEJJJ@Z"); SET(p_ios_unsetf, "?unsetf@ios@@QAEJJ@Z"); + SET(p_ios_good, "?good@ios@@QBEHXZ"); + SET(p_ios_bad, "?bad@ios@@QBEHXZ"); + SET(p_ios_eof, "?eof@ios@@QBEHXZ"); + SET(p_ios_fail, "?fail@ios@@QBEHXZ"); + SET(p_ios_clear, "?clear@ios@@QAEXH@Z"); } SET(p_ios_static_lock, "?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc@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::delbuf.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 9abffde3bcdc139eae77e8d66dfbc26ed08bd0ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abffde3bcdc139eae77e8d66… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:50 2015 +0200 msvcirt: Implement ios::delbuf. --- dlls/msvcirt/msvcirt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index dbb2ea3..5bae2c8 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -878,7 +878,8 @@ void __cdecl ios_clrlock(ios *this) DEFINE_THISCALL_WRAPPER(ios_delbuf_set, 8) void __thiscall ios_delbuf_set(ios *this, int delete) { - FIXME("(%p %d) stub\n", this, delete); + TRACE("(%p %d)\n", this, delete); + this->delbuf = delete; } /* ?delbuf@ios@@QBEHXZ */ @@ -886,8 +887,8 @@ void __thiscall ios_delbuf_set(ios *this, int delete) DEFINE_THISCALL_WRAPPER(ios_delbuf_get, 4) int __thiscall ios_delbuf_get(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->delbuf; } /* ?dec@@YAAAVios@@AAV1@@Z */

1 0

Iván Matellanes : msvcirt: Implement ios::rdbuf.
by Alexandre Julliard 20 Jul '15

20 Jul '15

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@ios@@QBEHXZ */

1 0

Iván Matellanes : msvcirt: Implement ios::tie.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 5fea62039986fb736c50b6de268a33985d11809e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fea62039986fb736c50b6de2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:40 2015 +0200 msvcirt: Implement ios::tie. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 4e4315e..d1c5509 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1142,8 +1142,12 @@ void __cdecl ios_sync_with_stdio(void) DEFINE_THISCALL_WRAPPER(ios_tie_set, 8) ostream* __thiscall ios_tie_set(ios *this, ostream *ostr) { - FIXME("(%p %p) stub\n", this, ostr); - return NULL; + ostream *prev = this->tie; + + TRACE("(%p %p)\n", this, ostr); + + this->tie = ostr; + return prev; } /* ?tie@ios@@QBEPAVostream@@XZ */ @@ -1151,8 +1155,8 @@ ostream* __thiscall ios_tie_set(ios *this, ostream *ostr) DEFINE_THISCALL_WRAPPER(ios_tie_get, 4) ostream* __thiscall ios_tie_get(const ios *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + return this->tie; } /* ?unlock@ios@@QAAXXZ */

1 0

Iván Matellanes : msvcirt: Implement ios::width.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: c21fa9c532dfc41d33b21c4d2fb5ab6937c4c8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21fa9c532dfc41d33b21c4d2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:32 2015 +0200 msvcirt: Implement ios::width. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 275a849..4e4315e 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1199,8 +1199,12 @@ LONG __thiscall ios_unsetf(ios *this, LONG flags) DEFINE_THISCALL_WRAPPER(ios_width_set, 8) int __thiscall ios_width_set(ios *this, int width) { - FIXME("(%p %d) stub\n", this, width); - return 0; + int prev = this->width; + + TRACE("(%p %d)\n", this, width); + + this->width = width; + return prev; } /* ?width@ios@@QBEHXZ */ @@ -1208,8 +1212,8 @@ int __thiscall ios_width_set(ios *this, int width) DEFINE_THISCALL_WRAPPER(ios_width_get, 4) int __thiscall ios_width_get(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->width; } /* ?xalloc@ios@@SAHXZ */

1 0

Iván Matellanes : msvcirt: Implement ios::precision.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 80f5fd53617fcf5797318c111b24c127d5b901f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f5fd53617fcf5797318c111… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:27 2015 +0200 msvcirt: Implement ios::precision. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 068beab..275a849 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1047,8 +1047,12 @@ ios* __cdecl ios_oct(ios *this) DEFINE_THISCALL_WRAPPER(ios_precision_set, 8) int __thiscall ios_precision_set(ios *this, int prec) { - FIXME("(%p %d) stub\n", this, prec); - return 0; + int prev = this->precision; + + TRACE("(%p %d)\n", this, prec); + + this->precision = prec; + return prev; } /* ?precision@ios@@QBEHXZ */ @@ -1056,8 +1060,8 @@ int __thiscall ios_precision_set(ios *this, int prec) DEFINE_THISCALL_WRAPPER(ios_precision_get, 4) int __thiscall ios_precision_get(const ios *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->precision; } /* ?pword@ios@@QBEAAPAXH@Z */

1 0

Iván Matellanes : msvcirt: Implement ios::fill.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 9b42f88e49c5cdc3df77947515d9c6328f14a4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b42f88e49c5cdc3df7794751… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 17 16:36:22 2015 +0200 msvcirt: Implement ios::fill. --- dlls/msvcirt/msvcirt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a0d670f..068beab 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -921,8 +921,12 @@ int __thiscall ios_fail(const ios *this) DEFINE_THISCALL_WRAPPER(ios_fill_set, 8) char __thiscall ios_fill_set(ios *this, char fill) { - FIXME("(%p %d) stub\n", this, fill); - return EOF; + char prev = this->fill; + + TRACE("(%p %d)\n", this, fill); + + this->fill = fill; + return prev; } /* ?fill@ios@@QBEDXZ */ @@ -930,8 +934,8 @@ char __thiscall ios_fill_set(ios *this, char fill) DEFINE_THISCALL_WRAPPER(ios_fill_get, 4) char __thiscall ios_fill_get(const ios *this) { - FIXME("(%p) stub\n", this); - return EOF; + TRACE("(%p)\n", this); + return this->fill; } /* ?flags@ios@@QAEJJ@Z */

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2015