October 2011 - Wine-Commits

Aric Stewart : usp10: Correct buffer reading overrun.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 85d33f41398568f967e7139b5d524fe72ba94621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d33f41398568f967e7139b5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 14 08:24:58 2011 -0500 usp10: Correct buffer reading overrun. Found by Dan Kegel using valgrind. --- dlls/usp10/indic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index 43bf0e5..a25ceec 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -333,6 +333,8 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L while((next < cChar) && lex(input[next]) == lex_Generic) next++; index = next; + if (next >= cChar) + break; next = Indic_process_next_syllable(input, cChar, 0, &center, index, lex); if (next != -1) {

1 0

Piotr Caban : msvcp90: Added _String_val class implementation.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 8cca58251bb175ad380ac1318f1083c0c33ca59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cca58251bb175ad380ac1318… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 14 15:01:50 2011 +0200 msvcp90: Added _String_val class implementation. --- dlls/msvcp90/msvcp90.spec | 48 ++++++++++++++++++++++---------------------- dlls/msvcp90/string.c | 40 +++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 11271cf..99bd7e0 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -518,18 +518,18 @@ @ stub -arch=win64 ??0?$_Mpunct(a)_W@std@@QEAA(a)AEBV_Locinfo@1(a)_K_N2@Z @ stub -arch=win32 ??0?$_Mpunct(a)_W@std@@QAE(a)I_N@Z @ stub -arch=win64 ??0?$_Mpunct(a)_W@std@@QEAA(a)_K_N@Z -@ stub -arch=win32 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IAE(a)V?$allocator(a)D@1@@Z -@ stub -arch=win64 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IEAA(a)V?$allocator(a)D@1@@Z -@ stub -arch=win32 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IAE(a)V?$allocator(a)G@1@@Z -@ stub -arch=win64 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IEAA(a)V?$allocator(a)G@1@@Z -@ stub -arch=win32 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IAE(a)V?$allocator(a)_W@1@@Z -@ stub -arch=win64 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IEAA(a)V?$allocator(a)_W@1@@Z -@ stub -arch=win32 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAA(a)AEBV01@@Z +@ thiscall -arch=win32 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IAE(a)V?$allocator(a)D@1@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IEAA(a)V?$allocator(a)D@1@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAE(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IAE(a)V?$allocator(a)G@1@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IEAA(a)V?$allocator(a)G@1@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAE(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IAE(a)V?$allocator(a)_W@1@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IEAA(a)V?$allocator(a)_W@1@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAE(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor @ thiscall -arch=win32 ??0?$allocator(a)D@std@@QAE(a)ABV01@@Z(ptr ptr) MSVCP_allocator_char_copy_ctor @ cdecl -arch=win64 ??0?$allocator(a)D@std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_char_copy_ctor @ thiscall -arch=win32 ??0?$allocator(a)D@std@@QAE(a)XZ(ptr) MSVCP_allocator_char_ctor @@ -1366,12 +1366,12 @@ @ stub -arch=win64 ??4?$_Iosb(a)H@std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??4?$_Locbase(a)H@std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4?$_Locbase(a)H@std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor @ thiscall -arch=win32 ??4?$allocator(a)D@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_allocator_char_assign @ cdecl -arch=win64 ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_char_assign @ thiscall -arch=win32 ??4?$allocator(a)G@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_allocator_short_assign @@ -1955,12 +1955,12 @@ @ stub -arch=win64 ??_D?$basic_stringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXXZ @ stub -arch=win32 ??_D?$basic_stringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXXZ @ stub -arch=win64 ??_D?$basic_stringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXXZ -@ stub -arch=win32 ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEXXZ -@ stub -arch=win64 ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAXXZ -@ stub -arch=win32 ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEXXZ -@ stub -arch=win64 ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAXXZ -@ stub -arch=win32 ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEXXZ -@ stub -arch=win64 ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAXXZ +@ thiscall -arch=win32 ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEXXZ(ptr) _String_val_ctor +@ cdecl -arch=win64 ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAXXZ(ptr) _String_val_ctor +@ thiscall -arch=win32 ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEXXZ(ptr) _String_val_ctor +@ cdecl -arch=win64 ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAXXZ(ptr) _String_val_ctor +@ thiscall -arch=win32 ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEXXZ(ptr) _String_val_ctor +@ cdecl -arch=win64 ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAXXZ(ptr) _String_val_ctor @ stub -arch=win32 ??_F?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ @ stub -arch=win64 ??_F?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ @ stub -arch=win32 ??_F?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEXXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index ab319c0..1971d71 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -3418,3 +3418,43 @@ MSVCP_size_t __cdecl MSVCP_basic_string_wchar_Pdif(String_iterator_wchar i1, Str return !i1.pos ? 0 : i1.pos-i2.pos; } + +/* _String_val class */ +/* ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEXXZ */ +/* ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAXXZ */ +/* ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEXXZ */ +/* ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAXXZ */ +/* ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEXXZ */ +/* ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_String_val_ctor, 4) +void* __thiscall _String_val_ctor(void *this) +{ + TRACE("%p\n", this); + return this; +} + +/* ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IAE(a)V?$allocator(a)D@1@@Z */ +/* ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IEAA(a)V?$allocator(a)D@1@@Z */ +/* ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IAE(a)V?$allocator(a)G@1@@Z */ +/* ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IEAA(a)V?$allocator(a)G@1@@Z */ +/* ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IAE(a)V?$allocator(a)_W@1@@Z */ +/* ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IEAA(a)V?$allocator(a)_W@1@@Z */ +/* ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAA(a)AEBV01@@Z */ +/* ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAA(a)AEBV01@@Z */ +/* ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAA(a)AEBV01@@Z */ +/* ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEAAV01(a)ABV01@@Z */ +/* ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAAEAV01(a)AEBV01@@Z */ +/* ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEAAV01(a)ABV01@@Z */ +/* ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAAEAV01(a)AEBV01@@Z */ +/* ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEAAV01(a)ABV01@@Z */ +/* ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAAEAV01(a)AEBV01@@Z */ +/* ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEAAV01(a)ABV01@@Z */ +DEFINE_THISCALL_WRAPPER(_String_val_null_ctor, 8) +void* __thiscall _String_val_null_ctor(void *this, const void *misc) +{ + TRACE("%p %p\n", this, misc); + return this; +}

1 0

Jacek Caban : vbscript: Keep script context alive after Close call, but make it reusable.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: b1c7f544ed638a9c819a935ad8988bf28b70be7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c7f544ed638a9c819a935ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 14 16:21:52 2011 +0200 vbscript: Keep script context alive after Close call, but make it reusable. --- dlls/vbscript/vbscript.c | 62 +++++++++++++++++++++++++++++++++------------ 1 files changed, 45 insertions(+), 17 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 7bea9f2b..ffaa63e 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -110,13 +110,10 @@ static HRESULT set_ctx_site(VBScript *This) return S_OK; } -static void destroy_script(script_ctx_t *ctx) +static void release_script(script_ctx_t *ctx) { collect_objects(ctx); - while(!list_empty(&ctx->code_list)) - release_vbscode(LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry)); - while(!list_empty(&ctx->named_items)) { named_item_t *iter = LIST_ENTRY(list_head(&ctx->named_items), named_item_t, entry); @@ -127,19 +124,46 @@ static void destroy_script(script_ctx_t *ctx) heap_free(iter); } - if(ctx->host_global) + if(ctx->host_global) { IDispatch_Release(ctx->host_global); - if(ctx->secmgr) + ctx->host_global = NULL; + } + + if(ctx->secmgr) { IInternetHostSecurityManager_Release(ctx->secmgr); - if(ctx->site) + ctx->secmgr = NULL; + } + + if(ctx->site) { IActiveScriptSite_Release(ctx->site); - if(ctx->err_obj) + ctx->site = NULL; + } + + if(ctx->err_obj) { IDispatchEx_Release(&ctx->err_obj->IDispatchEx_iface); - if(ctx->global_obj) + ctx->err_obj = NULL; + } + + if(ctx->global_obj) { IDispatchEx_Release(&ctx->global_obj->IDispatchEx_iface); - if(ctx->script_obj) + ctx->global_obj = NULL; + } + + if(ctx->script_obj) { IDispatchEx_Release(&ctx->script_obj->IDispatchEx_iface); + ctx->script_obj = NULL; + } + vbsheap_free(&ctx->heap); + vbsheap_init(&ctx->heap); +} + +static void destroy_script(script_ctx_t *ctx) +{ + while(!list_empty(&ctx->code_list)) + release_vbscode(LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry)); + + release_script(ctx); heap_free(ctx); } @@ -167,13 +191,12 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) This->site = NULL; } - This->thread_id = 0; - - if(state == SCRIPTSTATE_CLOSED) { - destroy_script(This->ctx); - This->ctx = NULL; - } + if(This->ctx) + release_script(This->ctx); + This->thread_id = 0; + break; + case SCRIPTSTATE_CLOSED: break; default: assert(0); @@ -229,6 +252,11 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) TRACE("(%p) ref=%d\n", iface, ref); if(!ref) { + if(This->ctx) { + decrease_state(This, SCRIPTSTATE_CLOSED); + destroy_script(This->ctx); + This->ctx = NULL; + } if(This->site) IActiveScriptSite_Release(This->site); heap_free(This); @@ -413,7 +441,7 @@ static HRESULT WINAPI VBScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR if(!ppdisp) return E_POINTER; - if(This->thread_id != GetCurrentThreadId() || !This->ctx->script_obj) { + if(This->thread_id != GetCurrentThreadId() || !This->ctx || !This->ctx->script_obj) { *ppdisp = NULL; return E_UNEXPECTED; }

1 0

Jacek Caban : vbscript: Added more releasing tests.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 01c4fed7b42f72983c3a6d0b1e28c21dd3d91cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c4fed7b42f72983c3a6d0b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 14 16:22:33 2011 +0200 vbscript: Added more releasing tests. --- dlls/vbscript/tests/run.c | 132 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 131 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 4fbf689..367ffea 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -74,6 +74,7 @@ DEFINE_EXPECT(testobj_propput_i); #define DISPID_GLOBAL_TESTOBJ 1006 #define DISPID_GLOBAL_ISNULLDISP 1007 #define DISPID_GLOBAL_TESTDISP 1008 +#define DISPID_GLOBAL_REFOBJ 1009 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -342,6 +343,7 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, else return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } @@ -420,6 +422,19 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown return E_NOTIMPL; } +static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "propget")) { @@ -500,6 +515,38 @@ static IDispatchExVtbl testObjVtbl = { static IDispatchEx testObj = { &testObjVtbl }; +static ULONG refobj_ref; + +static ULONG WINAPI RefObj_AddRef(IDispatchEx *iface) +{ + return ++refobj_ref; +} + +static ULONG WINAPI RefObj_Release(IDispatchEx *iface) +{ + return --refobj_ref; +} + +static IDispatchExVtbl RefObjVtbl = { + DispatchEx_QueryInterface, + RefObj_AddRef, + RefObj_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx RefObj = { &RefObjVtbl }; + static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "ok")) { @@ -549,6 +596,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTDISP; return S_OK; } + if(!strcmp_wa(bstrName, "RefObj")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_REFOBJ; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -679,6 +731,22 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_DISPATCH(pvarRes) = (IDispatch*)&testObj; return S_OK; + case DISPID_GLOBAL_REFOBJ: + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); + + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + IDispatchEx_AddRef(&RefObj); + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&RefObj; + return S_OK; + case DISPID_GLOBAL_ISNULLDISP: { VARIANT *v; @@ -850,6 +918,7 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) IActiveScriptParse *parser; IActiveScript *engine; IDispatch *script_disp; + LONG ref; HRESULT hres; engine = create_script(); @@ -888,8 +957,9 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) IDispatch_Release(script_disp); IActiveScript_Release(engine); - IUnknown_Release(parser); + ref = IUnknown_Release(parser); + ok(!ref, "ref=%d\n", ref); return hres; } @@ -964,6 +1034,63 @@ static void test_gc(void) IUnknown_Release(parser); } +static HRESULT test_global_vars_ref(BOOL use_close) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR script_str; + LONG ref; + HRESULT hres; + + engine = create_script(); + if(!engine) + return S_OK; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + if (FAILED(hres)) + { + IActiveScript_Release(engine); + return hres; + } + + hres = IActiveScriptParse64_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_AddNamedItem(engine, testW, SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + refobj_ref = 0; + + script_str = a2bstr("Dim x\nset x = RefObj\n"); + hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + SysFreeString(script_str); + + ok(refobj_ref, "refobj_ref = 0\n"); + + if(use_close) { + hres = IActiveScript_Close(engine); + ok(hres == S_OK, "Close failed: %08x\n", hres); + }else { + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + } + + ok(!refobj_ref, "refobj_ref = %d\n", refobj_ref); + + IActiveScript_Release(engine); + + ref = IUnknown_Release(parser); + ok(!ref, "ref=%d\n", ref); + return hres; +} + static BSTR get_script_from_file(const char *filename) { DWORD size, len; @@ -1099,6 +1226,9 @@ static void run_tests(void) parse_script_a("x = 1\n Call ok(x = 1, \"x = \" & x)"); + test_global_vars_ref(TRUE); + test_global_vars_ref(FALSE); + strict_dispid_check = FALSE; parse_script_a("Sub testsub\n"

1 0

Jacek Caban : vbscript: Properly release global variables.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 6f0e215fb574ffe5891b717b5def2d08304430b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f0e215fb574ffe5891b717b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 14 16:22:18 2011 +0200 vbscript: Properly release global variables. --- dlls/vbscript/interp.c | 9 +++++++++ dlls/vbscript/vbscript.c | 3 +++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 08bf710..f036557 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1561,11 +1561,20 @@ OP_LIST #undef X }; +void release_dynamic_vars(dynamic_var_t *var) +{ + while(var) { + VariantClear(&var->v); + var = var->next; + } +} + static void release_exec(exec_ctx_t *ctx) { unsigned i; VariantClear(&ctx->ret_val); + release_dynamic_vars(ctx->dynamic_vars); if(ctx->this_obj) IDispatch_Release(ctx->this_obj); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index ffaa63e..af037bd 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -114,6 +114,9 @@ static void release_script(script_ctx_t *ctx) { collect_objects(ctx); + release_dynamic_vars(ctx->global_vars); + ctx->global_vars = NULL; + while(!list_empty(&ctx->named_items)) { named_item_t *iter = LIST_ENTRY(list_head(&ctx->named_items), named_item_t, entry); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9e18f47..890c7c7 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -309,6 +309,7 @@ struct _vbscode_t { void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,function_t*,IDispatch*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; +void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; #define TID_LIST \ XDIID(ErrObj) \

1 0

Alexandre Julliard : gdi32: Overlapping rectangles are not allowed in GdiAlphaBlend.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: b7a15ae7faa0541bbaf55074413e4c176ed4f852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a15ae7faa0541bbaf550744… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 18:22:50 2011 +0200 gdi32: Overlapping rectangles are not allowed in GdiAlphaBlend. --- dlls/gdi32/bitblt.c | 8 ++++++++ dlls/gdi32/tests/bitmap.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index e03a5c1..eee6fa2 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -774,6 +774,14 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig SetLastError( ERROR_INVALID_PARAMETER ); ret = FALSE; } + else if (dcSrc == dcDst && src.x + src.width > dst.x && src.x < dst.x + dst.width && + src.y + src.height > dst.y && src.y < dst.y + dst.height) + { + WARN( "Overlapping coords: (%d,%d), %dx%d and (%d,%d), %dx%d\n", + src.x, src.y, src.width, src.height, dst.x, dst.y, dst.width, dst.height ); + SetLastError( ERROR_INVALID_PARAMETER ); + ret = FALSE; + } else if (!ret) ret = dst_dev->funcs->pAlphaBlend( dst_dev, &dst, src_dev, &src, blendFunction ); release_dc_ptr( dcDst ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index e069fa8..32fabb8 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3279,6 +3279,25 @@ static void test_GdiAlphaBlend(void) ok( !ret, "GdiAlphaBlend succeeded\n" ); ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + /* overlapping source and dest not allowed */ + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcDst, 19, 19, 20, 20, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 20, 20, 20, 20, hdcDst, 1, 1, 20, 20, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcDst, 20, 10, 20, 20, blend); + ok( ret, "GdiAlphaBlend succeeded\n" ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcDst, 10, 20, 20, 20, blend); + ok( ret, "GdiAlphaBlend succeeded\n" ); + /* AC_SRC_ALPHA requires 32-bpp BI_RGB format */ blend.AlphaFormat = AC_SRC_ALPHA;

1 0

Frédéric Delanoy : cmd: Make RENAME work for read-only files.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 6fd9d774268fe2b9e4f3fecbbbcf29f8a87218c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd9d774268fe2b9e4f3fecbb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 14 15:37:59 2011 +0200 cmd: Make RENAME work for read-only files. --- programs/cmd/builtins.c | 15 +++------------ programs/cmd/tests/test_builtins.cmd.exp | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ed2b6f0..5a890c7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1768,8 +1768,8 @@ void WCMD_remove_dir (WCHAR *command) { * Rename a file. */ -void WCMD_rename (void) { - +void WCMD_rename (void) +{ int status; HANDLE hff; WIN32_FIND_DATAW fd; @@ -1779,7 +1779,6 @@ void WCMD_rename (void) { WCHAR dir[MAX_PATH]; WCHAR fname[MAX_PATH]; WCHAR ext[MAX_PATH]; - DWORD attribs; errorlevel = 0; @@ -1853,15 +1852,7 @@ void WCMD_rename (void) { WINE_TRACE("Source '%s'\n", wine_dbgstr_w(src)); WINE_TRACE("Dest '%s'\n", wine_dbgstr_w(dest)); - /* Check if file is read only, otherwise move it */ - attribs = GetFileAttributesW(src); - if ((attribs != INVALID_FILE_ATTRIBUTES) && - (attribs & FILE_ATTRIBUTE_READONLY)) { - SetLastError(ERROR_ACCESS_DENIED); - status = 0; - } else { - status = MoveFileW(src, dest); - } + status = MoveFileW(src, dest); if (!status) { WCMD_print_error (); diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index eaefdc1..20e5d12 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -602,7 +602,7 @@ bar renamed to foo foo bar ... rename read-only files ... -(a)todo_wine@read-only file renamed +read-only file renamed ... rename directories ... dir renamed read-only dir renamed

1 0

Frédéric Delanoy : inetmib1: Avoid idempotent operation in findSupportedQuery function (Clang).
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 699fb02d101d708b52cd8904f82ab455c9b00a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=699fb02d101d708b52cd8904f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 14 13:02:35 2011 +0200 inetmib1: Avoid idempotent operation in findSupportedQuery function (Clang). --- dlls/inetmib1/main.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 76741f3..af9f17c 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -1342,29 +1342,26 @@ static void cleanup(void) static struct mibImplementation *findSupportedQuery(UINT *ids, UINT idLength, UINT *matchingIndex) { - int indexHigh = DEFINE_SIZEOF(supportedIDs) - 1, indexLow = 0, i; - struct mibImplementation *impl = NULL; + int indexHigh = DEFINE_SIZEOF(supportedIDs) - 1, indexLow = 0; AsnObjectIdentifier oid1 = { idLength, ids}; if (!idLength) return NULL; - for (i = (indexLow + indexHigh) / 2; !impl && indexLow <= indexHigh; - i = (indexLow + indexHigh) / 2) - { - INT cmp; - cmp = SnmpUtilOidNCmp(&oid1, &supportedIDs[i].name, idLength); - if (!cmp) + while (indexLow <= indexHigh) + { + INT cmp, i = (indexLow + indexHigh) / 2; + if (!(cmp = SnmpUtilOidNCmp(&oid1, &supportedIDs[i].name, idLength))) { - impl = &supportedIDs[i]; *matchingIndex = i; + return &supportedIDs[i]; } - else if (cmp > 0) + if (cmp > 0) indexLow = i + 1; else indexHigh = i - 1; } - return impl; + return NULL; } /*****************************************************************************

1 0

Piotr Caban : msvcp90: Remove code that is never executed.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 105ffa40fddc70fe73e06bd046399830be91271e URL: http://source.winehq.org/git/wine.git/?a=commit;h=105ffa40fddc70fe73e06bd04… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 14 15:01:35 2011 +0200 msvcp90: Remove code that is never executed. --- dlls/msvcp90/string.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 1f2bf7d..ab319c0 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -637,10 +637,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_erase( { TRACE("%p %lu %lu\n", this, pos, len); - if(pos > this->size) { + if(pos > this->size) MSVCP__String_base_Xran(); - return NULL; - } if(len > this->size-pos) len = this->size-pos; @@ -664,10 +662,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign_substr( { TRACE("%p %p %lu %lu\n", this, assign, pos, len); - if(assign->size < pos) { + if(assign->size < pos) MSVCP__String_base_Xran(); - return NULL; - } if(len > assign->size-pos) len = assign->size-pos; @@ -2087,10 +2083,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_erase( { TRACE("%p %lu %lu\n", this, pos, len); - if(pos > this->size) { + if(pos > this->size) MSVCP__String_base_Xran(); - return NULL; - } if(len > this->size-pos) len = this->size-pos; @@ -2114,10 +2108,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_substr( { TRACE("%p %p %lu %lu\n", this, assign, pos, len); - if(assign->size < pos) { + if(assign->size < pos) MSVCP__String_base_Xran(); - return NULL; - } if(len > assign->size-pos) len = assign->size-pos;

1 0

Jacek Caban : shlwapi: Make sure we don' t write anything to output buffer if its size is too small to store the whole result .
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 4a39433eaee04182a08277b8ca2f208b46a11212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a39433eaee04182a08277b8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 14 17:29:51 2011 +0200 shlwapi: Make sure we don't write anything to output buffer if its size is too small to store the whole result. --- dlls/shlwapi/tests/url.c | 11 +++++++++++ dlls/shlwapi/url.c | 16 ++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 1ef2aab..29d0cff 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -882,16 +882,27 @@ static void test_UrlEscape(void) ok(size == 1, "got %d, expected %d\n", size, 1); size = 1; + empty_string[0] = 127; ret = pUrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); ok(size == 34, "got %d, expected %d\n", size, 34); + ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); if(pUrlEscapeW) { + WCHAR wc; + size = sizeof(overwrite)/sizeof(WCHAR); ret = pUrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); ok(ret == S_OK, "got %x, expected S_OK\n", ret); ok(size == 9, "got %d, expected 9\n", size); ok(!lstrcmpW(overwrite, out), "got %s, expected %s\n", wine_dbgstr_w(overwrite), wine_dbgstr_w(out)); + + size = 1; + wc = 127; + ret = pUrlEscapeW(overwrite, &wc, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); + ok(size == 10, "got %d, expected 9\n", size); + ok(wc == 127, "String has changed, wc = %d\n", wc); } for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 0c68529..bcd413c 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1072,7 +1072,7 @@ HRESULT WINAPI UrlEscapeW( LPCWSTR src; DWORD needed = 0, ret; BOOL stop_escaping = FALSE; - WCHAR next[5], *dst = pszEscaped, *dst_ptr = NULL; + WCHAR next[5], *dst, *dst_ptr; INT len; PARSEDURLW parsed_url; DWORD int_flags; @@ -1091,11 +1091,9 @@ HRESULT WINAPI UrlEscapeW( URL_ESCAPE_PERCENT)) FIXME("Unimplemented flags: %08x\n", dwFlags); - if(pszUrl == pszEscaped) { - dst_ptr = dst = HeapAlloc(GetProcessHeap(), 0, *pcchEscaped*sizeof(WCHAR)); - if(!dst) - return E_OUTOFMEMORY; - } + dst_ptr = dst = HeapAlloc(GetProcessHeap(), 0, *pcchEscaped*sizeof(WCHAR)); + if(!dst_ptr) + return E_OUTOFMEMORY; /* fix up flags */ if (dwFlags & URL_ESCAPE_SPACES_ONLY) @@ -1213,8 +1211,7 @@ HRESULT WINAPI UrlEscapeW( if(needed < *pcchEscaped) { *dst = '\0'; - if(pszUrl == pszEscaped) - memcpy(pszEscaped, dst-needed, (needed+1)*sizeof(WCHAR)); + memcpy(pszEscaped, dst_ptr, (needed+1)*sizeof(WCHAR)); ret = S_OK; } else { @@ -1223,8 +1220,7 @@ HRESULT WINAPI UrlEscapeW( } *pcchEscaped = needed; - if(pszUrl == pszEscaped) - HeapFree(GetProcessHeap(), 0, dst_ptr); + HeapFree(GetProcessHeap(), 0, dst_ptr); return ret; }

1 0