wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Daniel Lehman : msvcp: Sync std::getline(istream<> &) implementations.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 22c254c3ec4c88719c51834251e61945cc3dd5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c254c3ec4c88719c5183425… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Nov 2 11:27:12 2012 -0700 msvcp: Sync std::getline(istream<> &) implementations. --- dlls/msvcp60/ios.c | 40 ++++++++++++++++++++-------------------- dlls/msvcp71/ios.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index bd3eb7d..946afa5 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7767,27 +7767,27 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char * basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( basic_istream_char *istream, basic_string_char *str, char delim) { - IOSB_iostate state = IOSTATE_failbit; + basic_ios_char *base = basic_istream_char_get_basic_ios(istream); + IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; TRACE("(%p %p %c)\n", istream, str, delim); if(basic_istream_char_sentry_create(istream, TRUE)) { + basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); basic_string_char_clear(str); - c = basic_istream_char_get(istream); - if(c != EOF) - state = IOSTATE_goodbit; - - for(; c!=(unsigned char)delim && c!=EOF; c = basic_istream_char_get(istream)) { - state = IOSTATE_goodbit; + c = basic_streambuf_char_sgetc(strbuf); + for(; c!=(unsigned char)delim && c!=EOF; c = basic_streambuf_char_snextc(strbuf)) basic_string_char_append_ch(str, c); - } + if(c==EOF) state |= IOSTATE_eofbit; + else if(c==(unsigned char)delim) basic_streambuf_char_sbumpc(strbuf); + + if(!basic_string_char_length(str) && c!=(unsigned char)delim) state |= IOSTATE_failbit; } basic_istream_char_sentry_destroy(istream); - basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), - state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), state); return istream; } @@ -9078,27 +9078,27 @@ basic_istream_wchar* __thiscall basic_istream_short_read_bool(basic_istream_wcha basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( basic_istream_wchar *istream, basic_string_wchar *str, wchar_t delim) { - IOSB_iostate state = IOSTATE_failbit; + basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream); + IOSB_iostate state = IOSTATE_goodbit; int c = delim; TRACE("(%p %p %c)\n", istream, str, delim); if(basic_istream_wchar_sentry_create(istream, TRUE)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); basic_string_wchar_clear(str); - c = basic_istream_wchar_get(istream); - if(c != WEOF) - state = IOSTATE_goodbit; - - for(; c!=delim && c!=WEOF; c = basic_istream_wchar_get(istream)) { - state = IOSTATE_goodbit; + c = basic_streambuf_wchar_sgetc(strbuf); + for(; c!=delim && c!=WEOF; c = basic_streambuf_wchar_snextc(strbuf)) basic_string_wchar_append_ch(str, c); - } + if(c==delim) basic_streambuf_wchar_sbumpc(strbuf); + else if(c==WEOF) state |= IOSTATE_eofbit; + + if(!basic_string_wchar_length(str) && c!=delim) state |= IOSTATE_failbit; } basic_istream_wchar_sentry_destroy(istream); - basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), - state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), state); return istream; } diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index fff2abc..95037e9 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -8108,27 +8108,27 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char * basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( basic_istream_char *istream, basic_string_char *str, char delim) { - IOSB_iostate state = IOSTATE_failbit; + basic_ios_char *base = basic_istream_char_get_basic_ios(istream); + IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; TRACE("(%p %p %c)\n", istream, str, delim); if(basic_istream_char_sentry_create(istream, TRUE)) { + basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); MSVCP_basic_string_char_clear(str); - c = basic_istream_char_get(istream); - if(c != EOF) - state = IOSTATE_goodbit; - - for(; c!=(unsigned char)delim && c!=EOF; c = basic_istream_char_get(istream)) { - state = IOSTATE_goodbit; + c = basic_streambuf_char_sgetc(strbuf); + for(; c!=(unsigned char)delim && c!=EOF; c = basic_streambuf_char_snextc(strbuf)) MSVCP_basic_string_char_append_ch(str, c); - } + if(c==EOF) state |= IOSTATE_eofbit; + else if(c==(unsigned char)delim) basic_streambuf_char_sbumpc(strbuf); + + if(!MSVCP_basic_string_char_length(str) && c!=(unsigned char)delim) state |= IOSTATE_failbit; } basic_istream_char_sentry_destroy(istream); - basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), - state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), state); return istream; } @@ -9573,27 +9573,27 @@ basic_istream_wchar* __thiscall basic_istream_short_read_bool(basic_istream_wcha basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( basic_istream_wchar *istream, basic_string_wchar *str, wchar_t delim) { - IOSB_iostate state = IOSTATE_failbit; + basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream); + IOSB_iostate state = IOSTATE_goodbit; int c = delim; TRACE("(%p %p %c)\n", istream, str, delim); if(basic_istream_wchar_sentry_create(istream, TRUE)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); MSVCP_basic_string_wchar_clear(str); - c = basic_istream_wchar_get(istream); - if(c != WEOF) - state = IOSTATE_goodbit; - - for(; c!=delim && c!=WEOF; c = basic_istream_wchar_get(istream)) { - state = IOSTATE_goodbit; + c = basic_streambuf_wchar_sgetc(strbuf); + for(; c!=delim && c!=WEOF; c = basic_streambuf_wchar_snextc(strbuf)) MSVCP_basic_string_wchar_append_ch(str, c); - } + if(c==delim) basic_streambuf_wchar_sbumpc(strbuf); + else if(c==WEOF) state |= IOSTATE_eofbit; + + if(!MSVCP_basic_string_wchar_length(str) && c!=delim) state |= IOSTATE_failbit; } basic_istream_wchar_sentry_destroy(istream); - basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), - state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), state); return istream; }

