August 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Simplify stack layout in __crtCapturePreviousContext().
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: ed6aa17d9880f5c5e1fe47fe725bfe96d4ed681f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed6aa17d9880f5c5e1fe47fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 13:54:46 2019 +0200 msvcrt: Simplify stack layout in __crtCapturePreviousContext(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 1aa04ab..09eddfb 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -732,9 +732,6 @@ void __cdecl get_prev_context(CONTEXT *ctx, DWORD64 rip) TRACE("(%p)\n", ctx); - ctx->Rip = rip; - ctx->Rsp += 3*8; /* Rip, Rcx, return address */ - rf = RtlLookupFunctionEntry(ctx->Rip, &image_base, NULL); if(!rf) { FIXME("RtlLookupFunctionEntry failed\n"); @@ -746,16 +743,14 @@ void __cdecl get_prev_context(CONTEXT *ctx, DWORD64 rip) } __ASM_GLOBAL_FUNC( __crtCapturePreviousContext, - "pushq (%rsp)\n\t" /* save Rip */ - __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") - "pushq %rcx\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") - "call " __ASM_NAME("RtlCaptureContext") "\n\t" - "popq %rcx\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") - "popq %rdx\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") - "jmp " __ASM_NAME("get_prev_context") ); + "movq %rcx,8(%rsp)\n\t" + "call " __ASM_NAME("RtlCaptureContext") "\n\t" + "movq 8(%rsp),%rcx\n\t" /* context */ + "leaq 8(%rsp),%rax\n\t" + "movq %rax,0x98(%rcx)\n\t" /* context->Rsp */ + "movq (%rsp),%rax\n\t" + "movq %rax,0xf8(%rcx)\n\t" /* context->Rip */ + "jmp " __ASM_NAME("get_prev_context") ) #endif #endif /* __x86_64__ */

1 0

Bernhard belacker : cmd.exe: Command type with multiple files should print filenames to stderr.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 4684e1a9c67039be1504af0f836c13e5045b14d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4684e1a9c67039be1504af0f… Author: Bernhard belacker <bernhardu(a)mailbox.org> Date: Tue Aug 20 15:46:37 2019 +0200 cmd.exe: Command type with multiple files should print filenames to stderr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46983 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 4 ++-- programs/cmd/tests/test_builtins.cmd | 10 +++++++++- programs/cmd/tests/test_builtins.cmd.exp | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 62ae19a..cd5f744 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4561,8 +4561,8 @@ void WCMD_type (WCHAR *args) { errorlevel = 1; } else { if (writeHeaders) { - static const WCHAR fmt[] = {'\n','%','1','\n','\n','\0'}; - WCMD_output(fmt, thisArg); + static const WCHAR fmt[] = {'\n','%','1','\n','\n','\n','\0'}; + WCMD_output_stderr(fmt, thisArg); } while (WCMD_ReadFile(h, buffer, ARRAY_SIZE(buffer) - 1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f4dfc9f..a992cda 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -875,7 +875,15 @@ type ."\foobaz" echo ---2 type ".\foobaz" echo ---3 -del foobaz +echo foo> foobay +echo ---4 +type foobaz foobay > foobax 2> foobaw +echo ---5 +type foobax +echo ---6 +type foobaw +echo ---7 +del foobaz foobay foobax foobaw echo ------------ Testing NUL ------------ md foobar & cd foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d78d91a..488c8e6 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -659,6 +659,20 @@ bar ---2 bar ---3 +---4 +---5 +bar +foo +---6 + +foobaz + + + +foobay + + +---7 ------------ Testing NUL ------------ bar bar

1 0

Jacek Caban : jscript: Fix Object.defineProperty return value.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 7dab372271f8423e4ff2f6612179eaf5d4572610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dab372271f8423e4ff2f661… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 12:32:01 2019 +0200 jscript: Fix Object.defineProperty return value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 2 ++ dlls/mshtml/tests/es5.js | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 123541e..58db45b 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -500,6 +500,8 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl hres = jsdisp_define_property(obj, name, &prop_desc); release_property_descriptor(&prop_desc); + if(SUCCEEDED(hres) && r) + *r = jsval_obj(jsdisp_addref(obj)); return hres; } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 11b68e5..7ee8cc1 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -311,8 +311,9 @@ function test_defineProperty() { ok(false, "expected exception"); } - var obj = new Object(); - Object.defineProperty(obj, "test", {}); + var obj = new Object(), defined; + defined = Object.defineProperty(obj, "test", {}); + ok(defined === obj, "defined != obj"); ok("test" in obj, "test is not in obj"); test_own_data_prop_desc(obj, "test", false, false, false); ok(obj.test === undefined, "obj.test = " + obj.test);

1 0

Zhiyi Zhang : winex11.drv: Add xrandr_get_screen_resources() helper.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 95a0a5c755cecdedd111c57f128a0150280316f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a0a5c755cecdedd111c57f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 14 16:22:01 2019 +0800 winex11.drv: Add xrandr_get_screen_resources() helper. Getting screen resources will be used in multiple places. So put it in a function. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 9f63310..288b83f 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -274,6 +274,20 @@ static void xrandr10_init_modes(void) #ifdef HAVE_XRRGETSCREENRESOURCES +static XRRScreenResources *xrandr_get_screen_resources(void) +{ + XRRScreenResources *resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ); + if (resources && !resources->ncrtc) + { + pXRRFreeScreenResources( resources ); + resources = pXRRGetScreenResources( gdi_display, root_window ); + } + + if (!resources) + ERR("Failed to get screen resources.\n"); + return resources; +} + static int xrandr12_get_current_mode(void) { XRRScreenResources *resources; @@ -448,21 +462,8 @@ static int xrandr12_init_modes(void) int ret = -1; int i, j; - if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) - { - ERR("Failed to get screen resources.\n"); + if (!(resources = xrandr_get_screen_resources())) return ret; - } - - if (!resources->ncrtc) - { - pXRRFreeScreenResources( resources ); - if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) - { - ERR("Failed to get screen resources.\n"); - return ret; - } - } if (!(crtc_info = xrandr12_get_primary_crtc_info( resources, &primary_crtc ))) {

1 0

Zhiyi Zhang : user32: Wait for graphics driver to be ready in EnumDisplayDevicesW.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 8f45d9a991cbc739fafde55811524eaf742282b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f45d9a991cbc739fafde558… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 14 16:21:06 2019 +0800 user32: Wait for graphics driver to be ready in EnumDisplayDevicesW. It's possible that EnumDisplayDevicesW gets called before graphics driver is loaded. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index cdeea65..09cebc2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -736,6 +736,18 @@ static void release_display_device_init_mutex( HANDLE mutex ) CloseHandle( mutex ); } +/* Wait until graphics driver is loaded by explorer */ +static void wait_graphics_driver_ready(void) +{ + static BOOL ready = FALSE; + + if (!ready) + { + SendMessageW( GetDesktopWindow(), WM_NULL, 0, 0 ); + ready = TRUE; + } +} + /* map value from system dpi to standard 96 dpi for storing in the registry */ static int map_from_system_dpi( int val ) { @@ -4048,6 +4060,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i TRACE("%s %d %p %#x\n", debugstr_w( device ), index, info, flags); + wait_graphics_driver_ready(); mutex = get_display_device_init_mutex(); /* Find adapter */

1 0

Jacek Caban : jscript: Support enumerating own properties.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 9b4267b04d4f84042931c0cfb7c848fd22a6dbc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b4267b04d4f84042931c0cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 12:31:08 2019 +0200 jscript: Support enumerating own properties. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 54 +++++++++++++++++++++++++++++--------------------- dlls/jscript/jscript.h | 1 + 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b1f2914..da23d18 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -870,34 +870,14 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { jsdisp_t *This = impl_from_IDispatchEx(iface); - dispex_prop_t *iter; HRESULT hres; TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid); - if(id == DISPID_STARTENUM) { - hres = fill_protrefs(This); - if(FAILED(hres)) - return hres; - } - - if(id+1>=0 && id+1<This->prop_cnt) { - iter = &This->props[id+1]; - }else { + hres = jsdisp_next_prop(This, id, FALSE, pid); + if(hres == S_FALSE) *pid = DISPID_STARTENUM; - return S_FALSE; - } - - while(iter < This->props + This->prop_cnt) { - if(iter->name && (get_flags(This, iter) & PROPF_ENUMERABLE) && iter->type!=PROP_DELETED) { - *pid = prop_to_id(This, iter); - return S_OK; - } - iter++; - } - - *pid = DISPID_STARTENUM; - return S_FALSE; + return hres; } static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) @@ -1563,6 +1543,34 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) return S_OK; } +HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, BOOL own_only, DISPID *ret) +{ + dispex_prop_t *iter; + HRESULT hres; + + if(id == DISPID_STARTENUM && !own_only) { + hres = fill_protrefs(obj); + if(FAILED(hres)) + return hres; + } + + if(id + 1 < 0 || id+1 >= obj->prop_cnt) + return S_FALSE; + + for(iter = &obj->props[id + 1]; iter < obj->props + obj->prop_cnt; iter++) { + if(!iter->name || iter->type == PROP_DELETED) + continue; + if(own_only && iter->type == PROP_PROTREF) + continue; + if(!(get_flags(obj, iter) & PROPF_ENUMERABLE)) + continue; + *ret = prop_to_id(obj, iter); + return S_OK; + } + + return S_FALSE; +} + HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL *ret) { IDispatchEx *dispex; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 1fbd957..2dd73d6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -297,6 +297,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DECLSPEC_HIDDEN; +HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,BOOL,DISPID*) 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;

