September 2012 - Wine-commits

Piotr Caban : msvcrt/tests: Added more RTTI tests.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: b3dff995eec1d59b191b85dde09d1e93018036f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3dff995eec1d59b191b85dde… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 13 13:30:13 2012 +0200 msvcrt/tests: Added more RTTI tests. --- dlls/msvcrt/tests/cpp.c | 60 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 140d8b2..8baf9b6 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -840,13 +840,13 @@ static inline void/*rtti_object_locator*/ *get_obj_locator( void *cppobj ) } #ifndef __x86_64__ -#define RTTI_SIGNATURE 0 #define DEFINE_RTTI_REF(type, name) type *name #define RTTI_REF(instance, name) &instance.name +#define RTTI_REF_SIG0(instance, name, base) RTTI_REF(instance, name) #else -#define RTTI_SIGNATURE 1 #define DEFINE_RTTI_REF(type, name) unsigned name #define RTTI_REF(instance, name) FIELD_OFFSET(struct rtti_data, name) +#define RTTI_REF_SIG0(instance, name, base) ((char*)&instance.name-base) #endif /* Test RTTI functions */ static void test_rtti(void) @@ -894,24 +894,33 @@ static void test_rtti(void) { {RTTI_REF(simple_class_rtti, type_info[0]), 0, {0, 0, 0}, 0} }, { {RTTI_REF(simple_class_rtti, base_descriptor[0])} }, {0, 0, 1, RTTI_REF(simple_class_rtti, base_array)}, - {RTTI_SIGNATURE, 0, 0, RTTI_REF(simple_class_rtti, type_info[0]), RTTI_REF(simple_class_rtti, object_hierarchy), RTTI_REF(simple_class_rtti, object_locator)} + {1, 0, 0, RTTI_REF(simple_class_rtti, type_info[0]), RTTI_REF(simple_class_rtti, object_hierarchy), RTTI_REF(simple_class_rtti, object_locator)} }, child_class_rtti = { { {NULL, NULL, "simple_class"}, {NULL, NULL, "child_class"} }, { {RTTI_REF(child_class_rtti, type_info[1]), 0, {4, -1, 0}, 0}, {RTTI_REF(child_class_rtti, type_info[0]), 0, {8, -1, 0}, 0} }, { {RTTI_REF(child_class_rtti, base_descriptor[0]), RTTI_REF(child_class_rtti, base_descriptor[1])} }, {0, 0, 2, RTTI_REF(child_class_rtti, base_array)}, - {RTTI_SIGNATURE, 0, 0, RTTI_REF(child_class_rtti, type_info[1]), RTTI_REF(child_class_rtti, object_hierarchy), RTTI_REF(child_class_rtti, object_locator)} + {1, 0, 0, RTTI_REF(child_class_rtti, type_info[1]), RTTI_REF(child_class_rtti, object_hierarchy), RTTI_REF(child_class_rtti, object_locator)} }; + static struct rtti_data simple_class_sig0_rtti, child_class_sig0_rtti; + void *simple_class_vtbl[2] = {&simple_class_rtti.object_locator}; void *simple_class = &simple_class_vtbl[1]; void *child_class_vtbl[2] = {&child_class_rtti.object_locator}; void *child_class = &child_class_vtbl[1]; + void *simple_class_sig0_vtbl[2] = {&simple_class_sig0_rtti.object_locator}; + void *simple_class_sig0 = &simple_class_sig0_vtbl[1]; + void *child_class_sig0_vtbl[2] = {&child_class_sig0_rtti.object_locator}; + void *child_class_sig0 = &child_class_sig0_vtbl[1]; static const char* e_name = "name"; type_info *ti,*bti; exception e,b; void *casted; BOOL old_signature; +#ifdef __x86_64__ + char *base = (char*)GetModuleHandleW(NULL); +#endif if (bAncientVersion || !p__RTCastToVoid || !p__RTtypeid || !pexception_ctor || !pbad_typeid_ctor @@ -922,7 +931,7 @@ static void test_rtti(void) call_func2(pbad_typeid_ctor, &b, e_name); obj_locator = get_obj_locator(&e); - if(obj_locator->signature!=RTTI_SIGNATURE && sizeof(void*)>sizeof(int)) + if(obj_locator->signature!=1 && sizeof(void*)>sizeof(int)) old_signature = TRUE; else old_signature = FALSE; @@ -949,6 +958,47 @@ static void test_rtti(void) call_func1(pexception_dtor, &e); call_func1(pbad_typeid_dtor, &b); + memcpy(&simple_class_sig0_rtti, &simple_class_rtti, sizeof(struct rtti_data)); + simple_class_sig0_rtti.object_locator.signature = 0; + simple_class_sig0_rtti.base_descriptor[0].type_descriptor = RTTI_REF_SIG0(simple_class_sig0_rtti, type_info[0], base); + simple_class_sig0_rtti.base_array.bases[0] = RTTI_REF_SIG0(simple_class_sig0_rtti, base_descriptor[0], base); + simple_class_sig0_rtti.object_hierarchy.base_classes = RTTI_REF_SIG0(simple_class_sig0_rtti, base_array, base); + simple_class_sig0_rtti.object_locator.type_descriptor = RTTI_REF_SIG0(simple_class_sig0_rtti, type_info[0], base); + simple_class_sig0_rtti.object_locator.type_hierarchy = RTTI_REF_SIG0(simple_class_sig0_rtti, object_hierarchy, base); + + memcpy(&child_class_sig0_rtti, &child_class_rtti, sizeof(struct rtti_data)); + child_class_sig0_rtti.object_locator.signature = 0; + child_class_sig0_rtti.base_descriptor[0].type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[1], base); + child_class_sig0_rtti.base_descriptor[1].type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[0], base); + child_class_sig0_rtti.base_array.bases[0] = RTTI_REF_SIG0(child_class_sig0_rtti, base_descriptor[0], base); + child_class_sig0_rtti.base_array.bases[1] = RTTI_REF_SIG0(child_class_sig0_rtti, base_descriptor[1], base); + child_class_sig0_rtti.object_hierarchy.base_classes = RTTI_REF_SIG0(child_class_sig0_rtti, base_array, base); + child_class_sig0_rtti.object_locator.type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[1], base); + child_class_sig0_rtti.object_locator.type_hierarchy = RTTI_REF_SIG0(child_class_sig0_rtti, object_hierarchy, base); + + ti = p__RTtypeid(&simple_class_sig0); + ok (ti && ti->mangled && !strcmp(ti->mangled, "simple_class"), + "incorrect rtti data\n"); + + casted = p__RTCastToVoid(&simple_class_sig0); + ok (casted == (void*)&simple_class_sig0, "failed cast to void\n"); + + ti = p__RTtypeid(&child_class_sig0); + ok (ti && ti->mangled && !strcmp(ti->mangled, "child_class"), + "incorrect rtti data\n"); + + casted = p__RTCastToVoid(&child_class_sig0); + ok (casted == (void*)&child_class_sig0, "failed cast to void\n"); + + casted = p__RTDynamicCast(&child_class_sig0, 0, NULL, simple_class_sig0_rtti.type_info, 0); + if(casted) + { + ok (casted == (char*)&child_class_sig0+8, "failed cast to simple_class (%p %p)\n", casted, &child_class_sig0); + } + + casted = p__RTDynamicCast(&child_class_sig0, 0, &child_class_sig0_rtti.type_info[0], &child_class_sig0_rtti.type_info[1], 0); + ok(casted == (char*)&child_class_sig0+4, "failed cast to child class (%p %p)\n", casted, &child_class_sig0); + if(old_signature) { skip("signature==1 is not supported\n"); return;

