November 2021 - Wine-Devel - list.winehq.org

[PATCH v4 4/9] win32u: Implement display adapter registration.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 4 ++- dlls/win32u/sysparams.c | 67 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 2 deletions(-)

Nov. 30, 2021

[PATCH v4 3/9] win32u: Implement GPU registration.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/font.c | 10 +- dlls/win32u/sysparams.c | 473 ++++++++++++++++++++++++++++++++++- dlls/win32u/win32u_private.h | 6 + 3 files changed, 481 insertions(+), 8 deletions(-)

Nov. 30, 2021

[PATCH v4 2/9] win32u: Introduce UpdateDisplayDevice user driver entry point.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 1 + dlls/win32u/driver.c | 13 +++++++ dlls/win32u/sysparams.c | 75 ++++++++++++++++++++++++++++++++++++++- include/wine/gdi_driver.h | 39 +++++++++++++++++++- 4 files changed, 126 insertions(+), 2 deletions(-)

Nov. 30, 2021

[PATCH v4 1/9] win32u: Implement NtUserGetDisplayConfigBufferSizes.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/Makefile.in | 1 + dlls/win32u/font.c | 4 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 467 +++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 2 + 8 files changed, 484 insertions(+), 3 deletions(-) create mode 100644 dlls/win32u/sysparams.c

Nov. 30, 2021

Re: [PATCH 4/5] configure: Try to detect MinGW zlib using pkg-config if --with-system-dllpath is specified.

by Alexandre Julliard

Zebediah Figura <zfigura(a)codeweavers.com> writes: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > aclocal.m4 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > configure.ac | 12 +++++++++++ > 2 files changed, 71 insertions(+) This is causing defines like HAVE_ZLIB_H to end up in the main config.h, I don't think we want that. -- Alexandre Julliard julliard(a)winehq.org

Nov. 30, 2021

Re: [PATCH v2 2/2] windows.media.speech: Add stub SpeechSynthesizer class.

by Rémi Bernon

On 11/23/21 21:02, Paul Gofman wrote: > Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> > --- > static const struct IActivationFactoryVtbl activation_factory_vtbl = > @@ -364,6 +597,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) > HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) > { > TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); > + > + if (lstrcmpW(WindowsGetStringRawBuffer(classid, NULL), L"Windows.Media.SpeechSynthesis.SpeechSynthesizer")) > + { > + ERR("Unknown classid %s.\n", debugstr_hstring(classid)); > + return CLASS_E_CLASSNOTAVAILABLE; > + } > + I think you can (should?) use wcscmp instead, at least I think it's more canonical. I'm not sure about the exact differences but lstrcmpW seems to be locale-dependent when wcscmp isn't? > *factory = &windows_media_speech.IActivationFactory_iface; > IUnknown_AddRef(*factory); > return S_OK; > diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c > index c949b35900b..38fd5c90dd0 100644 > --- a/dlls/windows.media.speech/tests/speech.c > +++ b/dlls/windows.media.speech/tests/speech.c > @@ -34,19 +34,26 @@ > > #include "wine/test.h" > > +HRESULT WINAPI (*pDllGetActivationFactory)(HSTRING, IActivationFactory **); > + > static void test_SpeechSynthesizer(void) > { > static const WCHAR *speech_synthesizer_name = L"Windows.Media.SpeechSynthesis.SpeechSynthesizer"; > - > + static const WCHAR *speech_synthesizer_name2 = L"windows.media.speechsynthesis.speechsynthesizer"; > + static const WCHAR *unknown_class_name = L"Unknown.Class"; > + IActivationFactory *factory = NULL, *factory2 = NULL; > IVectorView_VoiceInformation *voices = NULL; > IInstalledVoicesStatic *voices_static = NULL; > - IActivationFactory *factory = NULL; > IVoiceInformation *voice; > IInspectable *inspectable = NULL, *tmp_inspectable = NULL; > IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; > - HSTRING str; > + ISpeechSynthesizer *synthesizer; > + IClosable *closable; > + HMODULE hdll; > + HSTRING str, str2; > HRESULT hr; > UINT32 size; > + ULONG ref; > > hr = RoInitialize(RO_INIT_MULTITHREADED); > ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); > @@ -54,9 +61,46 @@ static void test_SpeechSynthesizer(void) > hr = WindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str); > ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); > > + hdll = LoadLibraryW(L"windows.media.speech.dll"); > + if (hdll) > + { > + pDllGetActivationFactory = (void *)GetProcAddress(hdll, "DllGetActivationFactory"); > + ok(!!pDllGetActivationFactory, "DllGetActivationFactory not found.\n"); > + > + hr = WindowsCreateString(unknown_class_name, wcslen(unknown_class_name), &str2); > + ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); > + > + hr = pDllGetActivationFactory(str2, &factory); > + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr); > + > + WindowsDeleteString(str2); > + > + hr = WindowsCreateString(speech_synthesizer_name2, wcslen(speech_synthesizer_name2), &str2); > + ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); > + > + hr = pDllGetActivationFactory(str2, &factory2); > + ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr); > + > + WindowsDeleteString(str2); > + > + hr = pDllGetActivationFactory(str, &factory2); > + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); > + } > + else > + { > + win_skip("Failed to load library, err %u.\n", GetLastError()); > + } > + > hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); > ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); > > + if (hdll) > + { > + ok(factory == factory2, "Got unexpected factory %p, factory2 %p.\n", factory, factory2); > + IActivationFactory_Release(factory2); > + FreeLibrary(hdll); > + } > + > hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); > ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); > > @@ -107,8 +151,29 @@ static void test_SpeechSynthesizer(void) > > IAgileObject_Release(agile_object); > IInspectable_Release(inspectable); > - IActivationFactory_Release(factory); > > + hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechSynthesizer, (void **)&synthesizer); > + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); > + > + hr = RoActivateInstance(str, &inspectable); > + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); > + > + hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer, (void **)&synthesizer); > + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); > + > + hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable); > + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); > + > + ref = IClosable_Release(closable); > + ok(ref == 2, "Got unexpected ref %u.\n", ref); > + > + ref = ISpeechSynthesizer_Release(synthesizer); > + ok(ref == 1, "Got unexpected ref %u.\n", ref); > + > + ref = IInspectable_Release(inspectable); > + ok(!ref, "Got unexpected ref %u.\n", ref); > + > + IActivationFactory_Release(factory); > WindowsDeleteString(str); > > RoUninitialize(); > It may be interesting to compare the activation factories of two different activatable classes, to confirm that they should be different static objects? Looks good otherwise. -- Rémi Bernon <rbernon(a)codeweavers.com>

