wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Hans Leidekker : wbemprox: Correctly report the number of logical processors.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: b11cfb7b216a20bd9c3adf9640bb5e93fc5f2a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11cfb7b216a20bd9c3adf964… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 6 14:03:24 2012 +0200 wbemprox: Correctly report the number of logical processors. --- dlls/wbemprox/builtin.c | 54 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e3a5e6d..4c82425 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -23,6 +23,8 @@ #include "config.h" #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wbemcli.h" @@ -259,7 +261,7 @@ static const struct column col_processor[] = { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_maxclockspeedW, CIM_UINT32 }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_numlogicalprocessorsW, CIM_UINT32 }, + { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_service[] = @@ -400,7 +402,7 @@ struct record_processor const WCHAR *manufacturer; UINT32 maxclockspeed; const WCHAR *name; - UINT32 numberoflogicalprocessors; + UINT32 num_logical_processors; const WCHAR *processor_id; }; struct record_service @@ -475,6 +477,32 @@ static UINT get_processor_count(void) return info.NumberOfProcessors; } +static UINT get_logical_processor_count(void) +{ + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *info; + UINT i, j, count = 0; + NTSTATUS status; + ULONG len; + + status = NtQuerySystemInformation( SystemLogicalProcessorInformation, NULL, 0, &len ); + if (status != STATUS_INFO_LENGTH_MISMATCH) return get_processor_count(); + + if (!(info = heap_alloc( len ))) return get_processor_count(); + status = NtQuerySystemInformation( SystemLogicalProcessorInformation, info, len, &len ); + if (status != STATUS_SUCCESS) + { + heap_free( info ); + return get_processor_count(); + } + for (i = 0; i < len / sizeof(*info); i++) + { + if (info[i].Relationship != RelationProcessorCore) continue; + for (j = 0; j < sizeof(ULONG_PTR); j++) if (info[i].ProcessorMask & (1 << j)) count++; + } + heap_free( info ); + return count; +} + static UINT64 get_total_physical_memory(void) { MEMORYSTATUSEX status; @@ -495,8 +523,8 @@ static void fill_compsys( struct table *table ) rec->domainrole = 0; /* standalone workstation */ rec->manufacturer = compsys_manufacturerW; rec->model = compsys_modelW; - rec->num_logical_processors = get_processor_count(); - rec->num_processors = rec->num_logical_processors; + rec->num_logical_processors = get_logical_processor_count(); + rec->num_processors = get_processor_count(); rec->total_physical_memory = get_total_physical_memory(); TRACE("created 1 row\n"); @@ -758,7 +786,7 @@ static void fill_processor( struct table *table ) static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; struct record_processor *rec; - UINT i, offset = 0, count = get_processor_count(), cpuMhz; + UINT i, offset = 0, num_logical_processors, count = get_processor_count(), cpuMhz; PROCESSOR_POWER_INFORMATION ppi; if (!(table->data = heap_alloc( sizeof(*rec) * count ))) return; @@ -772,17 +800,19 @@ static void fill_processor( struct table *table ) else cpuMhz = 1000000; + num_logical_processors = get_logical_processor_count() / count; + for (i = 0; i < count; i++) { rec = (struct record_processor *)(table->data + offset); - rec->cpu_status = 1; /* CPU Enabled */ + rec->cpu_status = 1; /* CPU Enabled */ sprintfW( device_id, fmtW, i ); - rec->device_id = heap_strdupW( device_id ); - rec->manufacturer = heap_strdupW( manufacturer ); - rec->maxclockspeed = cpuMhz; - rec->name = heap_strdupW( name ); - rec->numberoflogicalprocessors = count; - rec->processor_id = heap_strdupW( processor_id ); + rec->device_id = heap_strdupW( device_id ); + rec->manufacturer = heap_strdupW( manufacturer ); + rec->maxclockspeed = cpuMhz; + rec->name = heap_strdupW( name ); + rec->num_logical_processors = num_logical_processors; + rec->processor_id = heap_strdupW( processor_id ); offset += sizeof(*rec); }

1 0

Jacek Caban : mshtml: Added VBScript as event attribute tests.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 1cd527924f5814dc7fd1cb89de983b50ad570719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd527924f5814dc7fd1cb89d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 11:59:23 2012 +0200 mshtml: Added VBScript as event attribute tests. --- dlls/mshtml/tests/vbtest.html | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index 9addc93..7b8cebc 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -26,9 +26,6 @@ Sub runTest() End Sub </script> </script> -<body> -<script> -runTest() -</script> +<body onload="If true then runTest()"> </body> </html>