1 0

Richard Pospesel : widl: Add the typedef to the type library if the aliasee is an anonymous UDT.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 4b1dfa60371a69f978455edc52a2a1cfef33eb4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b1dfa60371a69f978455edc… Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Aug 21 11:18:09 2019 -0500 widl: Add the typedef to the type library if the aliasee is an anonymous UDT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47050 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8496109..59875a5 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1895,7 +1895,11 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at type_get_type_detect_alias(type) == TYPE_ENCAPSULATED_UNION) { if (!type->name) + { type->name = gen_name(); + if (!is_attr(attrs, ATTR_PUBLIC)) + attrs = append_attr(attrs, make_attr(ATTR_PUBLIC)); + } /* replace existing attributes when generating a typelib */ if (do_typelib)

1 0

Zebediah Figura : widl: Write public typedefs into the typelib if they are referenced directly.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 96e11d51bae0ef323c32fd0ba1668be0d0283092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e11d51bae0ef323c32fd0b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 11:18:08 2019 -0500 widl: Write public typedefs into the typelib if they are referenced directly. I.e. write "apple_t" into the typelib given the following snippet: typedef [public] struct { ... } apple_t; library { interface IFoo { HRESULT a(apple_t arg); } } Based on a patch by Richard Pospesel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 5d5fd89..e972a26 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -763,6 +763,7 @@ static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration); static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion); static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls); static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinterface); +static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *dispinterface); /**************************************************************************** @@ -973,7 +974,7 @@ static int encode_type( chat("encode_type: VT_USERDEFINED - adding new type %s, real type %d\n", type->name, type_get_type(type)); - switch (type_get_type(type)) + switch (type_get_type_detect_alias(type)) { case TYPE_STRUCT: case TYPE_ENCAPSULATED_UNION: @@ -991,6 +992,9 @@ static int encode_type( case TYPE_COCLASS: add_coclass_typeinfo(typelib, type); break; + case TYPE_ALIAS: + add_typedef_typeinfo(typelib, type); + break; default: error("encode_type: VT_USERDEFINED - unhandled type %d\n", type_get_type(type));

1 0

Jacek Caban : jscript: Add Object.defineProperties implementation.
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 34d4a9c75188093675b97bc142f2ff6e6489a268 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34d4a9c75188093675b97bc1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 12:31:18 2019 +0200 jscript: Add Object.defineProperties implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 619356b..7794f1d 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -409,6 +409,57 @@ static HRESULT to_property_descriptor(script_ctx_t *ctx, jsdisp_t *attr_obj, pro return hres; } +static HRESULT jsdisp_define_properties(script_ctx_t *ctx, jsdisp_t *obj, jsval_t list_val) +{ + DISPID id = DISPID_STARTENUM; + property_desc_t prop_desc; + IDispatch *list_disp; + jsdisp_t *list_obj, *desc_obj; + jsval_t desc_val; + BSTR name; + HRESULT hres; + + hres = to_object(ctx, list_val, &list_disp); + if(FAILED(hres)) + return hres; + + if(!(list_obj = to_jsdisp(list_disp))) { + FIXME("non-JS list obj\n"); + IDispatch_Release(list_disp); + return E_NOTIMPL; + } + + while(1) { + hres = jsdisp_next_prop(list_obj, id, TRUE, &id); + if(hres != S_OK) + break; + + hres = jsdisp_propget(list_obj, id, &desc_val); + if(FAILED(hres)) + break; + + if(!is_object_instance(desc_val) || !get_object(desc_val) || !(desc_obj = to_jsdisp(get_object(desc_val)))) { + jsval_release(desc_val); + break; + } + + hres = to_property_descriptor(ctx, desc_obj, &prop_desc); + jsdisp_release(desc_obj); + if(FAILED(hres)) + break; + + hres = IDispatchEx_GetMemberName(&list_obj->IDispatchEx_iface, id, &name); + if(SUCCEEDED(hres)) + hres = jsdisp_define_property(obj, name, &prop_desc); + release_property_descriptor(&prop_desc); + if(FAILED(hres)) + break; + } + + jsdisp_release(list_obj); + return FAILED(hres) ? hres : S_OK; +} + static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -455,8 +506,20 @@ static HRESULT Object_defineProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl static HRESULT Object_defineProperties(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + jsdisp_t *obj; + HRESULT hres; + + if(argc < 1 || !is_object_instance(argv[0]) || !get_object(argv[0]) || !(obj = to_jsdisp(get_object(argv[0])))) { + FIXME("not an object\n"); + return E_NOTIMPL; + } + + TRACE("%p\n", obj); + + hres = jsdisp_define_properties(ctx, obj, argc >= 2 ? argv[1] : jsval_undefined()); + if(SUCCEEDED(hres) && r) + *r = jsval_obj(jsdisp_addref(obj)); + return hres; } static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,

1 0

Nikolay Sivov : gdiplus: Add GdipRecordMetafileStreamI().
by Alexandre Julliard Aug. 21, 2019

Aug. 21, 2019

Module: wine Branch: master Commit: 88207f0c117cc28ae60190954e6ad110efa0e5b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88207f0c117cc28ae6019095… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 20 22:48:35 2019 +0300 gdiplus: Add GdipRecordMetafileStreamI(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 21 +++++++++++++++++++++ include/gdiplusflat.h | 5 +++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ed9d50c..ee28b0e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -451,7 +451,7 @@ 451 stdcall GdipRecordMetafileFileNameI(wstr long long ptr long wstr ptr) 452 stdcall GdipRecordMetafileI(long long ptr long wstr ptr) 453 stdcall GdipRecordMetafileStream(ptr long long ptr long wstr ptr) -454 stub GdipRecordMetafileStreamI +454 stdcall GdipRecordMetafileStreamI(ptr long long ptr long wstr ptr) 455 stdcall GdipReleaseDC(ptr ptr) 456 stdcall GdipRemovePropertyItem(ptr long) 457 stdcall GdipResetClip(ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 47d5ac5..a292483 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -859,6 +859,27 @@ GpStatus WINGDIPAPI GdipRecordMetafileI(HDC hdc, EmfType type, GDIPCONST GpRect return GdipRecordMetafile(hdc, type, pFrameRectF, frameUnit, desc, metafile); } +GpStatus WINGDIPAPI GdipRecordMetafileStreamI(IStream *stream, HDC hdc, EmfType type, GDIPCONST GpRect *frameRect, + MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) +{ + GpRectF frameRectF, *pFrameRectF; + + TRACE("(%p %p %d %p %d %p %p)\n", stream, hdc, type, frameRect, frameUnit, desc, metafile); + + if (frameRect) + { + frameRectF.X = frameRect->X; + frameRectF.Y = frameRect->Y; + frameRectF.Width = frameRect->Width; + frameRectF.Height = frameRect->Height; + pFrameRectF = &frameRectF; + } + else + pFrameRectF = NULL; + + return GdipRecordMetafileStream(stream, hdc, type, pFrameRectF, frameUnit, desc, metafile); +} + GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream *stream, HDC hdc, EmfType type, GDIPCONST GpRectF *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *desc, GpMetafile **metafile) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 57fa6c6..1e26c0a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -284,8 +284,6 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR*,HDC,EmfType, GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipRecordMetafileFileNameI(GDIPCONST WCHAR*,HDC,EmfType, GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); -GpStatus WINGDIPAPI GdipRecordMetafileI(HDC,EmfType,GDIPCONST GpRect*, - MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC); GpStatus WINGDIPAPI GdipResetClip(GpGraphics*); GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics*); @@ -549,6 +547,9 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*); GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile*,EmfPlusRecordType,UINT,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); GpStatus WINGDIPAPI GdipRecordMetafile(HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); +GpStatus WINGDIPAPI GdipRecordMetafileI(HDC,EmfType,GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); +GpStatus WINGDIPAPI GdipRecordMetafileStream(IStream*,HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR *,GpMetafile**); +GpStatus WINGDIPAPI GdipRecordMetafileStreamI(IStream*,HDC,EmfType,GDIPCONST GpRect*,MetafileFrameUnit,GDIPCONST WCHAR *,GpMetafile**); /* MetafileHeader */ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE,MetafileHeader*);

1 0