1 0

Daniel Lehman : msvcp90: Use streambuf sgetc/snextc in std::getline(istream <> &).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 89cde281d46dbdd54eeef913b82b0dff3ebc6d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89cde281d46dbdd54eeef913b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Oct 1 11:00:59 2012 -0700 msvcp90: Use streambuf sgetc/snextc in std::getline(istream<> &). --- dlls/msvcp90/ios.c | 40 ++++++++-------- dlls/msvcp90/tests/ios.c | 112 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 131 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89cde281d46dbdd54eeef…

1 0

Andrew Eikum : oleaut32: helpcontext is not an offset.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 561e46c435b824489922476fb448531e74ca482e URL: http://source.winehq.org/git/wine.git/?a=commit;h=561e46c435b824489922476fb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 2 12:53:36 2012 -0500 oleaut32: helpcontext is not an offset. --- dlls/oleaut32/typelib.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3d94164..cb179f9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4092,9 +4092,6 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) pOtherTypeInfoBlks[i].name_offs + pNameTable); (*ppTypeInfoImpl)->dwHelpContext = pOtherTypeInfoBlks[i].helpcontext; - (*ppTypeInfoImpl)->DocString = TLB_MultiByteToBSTR( - pOtherTypeInfoBlks[i].helpcontext + - pNameTable); (*ppTypeInfoImpl)->TypeAttr.guid = pOtherTypeInfoBlks[i].uuid; (*ppTypeInfoImpl)->TypeAttr.typekind = pTIHeader->typekind; (*ppTypeInfoImpl)->TypeAttr.wMajorVerNum = pTIHeader->major_version;

1 0

