September 2011 - Wine-Commits

Jacek Caban : vbscript: Added support for undeclared variables in non-explicit mode.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 4c23c99901a7dcb04341b20894ddf35612dacf5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c23c99901a7dcb04341b2089… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 14:59:53 2011 +0200 vbscript: Added support for undeclared variables in non-explicit mode. --- dlls/vbscript/interp.c | 61 ++++++++++++++++++++++++++++++++++++++------ dlls/vbscript/tests/run.c | 10 +++++++ dlls/vbscript/vbscript.c | 2 + dlls/vbscript/vbscript.h | 2 + 4 files changed, 66 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 074dae1..aff7b91 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -35,6 +35,9 @@ typedef struct { VARIANT *args; VARIANT *vars; + dynamic_var_t *dynamic_vars; + vbsheap_t heap; + unsigned stack_size; unsigned top; VARIANT *stack; @@ -120,6 +123,9 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } + if(lookup_dynamic_vars(ctx->func->type == FUNC_GLOBAL ? ctx->script->global_vars : ctx->dynamic_vars, name, ref)) + return S_OK; + hres = disp_get_id(ctx->this_obj, name, invoke_type, TRUE, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP; @@ -128,7 +134,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) + if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; for(func = ctx->script->global_funcs; func; func = func->next) { @@ -188,9 +194,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - if(!ctx->func->code_ctx->option_explicit) - FIXME("create an attempt to set\n"); - ref->type = REF_NONE; return S_OK; } @@ -488,11 +491,48 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_v case REF_OBJ: FIXME("REF_OBJ\n"); return E_NOTIMPL; - case REF_NONE: - FIXME("%s not found\n", debugstr_w(name)); - if(own_val) - VariantClear(val); - return DISP_E_UNKNOWNNAME; + case REF_NONE: { + dynamic_var_t *new_var; + vbsheap_t *heap; + WCHAR *str; + unsigned size; + + if(ctx->func->code_ctx->option_explicit) { + FIXME("throw exception\n"); + return E_FAIL; + } + + TRACE("creating variable %s\n", debugstr_w(name)); + + heap = ctx->func->type == FUNC_GLOBAL ? &ctx->script->heap : &ctx->heap; + + new_var = vbsheap_alloc(heap, sizeof(*new_var)); + if(!new_var) + return E_OUTOFMEMORY; + + size = (strlenW(name)+1)*sizeof(WCHAR); + str = vbsheap_alloc(heap, size); + if(!str) + return E_OUTOFMEMORY; + memcpy(str, name, size); + new_var->name = str; + + if(own_val) { + new_var->v = *val; + }else { + hres = VariantCopy(&new_var->v, val); + if(FAILED(hres)) + return hres; + } + + if(ctx->func->type == FUNC_GLOBAL) { + new_var->next = ctx->script->global_vars; + ctx->script->global_vars = new_var; + }else { + new_var->next = ctx->dynamic_vars; + ctx->dynamic_vars = new_var; + } + } } return hres; @@ -1392,6 +1432,7 @@ static void release_exec(exec_ctx_t *ctx) VariantClear(ctx->vars+i); } + vbsheap_free(&ctx->heap); heap_free(ctx->args); heap_free(ctx->vars); heap_free(ctx->stack); @@ -1410,6 +1451,8 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, IDispatch *this_obj, DI return E_FAIL; } + vbsheap_init(&exec.heap); + if(func->arg_cnt) { VARIANT *v; unsigned i; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index b631c88..4fbf689 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1097,6 +1097,16 @@ static void run_tests(void) CHECK_CALLED(testobj_propput_d); CHECK_CALLED(testobj_propput_i); + parse_script_a("x = 1\n Call ok(x = 1, \"x = \" & x)"); + + strict_dispid_check = FALSE; + + parse_script_a("Sub testsub\n" + "x = 1\n" + "Call ok(x = 1, \"x = \" & x)\n" + "End Sub\n" + "Call testsub()"); + run_from_res("lang.vbs"); run_from_res("api.vbs"); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index c9fa3d0..3ac9560 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -137,6 +137,7 @@ static void destroy_script(script_ctx_t *ctx) IDispatchEx_Release(&ctx->global_obj->IDispatchEx_iface); if(ctx->script_obj) IDispatchEx_Release(&ctx->script_obj->IDispatchEx_iface); + vbsheap_free(&ctx->heap); heap_free(ctx); } @@ -515,6 +516,7 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) if(!ctx) return E_OUTOFMEMORY; + vbsheap_init(&ctx->heap); 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 e1c7fa1..5a968d1 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -157,6 +157,8 @@ struct _script_ctx_t { function_t *global_funcs; class_desc_t *classes; + vbsheap_t heap; + struct list objects; struct list code_list; struct list named_items;

1 0

Michael Stefaniuc : windowscodecs: Remove casts to the type of the casted variable.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 952699e8439a567faa4e1137d1d27913c856cfd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=952699e8439a567faa4e1137d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 20 15:49:05 2011 +0200 windowscodecs: Remove casts to the type of the casted variable. --- dlls/windowscodecs/converter.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index a52c7d2..e404464 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -145,7 +145,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe srcrow = srcdata; dstrow = pbBuffer; for (y=0; y<prc->Height; y++) { - srcbyte=(const BYTE*)srcrow; + srcbyte = srcrow; dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x+=8) { BYTE srcval; @@ -214,7 +214,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe srcrow = srcdata; dstrow = pbBuffer; for (y=0; y<prc->Height; y++) { - srcbyte=(const BYTE*)srcrow; + srcbyte = srcrow; dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x+=4) { BYTE srcval; @@ -279,7 +279,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe srcrow = srcdata; dstrow = pbBuffer; for (y=0; y<prc->Height; y++) { - srcbyte=(const BYTE*)srcrow; + srcbyte = srcrow; dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x+=2) { BYTE srcval; @@ -322,7 +322,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe srcrow = srcdata; dstrow = pbBuffer; for (y=0; y<prc->Height; y++) { - srcbyte=(const BYTE*)srcrow; + srcbyte = srcrow; dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x++) { @@ -378,7 +378,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe srcrow = srcdata; dstrow = pbBuffer; for (y=0; y<prc->Height; y++) { - srcbyte=(const BYTE*)srcrow; + srcbyte = srcrow; dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x++) *dstpixel++ = colors[*srcbyte++]; @@ -417,7 +417,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe srcrow = srcdata; dstrow = pbBuffer; for (y=0; y<prc->Height; y++) { - srcbyte=(const BYTE*)srcrow; + srcbyte = srcrow; dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x++) {

1 0

Michael Stefaniuc : d3dx9_36: Remove casts to the type of the casted expression.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 977308365dcd4331e75814c736941d51071f110a URL: http://source.winehq.org/git/wine.git/?a=commit;h=977308365dcd4331e75814c73… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 20 15:50:47 2011 +0200 d3dx9_36: Remove casts to the type of the casted expression. --- dlls/d3dx9_36/mesh.c | 4 ++-- dlls/d3dx9_36/tests/math.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 760931c..796e556 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1243,7 +1243,7 @@ static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flag return E_NOTIMPL; } - hr = iface->lpVtbl->LockIndexBuffer(iface, 0, (void**)&indices); + hr = iface->lpVtbl->LockIndexBuffer(iface, 0, &indices); if (FAILED(hr)) goto cleanup; dword_indices = HeapAlloc(GetProcessHeap(), 0, This->numfaces * 3 * sizeof(DWORD)); @@ -3010,7 +3010,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, } d3dxmesh->lpVtbl->UnlockVertexBuffer(d3dxmesh); - hr = d3dxmesh->lpVtbl->LockIndexBuffer(d3dxmesh, 0, (void**)&indices); + hr = d3dxmesh->lpVtbl->LockIndexBuffer(d3dxmesh, 0, &indices); if (FAILED(hr)) goto cleanup; index_in_ptr = mesh_data.indices; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 0ca6150..c26a523 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2268,7 +2268,7 @@ static void test_D3DXFloat_Array(void) out = D3DXFloat32To16Array(&half, &single, 0); ok(out == &half, "Got %p, expected %p.\n", out, &half); - out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&half, 0); + out = D3DXFloat16To32Array(&single, &half, 0); ok(out == &single, "Got %p, expected %p.\n", out, &single); for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++)

1 0

Alistair Leslie-Hughes : mscoree: Add .Net debugging interfaces.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 4072d20f6e6272f3ca17ede39bc8fffba090facb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4072d20f6e6272f3ca17ede39… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 19 12:11:13 2011 +1000 mscoree: Add .Net debugging interfaces. --- .gitignore | 1 + include/Makefile.in | 1 + include/cordebug.idl | 951 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 953 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4072d20f6e6272f3ca17e…

1 0

Jacek Caban : vbscript: Added support for short if statements.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 7146387dc68534a287f61a5ef5d8c26e6834a1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7146387dc68534a287f61a5ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 14:59:21 2011 +0200 vbscript: Added support for short if statements. --- dlls/vbscript/parser.y | 4 +++- dlls/vbscript/tests/lang.vbs | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2d80c40..728bd92 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -198,7 +198,9 @@ DoType IfStatement : tIF Expression tTHEN tNL StatementsNl ElseIfs_opt Else_opt tEND tIF { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } - /* FIXME: short if statement */ + | tIF Expression tTHEN Statement { $$ = new_if_statement(ctx, $2, $4, NULL, NULL); CHECK_ERROR; } + | tIF Expression tTHEN Statement tELSE Statement + { $$ = new_if_statement(ctx, $2, $4, NULL, $6); CHECK_ERROR; } ElseIfs_opt : /* empty */ { $$ = NULL; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 17c92e5..029c5ac 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -164,6 +164,29 @@ Call ok(2^3^2 = 64, "2^3^2 = " & (2^3^2)) Call ok(-3^2 = 9, "-3^2 = " & (-3^2)) Call ok(2*3^2 = 18, "2*3^2 = " & (2*3^2)) +if true then y = true : x = y +ok x, "x is false" + +x = true : if false then x = false +ok x, "x is false, if false called?" + +if not false then x = true +ok x, "x is false, if not false not called?" + +if not false then x = "test" : x = true +ok x, "x is false, if not false not called?" + +if false then x = y : call ok(false, "if false .. : called") + +if false then x = y : call ok(false, "if false .. : called") else x = "else" +Call ok(x = "else", "else not called?") + +if true then x = y else y = x : Call ok(false, "in else?") + +if false then : + +if false then x = y : if true then call ok(false, "embedded if called") + if false then ok false, "if false called" end if

1 0

Jacek Caban : vbscript: Added support for ':' as statement separator.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: d0ae4c47a9fb91940e90ffbe2e0c02a86bc7a0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ae4c47a9fb91940e90ffbe2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 14:58:53 2011 +0200 vbscript: Added support for ':' as statement separator. --- dlls/vbscript/lex.c | 1 + dlls/vbscript/parser.y | 26 ++++++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 394a24d..8bad383 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -333,6 +333,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) else ctx->ptr = ctx->end; return tNL; + case ':': case ')': case ',': case '=': diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index d3ed732..2d80c40 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -66,6 +66,8 @@ static class_decl_t *new_class_decl(parser_ctx_t*); static class_decl_t *add_class_function(parser_ctx_t*,class_decl_t*,function_decl_t*); static class_decl_t *add_variant_prop(parser_ctx_t*,class_decl_t*,const WCHAR*,unsigned); +static statement_t *link_statements(statement_t*,statement_t*); + #define STORAGE_IS_PRIVATE 1 #define STORAGE_IS_DEFAULT 2 @@ -109,7 +111,7 @@ static class_decl_t *add_variant_prop(parser_ctx_t*,class_decl_t*,const WCHAR*,u %token <lng> tLong tShort %token <dbl> tDouble -%type <statement> Statement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt +%type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression @@ -143,12 +145,19 @@ StatementsNl_opt StatementsNl : StatementNl { $$ = $1; } - | StatementNl StatementsNl { $1->next = $2; $$ = $1; } + | StatementNl StatementsNl { $$ = link_statements($1, $2); } StatementNl : Statement tNL { $$ = $1; } Statement + : ':' { $$ = NULL; } + | ':' Statement { $$ = $2; } + | SimpleStatement { $$ = $1; } + | SimpleStatement ':' Statement { $1->next = $3; $$ = $1; } + | SimpleStatement ':' { $$ = $1; } + +SimpleStatement : MemberExpression ArgumentList_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } | tCALL MemberExpression Arguments_opt { $2->args = $3; $$ = new_call_statement(ctx, $2); CHECK_ERROR; } | MemberExpression Arguments_opt '=' Expression @@ -366,6 +375,9 @@ static int parser_error(const char *str) static void source_add_statement(parser_ctx_t *ctx, statement_t *stat) { + if(!stat) + return; + if(ctx->stats) { ctx->stats_tail->next = stat; ctx->stats_tail = stat; @@ -752,6 +764,16 @@ static class_decl_t *add_variant_prop(parser_ctx_t *ctx, class_decl_t *class_dec return class_decl; } +static statement_t *link_statements(statement_t *head, statement_t *tail) +{ + statement_t *iter; + + for(iter = head; iter->next; iter = iter->next); + iter->next = tail; + + return head; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 922fc6a..2966453 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -608,6 +608,11 @@ funcCalled = "" Set obj = Nothing Call ok(funcCalled = "terminate", "funcCalled = " & funcCalled) +x = "following ':' is correct syntax" : +x = "following ':' is correct syntax" :: : +:: x = "also correct syntax" +: + Set obj = new EmptyClass Set x = obj Set y = new EmptyClass

1 0

Jacek Caban : wshom.ocx: Added WshShell class factory implementation.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 8d7fe3711b4863dc1bbfc03cb516acd44df862d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d7fe3711b4863dc1bbfc03cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 11:55:34 2011 +0200 wshom.ocx: Added WshShell class factory implementation. --- .gitignore | 1 + dlls/wshom.ocx/Makefile.in | 2 + dlls/wshom.ocx/shell.c | 29 +++++++++++++++++ dlls/wshom.ocx/wshom_main.c | 66 ++++++++++++++++++++++++++++++++++----- dlls/wshom.ocx/wshom_private.h | 27 ++++++++++++++++ 5 files changed, 116 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b9a7636..8474c43 100644 --- a/.gitignore +++ b/.gitignore @@ -128,6 +128,7 @@ dlls/vbscript/vbscript_classes.h dlls/vbscript/vbsglobal.h dlls/windowscodecs/windowscodecs_wincodec.h dlls/windowscodecs/windowscodecs_wincodec_p.c +dlls/wshom.ocx/wshom.h include/activaut.h include/activdbg.h include/activscp.h diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index 5fb73d5..879cc70 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,10 +1,12 @@ MODULE = wshom.ocx C_SRCS = \ + shell.c \ wshom_main.c RC_SRCS = wshom.rc +IDL_H_SRCS = wshom.idl IDL_TLB_SRCS = wshom.idl @MAKE_DLL_RULES@ diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c new file mode 100644 index 0000000..598ca9a --- /dev/null +++ b/dlls/wshom.ocx/shell.c @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wshom_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wshom); + +HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 0266822..2e6016c 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -16,15 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "ole2.h" +#include "initguid.h" +#include "wshom_private.h" +#include "wshom.h" #include "rpcproxy.h" #include "wine/debug.h" @@ -33,6 +27,55 @@ WINE_DEFAULT_DEBUG_CHANNEL(wshom); static HINSTANCE wshom_instance; +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl WshShellFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + WshShellFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory WshShellFactory = { &WshShellFactoryVtbl }; + /****************************************************************** * DllMain (wshom.ocx.@) */ @@ -58,6 +101,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { + if(IsEqualGUID(&CLSID_WshShell, rclsid)) { + TRACE("(CLSID_WshShell %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&WshShellFactory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h new file mode 100644 index 0000000..50b84b3 --- /dev/null +++ b/dlls/wshom.ocx/wshom_private.h @@ -0,0 +1,27 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" + +HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : wshom.ocx: Added beginning WshShell object tests.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 13fef511b2a3e1503250db237b710137fcda1569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fef511b2a3e1503250db237… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 11:55:52 2011 +0200 wshom.ocx: Added beginning WshShell object tests. --- configure | 1 + configure.ac | 1 + dlls/wshom.ocx/tests/Makefile.in | 7 ++++ dlls/wshom.ocx/tests/wshom.c | 59 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f18a7b7..ae33294 100755 --- a/configure +++ b/configure @@ -15184,6 +15184,7 @@ wine_fn_config_dll wow32 enable_win16 implib wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test wine_fn_config_dll wshom.ocx enable_wshom_ocx +wine_fn_config_test dlls/wshom.ocx/tests wshom.ocx_test wine_fn_config_dll wsock32 enable_wsock32 implib wine_fn_config_dll wtsapi32 enable_wtsapi32 implib wine_fn_config_dll wuapi enable_wuapi diff --git a/configure.ac b/configure.ac index e12fb37..1401072 100644 --- a/configure.ac +++ b/configure.ac @@ -2877,6 +2877,7 @@ WINE_CONFIG_DLL(wow32,enable_win16,[implib]) WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) WINE_CONFIG_DLL(wshom.ocx) +WINE_CONFIG_TEST(dlls/wshom.ocx/tests) WINE_CONFIG_DLL(wsock32,,[implib]) WINE_CONFIG_DLL(wtsapi32,,[implib]) WINE_CONFIG_DLL(wuapi) diff --git a/dlls/wshom.ocx/tests/Makefile.in b/dlls/wshom.ocx/tests/Makefile.in new file mode 100644 index 0000000..90094fb --- /dev/null +++ b/dlls/wshom.ocx/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = wshom.ocx +IMPORTS = ole32 + +C_SRCS = \ + wshom.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c new file mode 100644 index 0000000..f9768b9 --- /dev/null +++ b/dlls/wshom.ocx/tests/wshom.c @@ -0,0 +1,59 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define CONST_VTABLE + +#include <initguid.h> +#include <ole2.h> +#include <dispex.h> + +#include "wine/test.h" + +DEFINE_GUID(CLSID_WshShell, 0x72c24dd5, 0xd70a, 0x438b, 0x8a,0x42, 0x98,0x42,0x4b,0x88,0xaf,0xb8); + +DEFINE_GUID(IID_IWshShell3, 0x41904400, 0xbe18, 0x11d3, 0xa2,0x8b, 0x00,0x10,0x4b,0xd3,0x50,0x90); + +static void test_wshshell(void) +{ + IDispatch *disp; + IUnknown *shell; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) { + win_skip("Could not create WshShell object: %08x\n", hres); + return; + } + + hres = IDispatch_QueryInterface(disp, &IID_IWshShell3, (void**)&shell); + IDispatch_Release(disp); + ok(hres == S_OK, "Could not get IWshShell3 iface: %08x\n", hres); + + IUnknown_Release(shell); +} + +START_TEST(wshom) +{ + CoInitialize(NULL); + + test_wshshell(); + + CoUninitialize(); +}

1 0

Jacek Caban : vbscript: Added more tests.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: 77620c648e651755be644bb54d658b314a4e8776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77620c648e651755be644bb54… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 20 14:59:35 2011 +0200 vbscript: Added more tests. --- dlls/vbscript/tests/lang.vbs | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 029c5ac..7c64adf 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -41,6 +41,8 @@ Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") Call ok(--1 = 1, "--1 = " & --1) Call ok(-empty = 0, "-empty = " & (-empty)) +Call ok(true = -1, "! true = -1") +Call ok(false = 0, "false <> 0") x = "xx" Call ok(x = "xx", "x = " & x & " expected ""xx""") @@ -50,6 +52,12 @@ Call ok(not (true <> true), "true <> true is true") Call ok(not ("x" <> "x"), """x"" <> ""x"" is true") Call ok(not (empty <> empty), "empty <> empty is true") Call ok(x <> "x", "x = ""x""") +Call ok("true" <> true, """true"" = true is true") + +Call ok("" = true = false, """"" = true = false is false") +Call ok(not(false = true = ""), "false = true = """" is true") +Call ok(not (false = false <> false = false), "false = false <> false = false is true") +Call ok(not ("" <> false = false), """"" <> false = false is true") Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") @@ -76,6 +84,11 @@ set x = nothing Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x=nothing) = " & getVT(x)) x = true Call ok(getVT(x) = "VT_BOOL*", "getVT(x) = " & getVT(x)) +Call ok(getVT(false or true) = "VT_BOOL", "getVT(false) is not VT_BOOL") +x = "x" +Call ok(getVT(x) = "VT_BSTR*", "getVT(x) is not VT_BSTR*") +x = 0.0 +Call ok(getVT(x) = "VT_R8*", "getVT(x) = " & getVT(x)) Call ok(isNullDisp(nothing), "nothing is not nulldisp?") @@ -472,6 +485,13 @@ End Function Call TestFuncExit(true) +Sub SubParseTest +End Sub : x = false +Call SubParseTest + +Function FuncParseTest +End Function : x = false + Function ReturnTrue ReturnTrue = false ReturnTrue = true @@ -510,6 +530,9 @@ Call ok(getVT(obj) = "VT_DISPATCH*", "getVT(obj) = " & getVT(obj)) Class EmptyClass End Class +Set x = obj +Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x)) + Class TestClass Public publicProp @@ -631,6 +654,9 @@ funcCalled = "" Set obj = Nothing Call ok(funcCalled = "terminate", "funcCalled = " & funcCalled) +Call (New testclass).publicSub() +Call (New testclass).publicSub + x = "following ':' is correct syntax" : x = "following ':' is correct syntax" :: : :: x = "also correct syntax"

1 0

Alexandre Julliard : gdi32/tests: Add a test for alpha channel handling in StretchBlt.
by Alexandre Julliard Sept. 20, 2011

Sept. 20, 2011

Module: wine Branch: master Commit: b6153354dd28c57fb1f92f85df1f1ba751794fc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6153354dd28c57fb1f92f85d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 20 17:58:12 2011 +0200 gdi32/tests: Add a test for alpha channel handling in StretchBlt. --- dlls/gdi32/tests/bitmap.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 14d7f7f..92d8181 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2942,7 +2942,39 @@ static void test_StretchBlt(void) check_StretchBlt_stretch(hdcDst, hdcSrc, dstBuffer, srcBuffer, 0, 0, 2, 2, 1, 1, -2, -2, expected, expected, __LINE__); - /* Tidy up */ + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + + biSrc.bmiHeader.biHeight = -2; + biSrc.bmiHeader.biBitCount = 24; + bmpSrc = CreateDIBSection(hdcScreen, &biSrc, DIB_RGB_COLORS, (void**)&srcBuffer, NULL, 0); + oldSrc = SelectObject(hdcSrc, bmpSrc); + + expected[0] = 0xFEEDFACE, expected[1] = 0xCAFED00D; + expected[2] = 0x76543210, expected[3] = 0xFEDCBA98; + memcpy(dstBuffer, expected, 4 * sizeof(*dstBuffer)); + StretchBlt(hdcSrc, 0, 0, 2, 2, hdcDst, 0, 0, 2, 2, SRCCOPY ); + memset(dstBuffer, 0x55, 4 * sizeof(*dstBuffer)); + StretchBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, 2, 2, SRCCOPY ); + expected[0] = 0x00EDFACE, expected[1] = 0x00FED00D; + expected[2] = 0x00543210, expected[3] = 0x00DCBA98; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + + expected[0] = 0xFEEDFACE, expected[1] = 0xCAFED00D; + expected[2] = 0x76543210, expected[3] = 0xFEDCBA98; + memcpy(srcBuffer, expected, 4 * sizeof(*dstBuffer)); + memset(dstBuffer, 0x55, 4 * sizeof(*dstBuffer)); + StretchBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, 2, 2, SRCCOPY ); + expected[0] = 0x00EDFACE, expected[1] = 0x00D00DFE; + expected[2] = 0x00543210, expected[3] = 0x00BA9876; + ok(!memcmp(dstBuffer, expected, 16), + "StretchBlt expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X }\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3] ); + SelectObject(hdcSrc, oldSrc); DeleteObject(bmpSrc); DeleteDC(hdcSrc);

1 0