September 2011 - Wine-commits

Francois Gouget : inetcomm: Fix printing NULL strings.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 54ae7787debda283f9853fe14683eec80f2428d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ae7787debda283f9853fe14… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:50:27 2011 +0200 inetcomm: Fix printing NULL strings. --- dlls/inetcomm/mimeole.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f297c29..8a1e3d4 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2134,7 +2134,8 @@ static HRESULT WINAPI MimeMessage_IsContentType( { HRESULT hr; IMimeBody *mime_body; - TRACE("(%p)->(%p, %s, %s)\n", iface, hBody, pszPriType, pszSubType); + TRACE("(%p)->(%p, %s, %s)\n", iface, hBody, debugstr_a(pszPriType), + debugstr_a(pszSubType)); hr = IMimeMessage_BindToObject(iface, hBody, &IID_IMimeBody, (void**)&mime_body); if(FAILED(hr)) return hr;

1 0

Rico Schüller : d3dx9: Use the original bytecode in D3DXGetShaderSamplers() instead of using a constant table.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 7cfdaedd3ee345bd2f1dcf8ac581fd82645decaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cfdaedd3ee345bd2f1dcf8ac… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 16 08:38:24 2011 +0200 d3dx9: Use the original bytecode in D3DXGetShaderSamplers() instead of using a constant table. --- dlls/d3dx9_36/shader.c | 57 ++++++++++++++++------------------------- dlls/d3dx9_36/tests/shader.c | 53 +++++++++++++++++++++++++++++++------- 2 files changed, 65 insertions(+), 45 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 50719b2..5a0f1db 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1273,50 +1273,40 @@ HRESULT WINAPI D3DXGetShaderConstantTable(CONST DWORD* byte_code, HRESULT WINAPI D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, UINT *count) { HRESULT hr; - LPD3DXCONSTANTTABLE constant_table = NULL; - D3DXCONSTANTTABLE_DESC constant_table_desc; UINT i, sampler_count = 0; + UINT size; + LPCSTR data; + const D3DXSHADER_CONSTANTTABLE *ctab_header; + const D3DXSHADER_CONSTANTINFO *constant_info; TRACE("byte_code %p, samplers %p, count %p\n", byte_code, samplers, count); if (count) *count = 0; - hr = D3DXGetShaderConstantTable(byte_code, &constant_table); - if (hr != D3D_OK) - { - WARN("Failed to get constant table\n"); + hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), (LPCVOID *)&data, &size); + if (hr != D3D_OK) return D3D_OK; - /* no samplers found, all is fine */ - return D3D_OK; - } + if (size < sizeof(D3DXSHADER_CONSTANTTABLE)) return D3D_OK; - hr = ID3DXConstantTable_GetDesc(constant_table, &constant_table_desc); - if (hr != D3D_OK) - { - WARN("Failed to get constant table desc\n"); - goto err_out; - } + ctab_header = (const D3DXSHADER_CONSTANTTABLE *)data; + if (ctab_header->Size != sizeof(*ctab_header)) return D3D_OK; - for (i = 0; i < constant_table_desc.Constants; ++i) + constant_info = (D3DXSHADER_CONSTANTINFO *)(data + ctab_header->ConstantInfo); + for (i = 0; i < ctab_header->Constants; i++) { - D3DXHANDLE handle = ID3DXConstantTable_GetConstant(constant_table, NULL, i); - D3DXCONSTANT_DESC constant_desc; - UINT size; + const D3DXSHADER_TYPEINFO *type; - hr = ID3DXConstantTable_GetConstantDesc(constant_table, handle, &constant_desc, &size); - if (hr != D3D_OK) - { - WARN("Failed to get constant desc\n"); - goto err_out; - } + TRACE("name = %s\n", data + constant_info[i].Name); + + type = (D3DXSHADER_TYPEINFO *)(data + constant_info[i].TypeInfo); - if (constant_desc.Type == D3DXPT_SAMPLER - || constant_desc.Type == D3DXPT_SAMPLER1D - || constant_desc.Type == D3DXPT_SAMPLER2D - || constant_desc.Type == D3DXPT_SAMPLER3D - || constant_desc.Type == D3DXPT_SAMPLERCUBE) + if (type->Type == D3DXPT_SAMPLER + || type->Type == D3DXPT_SAMPLER1D + || type->Type == D3DXPT_SAMPLER2D + || type->Type == D3DXPT_SAMPLER3D + || type->Type == D3DXPT_SAMPLERCUBE) { - if (samplers) samplers[sampler_count] = constant_desc.Name; + if (samplers) samplers[sampler_count] = data + constant_info[i].Name; ++sampler_count; } @@ -1324,10 +1314,7 @@ HRESULT WINAPI D3DXGetShaderSamplers(CONST DWORD *byte_code, LPCSTR *samplers, U TRACE("Found %u samplers\n", sampler_count); -err_out: - if (count) *count = sampler_count; - if (constant_table) ID3DXConstantTable_Release(constant_table); - return hr; + return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 0a1b8bf..9220e28 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -768,6 +768,7 @@ static const DWORD get_shader_samplers_blob[] = static void test_get_shader_samplers(void) { LPCSTR samplers[16] = {NULL}; /* maximum number of sampler registers v/ps 3.0 = 16 */ + LPCSTR sampler_orig; UINT count = 2; HRESULT hr; @@ -785,11 +786,22 @@ static void test_get_shader_samplers(void) hr = D3DXGetShaderSamplers(get_shader_samplers_blob, samplers, NULL); ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK); - ok(!strcmp(samplers[0], "s"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[0], "s"); - ok(!strcmp(samplers[1], "s1D"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[1], "s1D"); - ok(!strcmp(samplers[2], "s2D"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[2], "s2D"); - ok(!strcmp(samplers[3], "s3D"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[3], "s3D"); - ok(!strcmp(samplers[4], "scube"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[4], "scube"); + /* check that sampler points to shader blob */ + sampler_orig = (LPCSTR)&get_shader_samplers_blob[0x2E]; + ok(sampler_orig == samplers[0], "D3DXGetShaderSamplers failed, got %p, expected %p\n", samplers[0], sampler_orig); + + sampler_orig = (LPCSTR)&get_shader_samplers_blob[0x33]; + ok(sampler_orig == samplers[1], "D3DXGetShaderSamplers failed, got %p, expected %p\n", samplers[1], sampler_orig); + + sampler_orig = (LPCSTR)&get_shader_samplers_blob[0x38]; + ok(sampler_orig == samplers[2], "D3DXGetShaderSamplers failed, got %p, expected %p\n", samplers[2], sampler_orig); + + sampler_orig = (LPCSTR)&get_shader_samplers_blob[0x3D]; + ok(sampler_orig == samplers[3], "D3DXGetShaderSamplers failed, got %p, expected %p\n", samplers[3], sampler_orig); + + sampler_orig = (LPCSTR)&get_shader_samplers_blob[0x42]; + ok(sampler_orig == samplers[4], "D3DXGetShaderSamplers failed, got %p, expected %p\n", samplers[4], sampler_orig); + ok(!strcmp(samplers[5], "dummy"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[5], "dummy"); /* reset samplers */ @@ -804,12 +816,33 @@ static void test_get_shader_samplers(void) ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK); ok(count == 5, "D3DXGetShaderSamplers failed, got %u, expected %u\n", count, 5); - ok(!strcmp(samplers[0], "s"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[0], "s"); - ok(!strcmp(samplers[1], "s1D"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[1], "s1D"); - ok(!strcmp(samplers[2], "s2D"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[2], "s2D"); - ok(!strcmp(samplers[3], "s3D"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[3], "s3D"); - ok(!strcmp(samplers[4], "scube"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[4], "scube"); + /* check that sampler points to shader blob */ + sampler_orig = (LPCSTR)&get_shader_samplers_blob[0x2E]; + ok(sampler_orig == samplers[0], "D3DXGetShaderSamplers failed, got %p, expected %p\n", samplers[0], sampler_orig); + + sampler_orig = (LPCSTR)&get_shader_samplers_blob[0x33]; + ok(sampler_orig == samplers[1], "D3DXGetShaderSamplers failed, got %p, expected %p\n", samplers[1], sampler_orig); + + sampler_orig = (LPCSTR)&get_shader_samplers_blob[0x38]; + ok(sampler_orig == samplers[2], "D3DXGetShaderSamplers failed, got %p, expected %p\n", samplers[2], sampler_orig); + + sampler_orig = (LPCSTR)&get_shader_samplers_blob[0x3D]; + ok(sampler_orig == samplers[3], "D3DXGetShaderSamplers failed, got %p, expected %p\n", samplers[3], sampler_orig); + + sampler_orig = (LPCSTR)&get_shader_samplers_blob[0x42]; + ok(sampler_orig == samplers[4], "D3DXGetShaderSamplers failed, got %p, expected %p\n", samplers[4], sampler_orig); + ok(!strcmp(samplers[5], "dummy"), "D3DXGetShaderSamplers failed, got \"%s\", expected \"%s\"\n", samplers[5], "dummy"); + + /* check without ctab */ + hr = D3DXGetShaderSamplers(simple_vs, samplers, &count); + ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK); + ok(count == 0, "D3DXGetShaderSamplers failed, got %u, expected %u\n", count, 0); + + /* check invalid ctab */ + hr = D3DXGetShaderSamplers(shader_with_invalid_ctab, samplers, &count); + ok(hr == D3D_OK, "D3DXGetShaderSamplers failed, got %x, expected %x\n", hr, D3D_OK); + ok(count == 0, "D3DXGetShaderSamplers failed, got %u, expected %u\n", count, 0); } START_TEST(shader)

1 0

Rico Schüller : d3dx9: Use the variable instead of the type in HeapAlloc().
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: a7df4958ab0f5b2e039452ed5bc992915a536658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7df4958ab0f5b2e039452ed5… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Sep 16 08:38:47 2011 +0200 d3dx9: Use the variable instead of the type in HeapAlloc(). --- dlls/d3dx9_36/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 5a0f1db..bc5e002 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1175,7 +1175,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, if (hr != D3D_OK) return D3DXERR_INVALIDDATA; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXConstantTableImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { ERR("Out of memory\n");

1 0

Alexandre Julliard : vbscript: Fix a memory allocation size to avoid overflows.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 9fe25eae4a185aa6c6959b5b589222cfe491e59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fe25eae4a185aa6c6959b5b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 19:36:52 2011 +0200 vbscript: Fix a memory allocation size to avoid overflows. --- dlls/vbscript/vbdisp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c1eba23..14fb8b0 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -398,7 +398,7 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) { vbdisp_t *vbdisp; - vbdisp = heap_alloc_zero(sizeof(*vbdisp) + (desc->prop_cnt-1)*sizeof(VARIANT)); + vbdisp = heap_alloc_zero( FIELD_OFFSET( vbdisp_t, props[desc->prop_cnt] )); if(!vbdisp) return E_OUTOFMEMORY;

1 0

Francois Gouget : ieframe/tests: Don' t crash if IWebBrowser2_get_LocationURL() fails.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 19e2c1578e5a53b01141d3d9182dd8593bc9eb11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e2c1578e5a53b01141d3d91… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 15:26:22 2011 +0200 ieframe/tests: Don't crash if IWebBrowser2_get_LocationURL() fails. --- dlls/ieframe/tests/webbrowser.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index e628947..d571034 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -230,9 +230,12 @@ static void _test_LocationURL(unsigned line, IUnknown *unk, const char *exurl) hres = IWebBrowser2_get_LocationURL(wb, &url); ok_(__FILE__,line) (hres == (*exurl ? S_OK : S_FALSE), "get_LocationURL failed: %08x\n", hres); - ok_(__FILE__,line) (!strcmp_wa(url, exurl), "unexpected URL: %s\n", wine_dbgstr_w(url)); + if (hres == S_OK) + { + ok_(__FILE__,line) (!strcmp_wa(url, exurl), "unexpected URL: %s\n", wine_dbgstr_w(url)); + SysFreeString(url); + } - SysFreeString(url); IWebBrowser2_Release(wb); }

1 0

Francois Gouget : ieframe/tests: Some tests require that the user interface be in English.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: ae80430feaef97e8bb0641384480c96a6dd191dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae80430feaef97e8bb0641384… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 15:33:22 2011 +0200 ieframe/tests: Some tests require that the user interface be in English. --- dlls/ieframe/tests/webbrowser.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index d571034..6d41462 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -159,6 +159,30 @@ static const char *current_url; static DWORD dwl_flags; + +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -2080,7 +2104,7 @@ static void test_ie_funcs(IUnknown *unk) /* Name */ hres = IWebBrowser2_get_Name(wb, &sName); ok(hres == S_OK, "getName failed: %08x, expected S_OK\n", hres); - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) == LANG_ENGLISH) + if (is_lang_english()) ok(!strcmp_wa(sName, "Microsoft Web Browser Control"), "got '%s', expected 'Microsoft Web Browser Control'\n", wine_dbgstr_w(sName)); else /* Non-English cannot be blank. */ ok(sName!=NULL, "get_Name return a NULL string.\n");

1 0

Jacek Caban : vbscript: Added class_initializer support.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 28bddf8dd1599b00ca571d01636711b8f23f350c URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bddf8dd1599b00ca571d016… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:29:25 2011 +0200 vbscript: Added class_initializer support. --- dlls/vbscript/compile.c | 12 ++++++++++++ dlls/vbscript/tests/lang.vbs | 4 ++++ dlls/vbscript/vbdisp.c | 12 ++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index bcf7b52..00dfc50 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -893,6 +893,8 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) unsigned i; HRESULT hres; + static const WCHAR class_initializeW[] = {'c','l','a','s','s','_','i','n','i','t','i','a','l','i','z','e',0}; + if(lookup_dim_decls(ctx, class_decl->name) || lookup_funcs_name(ctx, class_decl->name) || lookup_class_name(ctx, class_decl->name)) { FIXME("%s: redefinition\n", debugstr_w(class_decl->name)); @@ -909,6 +911,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) class_desc->func_cnt = 1; /* always allocate slot for default getter */ class_desc->prop_cnt = 0; + class_desc->class_initialize_id = 0; for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { @@ -932,6 +935,15 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) } } + if(!strcmpiW(class_initializeW, func_decl->name)) { + if(func_decl->type != FUNC_SUB) { + FIXME("class initializer is not sub\n"); + return E_FAIL; + } + + class_desc->class_initialize_id = i; + } + hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + (func_prop_decl ? 0 : i)); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 08f4736..46317b9 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -465,6 +465,7 @@ obj.publicProp = 3 Call ok(obj.publicProp = 3, "obj.publicProp = " & obj.publicProp) obj.publicProp() = 3 +Call ok(obj.getPrivateProp() = true, "obj.getPrivateProp() = " & obj.getPrivateProp()) Call obj.setPrivateProp(6) Call ok(obj.getPrivateProp = 6, "obj.getPrivateProp = " & obj.getPrivateProp) @@ -485,6 +486,9 @@ funcCalled = "" Call ok(obj = 3, "(x = obj) = " & obj) Call ok(funcCalled = "GetDefVal", "funcCalled = " & funcCalled) +Call obj.Class_Initialize +Call ok(obj.getPrivateProp() = true, "obj.getPrivateProp() = " & obj.getPrivateProp()) + x = (New testclass).publicProp reportSuccess() diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a5fa63c..e1386be 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -375,6 +375,18 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) vbdisp->ref = 1; vbdisp->desc = desc; + if(desc->class_initialize_id) { + DISPPARAMS dp = {0}; + HRESULT hres; + + hres = exec_script(desc->ctx, desc->funcs[desc->class_initialize_id].entries[VBDISP_CALLGET], + (IDispatch*)&vbdisp->IDispatchEx_iface, &dp, NULL); + if(FAILED(hres)) { + IDispatchEx_Release(&vbdisp->IDispatchEx_iface); + return hres; + } + } + *ret = vbdisp; return S_OK; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 37931db..270e223 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -76,6 +76,7 @@ typedef struct { typedef struct _class_desc_t { const WCHAR *name; script_ctx_t *ctx; + unsigned class_initialize_id; unsigned func_cnt; vbdisp_funcprop_desc_t *funcs; unsigned prop_cnt;

1 0

Jacek Caban : vbscript: Added class_terminate support.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 8b6b334c89e8414c5b8bb2d08b4a6123a4b0482f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6b334c89e8414c5b8bb2d08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:29:37 2011 +0200 vbscript: Added class_terminate support. --- dlls/vbscript/compile.c | 9 +++++++++ dlls/vbscript/tests/lang.vbs | 19 +++++++++++++++++++ dlls/vbscript/vbdisp.c | 23 ++++++++++++++++++++++- dlls/vbscript/vbscript.h | 2 ++ 4 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 00dfc50..6bacaa0 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -894,6 +894,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) HRESULT hres; static const WCHAR class_initializeW[] = {'c','l','a','s','s','_','i','n','i','t','i','a','l','i','z','e',0}; + static const WCHAR class_terminateW[] = {'c','l','a','s','s','_','t','e','r','m','i','n','a','t','e',0}; if(lookup_dim_decls(ctx, class_decl->name) || lookup_funcs_name(ctx, class_decl->name) || lookup_class_name(ctx, class_decl->name)) { @@ -912,6 +913,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) class_desc->func_cnt = 1; /* always allocate slot for default getter */ class_desc->prop_cnt = 0; class_desc->class_initialize_id = 0; + class_desc->class_terminate_id = 0; for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { @@ -942,6 +944,13 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) } class_desc->class_initialize_id = i; + }else if(!strcmpiW(class_terminateW, func_decl->name)) { + if(func_decl->type != FUNC_SUB) { + FIXME("class terminator is not sub\n"); + return E_FAIL; + } + + class_desc->class_terminate_id = i; } hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + (func_prop_decl ? 0 : i)); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 46317b9..961eea2 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -491,4 +491,23 @@ Call ok(obj.getPrivateProp() = true, "obj.getPrivateProp() = " & obj.getPrivateP x = (New testclass).publicProp +Class TermTest + Public Sub Class_Terminate() + funcCalled = "terminate" + End Sub +End Class + +Set obj = New TermTest +funcCalled = "" +Set obj = Nothing +Call ok(funcCalled = "terminate", "funcCalled = " & funcCalled) + +Set obj = New TermTest +funcCalled = "" +Call obj.Class_Terminate +Call ok(funcCalled = "terminate", "funcCalled = " & funcCalled) +funcCalled = "" +Set obj = Nothing +Call ok(funcCalled = "terminate", "funcCalled = " & funcCalled) + reportSuccess() diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index e1386be..c948f13 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -123,6 +123,23 @@ static HRESULT invoke_variant_prop(vbdisp_t *This, VARIANT *v, WORD flags, DISPP return hres; } +static void run_terminator(vbdisp_t *This) +{ + if(This->terminator_ran) + return; + This->terminator_ran = TRUE; + + if(This->desc->class_terminate_id) { + DISPPARAMS dp = {0}; + + This->ref++; + exec_script(This->desc->ctx, This->desc->funcs[This->desc->class_terminate_id].entries[VBDISP_CALLGET], + (IDispatch*)&This->IDispatchEx_iface, &dp, NULL); + This->ref--; + } + +} + static void clean_props(vbdisp_t *This) { unsigned i; @@ -172,8 +189,12 @@ static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) { vbdisp_t *This = impl_from_IDispatchEx(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + if(!ref) + run_terminator(This); if(!ref) { clean_props(This); heap_free(This); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 270e223..5dd434a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -77,6 +77,7 @@ typedef struct _class_desc_t { const WCHAR *name; script_ctx_t *ctx; unsigned class_initialize_id; + unsigned class_terminate_id; unsigned func_cnt; vbdisp_funcprop_desc_t *funcs; unsigned prop_cnt; @@ -88,6 +89,7 @@ typedef struct { IDispatchEx IDispatchEx_iface; LONG ref; + BOOL terminator_ran; const class_desc_t *desc; VARIANT props[1];

1 0

Jacek Caban : vbscript: Added GC implementation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: a99dc8cb3dc2ff90f894c746f17ea7b5d7e8c13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99dc8cb3dc2ff90f894c746f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:29:47 2011 +0200 vbscript: Added GC implementation. --- dlls/vbscript/tests/run.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 24 ++++++++++++++++++ dlls/vbscript/vbscript.c | 3 ++ dlls/vbscript/vbscript.h | 3 ++ 4 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 3fee711..9aba091 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -884,6 +884,8 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + IActiveScript_Close(engine); + IDispatch_Release(script_disp); IActiveScript_Release(engine); IUnknown_Release(parser); @@ -907,6 +909,61 @@ static void parse_script_a(const char *src) parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); } +static void test_gc(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR src; + HRESULT hres; + + strict_dispid_check = FALSE; + + engine = create_script(); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", 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); + + src = a2bstr( + "class C\n" + " Public ref\n" + " Public Sub Class_Terminate\n" + " Call reportSuccess()\n" + " End Sub\n" + "End Class\n" + "Dim x\n" + "set x = new C\n" + "set x.ref = x\n" + "set x = nothing\n"); + + hres = IActiveScriptParse64_ParseScriptText(parser, src, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(src); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + IActiveScript_Close(engine); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + IActiveScript_Release(engine); + IUnknown_Release(parser); +} + static BSTR get_script_from_file(const char *filename) { DWORD size, len; @@ -1041,6 +1098,8 @@ static void run_tests(void) CHECK_CALLED(testobj_propput_i); run_from_res("lang.vbs"); + + test_gc(); } static BOOL check_vbscript(void) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c948f13..c1eba23 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -144,6 +144,9 @@ static void clean_props(vbdisp_t *This) { unsigned i; + if(!This->desc) + return; + for(i=0; i < This->desc->prop_cnt; i++) VariantClear(This->props+i); } @@ -197,6 +200,7 @@ static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) run_terminator(This); if(!ref) { clean_props(This); + list_remove(&This->entry); heap_free(This); } @@ -247,6 +251,9 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + if(!This->desc) + return E_UNEXPECTED; + if(grfdex & ~(fdexNameEnsure|fdexNameCaseInsensitive)) { FIXME("unsupported flags %x\n", grfdex); return E_NOTIMPL; @@ -262,6 +269,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(!This->desc) + return E_UNEXPECTED; + if(pvarRes) V_VT(pvarRes) = VT_EMPTY; @@ -408,10 +418,24 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) } } + list_add_tail(&desc->ctx->objects, &vbdisp->entry); *ret = vbdisp; return S_OK; } +void collect_objects(script_ctx_t *ctx) +{ + vbdisp_t *iter, *iter2; + + LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &ctx->objects, vbdisp_t, entry) + run_terminator(iter); + + LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &ctx->objects, vbdisp_t, entry) { + clean_props(iter); + iter->desc = NULL; + } +} + HRESULT init_global(script_ctx_t *ctx) { ctx->script_desc.ctx = ctx; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index e0598a9..8074799 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -112,6 +112,8 @@ static HRESULT set_ctx_site(VBScript *This) static void destroy_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)); @@ -509,6 +511,7 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) if(!ctx) return E_OUTOFMEMORY; + list_init(&ctx->objects); list_init(&ctx->code_list); list_init(&ctx->named_items); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5dd434a..a2c23ea 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -90,6 +90,7 @@ typedef struct { LONG ref; BOOL terminator_ran; + struct list entry; const class_desc_t *desc; VARIANT props[1]; @@ -99,6 +100,7 @@ HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**); HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*); +void collect_objects(script_ctx_t*); static inline unsigned arg_cnt(const DISPPARAMS *dp) { @@ -129,6 +131,7 @@ struct _script_ctx_t { function_t *global_funcs; class_desc_t *classes; + struct list objects; struct list code_list; struct list named_items; };

1 0

Jacek Caban : vbscript: Added while..wend statement implementation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 3d34925802b62238ae9360ac1e210955cf63de91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d34925802b62238ae9360ac1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:29:59 2011 +0200 vbscript: Added while..wend statement implementation. --- dlls/vbscript/compile.c | 31 +++++++++++++++++++++++++++++++ dlls/vbscript/parse.h | 9 ++++++++- dlls/vbscript/parser.y | 16 ++++++++++++++++ dlls/vbscript/tests/lang.vbs | 13 +++++++++++++ 4 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 6bacaa0..814d9ea 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -483,6 +483,34 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) return S_OK; } +static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *stat) +{ + unsigned start_addr; + unsigned jmp_end; + HRESULT hres; + + start_addr = ctx->instr_cnt; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + jmp_end = push_instr(ctx, OP_jmp_false); + if(jmp_end == -1) + return E_OUTOFMEMORY; + + hres = compile_statement(ctx, stat->body); + if(FAILED(hres)) + return hres; + + hres = push_instr_addr(ctx, OP_jmp, start_addr); + if(FAILED(hres)) + return hres; + + instr_ptr(ctx, jmp_end)->arg1.uint = ctx->instr_cnt; + return S_OK; +} + static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat, BOOL is_set) { HRESULT hres; @@ -632,6 +660,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_STOP: hres = push_instr(ctx, OP_stop) == -1 ? E_OUTOFMEMORY : S_OK; break; + case STAT_WHILE: + hres = compile_while_statement(ctx, (while_statement_t*)stat); + break; default: FIXME("Unimplemented statement type %d\n", stat->type); hres = E_NOTIMPL; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 245badc..efd3d67 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -99,7 +99,8 @@ typedef enum { STAT_FUNC, STAT_IF, STAT_SET, - STAT_STOP + STAT_STOP, + STAT_WHILE } statement_type_t; typedef struct _statement_t { @@ -177,6 +178,12 @@ typedef struct { } if_statement_t; typedef struct { + statement_t stat; + expression_t *expr; + statement_t *body; +} while_statement_t; + +typedef struct { const WCHAR *code; const WCHAR *ptr; const WCHAR *end; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index adf1aba..d06c84f 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -52,6 +52,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expression_t*); static statement_t *new_set_statement(parser_ctx_t*,member_expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); +static statement_t *new_while_statement(parser_ctx_t*,statement_type_t,expression_t*,statement_t*); static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*); static statement_t *new_function_statement(parser_ctx_t*,function_decl_t*); @@ -153,6 +154,8 @@ Statement { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } | IfStatement { $$ = $1; } + | tWHILE Expression tNL StatementsNl_opt tWEND + { $$ = new_while_statement(ctx, STAT_WHILE, $2, $4); CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } | tEXIT tPROPERTY { $$ = new_statement(ctx, STAT_EXITPROP, 0); CHECK_ERROR; } @@ -565,6 +568,19 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t *ctx, expression_t *expr, sta return decl; } +static statement_t *new_while_statement(parser_ctx_t *ctx, statement_type_t type, expression_t *expr, statement_t *body) +{ + while_statement_t *stat; + + stat = new_statement(ctx, type, sizeof(*stat)); + if(!stat) + return NULL; + + stat->expr = expr; + stat->body = body; + return &stat->stat; +} + static statement_t *new_if_statement(parser_ctx_t *ctx, expression_t *expr, statement_t *if_stat, elseif_decl_t *elseif_decl, statement_t *else_stat) { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 961eea2..d3886d6 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -199,6 +199,19 @@ ElseIf not False Then End If Call ok(x, "elseif not called?") +x = false +y = false +while not (x and y) + if x then + y = true + end if + x = true +wend +call ok((x and y), "x or y is false after while") + +while false +wend + if false then Sub testsub x = true

1 0