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

Jacek Caban : mshtml: Support VT_R8 in variant_to_nsstr.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 2c389667295f014168a9b0bfa72a9511801eae15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c389667295f014168a9b0bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:37:32 2019 +0200 mshtml: Support VT_R8 in variant_to_nsstr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 15 +++++++++++++++ dlls/mshtml/tests/elements.js | 2 ++ dlls/mshtml/tests/style.c | 10 ++++++++++ 3 files changed, 27 insertions(+) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 08e6507..35e9bf0 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -962,6 +962,21 @@ HRESULT variant_to_nsstr(VARIANT *v, BOOL hex_int, nsAString *nsstr) nsAString_Init(nsstr, buf); break; + case VT_R8: { + VARIANT strv; + HRESULT hres; + + V_VT(&strv) = VT_EMPTY; + hres = VariantChangeTypeEx(&strv, v, MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), + 0, VT_BSTR); + if(FAILED(hres)) + return hres; + + nsAString_Init(nsstr, V_BSTR(&strv)); + SysFreeString(V_BSTR(&strv)); + break; + } + default: FIXME("not implemented for %s\n", debugstr_variant(v)); return E_NOTIMPL; diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 4f0c802..320a2f6 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -81,6 +81,8 @@ function test_textContent() { ok(div.textContent === "", "div.textContent = " + div.textContent); div.textContent = 11; ok(div.textContent === "11", "div.textContent = " + div.textContent); + div.textContent = 10.5; + ok(div.textContent === "10.5", "div.textContent = " + div.textContent); ok(document.textContent === null, "document.textContent = " + document.textContent); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index a7b4506..52a3a5c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -852,6 +852,16 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) test_var_bstr(&v, "0"); VariantClear(&v); + V_VT(&v) = VT_R8; + V_R8(&v) = 0.5; + hres = IHTMLCSSStyleDeclaration_put_opacity(css_style, v); + ok(hres == S_OK, "put_opacity failed: %08x\n", hres); + + hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); + ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + test_var_bstr(&v, "0.5"); + VariantClear(&v); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("1"); hres = IHTMLCSSStyleDeclaration_put_opacity(css_style, v);

1 0

Jacek Caban : mshtml: Factor out variant_to_nsstr from var_to_styleval.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 1593364466b195571c3be71650d113645895aa57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1593364466b195571c3be716… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:37:16 2019 +0200 mshtml: Factor out variant_to_nsstr from var_to_styleval. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 37 ++++--------------------------------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2d045db..7f50cb4 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -933,43 +933,14 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ static HRESULT var_to_styleval(CSSStyle *style, VARIANT *v, const style_tbl_entry_t *entry, nsAString *nsstr) { + HRESULT hres; unsigned flags = entry && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9 ? entry->flags : 0; - switch(V_VT(v)) { - case VT_NULL: - nsAString_InitDepend(nsstr, NULL); - return S_OK; - - case VT_BSTR: - nsAString_InitDepend(nsstr, V_BSTR(v)); - break; - - case VT_BSTR|VT_BYREF: - nsAString_InitDepend(nsstr, *V_BSTRREF(v)); - break; - - case VT_I4: { - static const WCHAR formatW[] = {'%','d',0}; - static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; - WCHAR buf[14]; - - if(flags & ATTR_HEX_INT) - wsprintfW(buf, hex_formatW, V_I4(v)); - else - wsprintfW(buf, formatW, V_I4(v)); - - nsAString_Init(nsstr, buf); - break; - } - default: - FIXME("not implemented for %s\n", debugstr_variant(v)); - return E_NOTIMPL; - - } - if(flags & ATTR_FIX_PX) + hres = variant_to_nsstr(v, !!(flags & ATTR_HEX_INT), nsstr); + if(SUCCEEDED(hres) && (flags & ATTR_FIX_PX)) fix_px_value(nsstr); - return S_OK; + return hres; } static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const WCHAR *value) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a44eaf5..f4bbe76 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -975,6 +975,7 @@ void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; HRESULT map_nsresult(nsresult) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) DECLSPEC_HIDDEN; +HRESULT variant_to_nsstr(VARIANT*,BOOL,nsAString*) DECLSPEC_HIDDEN; HRESULT return_nsform(nsresult,nsIDOMHTMLFormElement*,IHTMLFormElement**) DECLSPEC_HIDDEN; nsICommandParams *create_nscommand_params(void) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index bcfc437..08e6507 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -932,6 +932,44 @@ HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) return S_OK; } +/* + * Converts VARIANT to string and stores the result in nsAString. To avoid useless + * allocations, the function uses an existing string if available, so caller must + * ensure that passed VARIANT is unchanged as long as its string representation is used + */ +HRESULT variant_to_nsstr(VARIANT *v, BOOL hex_int, nsAString *nsstr) +{ + WCHAR buf[32]; + + static const WCHAR d_formatW[] = {'%','d',0}; + static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; + + switch(V_VT(v)) { + case VT_NULL: + nsAString_InitDepend(nsstr, NULL); + return S_OK; + + case VT_BSTR: + nsAString_InitDepend(nsstr, V_BSTR(v)); + break; + + case VT_BSTR|VT_BYREF: + nsAString_InitDepend(nsstr, *V_BSTRREF(v)); + break; + + case VT_I4: + wsprintfW(buf, hex_int ? hex_formatW : d_formatW, V_I4(v)); + nsAString_Init(nsstr, buf); + break; + + default: + FIXME("not implemented for %s\n", debugstr_variant(v)); + return E_NOTIMPL; + + } + return S_OK; +} + nsICommandParams *create_nscommand_params(void) { nsICommandParams *ret = NULL;

1 0

Józef Kucia : wined3d: Avoid enabling all features supported by Vulkan physical device.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: d2f477dd729ca54f40acee37f96483c26054b2bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f477dd729ca54f40acee37… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 19 12:50:14 2019 +0200 wined3d: Avoid enabling all features supported by Vulkan physical device. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e573c66..4c01fb8 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -165,6 +165,32 @@ static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_v return E_FAIL; } +static void wined3d_disable_vulkan_features(VkPhysicalDeviceFeatures *features) +{ + features->depthBounds = VK_FALSE; + features->alphaToOne = VK_FALSE; + features->textureCompressionETC2 = VK_FALSE; + features->textureCompressionASTC_LDR = VK_FALSE; + features->shaderStorageImageMultisample = VK_FALSE; + features->shaderUniformBufferArrayDynamicIndexing = VK_FALSE; + features->shaderSampledImageArrayDynamicIndexing = VK_FALSE; + features->shaderStorageBufferArrayDynamicIndexing = VK_FALSE; + features->shaderStorageImageArrayDynamicIndexing = VK_FALSE; + features->shaderInt16 = VK_FALSE; + features->shaderResourceResidency = VK_FALSE; + features->shaderResourceMinLod = VK_FALSE; + features->sparseBinding = VK_FALSE; + features->sparseResidencyBuffer = VK_FALSE; + features->sparseResidencyImage2D = VK_FALSE; + features->sparseResidencyImage3D = VK_FALSE; + features->sparseResidency2Samples = VK_FALSE; + features->sparseResidency4Samples = VK_FALSE; + features->sparseResidency8Samples = VK_FALSE; + features->sparseResidency16Samples = VK_FALSE; + features->sparseResidencyAliased = VK_FALSE; + features->inheritedQueries = VK_FALSE; +} + static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, @@ -192,6 +218,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi physical_device = adapter_vk->physical_device; VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features)); + wined3d_disable_vulkan_features(&features); queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; queue_info.pNext = NULL;

