March 2016 - Wine-Commits - list.winehq.org

Hans Leidekker : webservices/tests: Add more structure type tests.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 5650300786be22f9c6549465742b0a3a64bb4f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5650300786be22f9c65494657… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 14:12:18 2016 +0200 webservices/tests: Add more structure type tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 153 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 5e8dd93..027b6f4 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -64,6 +64,13 @@ static const char data9[] = static const char data10[] = "<a></b>"; +static const char data11[] = + "<o:OfficeConfig xmlns:o=\"urn:schemas-microsoft-com:office:office\">" + "<o:services o:GenerationTime=\"2015-09-03T18:47:54\">" + "" + "</o:services>" + "</o:OfficeConfig>"; + static void test_WsCreateError(void) { HRESULT hr; @@ -2490,6 +2497,151 @@ static void test_text_field_mapping(void) WsFreeHeap( heap ); } +static void test_complex_struct_type(void) +{ + static const WCHAR timestampW[] = + {'2','0','1','5','-','0','9','-','0','3','T','1','8',':','4','7',':','5','4',0}; + HRESULT hr; + WS_ERROR *error; + WS_ERROR_PROPERTY prop; + WS_XML_READER *reader; + WS_HEAP *heap; + WS_STRUCT_DESCRIPTION s, s2; + WS_FIELD_DESCRIPTION f, f2, *fields[1], *fields2[1]; + WS_XML_STRING str_officeconfig = {12, (BYTE *)"OfficeConfig"}; + WS_XML_STRING str_services = {8, (BYTE *)"services"}; + WS_XML_STRING str_generationtime = {14, (BYTE *)"GenerationTime"}; + WS_XML_STRING ns = {39, (BYTE *)"urn:schemas-microsoft-com:office:office"}; + LANGID langid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + const WS_XML_NODE *node; + const WS_XML_ELEMENT_NODE *elem; + struct services + { + WCHAR *generationtime; + }; + struct officeconfig + { + struct services *services; + } *test; + + prop.id = WS_ERROR_PROPERTY_LANGID; + prop.value = &langid; + prop.valueSize = sizeof(langid); + hr = WsCreateError( &prop, 1, &error ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + /* element content type mapping */ + prepare_struct_type_test( reader, data11 ); + + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 12, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "OfficeConfig", 12 ), "wrong data\n" ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 8, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "services", 8 ), "wrong data\n" ); + + memset( &f2, 0, sizeof(f2) ); + f2.mapping = WS_ATTRIBUTE_FIELD_MAPPING; + f2.localName = &str_generationtime; + f2.ns = &ns; + f2.type = WS_WSZ_TYPE; + f2.options = WS_FIELD_OPTIONAL; + fields2[0] = &f2; + + memset( &s2, 0, sizeof(s2) ); + s2.size = sizeof(*test->services); + s2.alignment = TYPE_ALIGNMENT(struct services); + s2.fields = fields2; + s2.fieldCount = 1; + s2.typeLocalName = &str_services; + s2.typeNs = &ns; + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_ELEMENT_FIELD_MAPPING; + f.localName = &str_services; + f.ns = &ns; + f.type = WS_STRUCT_TYPE; + f.typeDescription = &s2; + f.options = WS_FIELD_POINTER; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(*test); + s.alignment = TYPE_ALIGNMENT(struct officeconfig); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &str_officeconfig; + s.typeNs = &ns; + + test = NULL; + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + ok( !lstrcmpW( test->services->generationtime, timestampW ), "wrong data\n" ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + /* element type mapping */ + prepare_struct_type_test( reader, data11 ); + + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 12, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "OfficeConfig", 12 ), "wrong data\n" ); + + test = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), error ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + if (test) ok( !lstrcmpW( test->services->generationtime, timestampW ), "wrong data\n" ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + WsFreeReader( reader ); + WsFreeHeap( heap ); + WsFreeError( error ); +} + START_TEST(reader) { test_WsCreateError(); @@ -2512,4 +2664,5 @@ START_TEST(reader) test_WsFindAttribute(); test_WsGetNamespaceFromPrefix(); test_text_field_mapping(); + test_complex_struct_type(); }

1 0

Nikolay Sivov : d2d1: Move bitmap creation helpers to common location.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: c1ea9df0a04bb6c5f48ea5f783f0f9b0bed47185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ea9df0a04bb6c5f48ea5f78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 21:30:38 2016 +0300 d2d1: Move bitmap creation helpers to common location. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 127 +++++++++++++++++++++++++++++++++++++++++--- dlls/d2d1/d2d1_private.h | 10 ++-- dlls/d2d1/render_target.c | 132 ++++------------------------------------------ 3 files changed, 137 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1ea9df0a04bb6c5f48ea…

1 0

