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

Zhiyi Zhang : setupapi: Support full path enumerator in SetupDiGetClassDevs.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: d5e24897e2cd61a5af71a317c1797757acf1b794 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5e24897e2cd61a5af71a317… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 16 17:36:48 2019 +0800 setupapi: Support full path enumerator in SetupDiGetClassDevs. Based on a patch by Michael Müller. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35345 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 17 +++++++++++++++-- dlls/setupapi/tests/devinst.c | 6 ------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a69e826..f0d75f9 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2392,8 +2392,21 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, &enumStrKey); if (!l) { - SETUPDI_EnumerateMatchingDevices(DeviceInfoSet, enumstr, - enumStrKey, class, flags); + WCHAR *bus, *device; + + if (!wcschr(enumstr, '\\')) + { + SETUPDI_EnumerateMatchingDevices(DeviceInfoSet, enumstr, enumStrKey, class, flags); + } + else if ((bus = strdupW(enumstr))) + { + device = wcschr(bus, '\\'); + *device++ = 0; + + SETUPDI_EnumerateMatchingDeviceInstances(DeviceInfoSet, bus, device, enumStrKey, class, flags); + HeapFree(GetProcessHeap(), 0, bus); + } + RegCloseKey(enumStrKey); } } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 430dede..57adeeb 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2823,11 +2823,9 @@ static void test_get_class_devs(void) set = SetupDiGetClassDevsA(NULL, "ROOT\\LEGACY_BOGUS", NULL, DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_list(set, &GUID_NULL); -todo_wine { check_device_info(set, 0, &guid2, "ROOT\\LEGACY_BOGUS\\BAR"); check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); -} check_device_info(set, 3, NULL, NULL); check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); ret = SetupDiDestroyDeviceInfoList(set); @@ -2836,10 +2834,8 @@ todo_wine { set = SetupDiGetClassDevsA(&guid, "ROOT\\LEGACY_BOGUS", NULL, 0); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_list(set, &guid); -todo_wine { check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); -} check_device_info(set, 2, NULL, NULL); check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); ret = SetupDiDestroyDeviceInfoList(set); @@ -2848,11 +2844,9 @@ todo_wine { set = SetupDiGetClassDevsA(&guid, "ROOT\\LEGACY_BOGUS", NULL, DIGCF_ALLCLASSES); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_list(set, &GUID_NULL); -todo_wine { check_device_info(set, 0, &guid2, "ROOT\\LEGACY_BOGUS\\BAR"); check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\FOO"); check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\QUX"); -} check_device_info(set, 3, NULL, NULL); check_device_iface(set, NULL, &iface_guid, 0, 0, NULL); ret = SetupDiDestroyDeviceInfoList(set);

1 0