Nov. 30, 2021

Re: [PATCH v2 1/2] include: Define ISpeechSynthesizer interface.

by Rémi Bernon

Hi Paul! On 11/23/21 21:02, Paul Gofman wrote: > +namespace Windows { > + namespace Media { > + apicontract MediaControlContract; > + interface IMediaControl; > + } > +} > + > +namespace Windows { > + namespace Media { > + [contractversion(1.0)] > + apicontract MediaControlContract { > + } > + It doesn't look like you actually need this one? > + [contract(Windows.Foundation.UniversalApiContract, 1.0)] > + [exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream)] > + [uuid(83e46e93-244c-4622-ba0b-6229c4d0d65d)] > + interface ISpeechSynthesisStream : IInspectable > + { > + [propget] HRESULT Markers([out] [retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>** value); > + } > + The interface normally specifies a requires statements. Although I don't really know what use it has, I don't see a reason not to add it, so the interface definition fully matches the SDK. It's only a matter of forward declaring the corresponding interfaces above (and you already have IClosable), adding the requires here, and the interfaces to the SpeechSynthesisStream class so IMHO it's not too verbose. -- Rémi Bernon <rbernon(a)codeweavers.com>

Nov. 30, 2021

Re: [PATCH 2/4] kernel32: Forward SetCachedSigningLevel to kernelbase.

by Paul Gofman

You can examine GetProcAddress result. E. g. call GetProcAddress for the function in question from kernel32 and kernelbase and see if the result is the same or not. > On 30 Nov 2021, at 07:31, Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> wrote: > > > Hi Chip, > > Thanks for the detailed explanation, I think I understand the difference between the two now. But how do you determine if a function should be forwarded or imported? Is there a way to find out for certain? So for SetCachedSigningLevel, how can I know if it's better to forward it or import it? > >> On Mon, Nov 29, 2021 at 9:57 PM Chip Davis <cdavis(a)codeweavers.com> wrote: >> Normally, a forwarded function gets a special export entry which records the name of the DLL that has the real implementation and the name or ordinal of the target function. That way, when the loader resolves imports, it can resolve them directly to the real implementation instead of to a thunk in the imported DLL, like you'd have otherwise. But on Windows, a number of functions that would otherwise be forwarded to kernelbase from kernel32 instead use these thunks that call the target in kernelbase--presumably because existing programs abuse hotpatching to hook functions that were in kernel32. For these cases, winebuild supports a special option on a forwarded export which causes it to generate this thunk. >> >> November 29, 2021 7:08 PM, "Mohamad Al-Jaf" <mohamadaljaf(a)gmail.com> wrote: >> E-mail resend: Forgot to reply-all. >> Interesting, why do you think this? How does one know how to find out if forwarding or importing is more appropriate? Also, what exactly is the difference between the two? >> On Mon, Nov 29, 2021 at 3:11 AM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: >> It's possible it should be using -import for this function. >> >> >> Chip

Nov. 30, 2021

[PATCH 6/6] winecoreaudio: Build with msvcrt.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/Makefile.in | 2 -- dlls/winecoreaudio.drv/midi.c | 6 +----- dlls/winecoreaudio.drv/mmdevdrv.c | 25 ++++++++++--------------- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index 8162eae67d7..4be396c489c 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(COREAUDIO_LIBS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ coreaudio.c \ coremidi.c \ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6191885553a..6c6752c0c76 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -21,23 +21,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" -#include "wine/port.h" - #include <string.h> #include <stdarg.h> #include <stdio.h> #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "mmddk.h" #include "mmdeviceapi.h" #include "audioclient.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/unixlib.h" #include "coreaudio.h" diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index b4cf325c9d2..128396fbe29 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -21,11 +21,11 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winnls.h" #include "winreg.h" #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "wine/list.h" #include "wine/unixlib.h" @@ -126,10 +126,7 @@ typedef struct _SessionMgr { IMMDevice *device; } SessionMgr; -static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','c','o','r','e','a','u','d','i','o','.','d','r','v','\\','d','e','v','i','c','e','s',0}; -static const WCHAR guidW[] = {'g','u','i','d',0}; +static const WCHAR *drv_key_devicesW = L"Software\\Wine\\Drivers\\winecoreaudio.drv\\devices"; static HANDLE g_timer_q; @@ -253,7 +250,7 @@ static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, goto exit; } - lr = RegSetValueExW(key, guidW, 0, REG_BINARY, (BYTE*)guid, + lr = RegSetValueExW(key, L"guid", 0, REG_BINARY, (BYTE*)guid, sizeof(GUID)); if(lr != ERROR_SUCCESS) ERR("RegSetValueEx(%s\\guid) failed: %u\n", wine_dbgstr_w(key_name), lr); @@ -270,19 +267,17 @@ static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) DWORD type, size = sizeof(*guid); WCHAR key_name[256]; - static const WCHAR key_fmt[] = {'%','u',0}; - if(flow == eCapture) key_name[0] = '1'; else key_name[0] = '0'; key_name[1] = ','; - sprintfW(key_name + 2, key_fmt, device_id); + swprintf(key_name + 2, ARRAY_SIZE(key_name), L"%u", device_id); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ - if(RegQueryValueExW(dev_key, guidW, 0, &type, + if(RegQueryValueExW(dev_key, L"guid", 0, &type, (BYTE*)guid, &size) == ERROR_SUCCESS){ if(type == REG_BINARY){ RegCloseKey(dev_key); @@ -322,8 +317,8 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, { struct get_endpoint_ids_params params; unsigned int i; - GUID *guids; - WCHAR **ids; + GUID *guids = NULL; + WCHAR **ids = NULL; TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); @@ -346,7 +341,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, } for(i = 0; i < params.num; i++){ - int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); ids[i] = heap_alloc(size); if(!ids[i]){ params.result = E_OUTOFMEMORY; @@ -402,7 +397,7 @@ static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) } size = sizeof(reg_guid); - if(RegQueryValueExW(key, guidW, 0, &type, + if(RegQueryValueExW(key, L"guid", 0, &type, (BYTE*)&reg_guid, &size) == ERROR_SUCCESS){ if(IsEqualGUID(&reg_guid, guid)){ RegCloseKey(key); @@ -419,7 +414,7 @@ static BOOL get_deviceid_by_guid(GUID *guid, DWORD *id, EDataFlow *flow) return FALSE; } - *id = strtoulW(key_name + 2, NULL, 10); + *id = wcstoul(key_name + 2, NULL, 10); return TRUE; } -- 2.23.0

Nov. 30, 2021

[PATCH 5/6] winecoreaudio: Always start the notification thread.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 9 ++------- dlls/winecoreaudio.drv/midi.c | 7 +------ dlls/winecoreaudio.drv/unixlib.h | 1 - 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 5777236bd26..8c09d4a2c1b 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -417,19 +417,14 @@ NTSTATUS midi_init(void *args) dests[i].caps.wNotes = 0; } - params->num_srcs = num_srcs; - *params->err = DRV_SUCCESS; return STATUS_SUCCESS; } NTSTATUS midi_release(void *args) { - if (num_srcs) - { - /* stop the notify_wait thread */ - notify_post(NULL); - } + /* stop the notify_wait thread */ + notify_post(NULL); if (midi_client) MIDIClientDispose(midi_client); /* MIDIClientDispose will close all ports */ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 262713dd003..6191885553a 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -45,8 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); -static DWORD MIDIIn_NumDevs = 0; - static void notify_client(struct notify_context *notify) { TRACE("dev_id=%d msg=%d param1=%04lX param2=%04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -87,10 +85,7 @@ static LONG CoreAudio_MIDIInit(void) return err; } - MIDIIn_NumDevs = params.num_srcs; - - if (MIDIIn_NumDevs > 0) - CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); + CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); return err; } diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index d44a7a013e8..bd9a5ce03bd 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -186,7 +186,6 @@ struct set_volumes_params struct midi_init_params { DWORD *err; - UINT num_srcs; }; struct notify_context -- 2.23.0

Nov. 30, 2021