Piotr Caban : msvcp90: Use critical sections in mutex object.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 5e1cbccebf9a796782402038453833fa33b9917f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1cbccebf9a7967824020384… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 2 20:06:08 2012 +0100 msvcp90: Use critical sections in mutex object. --- dlls/msvcp100/misc.c | 18 ++++++++++++++---- dlls/msvcp100/msvcp.h | 2 +- dlls/msvcp60/misc.c | 16 ++++++++++++---- dlls/msvcp71/misc.c | 18 ++++++++++++++---- dlls/msvcp71/msvcp.h | 2 +- dlls/msvcp90/misc.c | 18 ++++++++++++++---- dlls/msvcp90/msvcp90.h | 2 +- 7 files changed, 57 insertions(+), 19 deletions(-) diff --git a/dlls/msvcp100/misc.c b/dlls/msvcp100/misc.c index 40f9fed..5854c5e 100644 --- a/dlls/msvcp100/misc.c +++ b/dlls/msvcp100/misc.c @@ -33,7 +33,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) mutex* __thiscall mutex_ctor(mutex *this) { - this->mutex = CreateMutexW(NULL, FALSE, NULL); + CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs)); + if(!cs) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + + InitializeCriticalSection(cs); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); + this->mutex = cs; return this; } @@ -42,7 +50,9 @@ mutex* __thiscall mutex_ctor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_dtor, 4) void __thiscall mutex_dtor(mutex *this) { - CloseHandle(this->mutex); + ((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(this->mutex); + MSVCRT_operator_delete(this->mutex); } /* ?_Lock@_Mutex@std@@QAEXXZ */ @@ -50,7 +60,7 @@ void __thiscall mutex_dtor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_lock, 4) void __thiscall mutex_lock(mutex *this) { - WaitForSingleObject(this->mutex, INFINITE); + EnterCriticalSection(this->mutex); } /* ?_Unlock@_Mutex@std@@QAEXXZ */ @@ -58,7 +68,7 @@ void __thiscall mutex_lock(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_unlock, 4) void __thiscall mutex_unlock(mutex *this) { - ReleaseMutex(this->mutex); + LeaveCriticalSection(this->mutex); } /* ?_Mutex_Lock@_Mutex@std@@CAXPAV12@@Z */ diff --git a/dlls/msvcp100/msvcp.h b/dlls/msvcp100/msvcp.h index 08c3471..de8d9e3 100644 --- a/dlls/msvcp100/msvcp.h +++ b/dlls/msvcp100/msvcp.h @@ -205,7 +205,7 @@ void __thiscall _Lockit_dtor(_Lockit*); /* class mutex */ typedef struct { - void *mutex; + void *mutex; } mutex; mutex* __thiscall mutex_ctor(mutex*); diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index f0796a4..9c840b7 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -31,7 +31,13 @@ /* ??0_Mutex@std@@QEAA@XZ */ mutex* mutex_ctor(mutex *this) { - this->mutex = CreateMutexW(NULL, FALSE, NULL); + CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs)); + if(!cs) + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + + InitializeCriticalSection(cs); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); + this->mutex = cs; return this; } @@ -39,21 +45,23 @@ mutex* mutex_ctor(mutex *this) /* ??1_Mutex@std@@QEAA@XZ */ void mutex_dtor(mutex *this) { - CloseHandle(this->mutex); + ((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(this->mutex); + MSVCRT_operator_delete(this->mutex); } /* ?_Lock@_Mutex@std@@QAEXXZ */ /* ?_Lock@_Mutex@std@@QEAAXXZ */ void mutex_lock(mutex *this) { - WaitForSingleObject(this->mutex, INFINITE); + EnterCriticalSection(this->mutex); } /* ?_Unlock@_Mutex@std@@QAEXXZ */ /* ?_Unlock@_Mutex@std@@QEAAXXZ */ void mutex_unlock(mutex *this) { - ReleaseMutex(this->mutex); + LeaveCriticalSection(this->mutex); } static CRITICAL_SECTION lockit_cs; diff --git a/dlls/msvcp71/misc.c b/dlls/msvcp71/misc.c index 8615a51..21ca929 100644 --- a/dlls/msvcp71/misc.c +++ b/dlls/msvcp71/misc.c @@ -33,7 +33,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) mutex* __thiscall mutex_ctor(mutex *this) { - this->mutex = CreateMutexW(NULL, FALSE, NULL); + CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs)); + if(!cs) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + + InitializeCriticalSection(cs); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); + this->mutex = cs; return this; } @@ -42,7 +50,9 @@ mutex* __thiscall mutex_ctor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_dtor, 4) void __thiscall mutex_dtor(mutex *this) { - CloseHandle(this->mutex); + ((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(this->mutex); + MSVCRT_operator_delete(this->mutex); } /* ?_Lock@_Mutex@std@@QAEXXZ */ @@ -50,7 +60,7 @@ void __thiscall mutex_dtor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_lock, 4) void __thiscall mutex_lock(mutex *this) { - WaitForSingleObject(this->mutex, INFINITE); + EnterCriticalSection(this->mutex); } /* ?_Unlock@_Mutex@std@@QAEXXZ */ @@ -58,7 +68,7 @@ void __thiscall mutex_lock(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_unlock, 4) void __thiscall mutex_unlock(mutex *this) { - ReleaseMutex(this->mutex); + LeaveCriticalSection(this->mutex); } static CRITICAL_SECTION lockit_cs[_MAX_LOCK]; diff --git a/dlls/msvcp71/msvcp.h b/dlls/msvcp71/msvcp.h index aea85cc..6f9e266 100644 --- a/dlls/msvcp71/msvcp.h +++ b/dlls/msvcp71/msvcp.h @@ -201,7 +201,7 @@ void __thiscall _Lockit_dtor(_Lockit*); /* class mutex */ typedef struct { - void *mutex; + void *mutex; } mutex; mutex* __thiscall mutex_ctor(mutex*); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c8c4122..8b3df21 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -33,7 +33,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) mutex* __thiscall mutex_ctor(mutex *this) { - this->mutex = CreateMutexW(NULL, FALSE, NULL); + CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs)); + if(!cs) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + + InitializeCriticalSection(cs); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); + this->mutex = cs; return this; } @@ -42,7 +50,9 @@ mutex* __thiscall mutex_ctor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_dtor, 4) void __thiscall mutex_dtor(mutex *this) { - CloseHandle(this->mutex); + ((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(this->mutex); + MSVCRT_operator_delete(this->mutex); } /* ?_Lock@_Mutex@std@@QAEXXZ */ @@ -50,7 +60,7 @@ void __thiscall mutex_dtor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_lock, 4) void __thiscall mutex_lock(mutex *this) { - WaitForSingleObject(this->mutex, INFINITE); + EnterCriticalSection(this->mutex); } /* ?_Unlock@_Mutex@std@@QAEXXZ */ @@ -58,7 +68,7 @@ void __thiscall mutex_lock(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_unlock, 4) void __thiscall mutex_unlock(mutex *this) { - ReleaseMutex(this->mutex); + LeaveCriticalSection(this->mutex); } /* ?_Mutex_Lock@_Mutex@std@@CAXPAV12@@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 1108591..2496ebcd 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -201,7 +201,7 @@ void __thiscall _Lockit_dtor(_Lockit*); /* class mutex */ typedef struct { - void *mutex; + void *mutex; } mutex; mutex* __thiscall mutex_ctor(mutex*);

1 0

Piotr Caban : msvcp90: Fixed incorrect sentry object usage.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 0280c5fb5f8a7a69725d7b5294906c31f9de7387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0280c5fb5f8a7a69725d7b529… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 2 20:05:51 2012 +0100 msvcp90: Fixed incorrect sentry object usage. --- dlls/msvcp100/ios.c | 3 --- dlls/msvcp60/ios.c | 3 --- dlls/msvcp71/ios.c | 3 --- dlls/msvcp90/ios.c | 3 --- 4 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 026ee99..608e9f5 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -6039,7 +6039,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret; basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -7160,7 +7159,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret; basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -7189,7 +7187,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret; basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 3a5fa52..bd3eb7d 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7432,7 +7432,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret; basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -8678,7 +8677,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret; basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -8707,7 +8705,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret; basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 043ac64..fff2abc 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -7773,7 +7773,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret; basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -9041,7 +9040,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret; basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -9070,7 +9068,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret; basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7759b72..d03f3a9 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7797,7 +7797,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret; basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -9052,7 +9051,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret; basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -9081,7 +9079,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret; basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit);