1 0

Derek Lesho : server: Allow creating process kernel objects.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: f534fbd3e3c83df49c7c6b8e608a99f2af65adc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f534fbd3e3c83df49c7c6b8e… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Fri Apr 19 18:24:30 2019 +0200 server: Allow creating process kernel objects. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 10 +++++++++- server/process.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 1260baf..4a1cebf 100644 --- a/server/process.c +++ b/server/process.c @@ -64,6 +64,7 @@ static struct object_type *process_get_type( struct object *obj ); static int process_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int process_map_access( struct object *obj, unsigned int access ); static void process_poll_event( struct fd *fd, int event ); +static struct list *process_get_kernel_obj_list( struct object *obj ); static void process_destroy( struct object *obj ); static void terminate_process( struct process *process, struct thread *skip, int exit_code ); @@ -85,7 +86,7 @@ static const struct object_ops process_ops = no_link_name, /* link_name */ NULL, /* unlink_name */ no_open_file, /* open_file */ - no_kernel_obj_list, /* get_kernel_obj_list */ + process_get_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ process_destroy /* destroy */ }; @@ -526,6 +527,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, process->trace_data = 0; process->rawinput_mouse = NULL; process->rawinput_kbd = NULL; + list_init( &process->kernel_object ); list_init( &process->thread_list ); list_init( &process->locks ); list_init( &process->asyncs ); @@ -661,6 +663,12 @@ static unsigned int process_map_access( struct object *obj, unsigned int access return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } +static struct list *process_get_kernel_obj_list( struct object *obj ) +{ + struct process *process = (struct process *)obj; + return &process->kernel_object; +} + static void process_poll_event( struct fd *fd, int event ) { struct process *process = get_fd_user( fd ); diff --git a/server/process.h b/server/process.h index 4566a04..d9d29f0 100644 --- a/server/process.h +++ b/server/process.h @@ -96,6 +96,7 @@ struct process struct list rawinput_devices;/* list of registered rawinput devices */ const struct rawinput_device *rawinput_mouse; /* rawinput mouse device, if any */ const struct rawinput_device *rawinput_kbd; /* rawinput keyboard device, if any */ + struct list kernel_object; /* list of kernel object pointers */ }; struct process_snapshot

1 0

