September 2012 - Wine-commits

Jacek Caban : oleaut32: Properly handle TKIND_ALIAS when looking for iface GUID.
by Alexandre Julliard 19 Sep '12

19 Sep '12

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 : mshtml: Fixed NULL event_obj handling in fire_event_obj.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: f833ac752e975f0040e2bcfa96180c2528982725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f833ac752e975f0040e2bcfa9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 15:30:25 2012 +0200 mshtml: Fixed NULL event_obj handling in fire_event_obj. --- dlls/mshtml/htmlevent.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 12ff2ff..eeb4070 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1042,7 +1042,7 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e window = doc->window; prev_event = window->event; - window->event = &event_obj->IHTMLEventObj_iface; + window->event = event_obj ? &event_obj->IHTMLEventObj_iface : NULL; nsIDOMNode_GetNodeType(target, &node_type); nsnode = target;

1 0

Piotr Caban : wininet: Define more fields in urlcache header structure.
by Alexandre Julliard 19 Sep '12

19 Sep '12

Module: wine Branch: master Commit: dba38b1ab437e42f3cd50146a92d19872c83db14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba38b1ab437e42f3cd50146a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 19 15:29:44 2012 +0200 wininet: Define more fields in urlcache header structure. --- dlls/wininet/urlcache.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 04ffd90..04ecd80 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -62,6 +62,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define ENTRY_START_OFFSET 0x4000 #define DIR_LENGTH 8 +#define MAX_DIR_NO 0x20 #define BLOCKSIZE 128 #define HASHTABLE_SIZE 448 #define HASHTABLE_NUM_ENTRIES 64 /* this needs to be power of 2, that divides HASHTABLE_SIZE */ @@ -167,8 +168,10 @@ typedef struct _URLCACHE_HEADER ULARGE_INTEGER CacheLimit; ULARGE_INTEGER CacheUsage; ULARGE_INTEGER ExemptUsage; - DWORD DirectoryCount; /* number of directory_data's */ - DIRECTORY_DATA directory_data[1]; /* first directory entry */ + DWORD DirectoryCount; + DIRECTORY_DATA directory_data[MAX_DIR_NO]; + DWORD options[0x21]; + BYTE allocation_table[ALLOCATION_TABLE_SIZE]; } URLCACHE_HEADER, *LPURLCACHE_HEADER; typedef const URLCACHE_HEADER *LPCURLCACHE_HEADER; @@ -850,7 +853,6 @@ static inline void URLCache_Allocation_BlockAllocate(BYTE * AllocationTable, DWO */ static DWORD URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBlocksNeeded, CACHEFILE_ENTRY ** ppEntry) { - LPBYTE AllocationTable = (LPBYTE)pHeader + ALLOCATION_TABLE_OFFSET; DWORD dwBlockNumber; DWORD dwFreeCounter; for (dwBlockNumber = 0; dwBlockNumber < pHeader->dwIndexCapacityInBlocks; dwBlockNumber++) @@ -858,7 +860,7 @@ static DWORD URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBloc for (dwFreeCounter = 0; dwFreeCounter < dwBlocksNeeded && dwFreeCounter + dwBlockNumber < pHeader->dwIndexCapacityInBlocks && - URLCache_Allocation_BlockIsFree(AllocationTable, dwBlockNumber + dwFreeCounter); + URLCache_Allocation_BlockIsFree(pHeader->allocation_table, dwBlockNumber + dwFreeCounter); dwFreeCounter++) TRACE("Found free block at no. %d (0x%x)\n", dwBlockNumber, ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE); @@ -867,7 +869,7 @@ static DWORD URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBloc DWORD index; TRACE("Found free blocks starting at no. %d (0x%x)\n", dwBlockNumber, ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE); for (index = 0; index < dwBlocksNeeded; index++) - URLCache_Allocation_BlockAllocate(AllocationTable, dwBlockNumber + index); + URLCache_Allocation_BlockAllocate(pHeader->allocation_table, dwBlockNumber + index); *ppEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE); for (index = 0; index < dwBlocksNeeded * BLOCKSIZE / sizeof(DWORD); index++) ((DWORD*)*ppEntry)[index] = 0xdeadbeef; @@ -893,12 +895,11 @@ static BOOL URLCache_DeleteEntry(LPURLCACHE_HEADER pHeader, CACHEFILE_ENTRY * pE { DWORD dwStartBlock; DWORD dwBlock; - BYTE * AllocationTable = (LPBYTE)pHeader + ALLOCATION_TABLE_OFFSET; /* update allocation table */ dwStartBlock = ((DWORD)((BYTE *)pEntry - (BYTE *)pHeader) - ENTRY_START_OFFSET) / BLOCKSIZE; for (dwBlock = dwStartBlock; dwBlock < dwStartBlock + pEntry->dwBlocksUsed; dwBlock++) - URLCache_Allocation_BlockFree(AllocationTable, dwBlock); + URLCache_Allocation_BlockFree(pHeader->allocation_table, dwBlock); return TRUE; }