Zhiyi Zhang : winex11.drv: Add DriverDateData registry property to display adapters.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 7d70d459842d7fd09352314b8bfea7216f87a89e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d70d459842d7fd09352314b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 16 17:37:14 2019 +0800 winex11.drv: Add DriverDateData registry property to display adapters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35345. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7ddaf1c..435c0b8 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -45,6 +45,7 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); +static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; @@ -126,6 +127,7 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g INT written; DWORD size; BOOL ret = FALSE; + FILETIME filetime; sprintfW(instanceW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) @@ -155,6 +157,11 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, (strlenW(gpu->name) + 1) * sizeof(WCHAR))) goto done; + /* Write DriverDateData value, using current time as driver date, needed by Evoland */ + GetSystemTimeAsFileTime(&filetime); + if (RegSetValueExW(hkey, driver_date_dataW, 0, REG_BINARY, (BYTE *)&filetime, sizeof(filetime))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */

1 0

Józef Kucia : dxgi: Obey image count limits for Vulkan swapchains.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 601b8d9fae6d76424794c76520e06d41646ae1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=601b8d9fae6d76424794c765… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 17 17:59:59 2019 +0200 dxgi: Obey image count limits for Vulkan swapchains. Mesa drivers require at least 3 images (see Mesa commit 4689e98fe884d9412b72fd6293b6d6a69e3ef68e). 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/dxgi/swapchain.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index caf0863..963ceee 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1663,9 +1663,9 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s VkSwapchainCreateInfoKHR vk_swapchain_desc; VkDevice vk_device = swapchain->vk_device; VkFormat vk_format, vk_swapchain_format; + unsigned int width, height, image_count; VkSurfaceCapabilitiesKHR surface_caps; VkSwapchainKHR vk_swapchain; - unsigned int width, height; VkImageUsageFlags usage; VkResult vr; HRESULT hr; @@ -1687,12 +1687,15 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s return hresult_from_vk_result(vr); } - if (surface_caps.maxImageCount && (swapchain->desc.BufferCount > surface_caps.maxImageCount - || swapchain->desc.BufferCount < surface_caps.minImageCount)) + image_count = swapchain->desc.BufferCount; + image_count = max(image_count, surface_caps.minImageCount); + if (surface_caps.maxImageCount) + image_count = min(image_count, surface_caps.maxImageCount); + + if (image_count != swapchain->desc.BufferCount) { WARN("Buffer count %u is not supported (%u-%u).\n", swapchain->desc.BufferCount, surface_caps.minImageCount, surface_caps.maxImageCount); - return DXGI_ERROR_UNSUPPORTED; } width = swapchain->desc.Width; @@ -1728,7 +1731,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s vk_swapchain_desc.pNext = NULL; vk_swapchain_desc.flags = 0; vk_swapchain_desc.surface = swapchain->vk_surface; - vk_swapchain_desc.minImageCount = swapchain->desc.BufferCount; + vk_swapchain_desc.minImageCount = image_count; vk_swapchain_desc.imageFormat = vk_swapchain_format; vk_swapchain_desc.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; vk_swapchain_desc.imageExtent.width = width;

1 0