1 0

Christian Costa : dmusic: Display new ref in AddRef and Release.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 31a582989fc56dab4310a53b8e19ee2421a13424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a582989fc56dab4310a53b8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Nov 1 17:34:44 2012 +0100 dmusic: Display new ref in AddRef and Release. --- dlls/dmusic/clock.c | 25 ++++++++++++------------- dlls/dmusic/collection.c | 4 ++-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 4d9a1b4..2a8cd09 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -45,30 +45,29 @@ static HRESULT WINAPI IReferenceClockImpl_QueryInterface(IReferenceClock *iface, static ULONG WINAPI IReferenceClockImpl_AddRef(IReferenceClock *iface) { - IReferenceClockImpl *This = impl_from_IReferenceClock(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IReferenceClockImpl_Release(IReferenceClock *iface) { - IReferenceClockImpl *This = impl_from_IReferenceClock(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) + HeapFree(GetProcessHeap(), 0, This); - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); - return refCount; + return ref; } /* IReferenceClockImpl IReferenceClock part: */ diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index c06d988..c1545b2 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -80,7 +80,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPD IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p)->(): new ref = %u)\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); DMUSIC_LockModule(); @@ -92,7 +92,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LP IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)->(): new ref = %u)\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This);

1 0

Christian Costa : dmusic: Dump port params only once.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: db390b774bf46db6e8d4745759c7337e49beb9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=db390b774bf46db6e8d474575… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Nov 1 17:30:49 2012 +0100 dmusic: Dump port params only once. --- dlls/dmusic/dmusic.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 111ff77..d914ce4 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -129,9 +129,6 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI TRACE("(%p)->(%s, %p, %p, %p)\n", This, debugstr_dmguid(rclsid_port), port_params, port, unkouter); - if (TRACE_ON(dmusic)) - dump_DMUS_PORTPARAMS(port_params); - if (!rclsid_port) return E_POINTER; if (!port_params)

