September 2012 - Wine-Commits

Alexandre Julliard : winex11: Add window data structure locking to the ReparentNotify event handler.
by Alexandre Julliard Sept. 19, 2012

Sept. 19, 2012

Module: wine Branch: master Commit: 89a60562a71c5322c11df875609b0f9e0beb96bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a60562a71c5322c11df8756… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 13:13:40 2012 +0200 winex11: Add window data structure locking to the ReparentNotify event handler. --- dlls/winex11.drv/event.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d58919c..744bc40 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -938,8 +938,13 @@ static void X11DRV_ReparentNotify( HWND hwnd, XEvent *xev ) HWND parent, old_parent; DWORD style; - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->embedded) return; + if (!(data = get_win_data( hwnd ))) return; + + if (!data->embedded) + { + release_win_data( data ); + return; + } if (data->whole_window) { @@ -947,6 +952,7 @@ static void X11DRV_ReparentNotify( HWND hwnd, XEvent *xev ) { TRACE( "%p/%lx reparented to root\n", hwnd, data->whole_window ); data->embedder = 0; + release_win_data( data ); SendMessageW( hwnd, WM_CLOSE, 0, 0 ); return; } @@ -954,6 +960,7 @@ static void X11DRV_ReparentNotify( HWND hwnd, XEvent *xev ) } TRACE( "%p/%lx reparented to %lx\n", hwnd, data->whole_window, event->parent ); + release_win_data( data ); style = GetWindowLongW( hwnd, GWL_STYLE ); if (event->parent == root_window)

1 0

Alexandre Julliard : winex11: Add window data structure locking to the Expose event handler.
by Alexandre Julliard Sept. 19, 2012

Sept. 19, 2012

Module: wine Branch: master Commit: 6a4490d8ab14a26a7647203f83e51b3dda4ff2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a4490d8ab14a26a7647203f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 13:12:42 2012 +0200 winex11: Add window data structure locking to the Expose event handler. --- dlls/winex11.drv/event.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c9ae725..5b50978 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -821,7 +821,7 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) TRACE( "win %p (%lx) %d,%d %dx%d\n", hwnd, event->window, event->x, event->y, event->width, event->height ); - if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!(data = get_win_data( hwnd ))) return; rect.left = event->x; rect.top = event->y; @@ -858,7 +858,10 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) } else OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - if (!data->surface) RedrawWindow( hwnd, &rect, 0, flags ); + if (data->surface) flags = 0; + release_win_data( data ); + + if (flags) RedrawWindow( hwnd, &rect, 0, flags ); }

1 0

Jacek Caban : oleaut32: Properly handle TKIND_ALIAS when looking for iface GUID.
by Alexandre Julliard Sept. 19, 2012

Sept. 19, 2012