Zebediah Figura : services: Fix the arguments to is_root_pnp_service().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 57038f8ca3945ae3c1e2c1d7b4186376481c6f5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=57038f8ca3945ae3c1e2c1d7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 18 18:29:38 2019 -0500 services: Fix the arguments to is_root_pnp_service(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 67cd4fa..ec2a8eb 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -424,7 +424,7 @@ static BOOL schedule_delayed_autostart(struct service_entry **services, unsigned return TRUE; } -static BOOL is_root_pnp_service(const struct service_entry *service, HDEVINFO set) +static BOOL is_root_pnp_service(HDEVINFO set, const struct service_entry *service) { SP_DEVINFO_DATA device = {sizeof(device)}; WCHAR name[MAX_SERVICE_NAME];

1 0

Andrew Eikum : msctf: Accept ITfUIElementSink in ThreadMgr AdviseSink.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 9122bf768f0a7de47f14fe12777e71ee0582cf30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9122bf768f0a7de47f14fe12… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 22 11:39:06 2019 -0500 msctf: Accept ITfUIElementSink in ThreadMgr AdviseSink. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/tests/inputprocessor.c | 71 ++++++++++++++++++++++++++++++++++++--- dlls/msctf/threadmgr.c | 12 ++++++- include/msctf.idl | 19 +++++++++++ 4 files changed, 97 insertions(+), 6 deletions(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 9d37548..71ed10b 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -32,6 +32,7 @@ #define COOKIE_MAGIC_DMSINK 0x0070 #define COOKIE_MAGIC_THREADFOCUSSINK 0x0080 #define COOKIE_MAGIC_KEYTRACESINK 0x0090 +#define COOKIE_MAGIC_UIELEMENTSINK 0x00a0 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 0d03ce3..d440b53 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -64,7 +64,7 @@ static DWORD tmSinkCookie; static DWORD tmSinkRefCount; static DWORD dmSinkCookie; static DWORD documentStatus; -static DWORD key_trace_sink_cookie; +static DWORD key_trace_sink_cookie, ui_element_sink_cookie; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; static ITfDocumentMgr *test_LastCurrentFocus = FOCUS_SAVE; @@ -671,6 +671,60 @@ static const ITfKeyTraceEventSinkVtbl TfKeyTraceEventSinkVtbl = { static ITfKeyTraceEventSink TfKeyTraceEventSink = { &TfKeyTraceEventSinkVtbl }; +static HRESULT WINAPI TfUIElementSink_QueryInterface(ITfUIElementSink *iface, + REFIID riid, void **ppvObject) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfUIElementSink, riid)){ + *ppvObject = iface; + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TfUIElementSink_AddRef(ITfUIElementSink *iface) +{ + return 2; +} + +static ULONG WINAPI TfUIElementSink_Release(ITfUIElementSink *iface) +{ + return 1; +} + +static HRESULT WINAPI TfUIElementSink_BeginUIElement(ITfUIElementSink *iface, + DWORD id, BOOL *show) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TfUIElementSink_UpdateUIElement(ITfUIElementSink *iface, + DWORD id) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TfUIElementSink_EndUIElement(ITfUIElementSink *iface, + DWORD id) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const ITfUIElementSinkVtbl TfUIElementSinkVtbl = { + TfUIElementSink_QueryInterface, + TfUIElementSink_AddRef, + TfUIElementSink_Release, + TfUIElementSink_BeginUIElement, + TfUIElementSink_UpdateUIElement, + TfUIElementSink_EndUIElement +}; + +static ITfUIElementSink TfUIElementSink = { &TfUIElementSinkVtbl }; + static HRESULT WINAPI TfTransitoryExtensionSink_QueryInterface(ITfTransitoryExtensionSink *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfTransitoryExtensionSink, riid)) { @@ -1128,7 +1182,7 @@ static void test_ThreadMgrAdviseSinks(void) tmSinkRefCount = 1; tmSinkCookie = 0; hr = ITfSource_AdviseSink(source,&IID_ITfThreadMgrEventSink, sink, &tmSinkCookie); - ok(hr == S_OK, "Failed to Advise Sink\n"); + ok(hr == S_OK, "Failed to Advise ITfThreadMgrEventSink\n"); ok(tmSinkCookie!=0,"Failed to get sink cookie\n"); /* Advising the sink adds a ref, Releasing here lets the object be deleted @@ -1138,7 +1192,11 @@ static void test_ThreadMgrAdviseSinks(void) hr = ITfSource_AdviseSink(source, &IID_ITfKeyTraceEventSink, (IUnknown*)&TfKeyTraceEventSink, &key_trace_sink_cookie); - ok(hr == S_OK, "Failed to Advise Sink\n"); + ok(hr == S_OK, "Failed to Advise ITfKeyTraceEventSink\n"); + + hr = ITfSource_AdviseSink(source, &IID_ITfUIElementSink, (IUnknown*)&TfUIElementSink, + &ui_element_sink_cookie); + ok(hr == S_OK, "Failed to Advise ITfUIElementSink\n"); ITfSource_Release(source); } @@ -1155,10 +1213,13 @@ static void test_ThreadMgrUnadviseSinks(void) tmSinkRefCount = 1; hr = ITfSource_UnadviseSink(source, tmSinkCookie); - ok(hr == S_OK, "Failed to unadvise Sink\n"); + ok(hr == S_OK, "Failed to unadvise ITfThreadMgrEventSink\n"); hr = ITfSource_UnadviseSink(source, key_trace_sink_cookie); - ok(hr == S_OK, "Failed to unadvise Sink\n"); + ok(hr == S_OK, "Failed to unadvise ITfKeyTraceEventSink\n"); + + hr = ITfSource_UnadviseSink(source, ui_element_sink_cookie); + ok(hr == S_OK, "Failed to unadvise ITfUIElementSink\n"); ITfSource_Release(source); } diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index a9fcb5c..7afef3c 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -96,6 +96,7 @@ typedef struct tagACLMulti { struct list PreservedKeyNotifySink; struct list ThreadFocusSink; struct list ThreadMgrEventSink; + struct list UIElementSink; } ThreadMgr; typedef struct tagEnumTfDocumentMgr { @@ -172,6 +173,7 @@ static void ThreadMgr_Destructor(ThreadMgr *This) free_sinks(&This->PreservedKeyNotifySink); free_sinks(&This->ThreadFocusSink); free_sinks(&This->ThreadMgrEventSink); + free_sinks(&This->UIElementSink); LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CurrentPreservedKeys) { @@ -624,6 +626,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, COOKIE_MAGIC_KEYTRACESINK, punk, pdwCookie); } + if (IsEqualIID(riid, &IID_ITfUIElementSink)) + { + WARN("semi-stub for ITfUIElementSink: sink won't be used.\n"); + return advise_sink(&This->UIElementSink, &IID_ITfUIElementSink, + COOKIE_MAGIC_UIELEMENTSINK, punk, pdwCookie); + } + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); return E_NOTIMPL; } @@ -637,7 +646,7 @@ static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCo magic = get_Cookie_magic(pdwCookie); if (magic != COOKIE_MAGIC_TMSINK && magic != COOKIE_MAGIC_THREADFOCUSSINK - && magic != COOKIE_MAGIC_KEYTRACESINK) + && magic != COOKIE_MAGIC_KEYTRACESINK && magic != COOKIE_MAGIC_UIELEMENTSINK) return E_INVALIDARG; return unadvise_sink(pdwCookie); @@ -1354,6 +1363,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) list_init(&This->PreservedKeyNotifySink); list_init(&This->ThreadFocusSink); list_init(&This->ThreadMgrEventSink); + list_init(&This->UIElementSink); TRACE("returning %p\n", This); *ppOut = (IUnknown *)&This->ITfThreadMgrEx_iface; diff --git a/include/msctf.idl b/include/msctf.idl index 01e944c..5ef3311 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -1139,6 +1139,25 @@ interface ITfKeyTraceEventSink : IUnknown [ object, local, + uuid(ea1ea136-19df-11d7-a6d2-00065b84435c), + pointer_default(unique) +] +interface ITfUIElementSink : IUnknown +{ + HRESULT BeginUIElement( + [in] DWORD id, + [in, out] BOOL *show); + + HRESULT UpdateUIElement( + [in] DWORD id); + + HRESULT EndUIElement( + [in] DWORD id); +} + +[ + object, + local, uuid(8f1b8ad8-0b6b-4874-90c5-bd76011e8f7c), pointer_default(unique) ]

1 0

Andrew Eikum : msctf: Accept ITfInputProcessorProfileActivationSink in ThreadMgr AdviseSink.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: d541087079a8770bb02bae830c56a6d3c0b6424e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d541087079a8770bb02bae83… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jul 25 13:35:05 2019 -0500 msctf: Accept ITfInputProcessorProfileActivationSink in ThreadMgr AdviseSink. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/tests/inputprocessor.c | 69 +++++++++++++++++++++++++++++++++++++-- dlls/msctf/threadmgr.c | 13 +++++++- 3 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 71ed10b..584bb10 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -33,6 +33,7 @@ #define COOKIE_MAGIC_THREADFOCUSSINK 0x0080 #define COOKIE_MAGIC_KEYTRACESINK 0x0090 #define COOKIE_MAGIC_UIELEMENTSINK 0x00a0 +#define COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK 0x00b0 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index d440b53..d73a3f9 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -64,7 +64,8 @@ static DWORD tmSinkCookie; static DWORD tmSinkRefCount; static DWORD dmSinkCookie; static DWORD documentStatus; -static DWORD key_trace_sink_cookie, ui_element_sink_cookie; +static DWORD key_trace_sink_cookie, ui_element_sink_cookie, profile_activation_sink_cookie; +static DWORD fake_service_onactivated_flags = 0; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; static ITfDocumentMgr *test_LastCurrentFocus = FOCUS_SAVE; @@ -85,6 +86,7 @@ static INT test_ACP_InsertTextAtSelection = SINK_UNEXPECTED; static INT test_ACP_SetSelection = SINK_UNEXPECTED; static INT test_OnEndEdit = SINK_UNEXPECTED; +DEFINE_GUID(CLSID_FakeService, 0xEDE1A7AD,0x66DE,0x47E0,0xB6,0x20,0x3E,0x92,0xF8,0x24,0x6B,0xF3); static inline int expected_count(int *sink) { @@ -725,6 +727,61 @@ static const ITfUIElementSinkVtbl TfUIElementSinkVtbl = { static ITfUIElementSink TfUIElementSink = { &TfUIElementSinkVtbl }; +static HRESULT WINAPI ProfileActivationSink_QueryInterface(ITfInputProcessorProfileActivationSink *iface, + REFIID riid, void **ppvObject) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfInputProcessorProfileActivationSink, riid)){ + *ppvObject = iface; + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ProfileActivationSink_AddRef(ITfInputProcessorProfileActivationSink *iface) +{ + return 2; +} + +static ULONG WINAPI ProfileActivationSink_Release(ITfInputProcessorProfileActivationSink *iface) +{ + return 1; +} + +static HRESULT WINAPI ProfileActivationSink_OnActivated(ITfInputProcessorProfileActivationSink *iface, + DWORD dwProfileType, LANGID langid, REFCLSID clsid, REFGUID catid, + REFGUID guidProfile, HKL hkl, DWORD dwFlags) +{ + trace("Got OnActivated: {dwProfileType %08x, langid %08x, clsid %s, catid %s, guidProfile %s, %p, dwFlags %08x}\n", + dwProfileType, langid, wine_dbgstr_guid(clsid), + wine_dbgstr_guid(catid), wine_dbgstr_guid(guidProfile), hkl, dwFlags); + + ok(dwProfileType == TF_PROFILETYPE_INPUTPROCESSOR || dwProfileType == TF_PROFILETYPE_KEYBOARDLAYOUT, + "unexpected dwProfileType: 0x%x\n", dwProfileType); + + if(dwProfileType == TF_PROFILETYPE_INPUTPROCESSOR && IsEqualGUID(&CLSID_FakeService, clsid)){ + if(dwFlags & TF_IPSINK_FLAG_ACTIVE){ + ok(test_ShouldActivate, "OnActivated: Activation came unexpectedly\n"); + } + + fake_service_onactivated_flags = dwFlags; + } + + return S_OK; +} + +static const ITfInputProcessorProfileActivationSinkVtbl TfInputProcessorProfileActivationSinkVtbl = { + ProfileActivationSink_QueryInterface, + ProfileActivationSink_AddRef, + ProfileActivationSink_Release, + ProfileActivationSink_OnActivated +}; + +static ITfInputProcessorProfileActivationSink TfInputProcessorProfileActivationSink = { + &TfInputProcessorProfileActivationSinkVtbl +}; + static HRESULT WINAPI TfTransitoryExtensionSink_QueryInterface(ITfTransitoryExtensionSink *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfTransitoryExtensionSink, riid)) { @@ -974,7 +1031,6 @@ static HRESULT UnregisterTextService(void) * The tests */ -DEFINE_GUID(CLSID_FakeService, 0xEDE1A7AD,0x66DE,0x47E0,0xB6,0x20,0x3E,0x92,0xF8,0x24,0x6B,0xF3); DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); @@ -1198,6 +1254,10 @@ static void test_ThreadMgrAdviseSinks(void) &ui_element_sink_cookie); ok(hr == S_OK, "Failed to Advise ITfUIElementSink\n"); + hr = ITfSource_AdviseSink(source, &IID_ITfInputProcessorProfileActivationSink, (IUnknown*)&TfInputProcessorProfileActivationSink, + &profile_activation_sink_cookie); + ok(hr == S_OK, "Failed to Advise ITfInputProcessorProfileActivationSink\n"); + ITfSource_Release(source); } @@ -1221,6 +1281,9 @@ static void test_ThreadMgrUnadviseSinks(void) hr = ITfSource_UnadviseSink(source, ui_element_sink_cookie); ok(hr == S_OK, "Failed to unadvise ITfUIElementSink\n"); + hr = ITfSource_UnadviseSink(source, profile_activation_sink_cookie); + ok(hr == S_OK, "Failed to unadvise ITfInputProcessorProfileActivationSink\n"); + ITfSource_Release(source); } @@ -1618,6 +1681,8 @@ static void test_startSession(void) ok(SUCCEEDED(hr),"Failed to Activate\n"); ok(cid != tid,"TextService id mistakenly matches Client id\n"); + todo_wine ok(fake_service_onactivated_flags & TF_IPSINK_FLAG_ACTIVE, "Expected OnActivated callback\n"); + test_ShouldActivate = FALSE; hr = ITfThreadMgr_Activate(g_tm,&cid2); ok(SUCCEEDED(hr),"Failed to Activate\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 7afef3c..2c208fb 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -97,6 +97,7 @@ typedef struct tagACLMulti { struct list ThreadFocusSink; struct list ThreadMgrEventSink; struct list UIElementSink; + struct list InputProcessorProfileActivationSink; } ThreadMgr; typedef struct tagEnumTfDocumentMgr { @@ -174,6 +175,7 @@ static void ThreadMgr_Destructor(ThreadMgr *This) free_sinks(&This->ThreadFocusSink); free_sinks(&This->ThreadMgrEventSink); free_sinks(&This->UIElementSink); + free_sinks(&This->InputProcessorProfileActivationSink); LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CurrentPreservedKeys) { @@ -633,6 +635,13 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, COOKIE_MAGIC_UIELEMENTSINK, punk, pdwCookie); } + if (IsEqualIID(riid, &IID_ITfInputProcessorProfileActivationSink)) + { + WARN("semi-stub for ITfInputProcessorProfileActivationSink: sink won't be used.\n"); + return advise_sink(&This->InputProcessorProfileActivationSink, &IID_ITfInputProcessorProfileActivationSink, + COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK, punk, pdwCookie); + } + FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid)); return E_NOTIMPL; } @@ -646,7 +655,8 @@ static HRESULT WINAPI ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCo magic = get_Cookie_magic(pdwCookie); if (magic != COOKIE_MAGIC_TMSINK && magic != COOKIE_MAGIC_THREADFOCUSSINK - && magic != COOKIE_MAGIC_KEYTRACESINK && magic != COOKIE_MAGIC_UIELEMENTSINK) + && magic != COOKIE_MAGIC_KEYTRACESINK && magic != COOKIE_MAGIC_UIELEMENTSINK + && magic != COOKIE_MAGIC_INPUTPROCESSORPROFILEACTIVATIONSINK) return E_INVALIDARG; return unadvise_sink(pdwCookie); @@ -1364,6 +1374,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) list_init(&This->ThreadFocusSink); list_init(&This->ThreadMgrEventSink); list_init(&This->UIElementSink); + list_init(&This->InputProcessorProfileActivationSink); TRACE("returning %p\n", This); *ppOut = (IUnknown *)&This->ITfThreadMgrEx_iface;

1 0

Jacek Caban : winegcc: Always mark executables as nx compat.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: aae296bfd799f2ae79ed31a07a99dbba7e8a55e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae296bfd799f2ae79ed31a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 30 18:29:26 2019 +0200 winegcc: Always mark executables as nx compat. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e8341a0..3d1817a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -450,6 +450,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) } } + strarray_add( flags, "-Wl,--nxcompat" ); + if (opts->image_base) strarray_add( flags, strmake("-Wl,--image-base,%s", opts->image_base )); if (opts->large_address_aware && opts->target_cpu == CPU_x86)