1 0

Piotr Caban : msvcrt: Allocate buffer in fwrite function.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: ec26342c88fb48954cad9044fecce336e1be31d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec26342c88fb48954cad9044f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 2 17:18:34 2012 +0100 msvcrt: Allocate buffer in fwrite function. --- dlls/msvcrt/file.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 185b1e2..1b87dd2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2919,8 +2919,13 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si } } if(wrcnt) { + int res; + + if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) + msvcrt_alloc_buffer(file); + /* Flush buffer */ - int res=msvcrt_flush_buffer(file); + res=msvcrt_flush_buffer(file); if(!res) { int pwritten = MSVCRT__write(file->_file, ptr, wrcnt); if (pwritten <= 0)

1 0

Piotr Caban : msvcp71: Fixed basic_streambuf<wchar> vtable.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 4455250a98b32f6f87eca76d24f26184ffa30f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4455250a98b32f6f87eca76d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 2 17:18:20 2012 +0100 msvcp71: Fixed basic_streambuf<wchar> vtable. --- dlls/msvcp71/ios.c | 115 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 70 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4455250a98b32f6f87eca…

1 0

Piotr Caban : msvcp71: Ignore prot argument in Fiopen_wchar function.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 79f314c31a2659ca820a49a843ed1771d98fdecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f314c31a2659ca820a49a84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 2 17:18:07 2012 +0100 msvcp71: Ignore prot argument in Fiopen_wchar function. --- dlls/msvcp71/ios.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index c538cf7..12e217f 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -2587,8 +2587,9 @@ static FILE* _Fiopen_wchar(const wchar_t *name, int mode, int prot) return NULL; } + /* msvcp60 - msvcp71 are ignoring prot argument */ f = _wfsopen(name, (mode & OPENMODE_binary) ? str_mode[mode_idx].str_bin - : str_mode[mode_idx].str, prot); + : str_mode[mode_idx].str, SH_DENYNO); if(!f) return NULL;

1 0

← Newer
1
...
63
64
65
66
67
68
69
70
71
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 November 2012