Module: wine Branch: master Commit: 2f7afbebd1e7944b0374ba2438baa52741936809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7afbebd1e7944b0374ba243… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 13:22:38 2012 +0200 oleaut32: Properly handle TKIND_ALIAS when looking for iface GUID. --- dlls/oleaut32/typelib.c | 60 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index abde61b..602181c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6022,6 +6022,42 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, return hr; } +static HRESULT get_iface_guid(ITypeInfo *tinfo, const TYPEDESC *tdesc, GUID *guid) +{ + ITypeInfo *tinfo2; + TYPEATTR *tattr; + HRESULT hres; + + hres = ITypeInfo_GetRefTypeInfo(tinfo, tdesc->u.hreftype, &tinfo2); + if(FAILED(hres)) + return hres; + + hres = ITypeInfo_GetTypeAttr(tinfo2, &tattr); + if(FAILED(hres)) { + ITypeInfo_Release(tinfo2); + return hres; + } + + switch(tattr->typekind) { + case TKIND_ALIAS: + hres = get_iface_guid(tinfo2, &tattr->tdescAlias, guid); + break; + + case TKIND_INTERFACE: + case TKIND_DISPATCH: + *guid = tattr->guid; + break; + + default: + ERR("Unexpected typekind %d\n", tattr->typekind); + hres = E_UNEXPECTED; + } + + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); + ITypeInfo_Release(tinfo2); + return hres; +} + /*********************************************************************** * DispCallFunc (OLEAUT32.@) * @@ -6515,30 +6551,18 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } if((tdesc->vt == VT_USERDEFINED || (tdesc->vt == VT_PTR && tdesc->u.lptdesc->vt == VT_USERDEFINED)) - && (V_VT(prgpvarg[i]) == VT_DISPATCH || V_VT(prgpvarg[i]) == VT_UNKNOWN)) { - const TYPEDESC *userdefined_tdesc = tdesc; + && (V_VT(prgpvarg[i]) == VT_DISPATCH || V_VT(prgpvarg[i]) == VT_UNKNOWN) + && V_UNKNOWN(prgpvarg[i])) { IUnknown *userdefined_iface; - ITypeInfo *tinfo2; - TYPEATTR *tattr; - - if(tdesc->vt == VT_PTR) - userdefined_tdesc = tdesc->u.lptdesc; + GUID guid; - hres = ITypeInfo2_GetRefTypeInfo(iface, userdefined_tdesc->u.hreftype, &tinfo2); + hres = get_iface_guid((ITypeInfo*)iface, tdesc->vt == VT_PTR ? tdesc->u.lptdesc : tdesc, &guid); if(FAILED(hres)) break; - hres = ITypeInfo_GetTypeAttr(tinfo2, &tattr); - if(FAILED(hres)) { - ITypeInfo_Release(tinfo2); - return hres; - } - - hres = IUnknown_QueryInterface(V_UNKNOWN(prgpvarg[i]), &tattr->guid, (void**)&userdefined_iface); - ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); - ITypeInfo_Release(tinfo2); + hres = IUnknown_QueryInterface(V_UNKNOWN(prgpvarg[i]), &guid, (void**)&userdefined_iface); if(FAILED(hres)) { - ERR("argument does not support %s interface\n", debugstr_guid(&tattr->guid)); + ERR("argument does not support %s interface\n", debugstr_guid(&guid)); break; }

1 0

Jacek Caban : jscript: Don't store jsexcept_t in exec_ctx_t.
by Alexandre Julliard Sept. 19, 2012

Sept. 19, 2012

Module: wine Branch: master Commit: 33331b1ccf8c82a86f5ffa052a6813a01cc59f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=33331b1ccf8c82a86f5ffa052… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 19:02:16 2012 +0200 jscript: Don't store jsexcept_t in exec_ctx_t. --- dlls/jscript/engine.c | 19 ++++++++----------- dlls/jscript/engine.h | 1 - dlls/jscript/jscript.h | 5 ++--- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ed17b73..6ff55e9 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -685,8 +685,8 @@ static HRESULT interp_throw(exec_ctx_t *ctx) { TRACE("\n"); - jsval_release(ctx->ei->val); - ctx->ei->val = stack_pop(ctx); + jsval_release(ctx->script->ei.val); + ctx->script->ei.val = stack_pop(ctx); return DISP_E_EXCEPTION; } @@ -778,7 +778,7 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) jsval_release(v); stack_popn(ctx, 1); - ctx->ei->val = stack_pop(ctx); + ctx->script->ei.val = stack_pop(ctx); return SUCCEEDED(hres) ? DISP_E_EXCEPTION : hres; } @@ -2395,8 +2395,9 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) ctx->ip = except_frame->catch_off; - except_val = ctx->ei->val; - memset(ctx->ei, 0, sizeof(*ctx->ei)); + except_val = ctx->script->ei.val; + ctx->script->ei.val = jsval_undefined(); + clear_ei(ctx->script); ident = except_frame->ident; heap_free(except_frame); @@ -2431,7 +2432,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) return hres; } -static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code_t *func, jsexcept_t *ei, jsval_t *ret) +static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code_t *func, jsval_t *ret) { exec_ctx_t *exec_ctx = ctx->exec_ctx; except_frame_t *prev_except_frame; @@ -2439,7 +2440,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code unsigned prev_ip, prev_top; scope_chain_t *prev_scope; bytecode_t *prev_code; - jsexcept_t *prev_ei; jsop_t op; HRESULT hres = S_OK; @@ -2449,11 +2449,9 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code prev_scope = exec_ctx->scope_chain; prev_except_frame = exec_ctx->except_frame; prev_ip = exec_ctx->ip; - prev_ei = exec_ctx->ei; prev_code = exec_ctx->code; prev_func = exec_ctx->func_code; exec_ctx->ip = func->instr_off; - exec_ctx->ei = ei; exec_ctx->except_frame = NULL; exec_ctx->code = code; exec_ctx->func_code = func; @@ -2477,7 +2475,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code } exec_ctx->ip = prev_ip; - exec_ctx->ei = prev_ei; exec_ctx->except_frame = prev_except_frame; exec_ctx->code = prev_code; exec_ctx->func_code = prev_func; @@ -2535,7 +2532,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO prev_ctx = ctx->script->exec_ctx; ctx->script->exec_ctx = ctx; - hres = enter_bytecode(ctx->script, code, func, &ctx->script->ei, &val); + hres = enter_bytecode(ctx->script, code, func, &val); assert(ctx->script->exec_ctx == ctx); ctx->script->exec_ctx = prev_ctx; if(FAILED(hres)) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index bebef3b..f7e03f7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -236,7 +236,6 @@ struct _exec_ctx_t { except_frame_t *except_frame; unsigned ip; - jsexcept_t *ei; }; static inline void exec_addref(exec_ctx_t *ctx) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b3b1f0a..87d43e8 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -37,7 +37,6 @@ typedef struct _jsval_t jsval_t; typedef struct _script_ctx_t script_ctx_t; typedef struct _exec_ctx_t exec_ctx_t; typedef struct _dispex_prop_t dispex_prop_t; -typedef struct _jsexcept_t jsexcept_t; typedef struct { void **blocks; @@ -295,10 +294,10 @@ typedef struct { #include "jsval.h" -struct _jsexcept_t { +typedef struct { EXCEPINFO ei; jsval_t val; -}; +} jsexcept_t; struct _script_ctx_t { LONG ref;

1 0

Jacek Caban : jscript: Pack jsval_t to 64-bit structure on i386.
by Alexandre Julliard Sept. 19, 2012

Sept. 19, 2012

Module: wine Branch: master Commit: 37509e540fc892c7919613204cf527fde6cd4090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37509e540fc892c7919613204… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 19:02:27 2012 +0200 jscript: Pack jsval_t to 64-bit structure on i386. --- dlls/jscript/jsutils.c | 4 +- dlls/jscript/jsval.h | 143 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 114 insertions(+), 33 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index d4260ca..c76d09a 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -239,8 +239,8 @@ HRESULT jsval_variant(jsval_t *val, VARIANT *var) VARIANT *v; HRESULT hres; - val->type = JSV_VARIANT; - val->u.v = v = heap_alloc(sizeof(VARIANT)); + __JSVAL_TYPE(*val) = JSV_VARIANT; + __JSVAL_VAR(*val) = v = heap_alloc(sizeof(VARIANT)); if(!v) return E_OUTOFMEMORY; diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index a678e05..9909de7 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -19,17 +19,52 @@ #ifndef JSVAL_H #define JSVAL_H +/* + * jsval_t structure is used to represent JavaScript dynamically-typed values. + * It's a (type,value) pair, usually represented as a structure of enum (type) + * and union (value of given type). For both memory and speed performance, we + * use tricks allowing storing both values as a struct with size equal to + * size of double (that is 64-bit) on 32-bit systems. For that, we use the fact + * that NaN value representation has 52 (almost) free bits. + */ + +#ifdef __i386__ +#define JSVAL_DOUBLE_LAYOUT_PTR32 +#endif + +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 +/* NaN exponent and our 0x80000 marker */ +#define JSV_VAL(x) (0x7ff80000|x) +#else +#define JSV_VAL(x) x +#endif + typedef enum { - JSV_UNDEFINED, - JSV_NULL, - JSV_OBJECT, - JSV_STRING, - JSV_NUMBER, - JSV_BOOL, - JSV_VARIANT + JSV_UNDEFINED = JSV_VAL(1), + JSV_NULL = JSV_VAL(2), + JSV_OBJECT = JSV_VAL(3), + JSV_STRING = JSV_VAL(4), + JSV_NUMBER = JSV_VAL(5), + JSV_BOOL = JSV_VAL(6), + JSV_VARIANT = JSV_VAL(7) } jsval_type_t; struct _jsval_t { +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 + union { + double n; + struct { + union { + IDispatch *obj; + BSTR str; + BOOL b; + VARIANT *v; + UINT_PTR as_uintptr; + } u; + jsval_type_t tag; + } s; + } u; +#else jsval_type_t type; union { IDispatch *obj; @@ -38,29 +73,50 @@ struct _jsval_t { BOOL b; VARIANT *v; } u; +#endif }; +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 + +C_ASSERT(sizeof(jsval_t) == sizeof(double)); + +#define __JSVAL_TYPE(x) ((x).u.s.tag) +#define __JSVAL_BOOL(x) ((x).u.s.u.b) +#define __JSVAL_STR(x) ((x).u.s.u.str) +#define __JSVAL_OBJ(x) ((x).u.s.u.obj) +#define __JSVAL_VAR(x) ((x).u.s.u.v) + +#else + +#define __JSVAL_TYPE(x) ((x).type) +#define __JSVAL_BOOL(x) ((x).u.b) +#define __JSVAL_STR(x) ((x).u.str) +#define __JSVAL_OBJ(x) ((x).u.obj) +#define __JSVAL_VAR(x) ((x).u.v) + +#endif + static inline jsval_t jsval_bool(BOOL b) { jsval_t ret; - ret.type = JSV_BOOL; - ret.u.b = b; + __JSVAL_TYPE(ret) = JSV_BOOL; + __JSVAL_BOOL(ret) = b; return ret; } static inline jsval_t jsval_string(BSTR str) { jsval_t ret; - ret.type = JSV_STRING; - ret.u.str = str; + __JSVAL_TYPE(ret) = JSV_STRING; + __JSVAL_STR(ret) = str; return ret; } static inline jsval_t jsval_disp(IDispatch *obj) { jsval_t ret; - ret.type = JSV_OBJECT; - ret.u.obj = obj; + __JSVAL_TYPE(ret) = JSV_OBJECT; + __JSVAL_OBJ(ret) = obj; return ret; } @@ -71,72 +127,97 @@ static inline jsval_t jsval_obj(jsdisp_t *obj) static inline jsval_t jsval_null(void) { - jsval_t ret = { JSV_NULL }; + jsval_t ret; + __JSVAL_TYPE(ret) = JSV_NULL; return ret; } static inline jsval_t jsval_undefined(void) { - jsval_t ret = { JSV_UNDEFINED }; + jsval_t ret; + __JSVAL_TYPE(ret) = JSV_UNDEFINED; return ret; } static inline jsval_t jsval_number(double n) { jsval_t ret; +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 + ret.u.n = n; + /* normalize NaN value */ + if((ret.u.s.tag & 0x7ff00000) == 0x7ff00000) { + /* isinf */ + if(ret.u.s.tag & 0xfffff) { + ret.u.s.tag = 0x7ff00000; + ret.u.s.u.as_uintptr = ~0; + }else if(ret.u.s.u.as_uintptr) { + ret.u.s.tag = 0x7ff00000; + } + } + return ret; +#else ret.type = JSV_NUMBER; ret.u.n = n; +#endif return ret; } -static inline jsval_type_t jsval_type(jsval_t v) -{ - return v.type; -} - static inline BOOL is_object_instance(jsval_t v) { - return v.type == JSV_OBJECT; + return __JSVAL_TYPE(v) == JSV_OBJECT; } static inline BOOL is_undefined(jsval_t v) { - return v.type == JSV_UNDEFINED; + return __JSVAL_TYPE(v) == JSV_UNDEFINED; } static inline BOOL is_null(jsval_t v) { - return v.type == JSV_NULL; + return __JSVAL_TYPE(v) == JSV_NULL; } static inline BOOL is_null_instance(jsval_t v) { - return v.type == JSV_NULL || (v.type == JSV_OBJECT && !v.u.obj); + return is_null(v) || (is_object_instance(v) && !__JSVAL_OBJ(v)); } static inline BOOL is_string(jsval_t v) { - return v.type == JSV_STRING; + return __JSVAL_TYPE(v) == JSV_STRING; } static inline BOOL is_number(jsval_t v) { +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 + return (v.u.s.tag & 0x7ff80000) != 0x7ff80000; +#else return v.type == JSV_NUMBER; +#endif } static inline BOOL is_variant(jsval_t v) { - return v.type == JSV_VARIANT; + return __JSVAL_TYPE(v) == JSV_VARIANT; } static inline BOOL is_bool(jsval_t v) { - return v.type == JSV_BOOL; + return __JSVAL_TYPE(v) == JSV_BOOL; +} + +static inline jsval_type_t jsval_type(jsval_t v) +{ +#ifdef JSVAL_DOUBLE_LAYOUT_PTR32 + return is_number(v) ? JSV_NUMBER : v.u.s.tag; +#else + return v.type; +#endif } static inline IDispatch *get_object(jsval_t v) { - return v.u.obj; + return __JSVAL_OBJ(v); } static inline double get_number(jsval_t v) @@ -146,17 +227,17 @@ static inline double get_number(jsval_t v) static inline BSTR get_string(jsval_t v) { - return v.u.str; + return __JSVAL_STR(v); } static inline VARIANT *get_variant(jsval_t v) { - return v.u.v; + return __JSVAL_VAR(v); } static inline BOOL get_bool(jsval_t v) { - return v.u.b; + return __JSVAL_BOOL(v); } HRESULT variant_to_jsval(VARIANT*,jsval_t*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Store exception value in script_ctx_t instead of passing it everywhere.
by Alexandre Julliard Sept. 19, 2012