1 0

Francois Gouget : xaudio2: Fix the optional FAudio functions check.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 55e09533db40f10ba3843d5b1736f9786f2fb5b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e09533db40f10ba3843d5b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 30 18:39:28 2019 +0200 xaudio2: Fix the optional FAudio functions check. WINE_CHECK_LIB_FUNCS() must be called in WINE_PACKAGE_FLAGS()'s checks parameter so this happens before CAUDIO_{FLAGS,LIBS} have been mangled for use by makefiles. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 ++++++++-------- configure.ac | 9 ++++----- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 177c834..ed56167 100755 --- a/configure +++ b/configure @@ -15004,15 +15004,10 @@ fi done -CPPFLAGS=$ac_save_CPPFLAGS -test -z "$FAUDIO_CFLAGS" || FAUDIO_CFLAGS=`echo " $FAUDIO_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` -test -z "$FAUDIO_LIBS" || FAUDIO_LIBS=`echo " $FAUDIO_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` - - ac_wine_check_funcs_save_LIBS="$LIBS" + ac_wine_check_funcs_save_LIBS="$LIBS" LIBS="$LIBS $FAUDIO_LIBS" -for ac_func in \ - FAudio_CommitOperationSet \ - F3DAudioInitialize8 +for ac_func in FAudio_CommitOperationSet \ + F3DAudioInitialize8 do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -15025,6 +15020,11 @@ fi done LIBS="$ac_wine_check_funcs_save_LIBS" + +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$FAUDIO_CFLAGS" || FAUDIO_CFLAGS=`echo " $FAUDIO_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$FAUDIO_LIBS" || FAUDIO_LIBS=`echo " $FAUDIO_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + fi if test "x$ac_cv_lib_soname_FAudio" = "x"; then : case "x$with_faudio" in diff --git a/configure.ac b/configure.ac index a2cd2c7..0fe2602 100644 --- a/configure.ac +++ b/configure.ac @@ -1691,11 +1691,10 @@ if test "x$with_faudio" != "xno" then WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,, [AC_CHECK_HEADERS([FAudio.h], - [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])])]) - WINE_CHECK_LIB_FUNCS(\ - FAudio_CommitOperationSet \ - F3DAudioInitialize8, - [$FAUDIO_LIBS]) + [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])]) + WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \ + F3DAudioInitialize8], [$FAUDIO_LIBS]) + ]) fi WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"], [libFAudio ${notice_platform}development files not found, XAudio2 won't be supported.])

