ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcirt: Implement ios locking control.

This commit is contained in:
Iván Matellanes 2015-07-13 21:39:00 +02:00 committed by Alexandre Julliard
parent dfae842cca
commit 9d0b679c1b
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/msvcirt/msvcirt.c
View File

@ -854,7 +854,11 @@ void __thiscall ios_clear(ios *this, int state)
/* ?clrlock@ios@@QEAAXXZ */ /* ?clrlock@ios@@QEAAXXZ */
void __cdecl ios_clrlock(ios *this) void __cdecl ios_clrlock(ios *this)
{ {
FIXME("(%p) stub\n", this); TRACE("(%p)\n", this);
if (this->do_lock <= 0)
this->do_lock++;
if (this->sb)
streambuf_clrlock(this->sb);
} }
/* ?delbuf@ios@@QAEXH@Z */ /* ?delbuf@ios@@QAEXH@Z */
@ -1002,8 +1006,8 @@ void __cdecl ios_lockc(void)
DEFINE_THISCALL_WRAPPER(ios_lockptr, 4) DEFINE_THISCALL_WRAPPER(ios_lockptr, 4)
CRITICAL_SECTION* __thiscall ios_lockptr(ios *this) CRITICAL_SECTION* __thiscall ios_lockptr(ios *this)
{ {
FIXME("(%p) stub\n", this); TRACE("(%p)\n", this);
return NULL; return &this->lock;
} }
/* ?oct@@YAAAVios@@AAV1@@Z */ /* ?oct@@YAAAVios@@AAV1@@Z */
@ -1081,7 +1085,10 @@ LONG __thiscall ios_setf_mask(ios *this, LONG flags, LONG mask)
/* ?setlock@ios@@QEAAXXZ */ /* ?setlock@ios@@QEAAXXZ */
void __cdecl ios_setlock(ios *this) void __cdecl ios_setlock(ios *this)
{ {
FIXME("(%p) stub\n", this); TRACE("(%p)\n", this);
this->do_lock--;
if (this->sb)
streambuf_setlock(this->sb);
} }
/* ?sync_with_stdio@ios@@SAXXZ */ /* ?sync_with_stdio@ios@@SAXXZ */

29
dlls/msvcirt/tests/msvcirt.c
View File

@ -128,6 +128,8 @@ static ios* (*__thiscall p_ios_sb_ctor)(ios*, streambuf*);
static ios* (*__thiscall p_ios_assign)(ios*, const ios*); static ios* (*__thiscall p_ios_assign)(ios*, const ios*);
static void (*__thiscall p_ios_init)(ios*, streambuf*); static void (*__thiscall p_ios_init)(ios*, streambuf*);
static void (*__thiscall p_ios_dtor)(ios*); static void (*__thiscall p_ios_dtor)(ios*);
static void (*__cdecl p_ios_clrlock)(ios*);
static void (*__cdecl p_ios_setlock)(ios*);
/* Emulate a __thiscall */ /* Emulate a __thiscall */
#ifdef __i386__ #ifdef __i386__
@ -230,6 +232,8 @@ static BOOL init(void)
SET(p_ios_assign, "??4ios@@IEAAAEAV0@AEBV0@@Z"); SET(p_ios_assign, "??4ios@@IEAAAEAV0@AEBV0@@Z");
SET(p_ios_init, "?init@ios@@IEAAXPEAVstreambuf@@@Z"); SET(p_ios_init, "?init@ios@@IEAAXPEAVstreambuf@@@Z");
SET(p_ios_dtor, "??1ios@@UEAA@XZ"); SET(p_ios_dtor, "??1ios@@UEAA@XZ");
SET(p_ios_clrlock, "?clrlock@ios@@QEAAXXZ");
SET(p_ios_setlock, "?setlock@ios@@QEAAXXZ");
} else { } else {
p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z");
@ -262,6 +266,8 @@ static BOOL init(void)
SET(p_ios_assign, "??4ios@@IAEAAV0@ABV0@@Z"); SET(p_ios_assign, "??4ios@@IAEAAV0@ABV0@@Z");
SET(p_ios_init, "?init@ios@@IAEXPAVstreambuf@@@Z"); SET(p_ios_init, "?init@ios@@IAEXPAVstreambuf@@@Z");
SET(p_ios_dtor, "??1ios@@UAE@XZ"); SET(p_ios_dtor, "??1ios@@UAE@XZ");
SET(p_ios_clrlock, "?clrlock@ios@@QAAXXZ");
SET(p_ios_setlock, "?setlock@ios@@QAAXXZ");
} }
init_thiscall_thunk(); init_thiscall_thunk();
@ -861,7 +867,6 @@ static void test_ios(void)
call_func2(p_ios_init, &ios_obj, psb); call_func2(p_ios_init, &ios_obj, psb);
ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb);
ok(ios_obj.state == 0x8, "expected %x got %x\n", 0x8, ios_obj.state); ok(ios_obj.state == 0x8, "expected %x got %x\n", 0x8, ios_obj.state);
ios_obj.delbuf = 1;
call_func1(p_ios_dtor, &ios_obj); call_func1(p_ios_dtor, &ios_obj);
/* copy constructor */ /* copy constructor */
@ -895,7 +900,27 @@ static void test_ios(void)
ok(ios_obj.fill == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.fill); 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.width == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.width);
ok(ios_obj.do_lock == 2, "expected 2 got %d\n", ios_obj.do_lock); ok(ios_obj.do_lock == 2, "expected 2 got %d\n", ios_obj.do_lock);
ios_obj.delbuf = 0;
/* locking */
ios_obj.sb = psb;
ios_obj.do_lock = 1;
ios_obj.sb->do_lock = 0;
p_ios_clrlock(&ios_obj);
ok(ios_obj.do_lock == 1, "expected 1 got %d\n", ios_obj.do_lock);
ok(ios_obj.sb->do_lock == 1, "expected 1 got %d\n", ios_obj.sb->do_lock);
ios_obj.do_lock = 0;
p_ios_clrlock(&ios_obj);
ok(ios_obj.do_lock == 1, "expected 1 got %d\n", ios_obj.do_lock);
ok(ios_obj.sb->do_lock == 1, "expected 1 got %d\n", ios_obj.sb->do_lock);
p_ios_setlock(&ios_obj);
ok(ios_obj.do_lock == 0, "expected 0 got %d\n", ios_obj.do_lock);
ok(ios_obj.sb->do_lock == 0, "expected 0 got %d\n", ios_obj.sb->do_lock);
ios_obj.do_lock = -1;
p_ios_setlock(&ios_obj);
ok(ios_obj.do_lock == -2, "expected -2 got %d\n", ios_obj.do_lock);
ok(ios_obj.sb->do_lock == -1, "expected -1 got %d\n", ios_obj.sb->do_lock);
ios_obj.delbuf = 1;
call_func1(p_ios_dtor, &ios_obj); call_func1(p_ios_dtor, &ios_obj);
ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state);
} }