Sept. 19, 2012

Module: wine Branch: master Commit: 6f5475dd26f4241ccab55fe11f377168d6e5afbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5475dd26f4241ccab55fe11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 19:01:49 2012 +0200 jscript: Store exception value in script_ctx_t instead of passing it everywhere. --- dlls/jscript/activex.c | 6 +- dlls/jscript/array.c | 191 ++++++++++++++-------------- dlls/jscript/bool.c | 16 +-- dlls/jscript/date.c | 323 +++++++++++++++++++++++------------------------ dlls/jscript/dispex.c | 114 ++++++++--------- dlls/jscript/engine.c | 181 ++++++++++++++------------- dlls/jscript/engine.h | 2 +- dlls/jscript/error.c | 96 +++++++------- dlls/jscript/function.c | 108 ++++++++--------- dlls/jscript/global.c | 153 +++++++++++----------- dlls/jscript/jscript.c | 8 +- dlls/jscript/jscript.h | 78 ++++++------ dlls/jscript/jsutils.c | 50 ++++---- dlls/jscript/math.c | 78 ++++++------ dlls/jscript/number.c | 56 ++++---- dlls/jscript/object.c | 22 ++-- dlls/jscript/regexp.c | 71 +++++------ dlls/jscript/string.c | 198 ++++++++++++++--------------- dlls/jscript/vbarray.c | 44 ++++---- 19 files changed, 886 insertions(+), 909 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f5475dd26f4241ccab55…