1 0

Alistair Leslie-Hughes : include: Add define SS_PORT.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 67aecface56b2f7514e76f982d7c737879cd8ade URL: https://source.winehq.org/git/wine.git/?a=commit;h=67aecface56b2f7514e76f98… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 23:07:40 2019 +0000 include: Add define SS_PORT. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 52c80c5..4cae361 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -280,6 +280,8 @@ typedef struct WS(in_pktinfo) { #define WS_IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } #endif /* USE_WS_PREFIX */ +#define SS_PORT(ssp) (((PSOCKADDR_IN)(ssp))->sin_port) + #ifdef __cplusplus extern "C" { #endif

1 0

Alistair Leslie-Hughes : include: Add more defines in sal.h.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: wine Branch: master Commit: 889050b1a3a35728f33d0832f324aa1aa22fc9a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=889050b1a3a35728f33d0832… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 29 23:07:38 2019 +0000 include: Add more defines in sal.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/sal.h b/include/sal.h index 35f6493..823361a 100644 --- a/include/sal.h +++ b/include/sal.h @@ -22,25 +22,34 @@ #define _Always_(exp) +#define _At_ #define _At_buffer_(a, b, c, d) #define _Check_return_ #define _Check_return_opt_ +#define _COM_Outptr_ +#define _COM_Outptr_result_maybenull_ + #define _Deref_out_ #define _Deref_out_z_ #define _Deref_out_opt_ #define _Deref_out_opt_z_ +#define _Deref_post_maybenull_ #define _Deref_post_opt_cap_(count) #define _Deref_post_opt_valid_ #define _Deref_post_opt_z_cap_(count) #define _Deref_post_valid_ #define _Deref_post_z_ +#define _Deref_pre_maybenull_ +#define _Deref_pre_z_ #define _Deref_prepost_opt_z_ #define _Deref_ret_z_ #define _Field_range_(min, max) +#define __in +#define __in_opt #define _In_ #define _In_bytecount_(count) #define _In_bytecount_c_(count) @@ -66,6 +75,7 @@ #define _In_reads_(count) #define _In_reads_bytes_(count) #define _In_reads_bytes_opt_(count) +#define _In_reads_opt_(count) #define _In_reads_opt_z_(count) #define _In_reads_or_z_(count) #define _In_reads_or_z_opt_(count) @@ -76,6 +86,7 @@ #define _In_z_count_(count) #define _In_z_count_c_(count) +#define __inout #define _Inout_ #define _Inout_bytecap_x_(count) #define _Inout_cap_(count) @@ -85,6 +96,7 @@ #define _Inout_opt_z_bytecap_(count) #define _Inout_updates_(count) #define _Inout_updates_bytes_(count) +#define _Inout_updates_bytes_all_opt_(count) #define _Inout_updates_opt_(count) #define _Inout_updates_z_(count) #define _Inout_updates_opt_z_(count) @@ -95,7 +107,10 @@ #define _Null_terminated_ +#define __out +#define __out_opt #define _Out_ +#define _Outptr_ #define _Out_bytecap_(count) #define _Out_bytecap_c_(count) #define _Out_bytecap_x_(count) @@ -129,6 +144,7 @@ #define _Out_opt_z_cap_post_count_(count1, count2) #define _Out_ptrdiff_cap_(count) #define _Out_writes_(count) +#define _Out_writes_all_(count) #define _Out_writes_bytes_(count) #define _Out_writes_bytes_all_(count) #define _Out_writes_bytes_all_opt_(count) @@ -150,10 +166,12 @@ #define _Out_z_cap_x_(count) #define _Out_z_cap_post_count_(count1, count2) +#define _Outptr_opt_ #define _Outptr_result_buffer_(count) #define _Outptr_result_buffer_maybenull_(count) #define _Outptr_result_maybenull_ #define _Outptr_result_maybenull_z_ +#define _Outptr_result_nullonfailure_ #define _Outptr_result_z_ #define _Param_(p) @@ -164,15 +182,20 @@ #define _Post_invalid_ #define _Post_maybez_ #define _Post_ptr_invalid_ +#define _Post_readable_byte_size_(count) #define _Post_readable_size_(count) +#define _Post_same_lock_(exp, exp1) #define _Post_satisfies_(exp) #define _Post_writable_byte_size_(count) +#define _Post_writable_size_(count) #define _Post_z_ #define _Pre_cap_for_(count) #define _Pre_maybenull_ #define _Pre_notnull_ +#define _Pre_null_ #define _Pre_opt_z_ +#define _Pre_valid_ #define _Pre_writable_size_(count) #define _Pre_z_ #define _Prepost_z_ @@ -180,6 +203,10 @@ #define _Printf_format_string_ #define _Printf_format_string_params_(count) +#define _Reserved_ + +#define _Result_nullonfailure_ + #define _Ret_maybenull_ #define _Ret_maybenull_z_ #define _Ret_notnull_ @@ -187,9 +214,12 @@ #define _Ret_opt_bytecap_(count) #define _Ret_opt_bytecap_x_(count) #define _Ret_opt_z_cap_(count) +#define _Ret_range_(exp,exp2) #define _Ret_writes_bytes_maybenull_(count) #define _Ret_z_ +#define _Return_type_success_(count) + #define _Scanf_format_string_ #define _Scanf_format_string_params_(count) #define _Scanf_s_format_string_

1 0