Daniel Lehman : msvcp120: Add _Mtx_current_owns.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 2a65d21d1a873cf14c0ad03dd2b53ebd760fe5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a65d21d1a873cf14c0ad03dd… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Mar 28 13:12:02 2016 -0700 msvcp120: Add _Mtx_current_owns. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 87b2392..ee2d62f 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3818,7 +3818,7 @@ @ stub _Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner -@ stub _Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) @ cdecl _Mtx_destroy(ptr) @ cdecl _Mtx_getconcrtcs(ptr) @ cdecl _Mtx_init(ptr long) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 8fdd4e7..ddb28c4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3763,7 +3763,7 @@ @ stub _Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner -@ stub _Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) @ cdecl _Mtx_destroy(ptr) @ cdecl _Mtx_getconcrtcs(ptr) @ cdecl _Mtx_init(ptr long) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 12a92fd..4027066 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3763,7 +3763,7 @@ @ stub _Lock_shared_ptr_spin_lock @ cdecl _Mbrtowc(ptr ptr long ptr ptr) msvcp120._Mbrtowc @ stub _Mtx_clear_owner -@ stub _Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) msvcp120._Mtx_current_owns @ cdecl _Mtx_destroy(ptr) msvcp120._Mtx_destroy @ cdecl _Mtx_getconcrtcs(ptr) msvcp120._Mtx_getconcrtcs @ cdecl _Mtx_init(ptr long) msvcp120._Mtx_init diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index a4713d2..a41d357 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -487,6 +487,11 @@ void __cdecl _Mtx_destroy(_Mtx_t *mtx) MSVCRT_operator_delete(*mtx); } +int __cdecl _Mtx_current_owns(_Mtx_t *mtx) +{ + return (*mtx)->thread_id == GetCurrentThreadId(); +} + int __cdecl _Mtx_lock(_Mtx_t *mtx) { if((*mtx)->thread_id != GetCurrentThreadId()) {

1 0

Jacek Caban : jscript: Use already running interpreter for eval() execution.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 6a03b38f33b3f3898da505364cd58887633a98ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a03b38f33b3f3898da505364… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:43 2016 +0200 jscript: Use already running interpreter for eval() execution. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 2 +- dlls/jscript/global.c | 4 +++- dlls/jscript/jscript.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 4f5a35f..5efe0d5 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -377,7 +377,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { vdisp_t vthis; - if(This->builtin_info->class != JSCLASS_FUNCTION) + if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(jsthis) set_disp(&vthis, jsthis); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index d473dc3..58dbd95 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -185,7 +185,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } /* ECMA-262 3rd Edition 15.1.2.1 */ -static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { call_frame_t *frame; @@ -226,6 +226,8 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns if(frame->flags & EXEC_GLOBAL) exec_flags |= EXEC_GLOBAL; + if(flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) + exec_flags |= EXEC_RETURN_TO_INTERP; hres = exec_source(ctx, exec_flags, code, &code->global_code, frame->scope, frame->this_obj, NULL, frame->variable_obj, NULL, r); release_bytecode(code); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index cc66418..4331ee7 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -475,6 +475,8 @@ HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,jsstr_t*,jsval_t*) DECLSPEC_ BOOL bool_obj_value(jsdisp_t*) DECLSPEC_HIDDEN; unsigned array_get_length(jsdisp_t*) DECLSPEC_HIDDEN; +HRESULT JSGlobal_eval(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; + static inline BOOL is_class(jsdisp_t *jsdisp, jsclass_t class) { return jsdisp->builtin_info->class == class;

1 0

Jacek Caban : jscript: Use already running interpreter for execution new expressions.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: fa726bed4dff8c114c8393e5f45ca3022d03c224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa726bed4dff8c114c8393e5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:19 2016 +0200 jscript: Use already running interpreter for execution new expressions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 3 +-- dlls/jscript/function.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1bbc2ba..74cef15 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -963,7 +963,7 @@ static HRESULT interp_new(script_ctx_t *ctx) return throw_type_error(ctx, JS_E_INVALID_PROPERTY, NULL); clear_ret(frame); - return disp_call_value(ctx, get_object(constr), NULL, DISPATCH_CONSTRUCT, + return disp_call_value(ctx, get_object(constr), NULL, DISPATCH_CONSTRUCT | DISPATCH_JSCRIPT_CALLEREXECSSOURCE, argc, stack_args(ctx, argc), &frame->ret); } @@ -2604,7 +2604,6 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->ip = function->instr_off; frame->stack_base = ctx->stack_top; frame->ret = jsval_undefined(); - if(scope) frame->base_scope = frame->scope = scope_addref(scope); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 55a34e1..617d835 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -334,7 +334,7 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi if(FAILED(hres)) return hres; - hres = invoke_source(function->dispex.ctx, function, to_disp(this_obj), argc, argv, TRUE, FALSE, r); + hres = invoke_source(function->dispex.ctx, function, to_disp(this_obj), argc, argv, TRUE, caller_execs_source, r); jsdisp_release(this_obj); return hres; }

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 860.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 6e1f687e4decfaa79def6a42db13f13566035b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e1f687e4decfaa79def6a42d… Author: Caron Wills <caron(a)codeweavers.com> Date: Tue Mar 29 17:38:28 2016 +0000 wined3d: Add Nvidia GeForce GTX 860. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 980a92d..57ba641 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1283,6 +1283,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1745,6 +1746,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f8182ca..9a7dff4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1742,6 +1742,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, + CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Alex Henrie : ole32: Fix sizeof mismatch in CompositeMonikerImpl_Construct.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 0bac055b5662b31f72b7f5bc665ef85ad97aff56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bac055b5662b31f72b7f5bc6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Mar 29 18:31:15 2016 -0600 ole32: Fix sizeof mismatch in CompositeMonikerImpl_Construct. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index e431bfc..e1e0e5c 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1803,7 +1803,7 @@ CompositeMonikerImpl_Construct(IMoniker **ppMoniker, IMoniker *pmkFirst, IMonike LPVOID tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; - This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); + This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(This->tabMoniker[0])); if (This->tabMoniker==NULL){ HeapFree(GetProcessHeap(), 0, tab_moniker);

1 0

Jacek Caban : jscript: Use already running interpreter for Function.call() execution.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 889f2657dd53b209b0265f9d50d6b82ce4958285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889f2657dd53b209b0265f9d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:35 2016 +0200 jscript: Use already running interpreter for Function.call() execution. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 45d5bab..1e8d563 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -492,7 +492,7 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns cnt = argc-1; } - hres = call_function(ctx, function, this_obj, cnt, argv+1, FALSE, r); + hres = call_function(ctx, function, this_obj, cnt, argv+1, (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0, r); if(this_obj) IDispatch_Release(this_obj);

1 0

Jacek Caban : jscript: Use already running interpreter for Function.apply( ) execution.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 813609b8436b09373529652795856937e46b0e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=813609b8436b0937352965279… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 29 17:49:28 2016 +0200 jscript: Use already running interpreter for Function.apply() execution. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 3 ++- dlls/jscript/function.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5abb3a7..4f5a35f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -377,7 +377,8 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { vdisp_t vthis; - flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; + if(This->builtin_info->class != JSCLASS_FUNCTION) + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(jsthis) set_disp(&vthis, jsthis); else diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 617d835..45d5bab 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -274,12 +274,12 @@ static HRESULT invoke_value_proc(script_ctx_t *ctx, FunctionInstance *function, } static HRESULT call_function(script_ctx_t *ctx, FunctionInstance *function, IDispatch *this_obj, - unsigned argc, jsval_t *argv, jsval_t *r) + unsigned argc, jsval_t *argv, BOOL caller_execs_source, jsval_t *r) { if(function->value_proc) return invoke_value_proc(ctx, function, this_obj, DISPATCH_METHOD, argc, argv, r); - return invoke_source(ctx, function, this_obj, argc, argv, FALSE, FALSE, r); + return invoke_source(ctx, function, this_obj, argc, argv, FALSE, caller_execs_source, r); } static HRESULT function_to_string(FunctionInstance *function, jsstr_t **ret) @@ -459,7 +459,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un } if(SUCCEEDED(hres)) - hres = call_function(ctx, function, this_obj, cnt, args, r); + hres = call_function(ctx, function, this_obj, cnt, args, (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0, r); if(this_obj) IDispatch_Release(this_obj); @@ -492,7 +492,7 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns cnt = argc-1; } - hres = call_function(ctx, function, this_obj, cnt, argv+1, r); + hres = call_function(ctx, function, this_obj, cnt, argv+1, FALSE, r); if(this_obj) IDispatch_Release(this_obj);

1 0

Stefan Dösinger : wined3d: Introduce wined3d_texture_validate_location().
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 5a29cc87871bc0c499c5cbd0513e7769fd60e29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a29cc87871bc0c499c5cbd05… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 29 16:45:36 2016 +0200 wined3d: Introduce wined3d_texture_validate_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 3 +- dlls/wined3d/device.c | 4 +-- dlls/wined3d/surface.c | 58 +++++++++++++++++++++------------------ dlls/wined3d/swapchain.c | 18 +++++------- dlls/wined3d/texture.c | 36 ++++++++++++------------ dlls/wined3d/volume.c | 24 +++++----------- dlls/wined3d/wined3d_private.h | 5 ++-- 7 files changed, 69 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a29cc87871bc0c499c5c…

1 0