1 0

Dmitry Timoshkov : gdiplus: Add some tests for GIF properties.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 058963282e0938bdff470f1b4bae8e7dbe56333d URL: http://source.winehq.org/git/wine.git/?a=commit;h=058963282e0938bdff470f1b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 13:02:36 2012 +0900 gdiplus: Add some tests for GIF properties. --- dlls/gdiplus/tests/image.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusimaging.h | 3 + 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 95dd2cd..e373a8c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3920,6 +3920,99 @@ static void test_DrawImage_scale(void) expect(Ok, status); } +static void test_gif_properties(void) +{ + static const struct test_data + { + ULONG type, id, length; + const BYTE value[12]; + } td[] = + { + { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,10,0,0,0 } }, + { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 1 } }, + { PropertyTagTypeByte, PropertyTagGlobalPalette, 12, { 0,0,0,0xff,0xff,0xff,0,0,0,0,0 } }, + { PropertyTagTypeByte, PropertyTagIndexBackground, 1, { 0 } } + }; + GpStatus status; + GpImage *image; + GUID guid; + UINT dim_count, frame_count, prop_count, prop_size, i; + PROPID *prop_id; + PropertyItem *prop_item; + + image = load_image(gifanimation, sizeof(gifanimation)); + ok(image != 0, "Failed to load GIF image data\n"); + if (!image) return; + + status = GdipImageGetFrameDimensionsCount(image, &dim_count); + expect(Ok, status); + expect(1, dim_count); + + status = GdipImageGetFrameDimensionsList(image, &guid, 1); + expect(Ok, status); + expect_guid(&FrameDimensionTime, &guid, __LINE__, FALSE); + + status = GdipImageGetFrameCount(image, &guid, &frame_count); + expect(Ok, status); + expect(2, frame_count); + + status = GdipGetPropertyCount(image, &prop_count); + expect(Ok, status); +todo_wine + ok(prop_count == sizeof(td)/sizeof(td[0]) || broken(prop_count == 1) /* before win7 */, + "expected property count %u, got %u\n", (UINT)(sizeof(td)/sizeof(td[0])), prop_count); + + if (prop_count != sizeof(td)/sizeof(td[0])) + { + GdipDisposeImage(image); + return; + } + + prop_id = HeapAlloc(GetProcessHeap(), 0, prop_count * sizeof(*prop_id)); + + status = GdipGetPropertyIdList(image, prop_count, prop_id); + expect(Ok, status); + + for (i = 0; i < prop_count; i++) + { + status = GdipGetPropertyItemSize(image, prop_id[i], &prop_size); + expect(Ok, status); + if (status != Ok) break; + ok(prop_size > sizeof(*prop_item), "%u: too small item length %u\n", i, prop_size); + + prop_item = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, prop_size); + status = GdipGetPropertyItem(image, prop_id[i], prop_size, prop_item); + expect(Ok, status); + ok(prop_item->value == prop_item + 1, "expected item->value %p, got %p\n", prop_item + 1, prop_item->value); + ok(td[i].type == prop_item->type, + "%u: expected type %u, got %u\n", i, td[i].type, prop_item->type); + ok(td[i].id == prop_item->id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item->id); + prop_size -= sizeof(*prop_item); + ok(prop_item->length == prop_size, "%u: expected length %u, got %u\n", i, prop_size, prop_item->length); + ok(td[i].length == prop_item->length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length); + ok(td[i].length == prop_size, "%u: expected length %u, got %u\n", i, td[i].length, prop_size); + if (td[i].length == prop_item->length) + { + int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0; + ok(match || broken(td[i].length <= 4 && !match), "%u: data mismatch\n", i); + if (!match) + { + UINT j; + BYTE *data = prop_item->value; + printf("id %#x:", prop_item->id); + for (j = 0; j < prop_item->length; j++) + printf(" %02x", data[j]); + printf("\n"); + } + } + HeapFree(GetProcessHeap(), 0, prop_item); + } + + HeapFree(GetProcessHeap(), 0, prop_id); + + GdipDisposeImage(image); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3940,6 +4033,7 @@ START_TEST(image) test_tiff_palette(); test_GdipGetAllPropertyItems(); test_tiff_properties(); + test_gif_properties(); test_image_properties(); test_Scan0(); test_FromGdiDib(); diff --git a/include/gdiplusimaging.h b/include/gdiplusimaging.h index 7c199c3..93114d9 100644 --- a/include/gdiplusimaging.h +++ b/include/gdiplusimaging.h @@ -364,6 +364,9 @@ typedef struct PropertyItem #define PropertyTagFrameDelay 0x5100 #define PropertyTagLoopCount 0x5101 +#define PropertyTagGlobalPalette 0x5102 +#define PropertyTagIndexBackground 0x5103 +#define PropertyTagIndexTransparent 0x5104 #define PropertyTagPixelUnit 0x5110 #define PropertyTagPixelPerUnitX 0x5111

