November 2012 - Wine-Commits

Daniel Lehman : msvcp90: Use streambuf sgetc/snextc in std::getline(istream <> &).
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

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

André Hentschel : urlmon: Fix copy and paste error ( coverity).
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Module: wine Branch: master Commit: 93936c4f9986eb411168402288f072632a469c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93936c4f9986eb41116840228… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:26:03 2012 +0100 urlmon: Fix copy and paste error (coverity). --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 18e2ebb..0a68b43 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -272,7 +272,7 @@ static inline BOOL is_drive_path(const WCHAR *str) { } static inline BOOL is_unc_path(const WCHAR *str) { - return (str[0] == '\\' && str[0] == '\\'); + return (str[0] == '\\' && str[1] == '\\'); } static inline BOOL is_forbidden_dos_path_char(WCHAR val) {

1 0

Piotr Caban : msvcp90: Use critical sections in mutex object.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

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(a)_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(a)_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(a)_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(a)std@@QEAA(a)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(a)std@@QEAA(a)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(a)_Mutex@std@@QAEXXZ */ /* ?_Lock(a)_Mutex@std@@QEAAXXZ */ void mutex_lock(mutex *this) { - WaitForSingleObject(this->mutex, INFINITE); + EnterCriticalSection(this->mutex); } /* ?_Unlock(a)_Mutex@std@@QAEXXZ */ /* ?_Unlock(a)_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(a)_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(a)_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(a)_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(a)_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(a)_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 Nov. 2, 2012

Nov. 2, 2012

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

Piotr Caban : msvcp71: Fixed basic_streambuf<wchar> vtable.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

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

Hans Leidekker : wbemprox: Avoid a crash when serializing object text.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: 6955b09023a0c74af01ecd6a9434ccd58429ecb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6955b09023a0c74af01ecd6a9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 2 15:34:27 2012 +0100 wbemprox: Avoid a crash when serializing object text. --- dlls/wbemprox/class.c | 20 ++++++++++++-------- dlls/wbemprox/table.c | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 75bd612..994e76b 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -568,19 +568,23 @@ static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) *len = 0; for (i = 0; i < table->num_cols; i++) { - *len += sizeof(fmtW) / sizeof(fmtW[0]); - *len += strlenW( table->columns[i].name ); - value = get_value_bstr( table, row, i ); - *len += SysStringLen( value ); - SysFreeString( value ); + if ((value = get_value_bstr( table, row, i ))) + { + *len += sizeof(fmtW) / sizeof(fmtW[0]); + *len += strlenW( table->columns[i].name ); + *len += SysStringLen( value ); + SysFreeString( value ); + } } if (!(ret = SysAllocStringLen( NULL, *len ))) return NULL; p = ret; for (i = 0; i < table->num_cols; i++) { - value = get_value_bstr( table, row, i ); - p += sprintfW( p, fmtW, table->columns[i].name, value ); - SysFreeString( value ); + if ((value = get_value_bstr( table, row, i ))) + { + p += sprintfW( p, fmtW, table->columns[i].name, value ); + SysFreeString( value ); + } } return ret; } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 43ab91d..c114e53 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -166,6 +166,7 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) case CIM_DATETIME: case CIM_STRING: + if (!val) return NULL; len = strlenW( (const WCHAR *)(INT_PTR)val ) + 2; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; sprintfW( ret, fmt_strW, (const WCHAR *)(INT_PTR)val );

1 0

Jacek Caban : mshtml: Try to install ActiveX if it's not registered.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: d1f2b8a8093dd7a3917c2aa5e84fd8f72fe30e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f2b8a8093dd7a3917c2aa5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 13:50:09 2012 +0100 mshtml: Try to install ActiveX if it's not registered. --- dlls/mshtml/npplugin.c | 288 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 288 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 192b8dc..aa74961 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -313,6 +313,292 @@ static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) return ret; } +typedef struct { + IBindStatusCallback IBindStatusCallback_iface; + IWindowForBindingUI IWindowForBindingUI_iface; + LONG ref; +} InstallCallback; + +static inline InstallCallback *impl_from_IBindStatusCallback(IBindStatusCallback *iface) +{ + return CONTAINING_RECORD(iface, InstallCallback, IBindStatusCallback_iface); +} + +static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface, + REFIID riid, void **ppv) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IBindStatusCallback_iface; + }else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) { + TRACE("(%p)->(IID_IBindStatusCallback %p)\n", This, ppv); + *ppv = &This->IBindStatusCallback_iface; + }else if(IsEqualGUID(&IID_IWindowForBindingUI, riid)) { + TRACE("(%p)->(IID_IWindowForBindingUI %p)\n", This, ppv); + *ppv = &This->IWindowForBindingUI_iface; + }else { + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI InstallCallback_AddRef(IBindStatusCallback *iface) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI InstallCallback_Release(IBindStatusCallback *iface) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI InstallCallback_OnStartBinding(IBindStatusCallback *iface, + DWORD dwReserved, IBinding *pib) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + TRACE("(%p)->(%x %p)\n", This, dwReserved, pib); + return S_OK; +} + +static HRESULT WINAPI InstallCallback_GetPriority(IBindStatusCallback *iface, LONG *pnPriority) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + TRACE("(%p)->(%p)\n", This, pnPriority); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallCallback_OnLowResource(IBindStatusCallback *iface, DWORD dwReserved) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + TRACE("(%p)->(%x)\n", This, dwReserved); + return S_OK; +} + +static HRESULT WINAPI InstallCallback_OnProgress(IBindStatusCallback *iface, ULONG ulProgress, + ULONG ulProgressMax, ULONG ulStatusCode, LPCWSTR szStatusText) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + TRACE("(%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); + return S_OK; +} + +static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, + HRESULT hresult, LPCWSTR szError) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); + return S_OK; +} + +static HRESULT WINAPI InstallCallback_GetBindInfo(IBindStatusCallback *iface, + DWORD* grfBINDF, BINDINFO* pbindinfo) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + + TRACE("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); + + *grfBINDF = BINDF_ASYNCHRONOUS; + return S_OK; +} + +static HRESULT WINAPI InstallCallback_OnDataAvailable(IBindStatusCallback *iface, DWORD grfBSCF, + DWORD dwSize, FORMATETC* pformatetc, STGMEDIUM* pstgmed) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + ERR("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallCallback_OnObjectAvailable(IBindStatusCallback *iface, + REFIID riid, IUnknown* punk) +{ + InstallCallback *This = impl_from_IBindStatusCallback(iface); + ERR("(%p)\n", This); + return E_NOTIMPL; +} + +static IBindStatusCallbackVtbl InstallCallbackVtbl = { + InstallCallback_QueryInterface, + InstallCallback_AddRef, + InstallCallback_Release, + InstallCallback_OnStartBinding, + InstallCallback_GetPriority, + InstallCallback_OnLowResource, + InstallCallback_OnProgress, + InstallCallback_OnStopBinding, + InstallCallback_GetBindInfo, + InstallCallback_OnDataAvailable, + InstallCallback_OnObjectAvailable +}; + +static inline InstallCallback *impl_from_IWindowForBindingUI(IWindowForBindingUI *iface) +{ + return CONTAINING_RECORD(iface, InstallCallback, IWindowForBindingUI_iface); +} + +static HRESULT WINAPI WindowForBindingUI_QueryInterface(IWindowForBindingUI *iface, REFIID riid, void **ppv) +{ + InstallCallback *This = impl_from_IWindowForBindingUI(iface); + return IBindStatusCallback_QueryInterface(&This->IBindStatusCallback_iface, riid, ppv); +} + +static ULONG WINAPI WindowForBindingUI_AddRef(IWindowForBindingUI *iface) +{ + InstallCallback *This = impl_from_IWindowForBindingUI(iface); + return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); +} + +static ULONG WINAPI WindowForBindingUI_Release(IWindowForBindingUI *iface) +{ + InstallCallback *This = impl_from_IWindowForBindingUI(iface); + return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); +} + +static HRESULT WINAPI WindowForBindingUI_GetWindow(IWindowForBindingUI *iface, REFGUID rguidReason, HWND *phwnd) +{ + InstallCallback *This = impl_from_IWindowForBindingUI(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(rguidReason), phwnd); + *phwnd = NULL; + return S_OK; +} + +static const IWindowForBindingUIVtbl WindowForBindingUIVtbl = { + WindowForBindingUI_QueryInterface, + WindowForBindingUI_AddRef, + WindowForBindingUI_Release, + WindowForBindingUI_GetWindow +}; + +typedef struct { + struct list entry; + IUri *uri; +} install_entry_t; + +static struct list install_list = LIST_INIT(install_list); + +static CRITICAL_SECTION cs_install_list; +static CRITICAL_SECTION_DEBUG cs_install_list_dbg = +{ + 0, 0, &cs_install_list, + { &cs_install_list_dbg.ProcessLocksList, &cs_install_list_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": install_list") } +}; +static CRITICAL_SECTION cs_install_list = { &cs_install_list_dbg, -1, 0, 0, 0, 0 }; + +static void install_codebase(const WCHAR *url) +{ + InstallCallback *callback; + IBindCtx *bctx; + HRESULT hres; + + callback = heap_alloc(sizeof(*callback)); + if(!callback) + return; + + callback->IBindStatusCallback_iface.lpVtbl = &InstallCallbackVtbl; + callback->IWindowForBindingUI_iface.lpVtbl = &WindowForBindingUIVtbl; + callback->ref = 1; + + hres = CreateAsyncBindCtx(0, &callback->IBindStatusCallback_iface, NULL, &bctx); + IBindStatusCallback_Release(&callback->IBindStatusCallback_iface); + if(FAILED(hres)) + return; + + hres = AsyncInstallDistributionUnit(NULL, NULL, NULL, 0, 0, url, bctx, NULL, 0); + IBindCtx_Release(bctx); + if(FAILED(hres)) + WARN("FAILED: %08x\n", hres); +} + +static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) +{ + nsAString attr_str, val_str; + BOOL is_on_list = FALSE; + install_entry_t *iter; + IUri *uri = NULL; + nsresult nsres; + HRESULT hres; + + static const PRUnichar codebaseW[] = {'c','o','d','e','b','a','s','e',0}; + + nsAString_InitDepend(&attr_str, codebaseW); + nsAString_Init(&val_str, NULL); + nsres = nsIDOMElement_GetAttribute(nselem, &attr_str, &val_str); + nsAString_Finish(&attr_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *val; + + nsAString_GetData(&val_str, &val); + if(*val) { + hres = CoInternetCombineUrlEx(window->base.outer_window->uri, val, 0, &uri, 0); + if(FAILED(hres)) + uri = NULL; + } + }else { + ERR("GetAttribute failed: %08x\n", nsres); + } + + nsAString_Finish(&attr_str); + if(!uri) + return; + + EnterCriticalSection(&cs_install_list); + + LIST_FOR_EACH_ENTRY(iter, &install_list, install_entry_t, entry) { + BOOL eq; + + hres = IUri_IsEqual(uri, iter->uri, &eq); + if(SUCCEEDED(hres) && eq) { + TRACE("already proceeded\n"); + is_on_list = TRUE; + break; + } + } + + if(!is_on_list) { + iter = heap_alloc(sizeof(*iter)); + if(iter) { + IUri_AddRef(uri); + iter->uri = uri; + + list_add_tail(&install_list, &iter->entry); + } + } + + LeaveCriticalSection(&cs_install_list); + + if(!is_on_list) { + BSTR display_uri; + + hres = IUri_GetDisplayUri(uri, &display_uri); + if(SUCCEEDED(hres)) { + install_codebase(display_uri); + SysFreeString(display_uri); + } + } + + IUri_Release(uri); +} + static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *nselem, CLSID *clsid) { IClassFactoryEx *cfex; @@ -337,6 +623,8 @@ static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *n } hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (void**)&cf); + if(hres == REGDB_E_CLASSNOTREG) + check_codebase(window, nselem); if(FAILED(hres)) return NULL;

1 0

Alexandre Julliard : urlmon: Add po file support for resource translation.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

Module: wine Branch: master Commit: c9e951dfd3dc0048806c0a6916a069f97ccedbf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e951dfd3dc0048806c0a691… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 2 14:35:48 2012 +0100 urlmon: Add po file support for resource translation. --- configure | 2 +- configure.ac | 2 +- dlls/urlmon/Makefile.in | 3 +- dlls/urlmon/{rsrc.rc => urlmon.rc} | 0 po/ar.po | 44 ++++++++++++++++++++++------ po/bg.po | 50 ++++++++++++++++++++++++++------ po/ca.po | 52 ++++++++++++++++++++++++++++----- po/cs.po | 56 +++++++++++++++++++++++++++++------ po/da.po | 52 ++++++++++++++++++++++++++++----- po/de.po | 52 ++++++++++++++++++++++++++++----- po/el.po | 44 ++++++++++++++++++++++------ po/en.po | 44 +++++++++++++++++++++++----- po/en_US.po | 44 +++++++++++++++++++++++----- po/eo.po | 50 +++++++++++++++++++++++++++----- po/es.po | 52 ++++++++++++++++++++++++++++----- po/fa.po | 44 ++++++++++++++++++++++------ po/fi.po | 52 ++++++++++++++++++++++++++++----- po/fr.po | 52 ++++++++++++++++++++++++++++----- po/he.po | 51 +++++++++++++++++++++++++++----- po/hi.po | 42 ++++++++++++++++++++++----- po/hu.po | 52 ++++++++++++++++++++++++++++----- po/it.po | 52 ++++++++++++++++++++++++++++----- po/ja.po | 52 ++++++++++++++++++++++++++++----- po/ko.po | 52 ++++++++++++++++++++++++++++----- po/lt.po | 52 ++++++++++++++++++++++++++++----- po/ml.po | 42 ++++++++++++++++++++++----- po/nb_NO.po | 54 ++++++++++++++++++++++++++++------ po/nl.po | 52 ++++++++++++++++++++++++++++----- po/or.po | 42 ++++++++++++++++++++++----- po/pa.po | 42 ++++++++++++++++++++++----- po/pl.po | 52 ++++++++++++++++++++++++++++----- po/pt_BR.po | 52 ++++++++++++++++++++++++++++----- po/pt_PT.po | 52 ++++++++++++++++++++++++++++----- po/rm.po | 44 +++++++++++++++++++++++----- po/ro.po | 51 +++++++++++++++++++++++++++----- po/ru.po | 52 ++++++++++++++++++++++++++++----- po/sk.po | 50 ++++++++++++++++++++++++++------ po/sl.po | 52 ++++++++++++++++++++++++++++----- po/sr_RS(a)cyrillic.po | 52 +++++++++++++++++++++++++++------ po/sr_RS(a)latin.po | 52 +++++++++++++++++++++++++++------ po/sv.po | 52 ++++++++++++++++++++++++++++----- po/te.po | 42 ++++++++++++++++++++++----- po/th.po | 44 ++++++++++++++++++++++------ po/tr.po | 47 +++++++++++++++++++++++++----- po/uk.po | 52 ++++++++++++++++++++++++++++----- po/wa.po | 44 +++++++++++++++++++++++----- po/wine.pot | 42 ++++++++++++++++++++++----- po/zh_CN.po | 52 ++++++++++++++++++++++++++++----- po/zh_TW.po | 52 ++++++++++++++++++++++++++++----- 49 files changed, 1841 insertions(+), 375 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9e951dfd3dc0048806c0…

1 0

Christian Costa : dmusic: Display new ref in AddRef and Release.
by Alexandre Julliard Nov. 2, 2012

Nov. 2, 2012

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 Nov. 2, 2012

Nov. 2, 2012

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