Hans Leidekker : msi/tests: Check the NT key first when retrieving registered owner and organization.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: dec192ce22283c4c0cb80337e0ce0904d9d9be89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec192ce22283c4c0cb80337… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 19 11:30:14 2019 +0200 msi/tests: Check the NT key first when retrieving registered owner and organization. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 60ae92e..7a515df 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2506,9 +2506,9 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase else { if (bcase) - ok_(__FILE__, line)(!lstrcmpA(val, expected), "Expected %s, got %s\n", expected, val); + ok_(__FILE__, line)(!lstrcmpA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val); else - ok_(__FILE__, line)(!lstrcmpiA(val, expected), "Expected %s, got %s\n", expected, val); + ok_(__FILE__, line)(!lstrcmpiA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val); } } @@ -3408,7 +3408,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company) if (!*owner || !*company) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey); + "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey); if (res == ERROR_SUCCESS) { *owner = reg_get_val_str(hkey, "RegisteredOwner"); @@ -3420,7 +3420,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company) if (!*owner || !*company) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey); + "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey); if (res == ERROR_SUCCESS) { *owner = reg_get_val_str(hkey, "RegisteredOwner");

1 0

Detlef Riekenberg : taskschd/tests: Avoid a crash in a test after E_ACCESSDENIED.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: c8b9aa00c634024a1ad6dc4c9022cdba3152ded4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8b9aa00c634024a1ad6dc4c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 16 19:42:47 2019 +0200 taskschd/tests: Avoid a crash in a test after E_ACCESSDENIED. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 639555e..c03ecd3 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -946,6 +946,11 @@ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == S_OK /* win7 */, "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); + if(hr == E_ACCESSDENIED) + { + skip("Access denied\n"); + goto no_access; + } ok(hr == S_OK, "RegisterTask error %#x\n", hr); hr = IRegisteredTask_get_Name(task1, &bstr); @@ -962,6 +967,7 @@ todo_wine hr = ITaskFolder_RegisterTask(folder, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); +no_access: ITaskFolder_Release(folder); hr = ITaskFolder_DeleteFolder(root, Wine, 0);

1 0

Zebediah Figura : qedit/tests: Abort on missing qedit.dll.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 66dc93570c711b19c676d818fc837cf3d72db7fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=66dc93570c711b19c676d818… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:22 2019 -0500 qedit/tests: Abort on missing qedit.dll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/mediadet.c | 12 ++++++++++++ dlls/qedit/tests/samplegrabber.c | 12 ++++++++++++ dlls/qedit/tests/timeline.c | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 34c43fd..311d77b 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -647,6 +647,9 @@ static void test_COM_sg_enumpins(void) START_TEST(mediadet) { + IMediaDet *detector; + HRESULT hr; + if (!init_tests()) { skip("Couldn't initialize tests!\n"); @@ -655,6 +658,15 @@ START_TEST(mediadet) CoInitialize(NULL); + if (FAILED(hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaDet, (void **)&detector))) + { + /* qedit.dll does not exist on 2003. */ + win_skip("Failed to create media detector object, hr %#x.\n", hr); + return; + } + IMediaDet_Release(detector); + test_aggregation(); test_mediadet(); test_samplegrabber(); diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 22f6ddb..8bc44b9 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -451,8 +451,20 @@ static void test_aggregation(void) START_TEST(samplegrabber) { + IBaseFilter *filter; + HRESULT hr; + CoInitialize(NULL); + if (FAILED(hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter))) + { + /* qedit.dll does not exist on 2003. */ + win_skip("Failed to create sample grabber filter, hr %#x.\n", hr); + return; + } + IBaseFilter_Release(filter); + test_interfaces(); test_enum_pins(); test_find_pin(); diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index 9e24062..0d01d51 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -246,8 +246,20 @@ static void test_timelineobj_interfaces(void) START_TEST(timeline) { + IAMTimeline *timeline; + HRESULT hr; + CoInitialize(NULL); + if (FAILED(hr = CoCreateInstance(&CLSID_AMTimeline, NULL, CLSCTX_INPROC_SERVER, + &IID_IAMTimeline, (void **)&timeline))) + { + /* qedit.dll does not exist on 2003. */ + win_skip("Failed to create timeline object, hr %#x.\n", hr); + return; + } + IAMTimeline_Release(timeline); + test_aggregation(); test_timeline(); test_timelineobj_interfaces();

1 0

Zebediah Figura : qedit/tests: Add some tests for null renderer pin interfaces.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: c9c28a638767501193da21c9c4552dd3a47a043e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9c28a638767501193da21c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:27 2019 -0500 qedit/tests: Add some tests for null renderer pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 9793860..be38e5f 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -59,6 +59,7 @@ static void test_interfaces(void) { IBaseFilter *filter = create_null_renderer(); ULONG ref; + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -78,6 +79,18 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); ref = IBaseFilter_Release(filter); ok(!ref, "Got unexpected refcount %d.\n", ref); }

1 0

Nikolay Sivov : mfreadwrite: Duplicate media type returned with GetNativeMediaType().
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 5b3fdc26b7450d312f33e0cad70eac5b55e746ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b3fdc26b7450d312f33e0ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:06:11 2019 +0300 mfreadwrite: Duplicate media type returned with GetNativeMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 10 ++++++++-- dlls/mfreadwrite/tests/mfplat.c | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 7625669..d80e450 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -463,6 +463,7 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR struct source_reader *reader = impl_from_IMFSourceReader(iface); IMFMediaTypeHandler *handler; IMFStreamDescriptor *sd; + IMFMediaType *src_type; BOOL selected; HRESULT hr; @@ -489,11 +490,16 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR return hr; if (type_index == MF_SOURCE_READER_CURRENT_TYPE_INDEX) - hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, type); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &src_type); else - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, type_index, type); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, type_index, &src_type); IMFMediaTypeHandler_Release(handler); + if (SUCCEEDED(hr = MFCreateMediaType(type))) + hr = IMFMediaType_CopyAllItems(src_type, (IMFAttributes *)*type); + + IMFMediaType_Release(src_type); + return hr; } diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 074c403..188e688 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -186,9 +186,9 @@ static struct async_callback *create_async_callback(void) static void test_source_reader(void) { + IMFMediaType *mediatype, *mediatype2; struct async_callback *callback; IMFAttributes *attributes; - IMFMediaType *mediatype; IMFSourceReader *reader; IMFMediaSource *source; IMFByteStream *stream; @@ -267,6 +267,10 @@ todo_wine hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &mediatype); ok(hr == S_OK, "Failed to get native mediatype, hr %#x.\n", hr); + hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &mediatype2); + ok(hr == S_OK, "Failed to get native mediatype, hr %#x.\n", hr); + ok(mediatype != mediatype2, "Unexpected media type instance.\n"); + IMFMediaType_Release(mediatype2); IMFMediaType_Release(mediatype); /* MF_SOURCE_READER_CURRENT_TYPE_INDEX is Win8+ */

1 0

Louis Lenders : rpcrt4: Quiet two noisy fixme`s.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: bc1b56ad1861a0e7aff80776108d67794f556e93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc1b56ad1861a0e7aff80776… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Apr 16 16:36:58 2019 +0200 rpcrt4: Quiet two noisy fixme`s. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d71d2fa..dbf4074 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -7263,7 +7263,10 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, */ void WINAPI NdrCorrelationInitialize(PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, ULONG CacheSize, ULONG Flags) { - FIXME("(%p, %p, %d, 0x%x): semi-stub\n", pStubMsg, pMemory, CacheSize, Flags); + static int once; + + if (!once++) + FIXME("(%p, %p, %d, 0x%x): semi-stub\n", pStubMsg, pMemory, CacheSize, Flags); if (pStubMsg->CorrDespIncrement == 0) pStubMsg->CorrDespIncrement = 2; /* size of the normal (non-range) /robust payload */ @@ -7301,5 +7304,8 @@ void WINAPI NdrCorrelationPass(PMIDL_STUB_MESSAGE pStubMsg) */ void WINAPI NdrCorrelationFree(PMIDL_STUB_MESSAGE pStubMsg) { - FIXME("(%p): stub\n", pStubMsg); + static int once; + + if (!once++) + FIXME("(%p): stub\n", pStubMsg); }

1 0

Zebediah Figura : wordpad: Use GetSysColorBrush().
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: dcd9376ae711d56778032f146480e1d1aaf245ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd9376ae711d56778032f14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 22:39:14 2019 -0500 wordpad: Use GetSysColorBrush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/print.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index d34fd66..acc583e 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -376,10 +376,9 @@ static void paint_ruler(HWND hWnd, LONG EditLeftmost, BOOL NewMetrics) HDC hdcPrint = make_dc(); RECT printRect = get_print_rect(hdcPrint); RECT drawRect; - HBRUSH hBrush = CreateSolidBrush(GetSysColor(COLOR_MENU)); GetClientRect(hWnd, &drawRect); - FillRect(hdc, &drawRect, hBrush); + FillRect(hdc, &drawRect, GetSysColorBrush(COLOR_MENU)); InflateRect(&drawRect, 0, -3); drawRect.left = EditLeftmost; @@ -399,7 +398,6 @@ static void paint_ruler(HWND hWnd, LONG EditLeftmost, BOOL NewMetrics) add_ruler_units(hdc, &drawRect, NewMetrics, EditLeftmost); SelectObject(hdc, GetStockObject(BLACK_BRUSH)); - DeleteObject(hBrush); DeleteDC(hdcPrint); EndPaint(hWnd, &ps); }