1 0

Michael Stefaniuc : comctl32/tests: Remove commented out struct declaration .
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 5b19a55910bc28318aa890992043c9ef6cca9ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b19a55910bc28318aa890992… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 13 13:34:10 2012 +0200 comctl32/tests: Remove commented out struct declaration. --- dlls/comctl32/tests/mru.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 86eddc0..fcace35 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -447,17 +447,7 @@ static void test_MRUListA(void) /* FreeMRUList(NULL) crashes on Win98 OSR0 */ } -/* -typedef struct tagMRUINFOA -{ - DWORD cbSize; - UINT uMax; - UINT fFlags; - HKEY hKey; - LPCSTR lpszSubKey; - PROC lpfnCompare; -} MRUINFOA; -*/ + typedef struct { MRUINFOA mruA; BOOL ret;

1 0

Michael Stefaniuc : comctl32/tests: Use the proper type for function pointers.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 9f56598fb92159e171ac3e8fe8e1da69fbdb7768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f56598fb92159e171ac3e8fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 13 13:35:56 2012 +0200 comctl32/tests: Use the proper type for function pointers. --- dlls/comctl32/tests/mru.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index fcace35..1d8ad9a 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -45,7 +45,7 @@ typedef struct tagMRUINFOA UINT fFlags; HKEY hKey; LPCSTR lpszSubKey; - PROC lpfnCompare; + int (CALLBACK *lpfnCompare)(LPCSTR, LPCSTR); } MRUINFOA; typedef struct tagMRUINFOW @@ -55,7 +55,7 @@ typedef struct tagMRUINFOW UINT fFlags; HKEY hKey; LPCWSTR lpszSubKey; - PROC lpfnCompare; + int (CALLBACK *lpfnCompare)(LPCWSTR, LPCWSTR); } MRUINFOW; #define MRU_STRING 0 /* this one's invented */ @@ -221,7 +221,7 @@ static void check_reg_entries(const char *mrulist, const char**items) } } -static INT CALLBACK cmp_mru_strA(LPCVOID data1, LPCVOID data2) +static int CALLBACK cmp_mru_strA(LPCSTR data1, LPCSTR data2) { return lstrcmpiA(data1, data2); } @@ -252,7 +252,7 @@ static void test_MRUListA(void) infoA.fFlags = MRU_STRING; infoA.hKey = NULL; infoA.lpszSubKey = REG_TEST_SUBKEYA; - infoA.lpfnCompare = (PROC)cmp_mru_strA; + infoA.lpfnCompare = cmp_mru_strA; SetLastError(0); hMRU = pCreateMRUListA(&infoA); @@ -266,7 +266,7 @@ static void test_MRUListA(void) infoA.fFlags = MRU_STRING; infoA.hKey = NULL; infoA.lpszSubKey = REG_TEST_SUBKEYA; - infoA.lpfnCompare = (PROC)cmp_mru_strA; + infoA.lpfnCompare = cmp_mru_strA; SetLastError(0); hMRU = pCreateMRUListA(&infoA); @@ -280,7 +280,7 @@ static void test_MRUListA(void) infoA.fFlags = MRU_STRING; infoA.hKey = NULL; infoA.lpszSubKey = REG_TEST_SUBKEYA; - infoA.lpfnCompare = (PROC)cmp_mru_strA; + infoA.lpfnCompare = cmp_mru_strA; SetLastError(0); hMRU = pCreateMRUListA(&infoA); @@ -294,7 +294,7 @@ static void test_MRUListA(void) infoA.fFlags = MRU_STRING; infoA.hKey = NULL; infoA.lpszSubKey = NULL; - infoA.lpfnCompare = (PROC)cmp_mru_strA; + infoA.lpfnCompare = cmp_mru_strA; SetLastError(0); hMRU = pCreateMRUListA(&infoA); @@ -312,7 +312,7 @@ static void test_MRUListA(void) infoA.fFlags = MRU_STRING; infoA.hKey = hKey; infoA.lpszSubKey = REG_TEST_SUBKEYA; - infoA.lpfnCompare = (PROC)cmp_mru_strA; + infoA.lpfnCompare = cmp_mru_strA; hMRU = pCreateMRUListA(&infoA); ok(hMRU && !GetLastError(),

