June 2019 - Wine-devel - list.winehq.org

[PATCH v5 1/6] dxgi: Move wined3d_swapchain_resize_target() from wined3d.
by Józef Kucia 27 Jun '19

27 Jun '19

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 2 + dlls/dxgi/output.c | 69 ++++++++++++++++++++++++++++++++ dlls/dxgi/swapchain.c | 82 ++++++++++++++++++++++++++++++++------- dlls/wined3d/swapchain.c | 58 --------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 - 6 files changed, 138 insertions(+), 76 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 553eacee3b80..2f21d8e5b0ca 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -148,6 +148,8 @@ struct dxgi_output }; HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) DECLSPEC_HIDDEN; +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; /* IDXGIAdapter */ struct dxgi_adapter diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 123dee8c99e2..3dcbb5d6e540 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -522,6 +522,14 @@ static const struct IDXGIOutput4Vtbl dxgi_output_vtbl = dxgi_output_CheckOverlayColorSpaceSupport, }; +static struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == (IDXGIOutputVtbl *)&dxgi_output_vtbl); + return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); +} + static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { output->IDXGIOutput4_iface.lpVtbl = &dxgi_output_vtbl; @@ -539,3 +547,64 @@ HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **ou dxgi_output_init(*output, adapter); return S_OK; } + +HRESULT dxgi_output_get_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct dxgi_output *target; + struct wined3d *wined3d; + HRESULT hr; + + target = unsafe_impl_from_IDXGIOutput(iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_mutex_lock(); + hr = wined3d_get_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode, NULL); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to get display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + dxgi_mode_from_wined3d(mode, &wined3d_mode); + + TRACE("Returning %s.\n", debug_dxgi_mode(mode)); + + return S_OK; +} + +HRESULT dxgi_output_set_display_mode(IDXGIOutput *iface, DXGI_MODE_DESC *mode) +{ + struct wined3d_display_mode wined3d_mode; + struct dxgi_adapter *adapter; + struct dxgi_output *target; + struct wined3d *wined3d; + HRESULT hr; + + target = unsafe_impl_from_IDXGIOutput(iface); + adapter = target->adapter; + wined3d = adapter->factory->wined3d; + + wined3d_display_mode_from_dxgi(&wined3d_mode, mode); + + if (FAILED(hr = dxgi_output_find_closest_matching_mode(target, &wined3d_mode, NULL))) + WARN("Failed to find closest matching mode, hr %#x.\n", hr); + else /* Copy the actual mode back to the caller */ + dxgi_mode_from_wined3d(mode, &wined3d_mode); + + wined3d_mutex_lock(); + hr = wined3d_set_adapter_display_mode(wined3d, adapter->ordinal, &wined3d_mode); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return DXGI_ERROR_INVALID_CALL; + } + + return S_OK; +} diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8dbbfab805d3..b7a4fd5cbad8 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -152,6 +152,70 @@ static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, I return DXGI_ERROR_NOT_FOUND; } +static HRESULT dxgi_swapchain_resize_target(IDXGISwapChain1 *iface, + const DXGI_SWAP_CHAIN_DESC *desc, const DXGI_MODE_DESC *mode) +{ + RECT original_window_rect, window_rect; + HWND window = desc->OutputWindow; + HRESULT hr; + + if (!mode) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + TRACE("Mode: %s.\n", debug_dxgi_mode(mode)); + + if (mode->Scaling) + FIXME("Ignoring scaling %#x.\n", mode->Scaling); + + if (desc->Windowed) + { + SetRect(&window_rect, 0, 0, mode->Width, mode->Height); + AdjustWindowRectEx(&window_rect, + GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); + SetRect(&window_rect, 0, 0, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); + GetWindowRect(window, &original_window_rect); + OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); + } + else + { + DXGI_MODE_DESC actual_mode; + IDXGIOutput *target; + + if (FAILED(hr = IDXGISwapChain1_GetContainingOutput(iface, &target))) + { + WARN("Failed to get output, hr %#x.\n", hr); + return hr; + } + + if (desc->Flags & DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH) + { + actual_mode = *mode; + hr = dxgi_output_set_display_mode(target, &actual_mode); + } + else + { + hr = dxgi_output_get_display_mode(target, &actual_mode); + } + + IDXGIOutput_Release(target); + + if (FAILED(hr)) + return hr; + + SetRect(&window_rect, 0, 0, actual_mode.Width, actual_mode.Height); + } + + MoveWindow(window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + + return S_OK; +} + static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) { struct wined3d_swapchain_desc wined3d_desc; @@ -507,25 +571,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeBuffers(IDXGISwapChain1 * static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *iface, const DXGI_MODE_DESC *target_mode_desc) { - struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_display_mode mode; + DXGI_SWAP_CHAIN_DESC swap_chain_desc; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); - if (!target_mode_desc) - { - WARN("Invalid pointer.\n"); - return DXGI_ERROR_INVALID_CALL; - } - - TRACE("Mode: %s.\n", debug_dxgi_mode(target_mode_desc)); - - if (target_mode_desc->Scaling) - FIXME("Ignoring scaling %#x.\n", target_mode_desc->Scaling); - - wined3d_display_mode_from_dxgi(&mode, target_mode_desc); + d3d11_swapchain_GetDesc(iface, &swap_chain_desc); - return wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); + return dxgi_swapchain_resize_target(iface, &swap_chain_desc, target_mode_desc); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b75aead1e831..8aa8b92a0a98 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1361,64 +1361,6 @@ static HRESULT wined3d_swapchain_set_display_mode(struct wined3d_swapchain *swap return WINED3D_OK; } -HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, - const struct wined3d_display_mode *mode) -{ - struct wined3d_display_mode actual_mode; - RECT original_window_rect, window_rect; - struct wined3d_device *device; - HWND window; - HRESULT hr; - - TRACE("swapchain %p, mode %p.\n", swapchain, mode); - - wined3d_mutex_lock(); - - device = swapchain->device; - window = swapchain->device_window; - - if (swapchain->desc.windowed) - { - SetRect(&window_rect, 0, 0, mode->width, mode->height); - AdjustWindowRectEx(&window_rect, - GetWindowLongW(window, GWL_STYLE), FALSE, - GetWindowLongW(window, GWL_EXSTYLE)); - SetRect(&window_rect, 0, 0, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); - GetWindowRect(window, &original_window_rect); - OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); - } - else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) - { - actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) - { - wined3d_mutex_unlock(); - return hr; - } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - else - { - if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, - &actual_mode, NULL))) - { - ERR("Failed to get display mode, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - - wined3d_mutex_unlock(); - - MoveWindow(window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); - - return WINED3D_OK; -} - HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 59f99c91e075..904bb3461ffb 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -274,7 +274,6 @@ @ cdecl wined3d_swapchain_incref(ptr) @ cdecl wined3d_swapchain_present(ptr ptr ptr ptr long long) @ cdecl wined3d_swapchain_resize_buffers(ptr long long long long long long) -@ cdecl wined3d_swapchain_resize_target(ptr ptr) @ cdecl wined3d_swapchain_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_swapchain_set_gamma_ramp(ptr long ptr) @ cdecl wined3d_swapchain_set_palette(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index abef3f0ad021..d1d3ca42e599 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2690,8 +2690,6 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, c HRESULT __cdecl wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality); -HRESULT __cdecl wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, - const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, -- 2.21.0

1 0

[PATCH] ntdll: Support ISOLATIONAWARE_MANIFEST_RESOURCE_ID range
by Alistair Leslie-Hughes 27 Jun '19

27 Jun '19

From: André Hentschel <nerv(a)dawncrow.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18889 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/actctx.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 106fea80a3..25c2dccb8c 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -57,6 +57,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); /* we don't want to include winuser.h */ #define RT_MANIFEST ((ULONG_PTR)24) #define CREATEPROCESS_MANIFEST_RESOURCE_ID ((ULONG_PTR)1) +#define MINIMUM_RESERVED_MANIFEST_RESOURCE_ID ((ULONG_PTR)1) +#define MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID ((ULONG_PTR)16) /* from oaidl.h */ typedef enum tagLIBFLAGS { @@ -3304,8 +3306,14 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = open_nt_file( &file, &nameW ); if (!status) { - status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, - (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); + INT rid; + for (rid = MINIMUM_RESERVED_MANIFEST_RESOURCE_ID; + rid <= MAXIMUM_RESERVED_MANIFEST_RESOURCE_ID; rid++) + { + status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, + (LPCWSTR)(ULONG_PTR)rid, 0 ); + if (status == STATUS_SUCCESS) break; + } NtClose( file ); if (status == STATUS_SUCCESS) break; -- 2.17.1

2 1

[PATCH] include: Complete IMimeHeaderTable/IMimeEnumHeaderRows interfaces.
by Alistair Leslie-Hughes 27 Jun '19

27 Jun '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/mimeole.idl | 124 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 105 insertions(+), 19 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index cc80c12f47..b560caeed1 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -495,13 +495,117 @@ library MIMEOLE [out, ref] LPPROPVARIANT pValue); } + [ + uuid(c558834d-7f86-11d0-8252-00c04fd85ab4), + object + ] + interface IMimeEnumHeaderRows : IUnknown + { + typedef struct tagENUMHEADERROW + { + HHEADERROW hRow; + LPSTR pszHeader; + LPSTR pszData; + ULONG cchData; + DWORD_PTR dwReserved; + } ENUMHEADERROW, *LPENUMHEADERROW; + + HRESULT Next( + [in] ULONG fetch, + [in,out] LPENUMHEADERROW row, + [out] ULONG *fetched); + + HRESULT Skip( + [in] ULONG items); + + HRESULT Reset(void); + + HRESULT Clone( + [out] IMimeEnumHeaderRows **rows); + + HRESULT Count( + [out] ULONG *pcItems); + } + [ uuid(fd853cd1-7f86-11d0-8252-00c04fd85ab4), object ] interface IMimeHeaderTable : IPersistStream { - /* FIXME: fill this in */ + typedef struct tagFINDHEADER + { + LPCSTR pszHeader; + DWORD dwReserved; + } FINDHEADER, *LPFINDHEADER; + + typedef struct tagHEADERROWINFO + { + DWORD dwRowNumber; + ULONG cboffStart; + ULONG cboffColon; + ULONG cboffEnd; + } HEADERROWINFO, *LPHEADERROWINFO; + + typedef enum tagHEADERTABLEFLAGS + { + HTF_NAMEINDATA = 0x00000001, + HTF_ENUMHANDLESONLY = 0x00000002 + } HEADERTABLEFLAGS; + + HRESULT FindFirstRow( + [in] LPFINDHEADER header, + [out] LPHHEADERROW row); + + HRESULT FindNextRow( + [in] LPFINDHEADER header, + [out] LPHHEADERROW row); + + HRESULT CountRows( + [in] const char *header, + [out] ULONG *rows); + + HRESULT AppendRow( + [in] const char *header, + [in] DWORD flags, + [in] const char *data, + [in] ULONG count, + [out] LPHHEADERROW row); + + HRESULT DeleteRow( + [in] HHEADERROW row); + + HRESULT GetRowData( + [in] HHEADERROW row, + [in] DWORD flags, + [out] char **data, + [out] ULONG *len); + + HRESULT SetRowData( + [in] HHEADERROW row, + [in] DWORD flags, + [in] const char *data, + [in] ULONG len); + + HRESULT GetRowInfo( + [in] HHEADERROW row, + [in,out] LPHEADERROWINFO info); + + HRESULT SetRowNumber( + [in] HHEADERROW row, + [in] DWORD number); + + HRESULT EnumRows( + [in] const char *header, + [in] DWORD flags, + [out] IMimeEnumHeaderRows **rows); + + HRESULT Clone( + [out] IMimeHeaderTable **table); + + HRESULT BindToObject( + [in] REFIID riid, + [out, iid_is(riid)] void *object); } [ @@ -1256,24 +1360,6 @@ cpp_quote("#endif") /* FIXME: fill this in */ } - [ - uuid(c558834d-7f86-11d0-8252-00c04fd85ab4), - object - ] - interface IMimeEnumHeaderRows : IUnknown - { - typedef struct tagENUMHEADERROW - { - HHEADERROW hRow; - LPSTR pszHeader; - LPSTR pszData; - ULONG cchData; - DWORD_PTR dwReserved; - } ENUMHEADERROW, *LPENUMHEADERROW; - - /* FIXME: fill this in */ - } - [ uuid(fd853cee-7f86-11d0-8252-00c04fd85ab4), object -- 2.17.1

1 0

[PATCH v2] setupapi: Also start newly installed root PnP services in SetupDiInstallDevice().
by Zebediah Figura 26 Jun '19

26 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b7625644bec..c38d518fb6f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -31,6 +31,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "winsvc.h" #include "setupapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -4735,9 +4736,12 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR dothwW[] = {'.','H','W',0}; static const WCHAR dotservicesW[] = {'.','S','e','r','v','i','c','e','s',0}; static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; + static const WCHAR rootW[] = {'r','o','o','t','\\',0}; WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; + WCHAR svc_name[LINE_LEN] = {0}; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; + SC_HANDLE manager, service; struct device *device; struct driver *driver; void *callback_ctx; @@ -4806,7 +4810,6 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) if (SetupGetIntField(&ctx, 2, &flags) && (flags & SPSVCINST_ASSOCSERVICE)) { - WCHAR svc_name[LINE_LEN]; if (SetupGetStringFieldW(&ctx, 1, svc_name, ARRAY_SIZE(svc_name), NULL) && svc_name[0]) RegSetValueExW(device->key, Service, 0, REG_SZ, (BYTE *)svc_name, strlenW(svc_name) * sizeof(WCHAR)); break; @@ -4827,5 +4830,24 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) RegCloseKey(device_key); RegCloseKey(driver_key); + + if (!strncmpiW(device->instanceId, rootW, strlenW(rootW)) && svc_name[0] + && (manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) + { + if ((service = OpenServiceW(manager, svc_name, SERVICE_START))) + { + SERVICE_STATUS status; + if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) + { + ERR("Failed to start service %s for device %s, error %u.\n", + debugstr_w(svc_name), debugstr_w(device->instanceId), GetLastError()); + } + CloseServiceHandle(service); + } + else + ERR("Failed to open service %s for device %s.\n", debugstr_w(svc_name), debugstr_w(device->instanceId)); + CloseServiceHandle(manager); + } + return TRUE; } -- 2.22.0

1 0

[PATCH 1/2] setupapi: Also start newly installed services in SetupDiInstallDevice().
by Zebediah Figura 26 Jun '19

26 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b7625644bec..f3ed10caca5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -31,6 +31,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "winsvc.h" #include "setupapi.h" #include "wine/debug.h" #include "wine/heap.h" @@ -4735,9 +4736,12 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR dothwW[] = {'.','H','W',0}; static const WCHAR dotservicesW[] = {'.','S','e','r','v','i','c','e','s',0}; static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; + static const WCHAR rootW[] = {'r','o','o','t','\\',0}; WCHAR section[LINE_LEN], section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; + WCHAR svc_name[LINE_LEN] = {0}; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; + SC_HANDLE manager, service; struct device *device; struct driver *driver; void *callback_ctx; @@ -4806,7 +4810,6 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) if (SetupGetIntField(&ctx, 2, &flags) && (flags & SPSVCINST_ASSOCSERVICE)) { - WCHAR svc_name[LINE_LEN]; if (SetupGetStringFieldW(&ctx, 1, svc_name, ARRAY_SIZE(svc_name), NULL) && svc_name[0]) RegSetValueExW(device->key, Service, 0, REG_SZ, (BYTE *)svc_name, strlenW(svc_name) * sizeof(WCHAR)); break; @@ -4827,5 +4830,24 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) RegCloseKey(device_key); RegCloseKey(driver_key); + + if (!strncmpiW(device->instanceId, rootW, strlenW(rootW)) && svc_name[0] + && (manager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT))) + { + if ((service = OpenServiceW(manager, svc_name, SERVICE_START|SERVICE_USER_DEFINED_CONTROL))) + { + SERVICE_STATUS status; + if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) + { + ERR("Failed to start service %s for device %s, error %u.\n", + debugstr_w(svc_name), debugstr_w(device->instanceId), GetLastError()); + } + CloseServiceHandle(service); + } + else + ERR("Failed to open service %s for device %s.\n", debugstr_w(svc_name), debugstr_w(device->instanceId)); + CloseServiceHandle(manager); + } + return TRUE; } -- 2.22.0

1 1

[PATCH 1/5] qcap/tests: Add some tests for IBaseFilter::EnumPins on the AVI muxer.
by Zebediah Figura 26 Jun '19

26 Jun '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/tests/avimux.c | 122 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index 8292067f533..e51c6af8b22 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -179,6 +179,127 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_avi_mux(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[3]; + 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); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + 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_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + 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_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_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Next(enum1, 2, 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, 3, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + 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, 3); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + 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); +} + static void test_seeking(void) { IBaseFilter *filter = create_avi_mux(); @@ -319,6 +440,7 @@ START_TEST(avimux) test_interfaces(); test_aggregation(); + test_enum_pins(); test_seeking(); CoUninitialize(); -- 2.22.0

1 4

32bit wine on macOS 10.15 (Catalina)
by Fabian Maurer 26 Jun '19

26 Jun '19

Hello wine-devel, What's the current state of wine on the new macOS? Now that the beta is released I got to play around with it, and it indeed seems to have all 32bit support removed. On Linux at least we could switch between 64bit and 32bit code, but the macOS kernel seems to not allow this. Assuming we can do the thunking, what are the options to execute 32bit code on 10.15? I see a few options: 1) Virtualization 2) Emulation / dynamic recompilation 3) Somehow get a 32bit "segment" to execute the code (Custom driver?) Unless I'm overlooking something, that's it. What are your current plans? Regards, Fabian Maurer

1 0

[PATCH] kernelbase: Return on failed allocation (Coverity)
by André Hentschel 26 Jun '19

26 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernelbase/registry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index f218ffccb5d..f2b0af9f03a 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -2680,9 +2680,11 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, return ERROR_FILE_NOT_FOUND; size = GetFullPathNameW(file_name, 0, NULL, NULL); - full_name = heap_alloc(size * sizeof(WCHAR)); if (!size) return GetLastError(); + full_name = heap_alloc(size * sizeof(WCHAR)); + if (!full_name) + return ERROR_NOT_ENOUGH_MEMORY; GetFullPathNameW(file_name, size, full_name, NULL); EnterCriticalSection(&reg_mui_cs); -- 2.17.1

1 0

[PATCH] advapi32: Return on failed allocation (Coverity) (try 2)
by André Hentschel 26 Jun '19

26 Jun '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/advapi32/registry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 2d2c1be4dce..01ae114bee1 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3260,9 +3260,11 @@ static LONG load_mui_string(const WCHAR *file_name, UINT res_id, WCHAR *buffer, return ERROR_FILE_NOT_FOUND; size = GetFullPathNameW(file_name, 0, NULL, NULL); - full_name = heap_alloc(size * sizeof(WCHAR)); if (!size) return GetLastError(); + full_name = heap_alloc(size * sizeof(WCHAR)); + if (!full_name) + return GetLastError(); GetFullPathNameW(file_name, size, full_name, NULL); EnterCriticalSection(&reg_mui_cs); -- 2.17.1

2 2

[v2 PATCH] mshtml: Add IDocumentRange stub.
by Nikolay Sivov 26 Jun '19

26 Jun '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 82 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 2 + include/mshtmdid.h | 3 ++ include/mshtml.idl | 16 +++++++ 5 files changed, 105 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 87ee8e6b68..7595ad852a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5159,6 +5159,85 @@ static const IDisplayServicesVtbl DisplayServicesVtbl = { DisplayServices_HasFlowLayout }; +/********************************************************** + * IDocumentRange implementation + */ +static inline HTMLDocument *impl_from_IDocumentRange(IDocumentRange *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDocumentRange_iface); +} + +static HRESULT WINAPI DocumentRange_QueryInterface(IDocumentRange *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI DocumentRange_AddRef(IDocumentRange *iface) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_addref(This); +} + +static ULONG WINAPI DocumentRange_Release(IDocumentRange *iface) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_release(This); +} + +static HRESULT WINAPI DocumentRange_GetTypeInfoCount(IDocumentRange *iface, UINT *pctinfo) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DocumentRange_GetTypeInfo(IDocumentRange *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DocumentRange_GetIDsOfNames(IDocumentRange *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI DocumentRange_Invoke(IDocumentRange *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMRange **p) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IDocumentRangeVtbl DocumentRangeVtbl = { + DocumentRange_QueryInterface, + DocumentRange_AddRef, + DocumentRange_Release, + DocumentRange_GetTypeInfoCount, + DocumentRange_GetTypeInfo, + DocumentRange_GetIDsOfNames, + DocumentRange_Invoke, + DocumentRange_createRange, +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -5243,6 +5322,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IMarkupContainer_iface; else if(IsEqualGUID(&IID_IDisplayServices, riid)) *ppv = &This->IDisplayServices_iface; + else if(IsEqualGUID(&IID_IDocumentRange, riid)) + *ppv = &This->IDocumentRange_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -5294,6 +5375,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; doc->IMarkupContainer_iface.lpVtbl = &MarkupContainerVtbl; doc->IDisplayServices_iface.lpVtbl = &DisplayServicesVtbl; + doc->IDocumentRange_iface.lpVtbl = &DocumentRangeVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6bfce89698..ef56f1d23d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -144,6 +144,7 @@ typedef struct EventTarget EventTarget; XIID(IDOMMouseEvent) \ XIID(IDOMUIEvent) \ XIID(IDocumentEvent) \ + XIID(IDocumentRange) \ XIID(IDocumentSelector) \ XIID(IElementSelector) \ XIID(IElementTraversal) \ @@ -626,6 +627,7 @@ struct HTMLDocument { IMarkupServices IMarkupServices_iface; IMarkupContainer IMarkupContainer_iface; IDisplayServices IDisplayServices_iface; + IDocumentRange IDocumentRange_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f6eebbc18b..586df7d8a5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -171,6 +171,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentRange, &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IDisplayServices, @@ -190,6 +191,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentRange, &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IDisplayServices, diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 82055f690b..87b8877f4e 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4711,4 +4711,7 @@ #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTOR DISPID_OMDOCUMENT+105 #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL DISPID_OMDOCUMENT+106 +/* IDocumentRange */ +#define DISPID_IDOCUMENTRANGE_CREATERANGE DISPID_OMDOCUMENT+111 + #endif /* __MSHTMDID_H__ */ diff --git a/include/mshtml.idl b/include/mshtml.idl index f7ebd9e71a..aea888b2b8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -23451,6 +23451,19 @@ interface IDocumentSelector : IDispatch [out, retval] IHTMLDOMChildrenCollection **pel); } +[ + odl, + oleautomation, + dual, + uuid(305104af-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDocumentRange : IDispatch +{ + [id(DISPID_IDOCUMENTRANGE_CREATERANGE)] + HRESULT createRange( + [out, retval] IHTMLDOMRange **ppIHTMLDOMRange); +} + /***************************************************************************** * DispHTMLDocument dispinterface */ @@ -24058,6 +24071,9 @@ methods: [id(DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL)] IHTMLDOMChildrenCollection *querySelectorAll([in] BSTR v); + + [id(DISPID_IDOCUMENTRANGE_CREATERANGE)] + IHTMLDOMRange *createRange(); } /***************************************************************************** -- 2.20.1

2 1