1 0

Matteo Bruni : d3dcompiler: Declare predefined data types.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: e7a9218ef1d7cdc12f3de26b021f0425ed04ca2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a9218ef1d7cdc12f3de26b0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:05 2012 +0200 d3dcompiler: Declare predefined data types. --- dlls/d3dcompiler_43/hlsl.y | 71 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 10 +++++- 2 files changed, 80 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 7ed50b4..35c9a4c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -175,6 +175,76 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc); +BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) +{ + if (get_type(scope, def->name, FALSE)) + return FALSE; + + list_add_tail(&scope->types, &def->scope_entry); + return TRUE; +} + +static void declare_predefined_types(struct hlsl_scope *scope) +{ + struct hlsl_type *type; + unsigned int x, y, bt; + static const char *names[] = + { + "float", + "half", + "double", + "int", + "uint", + "bool", + }; + char name[10]; + + for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) + { + for (y = 1; y <= 4; ++y) + { + for (x = 1; x <= 4; ++x) + { + sprintf(name, "%s%ux%u", names[bt], x, y); + type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_MATRIX, bt, x, y); + add_type_to_scope(scope, type); + + if (y == 1) + { + sprintf(name, "%s%u", names[bt], x); + type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_VECTOR, bt, x, y); + add_type_to_scope(scope, type); + + if (x == 1) + { + sprintf(name, "%s", names[bt]); + type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_SCALAR, bt, x, y); + add_type_to_scope(scope, type); + } + } + } + } + } + + /* DX8 effects predefined types */ + type = new_hlsl_type(d3dcompiler_strdup("DWORD"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("FLOAT"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("VECTOR"), HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("MATRIX"), HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("STRING"), HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("TEXTURE"), HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("PIXELSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("VERTEXSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1); + add_type_to_scope(scope, type); +} + static unsigned int components_count_expr_list(struct list *list) { struct hlsl_ir_node *node; @@ -1486,6 +1556,7 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino push_scope(&hlsl_ctx); hlsl_ctx.globals = hlsl_ctx.cur_scope; + declare_predefined_types(hlsl_ctx.globals); hlsl_parse(); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index ad7887a..f288efc 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -860,7 +860,15 @@ struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int arra struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) { - FIXME("stub.\n"); + struct hlsl_type *type; + + LIST_FOR_EACH_ENTRY(type, &scope->types, struct hlsl_type, scope_entry) + { + if (strcmp(type->name, name) == 0) + return type; + } + if (recursive && scope->upper) + return get_type(scope->upper, name, recursive); return NULL; }

1 0

Dmitry Timoshkov : gdiplus: Add some tests for scaling an image with various pixel offset modes.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: 556bdf249e9108f465cea404d034b899002a8492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=556bdf249e9108f465cea404d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 12:03:41 2012 +0900 gdiplus: Add some tests for scaling an image with various pixel offset modes. --- dlls/gdiplus/tests/image.c | 54 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 45ac01f..95dd2cd 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3808,19 +3808,53 @@ static void test_DrawImage_scale(void) 0x80,0x80,0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; static const BYTE image_250[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x80,0x80, 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x40 }; + static const BYTE image_120_half[24] = { 0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, + 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_150_half[24] = { 0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, + 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_200_half[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80, + 0x80,0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_250_half[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80, + 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x40 }; static const struct test_data { REAL scale_x; + PixelOffsetMode pixel_offset_mode; const BYTE *image; + BOOL todo; } td[] = { - { 0.8, image_080 }, - { 1.0, image_100 }, - { 1.2, image_120 }, - { 1.5, image_150 }, - { 1.8, image_180 }, - { 2.0, image_200 }, - { 2.5, image_250 } + { 0.8, PixelOffsetModeNone, image_080 }, /* 0 */ + { 1.0, PixelOffsetModeNone, image_100 }, + { 1.2, PixelOffsetModeNone, image_120 }, + { 1.5, PixelOffsetModeNone, image_150 }, + { 1.8, PixelOffsetModeNone, image_180 }, + { 2.0, PixelOffsetModeNone, image_200 }, + { 2.5, PixelOffsetModeNone, image_250 }, + + { 0.8, PixelOffsetModeHighSpeed, image_080 }, /* 7 */ + { 1.0, PixelOffsetModeHighSpeed, image_100 }, + { 1.2, PixelOffsetModeHighSpeed, image_120 }, + { 1.5, PixelOffsetModeHighSpeed, image_150 }, + { 1.8, PixelOffsetModeHighSpeed, image_180 }, + { 2.0, PixelOffsetModeHighSpeed, image_200 }, + { 2.5, PixelOffsetModeHighSpeed, image_250 }, + + { 0.8, PixelOffsetModeHalf, image_080 }, /* 14 */ + { 1.0, PixelOffsetModeHalf, image_100 }, + { 1.2, PixelOffsetModeHalf, image_120_half, TRUE }, + { 1.5, PixelOffsetModeHalf, image_150_half, TRUE }, + { 1.8, PixelOffsetModeHalf, image_180 }, + { 2.0, PixelOffsetModeHalf, image_200_half, TRUE }, + { 2.5, PixelOffsetModeHalf, image_250_half, TRUE }, + + { 0.8, PixelOffsetModeHighQuality, image_080 }, /* 21 */ + { 1.0, PixelOffsetModeHighQuality, image_100 }, + { 1.2, PixelOffsetModeHighQuality, image_120_half, TRUE }, + { 1.5, PixelOffsetModeHighQuality, image_150_half, TRUE }, + { 1.8, PixelOffsetModeHighQuality, image_180 }, + { 2.0, PixelOffsetModeHighQuality, image_200_half, TRUE }, + { 2.5, PixelOffsetModeHighQuality, image_250_half, TRUE }, }; BYTE src_2x1[6] = { 0x80,0x80,0x80,0x80,0x80,0x80 }; BYTE dst_8x1[24]; @@ -3850,6 +3884,9 @@ static void test_DrawImage_scale(void) for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + status = GdipSetPixelOffsetMode(graphics, td[i].pixel_offset_mode); + expect(Ok, status); + status = GdipCreateMatrix2(td[i].scale_x, 0.0, 0.0, 1.0, 0.0, 0.0, &matrix); expect(Ok, status); status = GdipSetWorldTransform(graphics, matrix); @@ -3861,6 +3898,9 @@ static void test_DrawImage_scale(void) expect(Ok, status); match = memcmp(dst_8x1, td[i].image, sizeof(dst_8x1)) == 0; + if (!match && td[i].todo) + todo_wine ok(match, "%d: data should match\n", i); + else ok(match, "%d: data should match\n", i); if (!match) {

1 0

Erich Hoover : ddraw: Enumerate wined3d interfaces with DirectDrawEnumerateEx.
by Alexandre Julliard Sept. 18, 2012

Sept. 18, 2012

Module: wine Branch: master Commit: b0cefe897c6dbd846b0525e3f3aab59cae75eb6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0cefe897c6dbd846b0525e3f… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Sep 17 14:18:39 2012 -0600 ddraw: Enumerate wined3d interfaces with DirectDrawEnumerateEx. --- dlls/ddraw/main.c | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e98b533..6d0ddc4 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -374,6 +374,8 @@ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA callback, void *context) ***********************************************************************/ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *context, DWORD flags) { + struct wined3d *wined3d; + TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags); if (flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES | @@ -384,23 +386,50 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex if (flags) FIXME("flags 0x%08x not handled\n", flags); - TRACE("Enumerating default DirectDraw HAL interface\n"); + TRACE("Enumerating ddraw interfaces\n"); + wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS); - /* We only have one driver by now */ __TRY { + /* QuickTime expects the description "DirectDraw HAL" */ static CHAR driver_desc[] = "DirectDraw HAL", driver_name[] = "display"; - - /* QuickTime expects the description "DirectDraw HAL" */ - callback(NULL, driver_desc, driver_name, context, 0); + struct wined3d_adapter_identifier adapter_id; + HRESULT hr = S_OK; + UINT adapter = 0; + BOOL cont_enum; + + /* The Battle.net System Checker expects both a NULL device and a GUID-based device */ + TRACE("Default interface: DirectDraw HAL\n"); + cont_enum = callback(NULL, driver_desc, driver_name, context, 0); + for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) + { + char DriverName[512] = ""; + + /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the + * Driver Name, so obtain the DeviceName and GUID from D3D. */ + memset(&adapter_id, 0x0, sizeof(adapter_id)); + adapter_id.device_name = DriverName; + adapter_id.device_name_size = sizeof(DriverName); + wined3d_mutex_lock(); + hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); + wined3d_mutex_unlock(); + if (SUCCEEDED(hr)) + { + TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); + cont_enum = callback(&adapter_id.device_identifier, driver_desc, + adapter_id.device_name, context, 0); + } + } } __EXCEPT_PAGE_FAULT { + wined3d_decref(wined3d); return DDERR_INVALIDPARAMS; } __ENDTRY; + wined3d_decref(wined3d); TRACE("End of enumeration\n"); return DD_OK; }

1 0