1 0

Jacek Caban : vbscript: Added IActiveScriptParseProcedure2:: ParseProcedureText tests.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 76b1a7e016e93eaa9f06b9a018728353da5bfd7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b1a7e016e93eaa9f06b9a01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 11:57:46 2012 +0200 vbscript: Added IActiveScriptParseProcedure2::ParseProcedureText tests. --- dlls/vbscript/tests/run.c | 162 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 141 insertions(+), 21 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d77c6cb..6a2b72a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -33,6 +33,8 @@ #define IActiveScriptParse_Release IActiveScriptParse64_Release #define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_64_Release +#define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_64_ParseProcedureText #else @@ -40,6 +42,8 @@ #define IActiveScriptParse_Release IActiveScriptParse32_Release #define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_32_Release +#define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_32_ParseProcedureText #endif @@ -106,6 +110,7 @@ DEFINE_EXPECT(Next); #define DISPID_COLLOBJ_RESET 3000 static const WCHAR testW[] = {'t','e','s','t',0}; +static const WCHAR emptyW[] = {0}; static BOOL strict_dispid_check, is_english; static const char *test_name = "(null)"; @@ -130,6 +135,18 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(buf, stra); } +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static const char *vt2a(VARIANT *v) { if(V_VT(v) == (VT_BYREF|VT_VARIANT)) { @@ -186,6 +203,38 @@ static BOOL is_lang_english(void) return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; } +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + ok(0, "unexpected service %s\n", debugstr_guid(guidService)); + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + +static IServiceProvider caller_sp = { &ServiceProviderVtbl }; + static void test_disp(IDispatch *disp) { DISPID id, public_prop_id, public_prop2_id, public_func_id, public_sub_id, defvalget_id; @@ -378,18 +427,6 @@ static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) ok_(__FILE__,line)(grfdex == expect, "grfdex = %x, expected %x\n", grfdex, expect); } -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static IDispatchEx enumDisp; static HRESULT WINAPI EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) @@ -1240,29 +1277,24 @@ static IActiveScript *create_script(void) return script; } -static HRESULT parse_script(DWORD flags, BSTR script_str) +static IActiveScript *create_and_init_script(DWORD flags) { IActiveScriptParse *parser; IActiveScript *engine; - IDispatch *script_disp; - LONG ref; HRESULT hres; engine = create_script(); if(!engine) - return S_OK; + return NULL; 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 = IActiveScriptParse_InitNew(parser); ok(hres == S_OK, "InitNew failed: %08x\n", hres); + IActiveScriptParse_Release(parser); + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); @@ -1273,6 +1305,41 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + return engine; +} + +static void close_script(IActiveScript *script) +{ + ULONG ref; + HRESULT hres; + + hres = IActiveScript_Close(script); + ok(hres == S_OK, "Close failed: %08x\n", hres); + + ref = IActiveScript_Release(script); + ok(!ref, "ref=%u\n", ref); +} + +static HRESULT parse_script(DWORD flags, BSTR script_str) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + IDispatch *script_disp; + LONG ref; + HRESULT hres; + + engine = create_and_init_script(flags); + 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 = IActiveScript_GetScriptDispatch(engine, NULL, &script_disp); ok(hres == S_OK, "GetScriptDispatch failed: %08x\n", hres); ok(script_disp != NULL, "script_disp == NULL\n"); @@ -1308,6 +1375,58 @@ static void parse_script_a(const char *src) parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); } +static IDispatchEx *parse_procedure(IActiveScriptParseProcedure2 *parse_proc, const char *src) +{ + IDispatchEx *dispex; + IDispatch *disp; + BSTR str; + HRESULT hres; + + static const WCHAR delimiterW[] = {'\"',0}; + + str = a2bstr(src); + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, str, NULL, emptyW, NULL, NULL, delimiterW, 0, 0, + SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); + SysFreeString(str); + ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); + ok(disp != NULL, "disp = NULL\n"); + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + IDispatch_Release(disp); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + return dispex; +} + + +static void test_procedures(void) +{ + IActiveScriptParseProcedure2 *parse_proc; + DISPPARAMS dp = {NULL}; + IActiveScript *script; + IDispatchEx *proc; + EXCEPINFO ei = {0}; + VARIANT v; + HRESULT hres; + + script = create_and_init_script(0); + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); + ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); + + proc = parse_procedure(parse_proc, "dim x\nif true then x=false"); + + V_VT(&v) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(proc, DISPID_VALUE, 0, DISPATCH_METHOD, &dp, &v, &ei, &caller_sp); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + IDispatchEx_Release(proc); + + IActiveScriptParseProcedure2_Release(parse_proc); + + close_script(script); +} + static void test_gc(void) { IActiveScriptParse *parser; @@ -1609,6 +1728,7 @@ static void run_tests(void) run_from_res("lang.vbs"); run_from_res("api.vbs"); + test_procedures(); test_gc(); }