1 0

Hans Leidekker : msi: Don't reinstall components shared with other products .
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: dd8f54a49fd29eb5e91cf4ac5798a41580434151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8f54a49fd29eb5e91cf4ac5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 13 13:43:37 2012 +0200 msi: Don't reinstall components shared with other products. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 845a0fd..f29be2b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -812,7 +812,7 @@ INSTALLSTATE msi_get_component_action( MSIPACKAGE *package, MSICOMPONENT *comp ) if (comp->num_clients > 0 && comp->ActionRequest == INSTALLSTATE_ABSENT) { TRACE("%s has %u clients left\n", debugstr_w(comp->Component), comp->num_clients); - return comp->Installed; + return INSTALLSTATE_UNKNOWN; } return comp->ActionRequest; }

1 0

Jacek Caban : jscript: Don' t leave current scope in return statement before evaluating the expression.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: fdbd536983a46a65ed6ba5d51787d99b6aaabe0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdbd536983a46a65ed6ba5d51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 14:34:11 2012 +0200 jscript: Don't leave current scope in return statement before evaluating the expression. --- dlls/jscript/compile.c | 33 +++++++++++++++++++++------------ dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index e45b132..034a55d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1287,25 +1287,30 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s return S_OK; } -static HRESULT pop_to_stat(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx) +static HRESULT pop_to_stat(compiler_ctx_t *ctx, BOOL var_stack, BOOL scope_stack, statement_ctx_t *stat_ctx) { unsigned stack_pop = 0; statement_ctx_t *iter; for(iter = ctx->stat_ctx; iter != stat_ctx; iter = iter->next) { - if(iter->using_scope && !push_instr(ctx, OP_pop_scope)) - return E_OUTOFMEMORY; - if(iter->using_except && !push_instr(ctx, OP_pop_except)) - return E_OUTOFMEMORY; + if(scope_stack) { + if(iter->using_scope && !push_instr(ctx, OP_pop_scope)) + return E_OUTOFMEMORY; + if(iter->using_except && !push_instr(ctx, OP_pop_except)) + return E_OUTOFMEMORY; + } stack_pop += iter->stack_use; } - /* FIXME: optimize */ - while(stack_pop--) { - if(!push_instr(ctx, OP_pop)) - return E_OUTOFMEMORY; + if(var_stack) { + /* FIXME: optimize */ + while(stack_pop--) { + if(!push_instr(ctx, OP_pop)) + return E_OUTOFMEMORY; + } } + return S_OK; } @@ -1353,7 +1358,7 @@ static HRESULT compile_continue_statement(compiler_ctx_t *ctx, branch_statement_ } } - hres = pop_to_stat(ctx, pop_ctx); + hres = pop_to_stat(ctx, TRUE, TRUE, pop_ctx); if(FAILED(hres)) return hres; @@ -1393,7 +1398,7 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * } } - hres = pop_to_stat(ctx, pop_ctx->next); + hres = pop_to_stat(ctx, TRUE, TRUE, pop_ctx->next); if(FAILED(hres)) return hres; @@ -1408,7 +1413,7 @@ static HRESULT compile_return_statement(compiler_ctx_t *ctx, expression_statemen { HRESULT hres; - hres = pop_to_stat(ctx, NULL); + hres = pop_to_stat(ctx, TRUE, FALSE, NULL); if(FAILED(hres)) return hres; @@ -1418,6 +1423,10 @@ static HRESULT compile_return_statement(compiler_ctx_t *ctx, expression_statemen return hres; } + hres = pop_to_stat(ctx, FALSE, TRUE, NULL); + if(FAILED(hres)) + return hres; + return push_instr(ctx, OP_ret) ? S_OK : E_OUTOFMEMORY; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index dbb9d50..ffb5e2e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1355,6 +1355,13 @@ ok(name_override_func === 3, "name_override_func = " + name_override_func); function name_override_func() {}; ok(name_override_func === 3, "name_override_func = " + name_override_func); +tmp = (function() { + var ret = false; + with({ret: true}) + return ret; +})(); +ok(tmp, "tmp = " + tmp); + /* NoNewline rule parser tests */ while(true) { if(true) break

1 0

Jacek Caban : jscript: Added support for host objects being part of scope chain.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 8c5f5b49eca0ea8e28698602c668606a6dacd736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c5f5b49eca0ea8e28698602c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 13 14:34:25 2012 +0200 jscript: Added support for host objects being part of scope chain. --- dlls/jscript/engine.c | 28 ++++++++++++---------------- dlls/jscript/engine.h | 5 +++-- dlls/jscript/function.c | 2 +- dlls/jscript/tests/run.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index eb2adca..f7c7d1a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -268,7 +268,7 @@ static void exprval_set_idref(exprval_t *val, IDispatch *disp, DISPID id) IDispatch_AddRef(disp); } -HRESULT scope_push(scope_chain_t *scope, jsdisp_t *obj, scope_chain_t **ret) +HRESULT scope_push(scope_chain_t *scope, jsdisp_t *jsobj, IDispatch *obj, scope_chain_t **ret) { scope_chain_t *new_scope; @@ -278,7 +278,8 @@ HRESULT scope_push(scope_chain_t *scope, jsdisp_t *obj, scope_chain_t **ret) new_scope->ref = 1; - jsdisp_addref(obj); + IDispatch_AddRef(obj); + new_scope->jsobj = jsobj; new_scope->obj = obj; if(scope) { @@ -309,7 +310,7 @@ void scope_release(scope_chain_t *scope) if(scope->next) scope_release(scope->next); - jsdisp_release(scope->obj); + IDispatch_Release(scope->obj); heap_free(scope); } @@ -511,9 +512,12 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re TRACE("%s\n", debugstr_w(identifier)); for(scope = ctx->exec_ctx->scope_chain; scope; scope = scope->next) { - hres = jsdisp_get_id(scope->obj, identifier, 0, &id); + if(scope->jsobj) + hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); + else + hres = disp_get_id(ctx, scope->obj, identifier, fdexNameImplicit, &id); if(SUCCEEDED(hres)) { - exprval_set_idref(ret, to_disp(scope->obj), id); + exprval_set_idref(ret, scope->obj, id); return S_OK; } } @@ -668,7 +672,6 @@ static HRESULT interp_forin(exec_ctx_t *ctx) static HRESULT interp_push_scope(exec_ctx_t *ctx) { IDispatch *disp; - jsdisp_t *obj; VARIANT *v; HRESULT hres; @@ -680,15 +683,8 @@ static HRESULT interp_push_scope(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - obj = to_jsdisp(disp); - if(!obj) { - IDispatch_Release(disp); - FIXME("disp is not jsdisp\n"); - return E_NOTIMPL; - } - - hres = scope_push(ctx->scope_chain, obj, &ctx->scope_chain); - jsdisp_release(obj); + hres = scope_push(ctx->scope_chain, to_jsdisp(disp), disp, &ctx->scope_chain); + IDispatch_Release(disp); return hres; } @@ -2509,7 +2505,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = scope_push(ctx->scope_chain, scope_obj, &ctx->scope_chain); + hres = scope_push(ctx->scope_chain, scope_obj, to_disp(scope_obj), &ctx->scope_chain); jsdisp_release(scope_obj); }else { VARIANT v; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b3648af..22283aa 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -203,11 +203,12 @@ static inline void *parser_alloc_tmp(parser_ctx_t *ctx, DWORD size) typedef struct _scope_chain_t { LONG ref; - jsdisp_t *obj; + jsdisp_t *jsobj; + IDispatch *obj; struct _scope_chain_t *next; } scope_chain_t; -HRESULT scope_push(scope_chain_t*,jsdisp_t*,scope_chain_t**) DECLSPEC_HIDDEN; +HRESULT scope_push(scope_chain_t*,jsdisp_t*,IDispatch*,scope_chain_t**) DECLSPEC_HIDDEN; void scope_release(scope_chain_t*) DECLSPEC_HIDDEN; static inline void scope_addref(scope_chain_t *scope) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 23ce98c..e7a011d 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -182,7 +182,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis return hres; } - hres = scope_push(function->scope_chain, var_disp, &scope); + hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { hres = create_exec_ctx(ctx, this_obj, var_disp, scope, FALSE, &exec_ctx); scope_release(scope); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 4a9f36d..30a1f9c 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -88,6 +88,8 @@ DEFINE_EXPECT(puredisp_noprop_d); DEFINE_EXPECT(testobj_delete); DEFINE_EXPECT(testobj_value); DEFINE_EXPECT(testobj_prop_d); +DEFINE_EXPECT(testobj_withprop_d); +DEFINE_EXPECT(testobj_withprop_i); DEFINE_EXPECT(testobj_noprop_d); DEFINE_EXPECT(testobj_onlydispid_d); DEFINE_EXPECT(testobj_onlydispid_i); @@ -124,6 +126,7 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 +#define DISPID_TESTOBJ_WITHPROP 0x2002 #define JS_E_INVALID_CHAR 0x800a03f6 @@ -297,6 +300,12 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_TESTOBJ_PROP; return S_OK; } + if(!strcmp_wa(bstrName, "withProp")) { + CHECK_EXPECT(testobj_withprop_d); + test_grfdex(grfdex, fdexNameCaseSensitive|fdexNameImplicit); + *pid = DISPID_TESTOBJ_WITHPROP; + return S_OK; + } if(!strcmp_wa(bstrName, "noprop")) { CHECK_EXPECT(testobj_noprop_d); test_grfdex(grfdex, fdexNameCaseSensitive); @@ -360,6 +369,23 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); ok(pei != NULL, "pei == NULL\n"); return DISP_E_MEMBERNOTFOUND; + case DISPID_TESTOBJ_WITHPROP: + CHECK_EXPECT(testobj_withprop_i); + + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_I4; + V_I4(pvarRes) = 1; + + return S_OK; } ok(0, "unexpected call %x\n", id); @@ -1754,6 +1780,12 @@ static BOOL run_tests(void) "});"); CHECK_CALLED(global_testargtypes_i); + SET_EXPECT(testobj_withprop_d); + SET_EXPECT(testobj_withprop_i); + parse_script_a("var t = (function () { with(testObj) { return withProp; }})(); ok(t === 1, 't = ' + t);"); + CHECK_CALLED(testobj_withprop_d); + CHECK_CALLED(testobj_withprop_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

James Eder : ntdll: Return as many PROCESSOR_POWER_INFORMATIONs as there are CPUs.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: c683b98da55a6d31475f04386cca96db2de2ffcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c683b98da55a6d31475f04386… Author: James Eder <jimportal(a)gmail.com> Date: Wed Sep 12 13:14:27 2012 -0600 ntdll: Return as many PROCESSOR_POWER_INFORMATIONs as there are CPUs. --- dlls/ntdll/nt.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 44bdc5f..ca05203 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2325,20 +2325,27 @@ NTSTATUS WINAPI NtPowerInformation( *ExecutionState = ES_USER_PRESENT; return STATUS_SUCCESS; } - case ProcessorInformation: { - PPROCESSOR_POWER_INFORMATION cpu_power = lpOutputBuffer; + case ProcessorInformation: { + PROCESSOR_POWER_INFORMATION* cpu_power = lpOutputBuffer; + int i; WARN("semi-stub: ProcessorInformation\n"); - if (nOutputBufferSize < sizeof(PROCESSOR_POWER_INFORMATION)) + + if ((lpOutputBuffer == NULL) || (nOutputBufferSize == 0)) + return STATUS_INVALID_PARAMETER; + if ((nOutputBufferSize / sizeof(PROCESSOR_POWER_INFORMATION)) < NtCurrentTeb()->Peb->NumberOfProcessors) return STATUS_BUFFER_TOO_SMALL; - cpu_power->Number = NtCurrentTeb()->Peb->NumberOfProcessors; - cpu_power->MaxMhz = cpuHz / 1000000; - cpu_power->CurrentMhz = cpuHz / 1000000; - cpu_power->MhzLimit = cpuHz / 1000000; - cpu_power->MaxIdleState = 0; /* FIXME */ - cpu_power->CurrentIdleState = 0; /* FIXME */ - return STATUS_SUCCESS; - } + + for(i = 0; i < NtCurrentTeb()->Peb->NumberOfProcessors; i++) { + cpu_power[i].Number = i; + cpu_power[i].MaxMhz = cpuHz / 1000000; + cpu_power[i].CurrentMhz = cpuHz / 1000000; + cpu_power[i].MhzLimit = cpuHz / 1000000; + cpu_power[i].MaxIdleState = 0; /* FIXME */ + cpu_power[i].CurrentIdleState = 0; /* FIXME */ + } + return STATUS_SUCCESS; + } default: /* FIXME: Needed by .NET Framework */ WARN("Unimplemented NtPowerInformation action: %d\n", InformationLevel);

1 0

James Eder : wineboot: Expect one PROCESSOR_POWER_INFORMATION structure for each CPU present when calling NtPowerInformation .
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 7f9dfe273a80d31e3f8c5bd0c100c81370aa6f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9dfe273a80d31e3f8c5bd0c… Author: James Eder <jimportal(a)gmail.com> Date: Wed Sep 12 13:15:50 2012 -0600 wineboot: Expect one PROCESSOR_POWER_INFORMATION structure for each CPU present when calling NtPowerInformation. --- programs/wineboot/wineboot.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index aac17ec..0be773b 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -189,19 +189,27 @@ static void create_hardware_registry_keys(void) unsigned int i; HKEY hkey, system_key, cpu_key, fpu_key; SYSTEM_CPU_INFORMATION sci; - PROCESSOR_POWER_INFORMATION power_info; + PROCESSOR_POWER_INFORMATION* power_info; + ULONG sizeof_power_info = sizeof(PROCESSOR_POWER_INFORMATION) * NtCurrentTeb()->Peb->NumberOfProcessors; WCHAR idW[60]; NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL ); - if (NtPowerInformation(ProcessorInformation, NULL, 0, &power_info, sizeof(power_info))) - power_info.MaxMhz = 0; + + power_info = HeapAlloc( GetProcessHeap(), 0, sizeof_power_info ); + if (power_info == NULL) + return; + if (NtPowerInformation( ProcessorInformation, NULL, 0, power_info, sizeof_power_info )) + memset( power_info, 0, sizeof_power_info ); /*TODO: report 64bit processors properly*/ sprintfW( idW, IntelCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); if (RegCreateKeyExW( HKEY_LOCAL_MACHINE, SystemW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &system_key, NULL )) + { + HeapFree( GetProcessHeap(), 0, power_info ); return; + } set_reg_value( system_key, IdentifierW, SysidW ); @@ -225,7 +233,7 @@ static void create_hardware_registry_keys(void) /*TODO; report amd's properly*/ set_reg_value( hkey, ProcessorNameStringW, IntelCpuStringW ); set_reg_value( hkey, VendorIdentifierW, VenidIntelW ); - RegSetValueExW( hkey, mhzKeyW, 0, REG_DWORD, (BYTE *)&power_info.MaxMhz, sizeof(DWORD) ); + RegSetValueExW( hkey, mhzKeyW, 0, REG_DWORD, (BYTE *)&power_info[i].MaxMhz, sizeof(DWORD) ); RegCloseKey( hkey ); } if (!RegCreateKeyExW( fpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, @@ -238,6 +246,7 @@ static void create_hardware_registry_keys(void) RegCloseKey( fpu_key ); RegCloseKey( cpu_key ); RegCloseKey( system_key ); + HeapFree( GetProcessHeap(), 0, power_info ); }

1 0

James Eder : ntdll/tests: Add test for ProcessorInformation case of NtPowerInformation.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: fbd5a9aaffbf738db2aaeaba0f78db3f72a1ddce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd5a9aaffbf738db2aaeaba0… Author: James Eder <jimportal(a)gmail.com> Date: Wed Sep 12 13:16:31 2012 -0600 ntdll/tests: Add test for ProcessorInformation case of NtPowerInformation. --- dlls/ntdll/tests/info.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 3dce90b..a50f23b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -23,6 +23,7 @@ #include <stdio.h> static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pNtPowerInformation)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQueryInformationThread)(HANDLE, THREADINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); @@ -62,6 +63,7 @@ static BOOL InitFunctionPtrs(void) } NTDLL_GET_PROC(NtQuerySystemInformation); + NTDLL_GET_PROC(NtPowerInformation); NTDLL_GET_PROC(NtQueryInformationProcess); NTDLL_GET_PROC(NtQueryInformationThread); NTDLL_GET_PROC(NtSetInformationProcess); @@ -621,6 +623,79 @@ static void test_query_logicalproc(void) proc_no, si.dwNumberOfProcessors); } +static void test_query_processor_power_info(void) +{ + NTSTATUS status; + PROCESSOR_POWER_INFORMATION* ppi; + ULONG size; + SYSTEM_INFO si; + int i; + + GetSystemInfo(&si); + size = si.dwNumberOfProcessors * sizeof(PROCESSOR_POWER_INFORMATION); + ppi = HeapAlloc(GetProcessHeap(), 0, size); + + /* If size < (sizeof(PROCESSOR_POWER_INFORMATION) * NumberOfProcessors), Win7 returns + * STATUS_BUFFER_TOO_SMALL. WinXP returns STATUS_SUCCESS for any value of size. It copies as + * many whole PROCESSOR_POWER_INFORMATION structures that there is room for. Even if there is + * not enough room for one structure, WinXP still returns STATUS_SUCCESS having done nothing. + * + * If ppi == NULL, Win7 returns STATUS_INVALID_PARAMETER while WinXP returns STATUS_SUCCESS + * and does nothing. + * + * The same behavior is seen with CallNtPowerInformation (in powrprof.dll). + */ + + if (si.dwNumberOfProcessors > 1) + { + for(i = 0; i < si.dwNumberOfProcessors; i++) + ppi[i].Number = 0xDEADBEEF; + + /* Call with a buffer size that is large enough to hold at least one but not large + * enough to hold them all. This will be STATUS_SUCCESS on WinXP but not on Win7 */ + status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, size - sizeof(PROCESSOR_POWER_INFORMATION)); + if (status == STATUS_SUCCESS) + { + /* lax version found on older Windows like WinXP */ + ok( (ppi[si.dwNumberOfProcessors - 2].Number != 0xDEADBEEF) && + (ppi[si.dwNumberOfProcessors - 1].Number == 0xDEADBEEF), + "Expected all but the last record to be overwritten.\n"); + + status = pNtPowerInformation(ProcessorInformation, 0, 0, 0, size); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + for(i = 0; i < si.dwNumberOfProcessors; i++) + ppi[i].Number = 0xDEADBEEF; + status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, sizeof(PROCESSOR_POWER_INFORMATION) - 1); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + for(i = 0; i < si.dwNumberOfProcessors; i++) + if (ppi[i].Number != 0xDEADBEEF) break; + ok( i == si.dwNumberOfProcessors, "Expected untouched buffer\n"); + } + else + { + /* picky version found on newer Windows like Win7 */ + ok( ppi[1].Number == 0xDEADBEEF, "Expected untouched buffer.\n"); + ok( status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); + + status = pNtPowerInformation(ProcessorInformation, 0, 0, 0, size); + ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + + status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, 0); + ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + } + } + else + { + skip("Test needs more than one processor.\n"); + } + + status = pNtPowerInformation(ProcessorInformation, 0, 0, ppi, size); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + HeapFree(GetProcessHeap(), 0, ppi); +} + static void test_query_process_basic(void) { NTSTATUS status; @@ -1496,7 +1571,6 @@ static void test_NtGetCurrentProcessorNumber(void) ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); } - START_TEST(info) { char **argv; @@ -1562,6 +1636,12 @@ START_TEST(info) trace("Starting test_query_logicalproc()\n"); test_query_logicalproc(); + /* NtPowerInformation */ + + /* 0xb ProcessorInformation */ + trace("Starting test_query_processor_power_info()\n"); + test_query_processor_power_info(); + /* NtQueryInformationProcess */ /* 0x0 ProcessBasicInformation */

1 0

Dmitry Timoshkov : windowscodecs: Create Image Descriptor metadata block for a GIF frame.
by Alexandre Julliard 13 Sep '12

13 Sep '12

Module: wine Branch: master Commit: 003c20467c355a3b251c685252456d2991faa412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003c20467c355a3b251c68525… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 10:26:04 2012 +0900 windowscodecs: Create Image Descriptor metadata block for a GIF frame. --- dlls/windowscodecs/gifformat.c | 164 +++++++++++++++++++++++++++++++---- dlls/windowscodecs/tests/metadata.c | 4 +- 2 files changed, 150 insertions(+), 18 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 66c56a8..62bdc6f 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -149,25 +149,27 @@ HRESULT LSDReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void **ppv) return MetadataReader_Create(&LSDReader_Vtbl, pUnkOuter, iid, ppv); } +#include "pshpack1.h" +struct image_descriptor +{ + USHORT left; + USHORT top; + USHORT width; + USHORT height; + BYTE packed; + /* local_color_table_flag : 1; + * interlace_flag : 1; + * sort_flag : 1; + * reserved : 2; + * local_color_table_size : 3; + */ +}; +#include "poppack.h" + static HRESULT load_IMD_metadata(IStream *stream, const GUID *vendor, DWORD options, MetadataItem **items, DWORD *count) { -#include "pshpack1.h" - struct image_descriptor - { - USHORT left; - USHORT top; - USHORT width; - USHORT height; - BYTE packed; - /* local_color_table_flag : 1; - * interlace_flag : 1; - * sort_flag : 1; - * reserved : 2; - * local_color_table_size : 3; - */ - } imd_data; -#include "poppack.h" + struct image_descriptor imd_data; HRESULT hr; ULONG bytesread, i; MetadataItem *result; @@ -353,6 +355,7 @@ typedef struct { typedef struct { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; + IWICMetadataBlockReader IWICMetadataBlockReader_iface; LONG ref; SavedImage *frame; GifDecoder *parent; @@ -373,6 +376,11 @@ static inline GifFrameDecode *impl_from_IWICBitmapFrameDecode(IWICBitmapFrameDec return CONTAINING_RECORD(iface, GifFrameDecode, IWICBitmapFrameDecode_iface); } +static inline GifFrameDecode *frame_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) +{ + return CONTAINING_RECORD(iface, GifFrameDecode, IWICMetadataBlockReader_iface); +} + static HRESULT WINAPI GifFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, void **ppv) { @@ -387,6 +395,10 @@ static HRESULT WINAPI GifFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface { *ppv = &This->IWICBitmapFrameDecode_iface; } + else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) + { + *ppv = &This->IWICMetadataBlockReader_iface; + } else { *ppv = NULL; @@ -604,6 +616,125 @@ static const IWICBitmapFrameDecodeVtbl GifFrameDecode_Vtbl = { GifFrameDecode_GetThumbnail }; +static HRESULT WINAPI GifFrameDecode_Block_QueryInterface(IWICMetadataBlockReader *iface, + REFIID iid, void **ppv) +{ + GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_QueryInterface(&This->IWICBitmapFrameDecode_iface, iid, ppv); +} + +static ULONG WINAPI GifFrameDecode_Block_AddRef(IWICMetadataBlockReader *iface) +{ + GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_AddRef(&This->IWICBitmapFrameDecode_iface); +} + +static ULONG WINAPI GifFrameDecode_Block_Release(IWICMetadataBlockReader *iface) +{ + GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); + return IWICBitmapFrameDecode_Release(&This->IWICBitmapFrameDecode_iface); +} + +static HRESULT WINAPI GifFrameDecode_Block_GetContainerFormat(IWICMetadataBlockReader *iface, + GUID *guid) +{ + TRACE("(%p,%p)\n", iface, guid); + + if (!guid) return E_INVALIDARG; + + *guid = GUID_ContainerFormatGif; + return S_OK; +} + +static HRESULT WINAPI GifFrameDecode_Block_GetCount(IWICMetadataBlockReader *iface, + UINT *count) +{ + TRACE("%p,%p\n", iface, count); + + if (!count) return E_INVALIDARG; + + *count = 1; + return S_OK; +} + +static HRESULT create_IMD_metadata_reader(GifFrameDecode *This, IWICMetadataReader **reader) +{ + HRESULT hr; + IWICMetadataReader *metadata_reader; + IWICPersistStream *persist; + IStream *stream; + struct image_descriptor IMD_data; + + /* FIXME: Use IWICComponentFactory_CreateMetadataReader once it's implemented */ + + hr = CoCreateInstance(&CLSID_WICIMDMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&metadata_reader); + if (FAILED(hr)) return hr; + + hr = IWICMetadataReader_QueryInterface(metadata_reader, &IID_IWICPersistStream, (void **)&persist); + if (FAILED(hr)) + { + IWICMetadataReader_Release(metadata_reader); + return hr; + } + + /* recreate IMD structure from GIF decoder data */ + IMD_data.left = This->frame->ImageDesc.Left; + IMD_data.top = This->frame->ImageDesc.Top; + IMD_data.width = This->frame->ImageDesc.Width; + IMD_data.height = This->frame->ImageDesc.Height; + IMD_data.packed = 0; + /* interlace_flag */ + IMD_data.packed |= This->frame->ImageDesc.Interlace ? (1 << 6) : 0; + if (This->frame->ImageDesc.ColorMap) + { + /* local_color_table_flag */ + IMD_data.packed |= 1 << 7; + /* local_color_table_size */ + IMD_data.packed |= This->frame->ImageDesc.ColorMap->BitsPerPixel; + /* FIXME: sort_flag */ + } + + stream = create_stream(&IMD_data, sizeof(IMD_data)); + IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); + IStream_Release(stream); + + IWICPersistStream_Release(persist); + + *reader = metadata_reader; + return S_OK; +} + +static HRESULT WINAPI GifFrameDecode_Block_GetReaderByIndex(IWICMetadataBlockReader *iface, + UINT index, IWICMetadataReader **reader) +{ + GifFrameDecode *This = frame_from_IWICMetadataBlockReader(iface); + + TRACE("(%p,%u,%p)\n", iface, index, reader); + + if (!reader || index != 0) return E_INVALIDARG; + + return create_IMD_metadata_reader(This, reader); +} + +static HRESULT WINAPI GifFrameDecode_Block_GetEnumerator(IWICMetadataBlockReader *iface, + IEnumUnknown **enumerator) +{ + FIXME("(%p,%p): stub\n", iface, enumerator); + return E_NOTIMPL; +} + +static const IWICMetadataBlockReaderVtbl GifFrameDecode_BlockVtbl = +{ + GifFrameDecode_Block_QueryInterface, + GifFrameDecode_Block_AddRef, + GifFrameDecode_Block_Release, + GifFrameDecode_Block_GetContainerFormat, + GifFrameDecode_Block_GetCount, + GifFrameDecode_Block_GetReaderByIndex, + GifFrameDecode_Block_GetEnumerator +}; + static HRESULT WINAPI GifDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { @@ -824,6 +955,7 @@ static HRESULT WINAPI GifDecoder_GetFrame(IWICBitmapDecoder *iface, if (!result) return E_OUTOFMEMORY; result->IWICBitmapFrameDecode_iface.lpVtbl = &GifFrameDecode_Vtbl; + result->IWICMetadataBlockReader_iface.lpVtbl = &GifFrameDecode_BlockVtbl; result->ref = 1; result->frame = &This->gif->SavedImages[index]; IWICBitmapDecoder_AddRef(iface); diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 6bdecee..39c5144 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -1088,7 +1088,6 @@ static void test_metadata_gif(void) ok(hr == S_OK, "GetFrame error %#x\n", hr); hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&blockreader); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* before Win7 */, "QueryInterface error %#x\n", hr); if (SUCCEEDED(hr)) @@ -1190,7 +1189,6 @@ todo_wine ok(hr == S_OK, "GetFrame error %#x\n", hr); hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&blockreader); -todo_wine ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* before Win7 */, "QueryInterface error %#x\n", hr); if (SUCCEEDED(hr)) @@ -1208,6 +1206,7 @@ todo_wine hr = IWICMetadataBlockReader_GetCount(blockreader, &count); ok(hr == S_OK, "GetCount error %#x\n", hr); +todo_wine ok(count == 2, "expected 2, got %u\n", count); hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 0, &reader); @@ -1229,6 +1228,7 @@ todo_wine } hr = IWICMetadataBlockReader_GetReaderByIndex(blockreader, 1, &reader); +todo_wine ok(hr == S_OK, "GetReaderByIndex error %#x\n", hr); if (SUCCEEDED(hr))

1 0