July 2012 - Wine-commits - list.winehq.org

Erich Hoover : hhctrl.ocx: Permit WS_CHILD help windows.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 2686b9b5880e2b9b27c131dd93d1c85743386253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2686b9b5880e2b9b27c131dd9… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jul 12 10:25:07 2012 -0600 hhctrl.ocx: Permit WS_CHILD help windows. --- dlls/hhctrl.ocx/help.c | 16 ++++++++++++---- dlls/hhctrl.ocx/hhctrl.c | 4 ++-- dlls/hhctrl.ocx/hhctrl.h | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 2f2fba1..ed5528c 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1585,7 +1585,7 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA static BOOL HH_CreateHelpWindow(HHInfo *info) { - HWND hWnd; + HWND hWnd, parent = 0; RECT winPos = info->WinType.rcWindowPos; WNDCLASSEXW wcex; DWORD dwStyles, dwExStyles; @@ -1613,7 +1613,11 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) /* Read in window parameters if available */ if (info->WinType.fsValidMembers & HHWIN_PARAM_STYLES) - dwStyles = info->WinType.dwStyles | WS_OVERLAPPEDWINDOW; + { + dwStyles = info->WinType.dwStyles; + if (!(info->WinType.dwStyles & WS_CHILD)) + dwStyles |= WS_OVERLAPPEDWINDOW; + } else dwStyles = WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; @@ -1655,8 +1659,11 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) caption = info->WinType.pszCaption; if (!*caption) caption = info->pCHMInfo->defTitle; + if (info->WinType.dwStyles & WS_CHILD) + parent = info->WinType.hwndCaller; + hWnd = CreateWindowExW(dwExStyles, windowClassW, caption, - dwStyles, x, y, width, height, NULL, NULL, hhctrl_hinstance, NULL); + dwStyles, x, y, width, height, parent, NULL, hhctrl_hinstance, NULL); if (!hWnd) return FALSE; @@ -1773,7 +1780,7 @@ void ReleaseHelpViewer(HHInfo *info) OleUninitialize(); } -HHInfo *CreateHelpViewer(LPCWSTR filename) +HHInfo *CreateHelpViewer(LPCWSTR filename, HWND caller) { HHInfo *info = heap_alloc_zero(sizeof(HHInfo)); int i; @@ -1796,6 +1803,7 @@ HHInfo *CreateHelpViewer(LPCWSTR filename) ReleaseHelpViewer(info); return NULL; } + info->WinType.hwndCaller = caller; if(!CreateViewer(info)) { ReleaseHelpViewer(info); diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index a5e7e37..bda435a 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -181,7 +181,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat } index = default_index; - info = CreateHelpViewer(fullname); + info = CreateHelpViewer(fullname, caller); if(!info) { heap_free(default_index); @@ -253,7 +253,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat return 0; } - info = CreateHelpViewer(fullname); + info = CreateHelpViewer(fullname, caller); if(!info) return NULL; diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index f03d476..bfc6618 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -194,7 +194,7 @@ IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*) DECLSPEC_HIDDEN; LPWSTR FindContextAlias(CHMInfo*,DWORD) DECLSPEC_HIDDEN; WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN; -HHInfo *CreateHelpViewer(LPCWSTR) DECLSPEC_HIDDEN; +HHInfo *CreateHelpViewer(LPCWSTR,HWND) DECLSPEC_HIDDEN; void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN; BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Properly set Number.prototyp.constructor.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: cf8029717c85967abc787425e65ec8b43f896372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8029717c85967abc787425e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 16 15:30:54 2012 +0200 jscript: Properly set Number.prototyp.constructor. --- dlls/jscript/function.c | 25 +++++++++++++++++++++++++ dlls/jscript/jscript.h | 2 ++ dlls/jscript/number.c | 2 +- dlls/jscript/tests/lang.js | 2 ++ 4 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 618831b..765efcc 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -639,6 +639,31 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, return S_OK; } +HRESULT create_builtin_constructor(script_ctx_t *ctx, builtin_invoke_t value_proc, const WCHAR *name, + const builtin_info_t *builtin_info, DWORD flags, jsdisp_t *prototype, jsdisp_t **ret) +{ + jsdisp_t *constr; + VARIANT v; + HRESULT hres; + + static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r',0}; + + hres = create_builtin_function(ctx, value_proc, name, builtin_info, flags, prototype, &constr); + if(FAILED(hres)) + return hres; + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = to_disp(constr); + hres = jsdisp_propput_name(prototype, constructorW, &v, NULL); + if(FAILED(hres)) { + jsdisp_release(constr); + return hres; + } + + *ret = constr; + return S_OK; +} + HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_code_t *func_code, scope_chain_t *scope_chain, jsdisp_t **ret) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 11b6ec9..ca91ee6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -225,6 +225,8 @@ VARIANT_BOOL jsdisp_is_own_prop(jsdisp_t *obj, BSTR name) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_builtin_constructor(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, + jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT Function_value(script_ctx_t*,vdisp_t*,WORD,unsigned,VARIANT*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT Function_invoke(jsdisp_t*,IDispatch*,WORD,unsigned,VARIANT*,VARIANT*,jsexcept_t*); diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index c62d985..d2de790 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -625,7 +625,7 @@ HRESULT create_number_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi return hres; number->value = 0; - hres = create_builtin_function(ctx, NumberConstr_value, NumberW, NULL, + hres = create_builtin_constructor(ctx, NumberConstr_value, NumberW, NULL, PROPF_CONSTR|1, &number->dispex, ret); jsdisp_release(&number->dispex); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 308e0c9..75306f1 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -91,6 +91,8 @@ ok(Function.prototype.prototype === undefined, "Function.prototype.prototype is ok(Date.prototype !== undefined, "Date.prototype is undefined"); ok(Date.prototype.prototype === undefined, "Date.prototype is not undefined"); +ok(Number.prototype.constructor === Number, "Number.prototype.constructor !== Number"); + Function.prototype.test = true; ok(testFunc1.test === true, "testFunc1.test !== true"); ok(Function.test === true, "Function.test !== true");

1 0

Jacek Caban : jscript: Properly handle constructor property for most builtin constructors.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: d4926503322cce74258bee188e91200b09914d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4926503322cce74258bee188… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 16 15:31:10 2012 +0200 jscript: Properly handle constructor property for most builtin constructors. --- dlls/jscript/array.c | 2 +- dlls/jscript/bool.c | 2 +- dlls/jscript/date.c | 2 +- dlls/jscript/object.c | 2 +- dlls/jscript/regexp.c | 2 +- dlls/jscript/string.c | 2 +- dlls/jscript/tests/lang.js | 14 +++++++++++++- dlls/jscript/vbarray.c | 2 +- 8 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 5004eb5..6881412 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1183,7 +1183,7 @@ HRESULT create_array_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdis if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, ArrayConstr_value, ArrayW, NULL, PROPF_CONSTR|1, &array->dispex, ret); + hres = create_builtin_constructor(ctx, ArrayConstr_value, ArrayW, NULL, PROPF_CONSTR|1, &array->dispex, ret); jsdisp_release(&array->dispex); return hres; diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 6ddcf9e..14bb1a3 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -190,7 +190,7 @@ HRESULT create_bool_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, BoolConstr_value, BooleanW, NULL, + hres = create_builtin_constructor(ctx, BoolConstr_value, BooleanW, NULL, PROPF_CONSTR|1, &bool->dispex, ret); jsdisp_release(&bool->dispex); diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 4dad1e2..465f7b2 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2631,7 +2631,7 @@ HRESULT create_date_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, DateConstr_value, DateW, &DateConstr_info, + hres = create_builtin_constructor(ctx, DateConstr_value, DateW, &DateConstr_info, PROPF_CONSTR|7, date, ret); jsdisp_release(date); diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index b1a83de..ce43eb5 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -264,7 +264,7 @@ HRESULT create_object_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi { static const WCHAR ObjectW[] = {'O','b','j','e','c','t',0}; - return create_builtin_function(ctx, ObjectConstr_value, ObjectW, NULL, PROPF_CONSTR, + return create_builtin_constructor(ctx, ObjectConstr_value, ObjectW, NULL, PROPF_CONSTR, object_prototype, ret); } diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 8e5445f..996f9f0 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -4143,7 +4143,7 @@ HRESULT create_regexp_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, RegExpConstr_value, RegExpW, &RegExpConstr_info, + hres = create_builtin_constructor(ctx, RegExpConstr_value, RegExpW, &RegExpConstr_info, PROPF_CONSTR|2, &regexp->dispex, ret); jsdisp_release(&regexp->dispex); diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 46d779a..9b23005 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1669,7 +1669,7 @@ HRESULT create_string_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, StringConstr_value, StringW, &StringConstr_info, + hres = create_builtin_constructor(ctx, StringConstr_value, StringW, &StringConstr_info, PROPF_CONSTR|1, &string->dispex, ret); jsdisp_release(&string->dispex); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 75306f1..c37b7c7 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -91,7 +91,19 @@ ok(Function.prototype.prototype === undefined, "Function.prototype.prototype is ok(Date.prototype !== undefined, "Date.prototype is undefined"); ok(Date.prototype.prototype === undefined, "Date.prototype is not undefined"); -ok(Number.prototype.constructor === Number, "Number.prototype.constructor !== Number"); +function testConstructor(constr, name) { + ok(constr.prototype.constructor === constr, name + ".prototype.constructor !== " + name); +} + +testConstructor(Object, "Object"); +testConstructor(String, "String"); +testConstructor(Array, "Array"); +testConstructor(Boolean, "Boolean"); +testConstructor(Number, "Number"); +testConstructor(RegExp, "RegExp"); +//testConstructor(Function, "Function"); +testConstructor(Date, "Date"); +testConstructor(VBArray, "VBArray"); Function.prototype.test = true; ok(testFunc1.test === true, "testFunc1.test !== true"); diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 87bdf88..ac0c6de 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -326,7 +326,7 @@ HRESULT create_vbarray_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsd if(FAILED(hres)) return hres; - hres = create_builtin_function(ctx, VBArrayConstr_value, VBArrayW, NULL, PROPF_CONSTR|1, &vbarray->dispex, ret); + hres = create_builtin_constructor(ctx, VBArrayConstr_value, VBArrayW, NULL, PROPF_CONSTR|1, &vbarray->dispex, ret); jsdisp_release(&vbarray->dispex); return hres;

1 0

Jacek Caban : jscript: Properly set Function constructor' s constructor property.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: bf7b7272ee130e7c6d793c3b87cbf932be8aff48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7b7272ee130e7c6d793c3b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 16 15:31:24 2012 +0200 jscript: Properly set Function constructor's constructor property. --- dlls/jscript/function.c | 20 ++++++++++++++------ dlls/jscript/tests/lang.js | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 765efcc..1d188e7 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -639,22 +639,28 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, return S_OK; } +static HRESULT set_constructor_prop(script_ctx_t *ctx, jsdisp_t *constr, jsdisp_t *prot) +{ + VARIANT v; + + static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r',0}; + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = to_disp(constr); + return jsdisp_propput_name(prot, constructorW, &v, NULL); +} + HRESULT create_builtin_constructor(script_ctx_t *ctx, builtin_invoke_t value_proc, const WCHAR *name, const builtin_info_t *builtin_info, DWORD flags, jsdisp_t *prototype, jsdisp_t **ret) { jsdisp_t *constr; - VARIANT v; HRESULT hres; - static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r',0}; - hres = create_builtin_function(ctx, value_proc, name, builtin_info, flags, prototype, &constr); if(FAILED(hres)) return hres; - V_VT(&v) = VT_DISPATCH; - V_DISPATCH(&v) = to_disp(constr); - hres = jsdisp_propput_name(prototype, constructorW, &v, NULL); + hres = set_constructor_prop(ctx, constr, prototype); if(FAILED(hres)) { jsdisp_release(constr); return hres; @@ -839,6 +845,8 @@ HRESULT init_function_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) constr->value_proc = FunctionConstr_value; constr->name = FunctionW; hres = set_prototype(ctx, &constr->dispex, &prot->dispex); + if(SUCCEEDED(hres)) + hres = set_constructor_prop(ctx, &constr->dispex, &prot->dispex); if(FAILED(hres)) jsdisp_release(&constr->dispex); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index c37b7c7..a0eae4a 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -101,7 +101,7 @@ testConstructor(Array, "Array"); testConstructor(Boolean, "Boolean"); testConstructor(Number, "Number"); testConstructor(RegExp, "RegExp"); -//testConstructor(Function, "Function"); +testConstructor(Function, "Function"); testConstructor(Date, "Date"); testConstructor(VBArray, "VBArray");

1 0

Jacek Caban : jscript: Properly set Error object's constructor property.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 27747d3a755b8414be80cc84908851e02c992733 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27747d3a755b8414be80cc849… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 16 15:31:37 2012 +0200 jscript: Properly set Error object's constructor property. --- dlls/jscript/error.c | 2 +- dlls/jscript/tests/lang.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index aa948c6..5ff29fd 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -370,7 +370,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) hres = jsdisp_propput_name(err, nameW, &v, NULL/*FIXME*/); if(SUCCEEDED(hres)) - hres = create_builtin_function(ctx, constr_val[i], names[i], NULL, + hres = create_builtin_constructor(ctx, constr_val[i], names[i], NULL, PROPF_CONSTR|1, err, constr_addr[i]); jsdisp_release(err); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index a0eae4a..78e7782 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -104,6 +104,14 @@ testConstructor(RegExp, "RegExp"); testConstructor(Function, "Function"); testConstructor(Date, "Date"); testConstructor(VBArray, "VBArray"); +testConstructor(Error, "Error"); +testConstructor(EvalError, "EvalError"); +testConstructor(RangeError, "RangeError"); +testConstructor(ReferenceError, "ReferenceError"); +//testConstructor(RegExpError, "RegExpError"); +testConstructor(SyntaxError, "SyntaxError"); +testConstructor(TypeError, "TypeError"); +testConstructor(URIError, "URIError"); Function.prototype.test = true; ok(testFunc1.test === true, "testFunc1.test !== true");

1 0

Jacek Caban : jscript: Expose RegExpError constructor in global object.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 49fd90320581cdc72068824d0804eeaa8eeae0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=49fd90320581cdc72068824d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 16 15:31:58 2012 +0200 jscript: Expose RegExpError constructor in global object. --- dlls/jscript/global.c | 10 ++++++++++ dlls/jscript/tests/api.js | 1 + dlls/jscript/tests/lang.js | 2 +- 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index f50debf..23a36eb 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -48,6 +48,7 @@ static const WCHAR NumberW[] = {'N','u','m','b','e','r',0}; static const WCHAR ObjectW[] = {'O','b','j','e','c','t',0}; static const WCHAR StringW[] = {'S','t','r','i','n','g',0}; static const WCHAR RegExpW[] = {'R','e','g','E','x','p',0}; +static const WCHAR RegExpErrorW[] = {'R','e','g','E','x','p','E','r','r','o','r',0}; static const WCHAR ActiveXObjectW[] = {'A','c','t','i','v','e','X','O','b','j','e','c','t',0}; static const WCHAR VBArrayW[] = {'V','B','A','r','r','a','y',0}; static const WCHAR EnumeratorW[] = {'E','n','u','m','e','r','a','t','o','r',0}; @@ -172,6 +173,14 @@ static HRESULT JSGlobal_RangeError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return constructor_call(ctx->range_error_constr, flags, argc, argv, retv, ei); } +static HRESULT JSGlobal_RegExpError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, VARIANT *argv, + VARIANT *retv, jsexcept_t *ei) +{ + TRACE("\n"); + + return constructor_call(ctx->regexp_error_constr, flags, argc, argv, retv, ei); +} + static HRESULT JSGlobal_ReferenceError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) { @@ -1155,6 +1164,7 @@ static const builtin_prop_t JSGlobal_props[] = { {RangeErrorW, JSGlobal_RangeError, PROPF_CONSTR|1}, {ReferenceErrorW, JSGlobal_ReferenceError, PROPF_CONSTR|1}, {RegExpW, JSGlobal_RegExp, PROPF_CONSTR|2}, + {RegExpErrorW, JSGlobal_RegExpError, PROPF_CONSTR|1}, {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, {ScriptEngineMajorVersionW, JSGlobal_ScriptEngineMajorVersion, PROPF_METHOD}, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ac909b2..f6b22d3 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2545,6 +2545,7 @@ ok(Date.length == 7, "Date.length = " + Date.length); ok(Enumerator.length == 7, "Enumerator.length = " + Enumerator.length); ok(Error.length == 1, "Error.length = " + Error.length); ok(EvalError.length == 1, "EvalError.length = " + EvalError.length); +ok(RegExpError.length == 1, "RegExpError.length = " + RegExpError.length); ok(Function.length == 1, "Function.length = " + Function.length); ok(GetObject.length == 2, "GetObject.length = " + GetObject.length); ok(Number.length == 1, "Number.length = " + Number.length); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 78e7782..515f1b5 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -108,7 +108,7 @@ testConstructor(Error, "Error"); testConstructor(EvalError, "EvalError"); testConstructor(RangeError, "RangeError"); testConstructor(ReferenceError, "ReferenceError"); -//testConstructor(RegExpError, "RegExpError"); +testConstructor(RegExpError, "RegExpError"); testConstructor(SyntaxError, "SyntaxError"); testConstructor(TypeError, "TypeError"); testConstructor(URIError, "URIError");

1 0

Jacek Caban : jscript: Don' t set constructor property to each object instance, it belongs to their prototypes.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: d0aa78c0961846be4ffcbd9384e6995cb977915d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0aa78c0961846be4ffcbd938… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 16 15:32:15 2012 +0200 jscript: Don't set constructor property to each object instance, it belongs to their prototypes. --- dlls/jscript/dispex.c | 28 ++++++++++++---------------- dlls/jscript/function.c | 4 +++- dlls/jscript/jscript.h | 1 + dlls/jscript/tests/lang.js | 15 ++++++++++++--- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 44008bd..909ed37 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -922,7 +922,6 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built dispex_prop_t *prop; HRESULT hres; - static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r',0}; static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; hres = find_prop_name_prot(constr, string_hash(prototypeW), prototypeW, &prop); @@ -947,21 +946,6 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built if(prot) jsdisp_release(prot); - if(FAILED(hres)) - return hres; - - hres = ensure_prop_name(dispex, constructorW, FALSE, 0, &prop); - if(SUCCEEDED(hres)) { - jsexcept_t jsexcept; - VARIANT var; - - var_set_jsdisp(&var, constr); - memset(&jsexcept, 0, sizeof(jsexcept)); - hres = prop_put(dispex, prop, &var, &jsexcept, NULL/*FIXME*/); - } - if(FAILED(hres)) - jsdisp_release(dispex); - return hres; } @@ -1245,6 +1229,18 @@ HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, VARIANT *val) return VariantCopy(&prop->u.var, val); } +HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, VARIANT *val) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = ensure_prop_name(obj, name, FALSE, 0, &prop); + if(FAILED(hres)) + return hres; + + return VariantCopy(&prop->u.var, val); +} + HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, VARIANT *val, jsexcept_t *ei) { WCHAR buf[12]; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 1d188e7..1ce1124 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -647,7 +647,7 @@ static HRESULT set_constructor_prop(script_ctx_t *ctx, jsdisp_t *constr, jsdisp_ V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = to_disp(constr); - return jsdisp_propput_name(prot, constructorW, &v, NULL); + return jsdisp_propput_dontenum(prot, constructorW, &v); } HRESULT create_builtin_constructor(script_ctx_t *ctx, builtin_invoke_t value_proc, const WCHAR *name, @@ -684,6 +684,8 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod hres = create_function(ctx, NULL, PROPF_CONSTR, FALSE, NULL, &function); if(SUCCEEDED(hres)) { hres = set_prototype(ctx, &function->dispex, prototype); + if(SUCCEEDED(hres)) + hres = set_constructor_prop(ctx, &function->dispex, prototype); if(FAILED(hres)) jsdisp_release(&function->dispex); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ca91ee6..484049c 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -216,6 +216,7 @@ HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*) DECLS HRESULT jsdisp_propget(jsdisp_t*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; +HRESULT jsdisp_propput_dontenum(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 515f1b5..26a28b8 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -91,8 +91,15 @@ ok(Function.prototype.prototype === undefined, "Function.prototype.prototype is ok(Date.prototype !== undefined, "Date.prototype is undefined"); ok(Date.prototype.prototype === undefined, "Date.prototype is not undefined"); -function testConstructor(constr, name) { +function testConstructor(constr, name, inst) { ok(constr.prototype.constructor === constr, name + ".prototype.constructor !== " + name); + ok(constr.prototype.hasOwnProperty("constructor"), name + ".prototype.hasOwnProperty('constructor')"); + + if(!inst) + inst = new constr(); + + ok(inst.constructor === constr, "(new " + name + "()).constructor !== " + name); + ok(!inst.hasOwnProperty("constructor"), "(new " + name + "()).hasOwnProperty('constructor')"); } testConstructor(Object, "Object"); @@ -100,10 +107,10 @@ testConstructor(String, "String"); testConstructor(Array, "Array"); testConstructor(Boolean, "Boolean"); testConstructor(Number, "Number"); -testConstructor(RegExp, "RegExp"); +testConstructor(RegExp, "RegExp", /x/); testConstructor(Function, "Function"); testConstructor(Date, "Date"); -testConstructor(VBArray, "VBArray"); +testConstructor(VBArray, "VBArray", new VBArray(createArray())); testConstructor(Error, "Error"); testConstructor(EvalError, "EvalError"); testConstructor(RangeError, "RangeError"); @@ -194,11 +201,13 @@ function testConstr1() { } testConstr1.prototype.pvar = 1; +ok(testConstr1.prototype.constructor === testConstr1, "testConstr1.prototype.constructor !== testConstr1"); var obj2 = new testConstr1(true); ok(typeof(obj2) === "object", "typeof(obj2) is not object"); ok(obj2.constructor === testConstr1, "unexpected obj2.constructor"); ok(obj2.pvar === 1, "obj2.pvar is not 1"); +ok(!obj2.hasOwnProperty('constructor'), "obj2.hasOwnProperty('constructor')"); testConstr1.prototype.pvar = 2; ok(obj2.pvar === 2, "obj2.pvar is not 2");

1 0

Józef Kucia : d3dx9: Implement pixel format conversion for volume textures.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 5d4bc533434a1ab717efa71bca488ebf1bdb0772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4bc533434a1ab717efa71bc… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jul 13 17:21:52 2012 +0200 d3dx9: Implement pixel format conversion for volume textures. --- dlls/d3dx9_36/d3dx9_36_private.h | 4 + dlls/d3dx9_36/surface.c | 121 ++++++++++++++++++++----------------- dlls/d3dx9_36/tests/volume.c | 17 +++++- dlls/d3dx9_36/volume.c | 39 ++++++++++++- 4 files changed, 122 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d4bc533434a1ab717efa…

1 0

Józef Kucia : d3dx9: Implement point filtering for volume textures.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 29acc31506216323a4e91367520d6cb0b4fff66f URL: http://source.winehq.org/git/wine.git/?a=commit;h=29acc31506216323a4e913675… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jul 13 17:21:53 2012 +0200 d3dx9: Implement point filtering for volume textures. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 + dlls/d3dx9_36/surface.c | 103 ++++++++++++++++++++------------------ dlls/d3dx9_36/tests/volume.c | 2 +- dlls/d3dx9_36/volume.c | 7 ++- 4 files changed, 63 insertions(+), 52 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index fec9ede..20d013f 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -67,6 +67,9 @@ const PixelFormatDesc *get_format_info_idx(int idx) DECLSPEC_HIDDEN; void copy_simple_data(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, SIZE src_size, UINT src_depth, const PixelFormatDesc *src_format, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, SIZE dst_size, UINT dst_depth, const PixelFormatDesc *dst_format, D3DCOLOR color_key) DECLSPEC_HIDDEN; +void point_filter_simple_data(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, SIZE src_size, UINT src_depth, const PixelFormatDesc *src_format, + BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, SIZE dst_size, UINT dst_depth, const PixelFormatDesc *dst_format, + D3DCOLOR color_key) DECLSPEC_HIDDEN; HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 433c251..e640160 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1353,78 +1353,83 @@ void copy_simple_data(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, * using a point filter. * Works only for ARGB formats with 1 - 4 bytes per pixel. */ -static void point_filter_simple_data(const BYTE *src, UINT srcpitch, SIZE src_size, const PixelFormatDesc *srcformat, - BYTE *dest, UINT destpitch, SIZE dst_size, const PixelFormatDesc *destformat, D3DCOLOR colorkey) +void point_filter_simple_data(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, SIZE src_size, UINT src_depth, const PixelFormatDesc *src_format, + BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, SIZE dst_size, UINT dst_depth, const PixelFormatDesc *dst_format, D3DCOLOR color_key) { struct argb_conversion_info conv_info, ck_conv_info; const PixelFormatDesc *ck_format = NULL; DWORD channels[4], pixel; - - UINT x, y; + UINT x, y, z; ZeroMemory(channels, sizeof(channels)); - init_argb_conversion_info(srcformat, destformat, &conv_info); + init_argb_conversion_info(src_format, dst_format, &conv_info); - if (colorkey) + if (color_key) { /* Color keys are always represented in D3DFMT_A8R8G8B8 format. */ ck_format = get_format_info(D3DFMT_A8R8G8B8); - init_argb_conversion_info(srcformat, ck_format, &ck_conv_info); + init_argb_conversion_info(src_format, ck_format, &ck_conv_info); } - for (y = 0; y < dst_size.cy; ++y) + for (z = 0; z < dst_depth; z++) { - BYTE *destptr = dest + y * destpitch; - const BYTE *bufptr = src + srcpitch * (y * src_size.cy / dst_size.cy); + BYTE *dst_slice_ptr = dst + z * dst_slice_pitch; + const BYTE *src_slice_ptr = src + src_slice_pitch * (z * src_depth / dst_depth); - for (x = 0; x < dst_size.cx; ++x) + for (y = 0; y < dst_size.cy; y++) { - const BYTE *srcptr = bufptr + (x * src_size.cx / dst_size.cx) * srcformat->bytes_per_pixel; - DWORD val; - - /* extract source color components */ - pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel); + BYTE *dst_ptr = dst_slice_ptr + y * dst_row_pitch; + const BYTE *src_row_ptr = src_slice_ptr + src_row_pitch * (y * src_size.cy / dst_size.cy); - if (!srcformat->to_rgba && !destformat->from_rgba) + for (x = 0; x < dst_size.cx; x++) { - get_relevant_argb_components(&conv_info, pixel, channels); - val = make_argb_color(&conv_info, channels); + const BYTE *src_ptr = src_row_ptr + (x * src_size.cx / dst_size.cx) * src_format->bytes_per_pixel; + DWORD val; - if (colorkey) + /* extract source color components */ + pixel = dword_from_bytes(src_ptr, src_format->bytes_per_pixel); + + if (!src_format->to_rgba && !dst_format->from_rgba) { - get_relevant_argb_components(&ck_conv_info, pixel, channels); - pixel = make_argb_color(&ck_conv_info, channels); - if (pixel == colorkey) - val &= ~conv_info.destmask[0]; - } - } - else - { - struct vec4 color, tmp; + get_relevant_argb_components(&conv_info, pixel, channels); + val = make_argb_color(&conv_info, channels); - format_to_vec4(srcformat, &pixel, &color); - if (srcformat->to_rgba) - srcformat->to_rgba(&color, &tmp); + if (color_key) + { + get_relevant_argb_components(&ck_conv_info, pixel, channels); + pixel = make_argb_color(&ck_conv_info, channels); + if (pixel == color_key) + val &= ~conv_info.destmask[0]; + } + } else - tmp = color; - - if (ck_format) { - format_from_vec4(ck_format, &tmp, &pixel); - if (pixel == colorkey) - tmp.w = 0.0f; - } + struct vec4 color, tmp; - if (destformat->from_rgba) - destformat->from_rgba(&tmp, &color); - else - color = tmp; + format_to_vec4(src_format, &pixel, &color); + if (src_format->to_rgba) + src_format->to_rgba(&color, &tmp); + else + tmp = color; - format_from_vec4(destformat, &color, &val); - } + if (ck_format) + { + format_from_vec4(ck_format, &tmp, &pixel); + if (pixel == color_key) + tmp.w = 0.0f; + } - dword_to_bytes(destptr, val, destformat->bytes_per_pixel); - destptr += destformat->bytes_per_pixel; + if (dst_format->from_rgba) + dst_format->from_rgba(&tmp, &color); + else + color = tmp; + + format_from_vec4(dst_format, &color, &val); + } + + dword_to_bytes(dst_ptr, val, dst_format->bytes_per_pixel); + dst_ptr += dst_format->bytes_per_pixel; + } } } } @@ -1581,8 +1586,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, /* Always apply a point filter until D3DX_FILTER_LINEAR, * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */ - point_filter_simple_data(src_memory, src_pitch, src_size, srcformatdesc, - lockrect.pBits, lockrect.Pitch, dst_size, destformatdesc, color_key); + point_filter_simple_data(src_memory, src_pitch, 0, src_size, 1, srcformatdesc, + lockrect.pBits, lockrect.Pitch, 0, dst_size, 1, destformatdesc, color_key); } IDirect3DSurface9_UnlockRect(dst_surface); diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index f49a634..35cd509 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -93,7 +93,7 @@ static void test_D3DXLoadVolumeFromMemory(IDirect3DDevice9 *device) ok(hr == E_FAIL, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, E_FAIL); hr = D3DXLoadVolumeFromMemory(volume, NULL, NULL, pixels, D3DFMT_A8R8G8B8, 16, 16, NULL, &src_box, D3DX_DEFAULT, 0); - todo_wine ok(hr == D3D_OK, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadVolumeFromMemory(volume, NULL, &dst_box, NULL, D3DFMT_A8R8G8B8, 16, 16, NULL, &src_box, D3DX_DEFAULT, 0); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 90dbd29..ca7df62 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -226,8 +226,11 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, } else { - FIXME("Filtering for volume textures not implemented\n"); - return E_NOTIMPL; + if ((filter & 0xf) != D3DX_FILTER_POINT) + FIXME("Unhandled filter %#x.\n", filter); + + point_filter_simple_data(src_addr, src_row_pitch, src_slice_pitch, src_size, src_depth, src_format_desc, + locked_box.pBits, locked_box.RowPitch, locked_box.SlicePitch, dst_size, dst_depth, dst_format_desc, color_key); } IDirect3DVolume9_UnlockBox(dst_volume);

1 0

Józef Kucia : d3dx9: Use structure to pass volume size to pixel format conversion functions.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: e8bfaf172782676fab4d25afeb214076afa9a09f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8bfaf172782676fab4d25afe… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jul 13 17:21:54 2012 +0200 d3dx9: Use structure to pass volume size to pixel format conversion functions. --- dlls/d3dx9_36/d3dx9_36_private.h | 15 +++++-- dlls/d3dx9_36/surface.c | 87 +++++++++++++++++++------------------ dlls/d3dx9_36/volume.c | 47 +++++++++------------ 3 files changed, 76 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8bfaf172782676fab4d2…

1 0