1 0

Zebediah Figura : qedit/tests: Add some tests for IBaseFilter::EnumPins() on the null renderer.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: bdf5e8f5e02e160099efdbadee125da32e69a860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdf5e8f5e02e160099efdbad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:24 2019 -0500 qedit/tests: Add some tests for IBaseFilter::EnumPins() on the null renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 98 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 025a258..5bdfc18 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -31,6 +31,13 @@ static IBaseFilter *create_null_renderer(void) return filter; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -73,6 +80,96 @@ static void test_interfaces(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_null_renderer(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[2]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -90,6 +187,7 @@ START_TEST(nullrenderer) IBaseFilter_Release(filter); test_interfaces(); + test_enum_pins(); CoUninitialize(); }

1 0

Zebediah Figura : qedit/tests: Add some tests for IBaseFilter::FindPin() on the null renderer.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: e407dae3c7d0041f3643ac47f88bab268fc0ead8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e407dae3c7d0041f3643ac47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:25 2019 -0500 qedit/tests: Add some tests for IBaseFilter::FindPin() on the null renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 5bdfc18..f709d2a 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -22,6 +22,8 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR sink_id[] = {'I','n',0}; + static IBaseFilter *create_null_renderer(void) { IBaseFilter *filter = NULL; @@ -170,6 +172,34 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; + IBaseFilter *filter = create_null_renderer(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -188,6 +218,7 @@ START_TEST(nullrenderer) test_interfaces(); test_enum_pins(); + test_find_pin(); CoUninitialize(); }

1 0

Zebediah Figura : qedit/tests: Add a test for aggregation on the null renderer.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 50395b03374e8f2f0a17706037cbff3097ef7a1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=50395b03374e8f2f0a177060… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:28 2019 -0500 qedit/tests: Add a test for aggregation on the null renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 95 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index be38e5f..0ae17b1 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -258,6 +258,100 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IBaseFilter) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + IBaseFilter *filter, *filter2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + filter = (IBaseFilter *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_NullRenderer, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!filter, "Got interface %p.\n", filter); + + hr = CoCreateInstance(&CLSID_NullRenderer, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IBaseFilter_Release(filter); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -278,6 +372,7 @@ START_TEST(nullrenderer) test_enum_pins(); test_find_pin(); test_pin_info(); + test_aggregation(); CoUninitialize(); }

1 0

Nikolay Sivov : mfreadwrite: Add a helper to get associated event object value.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 5dfe4776186c2b1feb0171bcc9d94b3060b99c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dfe4776186c2b1feb0171bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:06:12 2019 +0300 mfreadwrite: Add a helper to get associated event object value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 51 +++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index d80e450..bb9ad0f 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -122,6 +122,36 @@ static inline struct sink_writer *impl_from_IMFSinkWriter(IMFSinkWriter *iface) return CONTAINING_RECORD(iface, struct sink_writer, IMFSinkWriter_iface); } +static HRESULT media_event_get_object(IMFMediaEvent *event, REFIID riid, void **obj) +{ + PROPVARIANT value; + HRESULT hr; + + PropVariantInit(&value); + if (FAILED(hr = IMFMediaEvent_GetValue(event, &value))) + { + WARN("Failed to get event value, hr %#x.\n", hr); + return hr; + } + + if (value.vt != VT_UNKNOWN || !value.u.punkVal) + { + WARN("Unexpected value type %d.\n", value.vt); + PropVariantClear(&value); + return E_UNEXPECTED; + } + + hr = IUnknown_QueryInterface(value.u.punkVal, riid, obj); + PropVariantClear(&value); + if (FAILED(hr)) + { + WARN("Unexpected object type.\n"); + return hr; + } + + return hr; +} + static HRESULT WINAPI source_reader_source_events_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { @@ -162,30 +192,13 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM { IMFStreamDescriptor *sd; IMFMediaStream *stream; - PROPVARIANT value; unsigned int i; DWORD id = 0; HRESULT hr; - PropVariantInit(&value); - if (FAILED(hr = IMFMediaEvent_GetValue(event, &value))) + if (FAILED(hr = media_event_get_object(event, &IID_IMFMediaStream, (void **)&stream))) { - WARN("Failed to get event value, hr %#x.\n", hr); - return hr; - } - - if (value.vt != VT_UNKNOWN || !value.u.punkVal) - { - WARN("Unexpected value type %d.\n", value.vt); - PropVariantClear(&value); - return E_UNEXPECTED; - } - - hr = IUnknown_QueryInterface(value.u.punkVal, &IID_IMFMediaStream, (void **)&stream); - PropVariantClear(&value); - if (FAILED(hr)) - { - WARN("Unexpected object type.\n"); + WARN("Failed to get stream object, hr %#x.\n", hr); return hr; }

1 0

Hans Leidekker : msi: Get rid of redundant KEY_WOW64_64KEY flags.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: be02ecda3c27f4fa3ed574b1df4e51337f9304de URL: https://source.winehq.org/git/wine.git/?a=commit;h=be02ecda3c27f4fa3ed574b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 19 11:30:13 2019 +0200 msi: Get rid of redundant KEY_WOW64_64KEY flags. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 3eca3bf..8c350f6 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1747,11 +1747,11 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, r = ERROR_UNKNOWN_PATCH; - res = RegOpenKeyExW(udprod, szPatches, 0, KEY_WOW64_64KEY|KEY_READ, &patches); + res = RegOpenKeyExW(udprod, szPatches, 0, KEY_READ, &patches); if (res != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW( patches, squashed_patch, 0, KEY_WOW64_64KEY|KEY_READ, &patch ); + res = RegOpenKeyExW( patches, squashed_patch, 0, KEY_READ, &patch ); if (res != ERROR_SUCCESS) goto done; @@ -1761,7 +1761,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, &prod, FALSE) != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW(prod, szPatches, 0, KEY_WOW64_64KEY|KEY_ALL_ACCESS, &prodpatches); + res = RegOpenKeyExW(prod, szPatches, 0, KEY_ALL_ACCESS, &prodpatches); if (res != ERROR_SUCCESS) goto done;

1 0

Nikolay Sivov : mfreadwrite/tests: Add some tests for ReadSample().
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 2ca469f818a192f277ef7c33dc73c39a6f2de795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ca469f818a192f277ef7c33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:06:15 2019 +0300 mfreadwrite/tests: Add some tests for ReadSample(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 59 +++++++++++++++++++++++++++++++++++++++++ include/mfreadwrite.idl | 21 +++++++++------ 2 files changed, 72 insertions(+), 8 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 188e688..29e8e08 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -187,11 +187,14 @@ static struct async_callback *create_async_callback(void) static void test_source_reader(void) { IMFMediaType *mediatype, *mediatype2; + DWORD stream_flags, actual_index; struct async_callback *callback; IMFAttributes *attributes; IMFSourceReader *reader; IMFMediaSource *source; IMFByteStream *stream; + LONGLONG timestamp; + IMFSample *sample; BOOL selected; HRESULT hr; @@ -298,6 +301,62 @@ todo_wine ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); IMFMediaType_Release(mediatype); + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + IMFSample_Release(sample); + + /* There is no video stream. */ + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(actual_index == MF_SOURCE_READER_FIRST_VIDEO_STREAM, "Unexpected stream index %u\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#x.\n", stream_flags); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(!sample, "Unexpected sample object.\n"); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + &actual_index, &stream_flags, &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(!sample, "Unexpected sample object.\n"); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + &actual_index, &stream_flags, &timestamp, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + &actual_index, NULL, &timestamp, &sample); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + NULL, &stream_flags, &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(!sample, "Unexpected sample object.\n"); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + &actual_index, &stream_flags, NULL, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(!sample, "Unexpected sample object.\n"); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + &actual_index, &stream_flags, NULL, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(!sample, "Unexpected sample object.\n"); + /* Flush. */ hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 0eea43b..ed09b74 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -19,6 +19,11 @@ import "mfobjects.idl"; import "mftransform.idl"; +typedef [v1_enum] enum MF_SOURCE_READER_CONTROL_FLAG +{ + MF_SOURCE_READER_CONTROLF_DRAIN = 0x00000001, +} MF_SOURCE_READER_CONTROL_FLAG; + enum { MF_SOURCE_READER_INVALID_STREAM_INDEX = 0xffffffff, @@ -30,15 +35,15 @@ enum MF_SOURCE_READER_CURRENT_TYPE_INDEX = 0xffffffff }; -typedef enum MF_SOURCE_READER_FLAG +typedef [v1_enum] enum MF_SOURCE_READER_FLAG { - MF_SOURCE_READERF_ERROR = 0x001, - MF_SOURCE_READERF_ENDOFSTREAM = 0x002, - MF_SOURCE_READERF_NEWSTREAM = 0x004, - MF_SOURCE_READERF_NATIVEMEDIATYPECHANGED = 0x010, - MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED = 0x020, - MF_SOURCE_READERF_STREAMTICK = 0x100, - MF_SOURCE_READERF_ALLEFFECTSREMOVED = 0x200 + MF_SOURCE_READERF_ERROR = 0x00000001, + MF_SOURCE_READERF_ENDOFSTREAM = 0x00000002, + MF_SOURCE_READERF_NEWSTREAM = 0x00000004, + MF_SOURCE_READERF_NATIVEMEDIATYPECHANGED = 0x00000010, + MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED = 0x00000020, + MF_SOURCE_READERF_STREAMTICK = 0x00000100, + MF_SOURCE_READERF_ALLEFFECTSREMOVED = 0x00000200, } MF_SOURCE_READER_FLAG; typedef struct _MF_SINK_WRITER_STATISTICS

1 0

Nikolay Sivov : mfreadwrite: Handle MEMediaSample event.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: fcf8cbfb2a616db2fe7c1c58e97c48a596fc267b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcf8cbfb2a616db2fe7c1c58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:06:14 2019 +0300 mfreadwrite: Handle MEMediaSample event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 84db9aa..43dfd4e 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -37,6 +37,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -72,11 +73,19 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( mfinstance ); } +struct sample +{ + struct list entry; + IMFSample *sample; +}; + struct media_stream { IMFMediaStream *stream; IMFMediaType *current; DWORD id; + CRITICAL_SECTION cs; + struct list samples; }; typedef struct source_reader @@ -308,8 +317,64 @@ static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallbac return IMFSourceReader_Release(&reader->IMFSourceReader_iface); } +static HRESULT source_reader_media_sample_handler(struct source_reader *reader, IMFMediaStream *stream, + IMFMediaEvent *event) +{ + IMFSample *sample; + unsigned int i; + DWORD id = 0; + HRESULT hr; + + TRACE("Got new sample for stream %p.\n", stream); + + if (FAILED(hr = media_event_get_object(event, &IID_IMFSample, (void **)&sample))) + { + WARN("Failed to get sample object, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = media_stream_get_id(stream, &id))) + { + WARN("Unidentified stream %p, hr %#x.\n", stream, hr); + IMFSample_Release(sample); + return hr; + } + + for (i = 0; i < reader->stream_count; ++i) + { + if (id == reader->streams[i].id) + { + struct sample *pending_sample; + + if (!(pending_sample = heap_alloc(sizeof(*pending_sample)))) + { + hr = E_OUTOFMEMORY; + goto failed; + } + + pending_sample->sample = sample; + IMFSample_AddRef(pending_sample->sample); + + EnterCriticalSection(&reader->streams[i].cs); + list_add_tail(&reader->streams[i].samples, &pending_sample->entry); + LeaveCriticalSection(&reader->streams[i].cs); + + break; + } + } + + if (i == reader->stream_count) + WARN("Stream with id %#x was not present in presentation descriptor.\n", id); + +failed: + IMFSample_Release(sample); + + return hr; +} + static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { + struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); MediaEventType event_type; IMFMediaStream *stream; IMFMediaEvent *event; @@ -326,6 +391,18 @@ static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallba TRACE("Got event %u.\n", event_type); + switch (event_type) + { + case MEMediaSample: + hr = source_reader_media_sample_handler(reader, stream, event); + break; + default: + ; + } + + if (FAILED(hr)) + WARN("Failed while handling %d event, hr %#x.\n", event_type, hr); + IMFMediaEvent_Release(event); IMFMediaStream_BeginGetEvent(stream, iface, (IUnknown *)stream); @@ -394,10 +471,21 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) for (i = 0; i < reader->stream_count; ++i) { - if (reader->streams[i].stream) - IMFMediaStream_Release(reader->streams[i].stream); - if (reader->streams[i].current) - IMFMediaType_Release(reader->streams[i].current); + struct media_stream *stream = &reader->streams[i]; + struct sample *ptr, *next; + + if (stream->stream) + IMFMediaStream_Release(stream->stream); + if (stream->current) + IMFMediaType_Release(stream->current); + DeleteCriticalSection(&stream->cs); + + LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &stream->samples, struct sample, entry) + { + IMFSample_Release(ptr->sample); + list_remove(&ptr->entry); + heap_free(ptr); + } } heap_free(reader->streams); DeleteCriticalSection(&reader->cs); @@ -832,6 +920,9 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri IMFMediaType_Release(src_type); if (FAILED(hr)) break; + + InitializeCriticalSection(&object->streams[i].cs); + list_init(&object->streams[i].samples); } if (FAILED(hr))

1 0

Nikolay Sivov : mfreadwrite: Add a helper to get stream identifier.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 002010e31a41e68433f7d1ac00f60f2c961fdd93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=002010e31a41e68433f7d1ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:06:13 2019 +0300 mfreadwrite: Add a helper to get stream identifier. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index bb9ad0f..84db9aa 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -152,6 +152,20 @@ static HRESULT media_event_get_object(IMFMediaEvent *event, REFIID riid, void ** return hr; } +static HRESULT media_stream_get_id(IMFMediaStream *stream, DWORD *id) +{ + IMFStreamDescriptor *sd; + HRESULT hr; + + if (SUCCEEDED(hr = IMFMediaStream_GetStreamDescriptor(stream, &sd))) + { + hr = IMFStreamDescriptor_GetStreamIdentifier(sd, id); + IMFStreamDescriptor_Release(sd); + } + + return hr; +} + static HRESULT WINAPI source_reader_source_events_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { @@ -190,7 +204,6 @@ static HRESULT WINAPI source_reader_source_events_callback_GetParameters(IMFAsyn static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IMFMediaEvent *event) { - IMFStreamDescriptor *sd; IMFMediaStream *stream; unsigned int i; DWORD id = 0; @@ -204,13 +217,7 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM TRACE("Got new stream %p.\n", stream); - if (SUCCEEDED(hr = IMFMediaStream_GetStreamDescriptor(stream, &sd))) - { - hr = IMFStreamDescriptor_GetStreamIdentifier(sd, &id); - IMFStreamDescriptor_Release(sd); - } - - if (FAILED(hr)) + if (FAILED(hr = media_stream_get_id(stream, &id))) { WARN("Unidentified stream %p, hr %#x.\n", stream, hr); IMFMediaStream_Release(stream);

1 0

Hans Leidekker : wineboot: Also process Run keys from the 32-bit registry view.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 6c486058f8a174c25e85a27f17f4468796bef0ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c486058f8a174c25e85a27f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 16 11:27:38 2019 +0200 wineboot: Also process Run keys from the 32-bit registry view. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 153 ++++++++++++++++++++----------------------- 1 file changed, 72 insertions(+), 81 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b85a3b6..0b544e5 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -90,6 +90,7 @@ extern BOOL shutdown_all_desktops( BOOL force ); extern void kill_processes( BOOL kill_desktop ); static WCHAR windowsdir[MAX_PATH]; +static const BOOL is_64bit = sizeof(void *) > sizeof(int); /* retrieve the (unix) path to the wine.inf file */ static char *get_wine_inf_path(void) @@ -765,119 +766,109 @@ static DWORD runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized) return exit_code; } -/* - * Process a "Run" type registry key. - * hkRoot is the HKEY from which "Software\Microsoft\Windows\CurrentVersion" is - * opened. - * szKeyName is the key holding the actual entries. - * bDelete tells whether we should delete each value right before executing it. - * bSynchronous tells whether we should wait for the prog to complete before - * going on to the next prog. - */ -static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, - BOOL bSynchronous ) +static void process_run_key( HKEY key, const WCHAR *keyname, BOOL delete, BOOL synchronous ) { - static const WCHAR WINKEY_NAME[]={'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; - HKEY hkWin, hkRun; - DWORD res, dispos; - DWORD i, nMaxCmdLine=0, nMaxValue=0; - WCHAR *szCmdLine=NULL; - WCHAR *szValue=NULL; - - if (hkRoot==HKEY_LOCAL_MACHINE) - WINE_TRACE("processing %s entries under HKLM\n",wine_dbgstr_w(szKeyName) ); - else - WINE_TRACE("processing %s entries under HKCU\n",wine_dbgstr_w(szKeyName) ); + HKEY runkey; + LONG res; + DWORD disp, i, max_cmdline = 0, max_value = 0; + WCHAR *cmdline = NULL, *value = NULL; - if (RegCreateKeyExW( hkRoot, WINKEY_NAME, 0, NULL, 0, KEY_READ, NULL, &hkWin, NULL ) != ERROR_SUCCESS) - return TRUE; + if (RegCreateKeyExW( key, keyname, 0, NULL, 0, delete ? KEY_ALL_ACCESS : KEY_READ, NULL, &runkey, &disp )) + return; - if ((res = RegCreateKeyExW( hkWin, szKeyName, 0, NULL, 0, bDelete ? KEY_ALL_ACCESS : KEY_READ, - NULL, &hkRun, &dispos )) != ERROR_SUCCESS) - { - RegCloseKey( hkWin ); - return TRUE; - } - RegCloseKey( hkWin ); - if (dispos == REG_CREATED_NEW_KEY) goto end; + if (disp == REG_CREATED_NEW_KEY) + goto end; - if( (res=RegQueryInfoKeyW( hkRun, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, - &nMaxCmdLine, NULL, NULL ))!=ERROR_SUCCESS ) + if (RegQueryInfoKeyW( runkey, NULL, NULL, NULL, NULL, NULL, NULL, &i, &max_value, &max_cmdline, NULL, NULL )) goto end; - if( i==0 ) + if (!i) { - WINE_TRACE("No commands to execute.\n"); - - res=ERROR_SUCCESS; + WINE_TRACE( "No commands to execute.\n" ); goto end; } - - if( (szCmdLine=HeapAlloc(GetProcessHeap(),0,nMaxCmdLine))==NULL ) + if (!(cmdline = HeapAlloc( GetProcessHeap(), 0, max_cmdline ))) { - WINE_ERR("Couldn't allocate memory for the commands to be executed\n"); - - res=ERROR_NOT_ENOUGH_MEMORY; + WINE_ERR( "Couldn't allocate memory for the commands to be executed.\n" ); goto end; } - - if( (szValue=HeapAlloc(GetProcessHeap(),0,(++nMaxValue)*sizeof(*szValue)))==NULL ) + if (!(value = HeapAlloc( GetProcessHeap(), 0, ++max_value * sizeof(*value) ))) { - WINE_ERR("Couldn't allocate memory for the value names\n"); - - res=ERROR_NOT_ENOUGH_MEMORY; + WINE_ERR( "Couldn't allocate memory for the value names.\n" ); goto end; } - - while( i>0 ) - { - DWORD nValLength=nMaxValue, nDataLength=nMaxCmdLine; - DWORD type; - --i; + while (i) + { + DWORD len = max_value, len_data = max_cmdline, type; - if( (res=RegEnumValueW( hkRun, i, szValue, &nValLength, 0, &type, - (LPBYTE)szCmdLine, &nDataLength ))!=ERROR_SUCCESS ) + if ((res = RegEnumValueW( runkey, --i, value, &len, 0, &type, (BYTE *)cmdline, &len_data ))) { - WINE_ERR("Couldn't read in value %d - %d\n", i, res ); - + WINE_ERR( "Couldn't read value %u (%d).\n", i, res ); continue; } - - if( bDelete && (res=RegDeleteValueW( hkRun, szValue ))!=ERROR_SUCCESS ) + if (delete && (res = RegDeleteValueW( runkey, value ))) { - WINE_ERR("Couldn't delete value - %d, %d. Running command anyways.\n", i, res ); + WINE_ERR( "Couldn't delete value %u (%d). Running command anyways.\n", i, res ); } - - if( type!=REG_SZ ) + if (type != REG_SZ) { - WINE_ERR("Incorrect type of value #%d (%d)\n", i, type ); - + WINE_ERR( "Incorrect type of value %u (%u).\n", i, type ); continue; } - - if( (res=runCmd(szCmdLine, NULL, bSynchronous, FALSE ))==INVALID_RUNCMD_RETURN ) + if (runCmd( cmdline, NULL, synchronous, FALSE ) == INVALID_RUNCMD_RETURN) { - WINE_ERR("Error running cmd %s (%d)\n", wine_dbgstr_w(szCmdLine), GetLastError() ); + WINE_ERR( "Error running cmd %s (%u).\n", wine_dbgstr_w(cmdline), GetLastError() ); } - - WINE_TRACE("Done processing cmd #%d\n", i); + WINE_TRACE( "Done processing cmd %u.\n", i ); } - res=ERROR_SUCCESS; - end: - HeapFree( GetProcessHeap(), 0, szValue ); - HeapFree( GetProcessHeap(), 0, szCmdLine ); - - if( hkRun!=NULL ) - RegCloseKey( hkRun ); + HeapFree( GetProcessHeap(), 0, value ); + HeapFree( GetProcessHeap(), 0, cmdline ); + RegCloseKey( runkey ); + WINE_TRACE( "Done.\n" ); +} - WINE_TRACE("done\n"); +/* + * Process a "Run" type registry key. + * hkRoot is the HKEY from which "Software\Microsoft\Windows\CurrentVersion" is + * opened. + * szKeyName is the key holding the actual entries. + * bDelete tells whether we should delete each value right before executing it. + * bSynchronous tells whether we should wait for the prog to complete before + * going on to the next prog. + */ +static void ProcessRunKeys( HKEY root, const WCHAR *keyname, BOOL delete, BOOL synchronous ) +{ + static const WCHAR keypathW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; + HKEY key; - return res==ERROR_SUCCESS; + if (root == HKEY_LOCAL_MACHINE) + { + WINE_TRACE( "Processing %s entries under HKLM.\n", wine_dbgstr_w(keyname) ); + if (!RegCreateKeyExW( root, keypathW, 0, NULL, 0, KEY_READ, NULL, &key, NULL )) + { + process_run_key( key, keyname, delete, synchronous ); + RegCloseKey( key ); + } + if (is_64bit && !RegCreateKeyExW( root, keypathW, 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &key, NULL )) + { + process_run_key( key, keyname, delete, synchronous ); + RegCloseKey( key ); + } + } + else + { + WINE_TRACE( "Processing %s entries under HKCU.\n", wine_dbgstr_w(keyname) ); + if (!RegCreateKeyExW( root, keypathW, 0, NULL, 0, KEY_READ, NULL, &key, NULL )) + { + process_run_key( key, keyname, delete, synchronous ); + RegCloseKey( key ); + } + } } /*

1 0

Louis Lenders : ntdll: Add DECLSPEC_HOTPATCH to NtQueryValueKey.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 89bfcfc6452062ee59ed6be5cfd9009e46bf8c9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=89bfcfc6452062ee59ed6be5… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Apr 19 09:55:16 2019 +0200 ntdll: Add DECLSPEC_HOTPATCH to NtQueryValueKey. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45703 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index c6acd76..845e2e0 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -530,7 +530,7 @@ NTSTATUS WINAPI NtEnumerateValueKey( HANDLE handle, ULONG index, * NOTES * the name in the KeyValueInformation is never set */ -NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, +NTSTATUS WINAPI DECLSPEC_HOTPATCH NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, KEY_VALUE_INFORMATION_CLASS info_class, void *info, DWORD length, DWORD *result_len ) {

1 0

Hans Leidekker : msi: Always use the 64-bit registry view to retrieve registered owner and organization.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 0d17f36c13f129d5bfed290a0583b441657a6a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d17f36c13f129d5bfed290a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 19 11:30:15 2019 +0200 msi: Always use the 64-bit registry view to retrieve registered owner and organization. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 490c687..1e16fb1 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -742,7 +742,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0 }; - static const WCHAR szRegisteredUser[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; + static const WCHAR szRegisteredOwner[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; static const WCHAR szRegisteredOrganization[] = { 'R','e','g','i','s','t','e','r','e','d','O','r','g','a','n','i','z','a','t','i','o','n',0 }; @@ -971,10 +971,11 @@ static VOID set_installer_properties(MSIPACKAGE *package) CloseHandle( hkey ); } if ((!username || !companyname) && - RegOpenKeyW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, &hkey ) == ERROR_SUCCESS) + RegOpenKeyExW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, 0, KEY_QUERY_VALUE|KEY_WOW64_64KEY, + &hkey ) == ERROR_SUCCESS) { if (!username && - (username = msi_reg_get_val_str( hkey, szRegisteredUser ))) + (username = msi_reg_get_val_str( hkey, szRegisteredOwner ))) msi_set_property( package->db, szUSERNAME, username, -1 ); if (!companyname && (companyname = msi_reg_get_val_str( hkey, szRegisteredOrganization )))

1 0

Zebediah Figura : qedit/tests: Add some tests for querying null renderer pin information.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: e9c4d26638ec4d67be01c0b4ee9d9359f4c6188e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9c4d26638ec4d67be01c0b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:26 2019 -0500 qedit/tests: Add some tests for querying null renderer pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index f709d2a..9793860 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -200,6 +200,51 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter = create_null_renderer(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -219,6 +264,7 @@ START_TEST(nullrenderer) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Zebediah Figura : qedit/tests: Add some tests for null renderer filter interfaces.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: 1904ac4e3b37eb66fb8fb903437e9400e5654a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1904ac4e3b37eb66fb8fb903… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:23 2019 -0500 qedit/tests: Add some tests for null renderer filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/Makefile.in | 1 + dlls/qedit/tests/nullrenderer.c | 95 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in index 052336d..53d95d7 100644 --- a/dlls/qedit/tests/Makefile.in +++ b/dlls/qedit/tests/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = oleaut32 ole32 C_SRCS = \ mediadet.c \ + nullrenderer.c \ samplegrabber.c \ timeline.c diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c new file mode 100644 index 0000000..025a258 --- /dev/null +++ b/dlls/qedit/tests/nullrenderer.c @@ -0,0 +1,95 @@ +/* + * Null renderer filter unit tests + * + * Copyright 2018 Zebediah Figura + * + * 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 COBJMACROS +#include "dshow.h" +#include "wine/test.h" + +static IBaseFilter *create_null_renderer(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_NullRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_null_renderer(); + ULONG ref; + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMediaPosition, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + todo_wine check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got unexpected refcount %d.\n", ref); +} + +START_TEST(nullrenderer) +{ + IBaseFilter *filter; + HRESULT hr; + + CoInitialize(NULL); + + if (FAILED(hr = CoCreateInstance(&CLSID_NullRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter))) + { + /* qedit.dll does not exist on 2003. */ + win_skip("Failed to create null renderer filter, hr %#x.\n", hr); + return; + } + IBaseFilter_Release(filter); + + test_interfaces(); + + CoUninitialize(); +}

1 0

Zebediah Figura : regedit: Use the default implementation of WM_ERASEBKGND.
by Alexandre Julliard April 19, 2019

April 19, 2019

Module: wine Branch: master Commit: cf274c6f0c4cff6fedd6042bded3089154cf7835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf274c6f0c4cff6fedd6042b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 22:39:15 2019 -0500 regedit: Use the default implementation of WM_ERASEBKGND. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/hexedit.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index db48c80..951779b 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -340,34 +340,6 @@ HexEdit_Destroy (HEXEDIT_INFO *infoPtr) return 0; } - -static inline LRESULT -HexEdit_EraseBackground (HEXEDIT_INFO *infoPtr, HDC hdc) -{ - HBRUSH hBrush, hSolidBrush = NULL; - RECT rc; - - if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) - hBrush = hSolidBrush = CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); - else - { - hBrush = (HBRUSH)SendMessageW(GetParent(infoPtr->hwndSelf), WM_CTLCOLOREDIT, - (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); - if (!hBrush) - hBrush = hSolidBrush = CreateSolidBrush(GetSysColor(COLOR_WINDOW)); - } - - GetClientRect (infoPtr->hwndSelf, &rc); - - FillRect (hdc, &rc, hBrush); - - if (hSolidBrush) - DeleteObject(hSolidBrush); - - return -1; -} - - static inline LRESULT HexEdit_GetFont (HEXEDIT_INFO *infoPtr) { @@ -625,9 +597,6 @@ HexEdit_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_DESTROY: return HexEdit_Destroy (infoPtr); - case WM_ERASEBKGND: - return HexEdit_EraseBackground (infoPtr, (HDC)wParam); - case WM_GETDLGCODE: return DLGC_WANTCHARS | DLGC_WANTARROWS; @@ -675,7 +644,7 @@ void HexEdit_Register(void) wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(HEXEDIT_INFO *); wndClass.hCursor = NULL; - wndClass.hbrBackground = NULL; + wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = szHexEditClass; RegisterClassW(&wndClass);

1 0