1 0

Jacek Caban : vbscript: Added IActiveScriptParseProcedure2:: ParseProcedureText implementation.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: cf0faf1d3cac6b1eeb49bd270187de4ce8594164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0faf1d3cac6b1eeb49bd270… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 11:57:33 2012 +0200 vbscript: Added IActiveScriptParseProcedure2::ParseProcedureText implementation. --- dlls/vbscript/vbdisp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.c | 15 ++++++++++++- dlls/vbscript/vbscript.h | 3 ++ 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 022ac1d..f6e3f11 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -501,6 +501,8 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) vbdisp->ref = 1; vbdisp->desc = desc; + list_add_tail(&desc->ctx->objects, &vbdisp->entry); + if(desc->class_initialize_id) { DISPPARAMS dp = {0}; HRESULT hres; @@ -513,11 +515,56 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) } } - list_add_tail(&desc->ctx->objects, &vbdisp->entry); *ret = vbdisp; return S_OK; } +static HRESULT Procedure_invoke(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + script_ctx_t *ctx = This->desc->ctx; + HRESULT hres; + + TRACE("\n"); + + IActiveScriptSite_OnEnterScript(ctx->site); + hres = exec_script(ctx, This->desc->value_func, NULL, NULL, NULL); + IActiveScriptSite_OnLeaveScript(ctx->site); + + return hres; +} + +static const builtin_prop_t procedure_props[] = { + {DISPID_VALUE, Procedure_invoke, 0} +}; + +HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **ret) +{ + class_desc_t *desc; + vbdisp_t *vbdisp; + HRESULT hres; + + desc = heap_alloc_zero(sizeof(*desc)); + if(!desc) + return E_OUTOFMEMORY; + + desc->ctx = ctx; + desc->builtin_prop_cnt = sizeof(procedure_props)/sizeof(*procedure_props); + desc->builtin_props = procedure_props; + desc->value_func = &code->main_code; + + hres = create_vbdisp(desc, &vbdisp); + if(FAILED(hres)) { + heap_free(desc); + return hres; + } + + desc->next = ctx->procs; + ctx->procs = desc; + + *ret = (IDispatch*)&vbdisp->IDispatchEx_iface; + return S_OK; +} + void collect_objects(script_ctx_t *ctx) { vbdisp_t *iter, *iter2; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f250df3..f842bba 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -650,10 +650,21 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { VBScript *This = impl_from_IActiveScriptParseProcedure2(iface); - FIXME("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), + vbscode_t *code; + HRESULT hres; + + TRACE("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), debugstr_w(pstrProcedureName), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLineNumber, dwFlags, ppdisp); - return E_NOTIMPL; + + if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + hres = compile_script(This->ctx, pstrCode, &code); + if(FAILED(hres)) + return hres; + + return create_procedure_disp(This->ctx, code, ppdisp); } static const IActiveScriptParseProcedure2Vtbl VBScriptParseProcedureVtbl = { diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 788d98d..8a316ab 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -100,6 +100,7 @@ typedef struct _class_desc_t { unsigned builtin_prop_cnt; const builtin_prop_t *builtin_props; ITypeInfo *typeinfo; + function_t *value_func; struct _class_desc_t *next; } class_desc_t; @@ -121,6 +122,7 @@ HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT create_procedure_disp(script_ctx_t*,vbscode_t*,IDispatch**) DECLSPEC_HIDDEN; static inline unsigned arg_cnt(const DISPPARAMS *dp) { @@ -160,6 +162,7 @@ struct _script_ctx_t { dynamic_var_t *global_vars; function_t *global_funcs; class_desc_t *classes; + class_desc_t *procs; vbsheap_t heap;

1 0

Jacek Caban : vbscript: Renamed vbscode_t' s variables to not suggest that they are global code-only.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 9e3f75cfb1b40cdaff0c68cbf79c43770ca44e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3f75cfb1b40cdaff0c68cbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 11:57:15 2012 +0200 vbscript: Renamed vbscode_t's variables to not suggest that they are global code-only. --- dlls/vbscript/compile.c | 20 ++++++++++---------- dlls/vbscript/vbscript.c | 13 +++++++++---- dlls/vbscript/vbscript.h | 4 ++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c3334fd..89e290d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -973,7 +973,7 @@ static HRESULT compile_const_statement(compile_ctx_t *ctx, const_statement_t *st static HRESULT compile_function_statement(compile_ctx_t *ctx, function_statement_t *stat) { - if(ctx->func != &ctx->code->global_code) { + if(ctx->func != &ctx->code->main_code) { FIXME("Function is not in the global code\n"); return E_FAIL; } @@ -1615,15 +1615,15 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->bstr_pool = NULL; ret->bstr_pool_size = 0; ret->bstr_cnt = 0; - ret->global_executed = FALSE; + ret->pending_exec = FALSE; - ret->global_code.type = FUNC_GLOBAL; - ret->global_code.name = NULL; - ret->global_code.code_ctx = ret; - ret->global_code.vars = NULL; - ret->global_code.var_cnt = 0; - ret->global_code.arg_cnt = 0; - ret->global_code.args = NULL; + ret->main_code.type = FUNC_GLOBAL; + ret->main_code.name = NULL; + ret->main_code.code_ctx = ret; + ret->main_code.vars = NULL; + ret->main_code.var_cnt = 0; + ret->main_code.arg_cnt = 0; + ret->main_code.args = NULL; list_init(&ret->entry); return ret; @@ -1664,7 +1664,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) ctx.stat_ctx = NULL; ctx.labels_cnt = ctx.labels_size = 0; - hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->global_code); + hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->main_code); if(FAILED(hres)) { release_compiler(&ctx); return hres; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index a5a9853..f250df3 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -77,10 +77,10 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code) { HRESULT hres; - code->global_executed = TRUE; + code->pending_exec = FALSE; IActiveScriptSite_OnEnterScript(ctx->site); - hres = exec_script(ctx, &code->global_code, NULL, NULL, NULL); + hres = exec_script(ctx, &code->main_code, NULL, NULL, NULL); IActiveScriptSite_OnLeaveScript(ctx->site); return hres; @@ -91,7 +91,7 @@ static void exec_queued_code(script_ctx_t *ctx) vbscode_t *iter; LIST_FOR_EACH_ENTRY(iter, &ctx->code_list, vbscode_t, entry) { - if(!iter->global_executed) + if(iter->pending_exec) exec_global_code(ctx, iter); } } @@ -604,7 +604,12 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, if(FAILED(hres)) return hres; - return is_started(This) ? exec_global_code(This->ctx, code) : S_OK; + if(!is_started(This)) { + code->pending_exec = TRUE; + return S_OK; + } + + return exec_global_code(This->ctx, code); } static const IActiveScriptParseVtbl VBScriptParseVtbl = { diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 3f1e887..788d98d 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -298,8 +298,8 @@ struct _vbscode_t { BOOL option_explicit; - BOOL global_executed; - function_t global_code; + BOOL pending_exec; + function_t main_code; BSTR *bstr_pool; unsigned bstr_pool_size;

1 0

Jacek Caban : vbscript: Fixed uninitialized opcode param in forto statement bytecode.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 080169f1d2bf280b149943230d0ef859a8ae8b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=080169f1d2bf280b149943230… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 11:57:00 2012 +0200 vbscript: Fixed uninitialized opcode param in forto statement bytecode. --- dlls/vbscript/compile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 12db4e0..c3334fd 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -700,6 +700,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(!instr) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = identifier; + instr_ptr(ctx, instr)->arg2.uint = 0; hres = compile_expression(ctx, stat->to_expr); if(FAILED(hres))

1 0

Piotr Caban : msvcp90: Added locale_ctor_locale_locale implementation.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: e9b51093deeca572e93906c45fc08f6fefefc728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9b51093deeca572e93906c45… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 6 11:42:05 2012 +0200 msvcp90: Added locale_ctor_locale_locale implementation. --- dlls/msvcp100/locale.c | 19 +++++++++++++++++-- dlls/msvcp90/locale.c | 19 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 1bba834..55b3134 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -8104,8 +8104,23 @@ locale__Locimp* __cdecl locale__Init(void) DEFINE_THISCALL_WRAPPER(locale_ctor_locale_locale, 16) locale* __thiscall locale_ctor_locale_locale(locale *this, const locale *loc, const locale *other, category cat) { - FIXME("(%p %p %p %d) stub\n", this, loc, other, cat); - return NULL; + _Locinfo locinfo; + + TRACE("(%p %p %p %d)\n", this, loc, other, cat); + + this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!this->ptr) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + locale__Locimp_copy_ctor(this->ptr, loc->ptr); + + _Locinfo_ctor_cat_cstr(&locinfo, loc->ptr->catmask, MSVCP_basic_string_char_c_str(&loc->ptr->name)); + _Locinfo__Addcats(&locinfo, cat & other->ptr->catmask, MSVCP_basic_string_char_c_str(&other->ptr->name)); + locale__Locimp__Makeloc(&locinfo, cat, this->ptr, other); + _Locinfo_dtor(&locinfo); + + return this; } /* ??0locale@std@@QAE@ABV01@@Z */ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1d9eb33..f5a4534 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -8255,8 +8255,23 @@ locale__Locimp* __cdecl locale__Init(void) DEFINE_THISCALL_WRAPPER(locale_ctor_locale_locale, 16) locale* __thiscall locale_ctor_locale_locale(locale *this, const locale *loc, const locale *other, category cat) { - FIXME("(%p %p %p %d) stub\n", this, loc, other, cat); - return NULL; + _Locinfo locinfo; + + TRACE("(%p %p %p %d)\n", this, loc, other, cat); + + this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!this->ptr) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + locale__Locimp_copy_ctor(this->ptr, loc->ptr); + + _Locinfo_ctor_cat_cstr(&locinfo, loc->ptr->catmask, MSVCP_basic_string_char_c_str(&loc->ptr->name)); + _Locinfo__Addcats(&locinfo, cat & other->ptr->catmask, MSVCP_basic_string_char_c_str(&other->ptr->name)); + locale__Locimp__Makeloc(&locinfo, cat, this->ptr, other); + _Locinfo_dtor(&locinfo); + + return this; } /* ??0locale@std@@QAE@ABV01@@Z */

1 0

Piotr Caban : msvcp90: Fixed locale_ctor_cstr implementation.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 225cab98425484e92146d7c05c91502e2ccc3cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=225cab98425484e92146d7c05… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 6 11:41:31 2012 +0200 msvcp90: Fixed locale_ctor_cstr implementation. --- dlls/msvcp100/locale.c | 4 +++- dlls/msvcp90/locale.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index b217232..1bba834 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -8142,7 +8142,9 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - this->ptr = locale__Init(); + locale__Locimp_ctor(this->ptr); + + locale__Init(); _Locinfo_ctor_cat_cstr(&locinfo, cat, locname); if(!memcmp(MSVCP_basic_string_char_c_str(&locinfo.newlocname), "*", 2)) { diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7e6b10f..1d9eb33 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -8293,7 +8293,9 @@ locale* __thiscall locale_ctor_cstr(locale *this, const char *locname, category ERR("Out of memory\n"); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - this->ptr = locale__Init(); + locale__Locimp_ctor(this->ptr); + + locale__Init(); _Locinfo_ctor_cat_cstr(&locinfo, cat, locname); if(!memcmp(MSVCP_basic_string_char_c_str(&locinfo.newlocname), "*", 2)) {

1 0

Piotr Caban : msvcp90: Fixed basic_stringbuf_wchar_overflow implementation.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 0e6171f6d7b969a7a48bca7b02d88c3a56850cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6171f6d7b969a7a48bca7b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 6 11:40:56 2012 +0200 msvcp90: Fixed basic_stringbuf_wchar_overflow implementation. --- dlls/msvcp100/ios.c | 2 +- dlls/msvcp90/ios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 3e3bad8..5889d57 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -4133,7 +4133,7 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar * this->state |= STRINGBUF_allocated; }else { ptr = basic_streambuf_wchar_eback(&this->base); - memcpy(buf, ptr, oldsize); + memcpy(buf, ptr, oldsize*sizeof(wchar_t)); this->seekhigh = buf+(this->seekhigh-ptr); basic_streambuf_wchar_setp_next(&this->base, buf, diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 88ed0e9..e5d7233 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -4123,7 +4123,7 @@ unsigned short __thiscall basic_stringbuf_wchar_overflow(basic_stringbuf_wchar * this->state |= STRINGBUF_allocated; }else { ptr = basic_streambuf_wchar_eback(&this->base); - memcpy(buf, ptr, oldsize); + memcpy(buf, ptr, oldsize*sizeof(wchar_t)); this->seekhigh = buf+(this->seekhigh-ptr); basic_streambuf_wchar_setp_next(&this->base, buf,

1 0

Henri Verbeet : wined3d: Just return the buffer from wined3d_device_get_index_buffer().
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: c8f4ca315e5514c71ae14eca06a2a674515a9248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f4ca315e5514c71ae14eca0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 6 11:25:03 2012 +0200 wined3d: Just return the buffer from wined3d_device_get_index_buffer(). --- dlls/d3d8/device.c | 11 +++-------- dlls/d3d9/device.c | 13 ++++--------- dlls/wined3d/device.c | 13 +++---------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 +-- 5 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 49436da..36b8a7e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2367,9 +2367,8 @@ static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, IDirect3DIndexBuffer8 **buffer, UINT *base_vertex_index) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - struct wined3d_buffer *wined3d_buffer = NULL; + struct wined3d_buffer *wined3d_buffer; struct d3d8_indexbuffer *buffer_impl; - HRESULT hr; TRACE("iface %p, buffer %p, base_vertex_index %p.\n", iface, buffer, base_vertex_index); @@ -2379,23 +2378,19 @@ static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, /* The case from UINT to INT is safe because d3d8 will never set negative values */ wined3d_mutex_lock(); *base_vertex_index = wined3d_device_get_base_vertex_index(device->wined3d_device); - hr = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_buffer); - if (SUCCEEDED(hr) && wined3d_buffer) + if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device))) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer8_iface; IDirect3DIndexBuffer8_AddRef(*buffer); - wined3d_buffer_decref(wined3d_buffer); } else { - if (FAILED(hr)) - ERR("Failed to get wined3d index buffer, hr %#x.\n", hr); *buffer = NULL; } wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_CreatePixelShader(IDirect3DDevice8 *iface, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 523c9ac..0399ba3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2539,9 +2539,8 @@ static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3 static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 **buffer) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d_buffer *retIndexData = NULL; + struct wined3d_buffer *wined3d_buffer; struct d3d9_indexbuffer *buffer_impl; - HRESULT hr; TRACE("iface %p, buffer %p.\n", iface, buffer); @@ -2549,23 +2548,19 @@ static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3 return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_device_get_index_buffer(device->wined3d_device, &retIndexData); - if (SUCCEEDED(hr) && retIndexData) + if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device))) { - buffer_impl = wined3d_buffer_get_parent(retIndexData); + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer9_iface; IDirect3DIndexBuffer9_AddRef(*buffer); - wined3d_buffer_decref(retIndexData); } else { - if (FAILED(hr)) - FIXME("Call to GetIndices failed\n"); *buffer = NULL; } wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_CreatePixelShader(IDirect3DDevice9Ex *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2d6563f..7a57195 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2256,18 +2256,11 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, } } -HRESULT CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, struct wined3d_buffer **buffer) +struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device) { - TRACE("device %p, buffer %p.\n", device, buffer); - - *buffer = device->stateBlock->state.index_buffer; - - if (*buffer) - wined3d_buffer_incref(*buffer); - - TRACE("Returning %p.\n", *buffer); + TRACE("device %p.\n", device); - return WINED3D_OK; + return device->stateBlock->state.index_buffer; } /* Method to offer d3d9 a simple way to set the base vertex index without messing with the index buffer */ diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index aa0c186..c211e4a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -64,7 +64,7 @@ @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) -@ cdecl wined3d_device_get_index_buffer(ptr ptr) +@ cdecl wined3d_device_get_index_buffer(ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) @ cdecl wined3d_device_get_material(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 28a6719..afb007c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2125,8 +2125,7 @@ HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device UINT swapchain_idx, struct wined3d_surface *dst_surface); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); -HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, - struct wined3d_buffer **index_buffer); +struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, struct wined3d_light *light); HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable);

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012