1 0

Jacek Caban : jscript: Store exception value in script_ctx_t instead of passing it everywhere.
by Alexandre Julliard 19 Sep '12

19 Sep '12

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

Jacek Caban : jscript: Don't store jsexcept_t in exec_ctx_t.
by Alexandre Julliard 19 Sep '12

19 Sep '12

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 19 Sep '12

19 Sep '12

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

Erich Hoover : ddraw: Enumerate wined3d interfaces with DirectDrawEnumerateEx.
by Alexandre Julliard 18 Sep '12

18 Sep '12

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

Alistair Leslie-Hughes : odbccu32: Add new dll.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: cee8a76ecc702340ddf96e527089e4d0dda32f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee8a76ecc702340ddf96e527… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 18 10:59:04 2012 +1000 odbccu32: Add new dll. --- configure | 1 + configure.ac | 1 + dlls/odbccu32/Makefile.in | 8 +++++++ dlls/odbccu32/odbccu32.spec | 37 ++++++++++++++++++++++++++++++++++++ dlls/odbccu32/odbccu32_main.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/odbccu32/version.rc | 27 ++++++++++++++++++++++++++ 6 files changed, 116 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 87f93f9..21044af 100755 --- a/configure +++ b/configure @@ -15593,6 +15593,7 @@ wine_fn_config_dll objsel enable_objsel wine_fn_config_dll odbc32 enable_odbc32 implib wine_fn_config_dll odbccp32 enable_odbccp32 implib wine_fn_config_test dlls/odbccp32/tests odbccp32_test +wine_fn_config_dll odbccu32 enable_odbccu32 wine_fn_config_dll ole2.dll16 enable_win16 wine_fn_config_dll ole2conv.dll16 enable_win16 wine_fn_config_dll ole2disp.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 8a69570..84b5de8 100644 --- a/configure.ac +++ b/configure.ac @@ -2866,6 +2866,7 @@ WINE_CONFIG_DLL(objsel) WINE_CONFIG_DLL(odbc32,,[implib]) WINE_CONFIG_DLL(odbccp32,,[implib]) WINE_CONFIG_TEST(dlls/odbccp32/tests) +WINE_CONFIG_DLL(odbccu32) WINE_CONFIG_DLL(ole2.dll16,enable_win16) WINE_CONFIG_DLL(ole2conv.dll16,enable_win16) WINE_CONFIG_DLL(ole2disp.dll16,enable_win16) diff --git a/dlls/odbccu32/Makefile.in b/dlls/odbccu32/Makefile.in new file mode 100644 index 0000000..cc8bf71 --- /dev/null +++ b/dlls/odbccu32/Makefile.in @@ -0,0 +1,8 @@ +MODULE = odbccu32.dll + +C_SRCS = \ + odbccu32_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/odbccu32/odbccu32.spec b/dlls/odbccu32/odbccu32.spec new file mode 100644 index 0000000..e0dec29 --- /dev/null +++ b/dlls/odbccu32/odbccu32.spec @@ -0,0 +1,37 @@ + 4 stdcall SQLBindCol(long long long ptr long ptr) odbc32.SQLBindCol + 5 stdcall SQLCancel(long) odbc32.SQLCancel + 6 stub ReleaseCLStmtResources + 11 stdcall SQLExecDirect(long str long) odbc32.SQLExecDirect + 12 stdcall SQLExecute(long) odbc32.SQLExecute + 13 stdcall SQLFetch(long) odbc32.SQLFetch + 16 stdcall SQLFreeStmt(long long ) odbc32.SQLFreeStmt + 19 stdcall SQLPrepare(long str long) odbc32.SQLPrepare + 20 stdcall SQLRowCount(long ptr) odbc32.SQLRowCount + 23 stdcall SQLTransact(long long long) odbc32.SQLTransact + 26 stdcall SQLCloseCursor(long) odbc32.SQLCloseCursor + 29 stdcall SQLEndTran(long long long) odbc32.SQLEndTran + 30 stdcall SQLFetchScroll(long long long) odbc32.SQLFetchScroll + 31 stdcall SQLFreeHandle(long long) odbc32.SQLFreeHandle + 33 stdcall SQLGetDescField(long long long ptr long ptr) odbc32.SQLGetDescField + 34 stdcall SQLGetDescRec(long long str long ptr ptr ptr ptr ptr ptr ptr) odbc32.SQLGetDescRec + 38 stdcall SQLGetStmtAttr(long long ptr long ptr) odbc32.SQLGetStmtAttr + 39 stdcall SQLSetConnectAttr(long long ptr long) odbc32.SQLSetConnectAttr + 43 stdcall SQLGetData(long long long ptr long ptr) odbc32.SQLGetData + 45 stdcall SQLGetInfo(long long ptr long ptr) odbc32.SQLGetInfo + 46 stdcall SQLGetStmtOption(long long ptr) odbc32.SQLGetStmtOption + 48 stdcall SQLParamData(long ptr) odbc32.SQLParamData + 49 stdcall SQLPutData(long ptr long) odbc32.SQLPutData + 50 stdcall SQLSetConnectOption(long long long) odbc32.SQLSetConnectOption + 51 stdcall SQLSetStmtOption(long long long) odbc32.SQLSetStmtOption + 59 stdcall SQLExtendedFetch(long long long ptr ptr) odbc32.SQLExtendedFetch + 61 stdcall SQLMoreResults(long) odbc32.SQLMoreResults + 62 stdcall SQLNativeSql(long str long str long ptr) odbc32.SQLNativeSql + 63 stdcall SQLNumParams(long ptr) odbc32.SQLNumParams + 64 stdcall SQLParamOptions(long long ptr) odbc32.SQLParamOptions + 68 stdcall SQLSetPos(long long long long) odbc32.SQLSetPos + 69 stdcall SQLSetScrollOptions(long long long long) odbc32.SQLSetScrollOptions + 72 stdcall SQLBindParameter(long long long long long long long ptr long ptr) odbc32.SQLBindParameter + 73 stdcall SQLSetDescField(long long long ptr long) odbc32.SQLSetDescField + 74 stdcall SQLSetDescRec(long long long long long long long ptr ptr ptr) odbc32.SQLSetDescRec + 76 stdcall SQLSetStmtAttr(long long ptr long) odbc32.SQLSetStmtAttr + 78 stdcall SQLBulkOperations(long long) odbc32.SQLBulkOperations diff --git a/dlls/odbccu32/odbccu32_main.c b/dlls/odbccu32/odbccu32_main.c new file mode 100644 index 0000000..09abf2b --- /dev/null +++ b/dlls/odbccu32/odbccu32_main.c @@ -0,0 +1,42 @@ +/* + * ODBC Cursor Library + * + * Copyright 2012 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/odbccu32/version.rc b/dlls/odbccu32/version.rc new file mode 100644 index 0000000..bc1e6f2 --- /dev/null +++ b/dlls/odbccu32/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2012 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine ODBC Cursor Library" +#define WINE_FILENAME_STR "odbcu32.dll" +#define WINE_FILEVERSION 6,1,7601,17632 +#define WINE_FILEVERSION_STR "6.1.7601.17632" +#define WINE_PRODUCTVERSION 6,1,7601,17632 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17632" + +#include "wine/wine_common_ver.rc"

1 0

Dmitry Timoshkov : gdiplus: Add some tests for scaling an image with various pixel offset modes.
by Alexandre Julliard 18 Sep '12

18 Sep '12

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

Dmitry Timoshkov : gdiplus: Add preliminary support for pixel offset modes.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 4d42626dbe265e700bb72420a1d6a683bfbcf16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d42626dbe265e700bb72420a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 12:04:59 2012 +0900 gdiplus: Add preliminary support for pixel offset modes. --- dlls/gdiplus/graphics.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e986c94..7e16460 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -836,7 +836,7 @@ static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT wi static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT width, UINT height, GpPointF *point, GDIPCONST GpImageAttributes *attributes, - InterpolationMode interpolation) + InterpolationMode interpolation, PixelOffsetMode offset_mode) { static int fixme; @@ -881,8 +881,25 @@ static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT return blend_colors(top, bottom, point->Y - topyf); } case InterpolationModeNearestNeighbor: + { + FLOAT pixel_offset; + switch (offset_mode) + { + default: + case PixelOffsetModeNone: + case PixelOffsetModeHighSpeed: + pixel_offset = 0.5; + break; + + case PixelOffsetModeHalf: + case PixelOffsetModeHighQuality: + pixel_offset = 0.0; + break; + } return sample_bitmap_pixel(src_rect, bits, width, height, - gdip_round(point->X), gdip_round(point->Y), attributes); + floorf(point->X + pixel_offset), floorf(point->Y + pixel_offset), attributes); + } + } } @@ -1176,7 +1193,8 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, argb_pixels[x + y*cdwStride] = resample_bitmap_pixel( &src_area, fill->bitmap_bits, bitmap->width, bitmap->height, - &point, fill->imageattributes, graphics->interpolation); + &point, fill->imageattributes, graphics->interpolation, + graphics->pixeloffset); } } } @@ -3122,6 +3140,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image LPBYTE src_data, dst_data; BitmapData lockeddata; InterpolationMode interpolation = graphics->interpolation; + PixelOffsetMode offset_mode = graphics->pixeloffset; GpPointF dst_to_src_points[3] = {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}; REAL x_dx, x_dy, y_dx, y_dy; static const GpImageAttributes defaultImageAttributes = {WrapModeClamp, 0, FALSE}; @@ -3228,7 +3247,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) - *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, imageAttributes, interpolation); + *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, + imageAttributes, interpolation, offset_mode); else *dst_color = 0; }

1 0