October 2016 - Wine-commits

Jacek Caban : kernel32/tests: Added GetNamedPipeInfo tests.
by Alexandre Julliard 06 Oct '16

06 Oct '16

Module: wine Branch: master Commit: 7abde01cc112c45cf7dbf6f4c6c294321e80b9a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7abde01cc112c45cf7dbf6f4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 5 21:27:06 2016 +0200 kernel32/tests: Added GetNamedPipeInfo tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index a896843..cf7e3ba 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2250,6 +2250,77 @@ static void test_NamedPipeHandleState(void) CloseHandle(server); } +#define test_pipe_info(a,b,c,d,e) _test_pipe_info(__LINE__,a,b,c,d,e) +static void _test_pipe_info(unsigned line, HANDLE pipe, DWORD ex_flags, DWORD ex_out_buf_size, DWORD ex_in_buf_size, DWORD ex_max_instances) +{ + DWORD flags = 0xdeadbeef, out_buf_size = 0xdeadbeef, in_buf_size = 0xdeadbeef, max_instances = 0xdeadbeef; + BOOL res; + + res = GetNamedPipeInfo(pipe, &flags, &out_buf_size, &in_buf_size, &max_instances); + ok_(__FILE__,line)(res, "GetNamedPipeInfo failed: %x\n", res); + ok_(__FILE__,line)(flags == ex_flags, "flags = %x, expected %x\n", flags, ex_flags); + ok_(__FILE__,line)(out_buf_size == ex_out_buf_size, "out_buf_size = %x, expected %u\n", out_buf_size, ex_out_buf_size); + ok_(__FILE__,line)(in_buf_size == ex_in_buf_size, "in_buf_size = %x, expected %u\n", in_buf_size, ex_in_buf_size); + ok_(__FILE__,line)(max_instances == ex_max_instances, "max_instances = %x, expected %u\n", max_instances, ex_max_instances); +} + +static void test_GetNamedPipeInfo(void) +{ + HANDLE server; + + server = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + test_pipe_info(server, PIPE_SERVER_END | PIPE_TYPE_BYTE, 1024, 1024, 1); + + CloseHandle(server); + + server = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_MESSAGE | PIPE_NOWAIT, + /* nMaxInstances */ 3, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + test_pipe_info(server, PIPE_SERVER_END | PIPE_TYPE_MESSAGE, 1024, 1024, 3); + + CloseHandle(server); + + server = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_MESSAGE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 0, + /* nInBufSize */ 0, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + test_pipe_info(server, PIPE_SERVER_END | PIPE_TYPE_MESSAGE, 0, 0, 1); + + CloseHandle(server); + + server = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_MESSAGE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 0xf000, + /* nInBufSize */ 0xf000, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + test_pipe_info(server, PIPE_SERVER_END | PIPE_TYPE_MESSAGE, 0xf000, 0xf000, 1); + + CloseHandle(server); +} + static void test_readfileex_pending(void) { HANDLE server, client, event; @@ -2432,5 +2503,6 @@ START_TEST(pipe) test_overlapped(); test_overlapped_error(); test_NamedPipeHandleState(); + test_GetNamedPipeInfo(); test_readfileex_pending(); }

1 0

Aric Stewart : winebus.sys: Implement IOCTL_HID_GET_DEVICE_ATTRIBUTES for hid devices.
by Alexandre Julliard 06 Oct '16

06 Oct '16

Module: wine Branch: master Commit: ea95a47bb54741215811c535d7a46102422be041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea95a47bb54741215811c535d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 6 07:19:27 2016 -0500 winebus.sys: Implement IOCTL_HID_GET_DEVICE_ATTRIBUTES for hid devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_udev.c | 1 + dlls/winebus.sys/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 099558b..342a66b 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -34,3 +34,4 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, const GUID *class, const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) DECLSPEC_HIDDEN; void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; +NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 93e56f3..a01d88e 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -299,6 +299,7 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry udev_driver_obj = driver; driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; + driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = hid_internal_dispatch; if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) goto error; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 09a59d6..eaa0b93 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -30,7 +30,9 @@ #include "winternl.h" #include "winreg.h" #include "setupapi.h" +#include "winioctl.h" #include "ddk/wdm.h" +#include "ddk/hidport.h" #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" @@ -346,6 +348,50 @@ NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) return status; } +NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) +{ + NTSTATUS status = irp->IoStatus.u.Status; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + struct device_extension *extension = (struct device_extension *)device->DeviceExtension; + + TRACE("(%p, %p)\n", device, irp); + + switch (irpsp->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_HID_GET_DEVICE_ATTRIBUTES: + { + HID_DEVICE_ATTRIBUTES *attr = (HID_DEVICE_ATTRIBUTES *)irp->UserBuffer; + TRACE("IOCTL_HID_GET_DEVICE_ATTRIBUTES\n"); + + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(*attr)) + { + irp->IoStatus.u.Status = status = STATUS_BUFFER_TOO_SMALL; + break; + } + + memset(attr, 0, sizeof(*attr)); + attr->Size = sizeof(HID_DEVICE_ATTRIBUTES); + attr->VendorID = extension->vid; + attr->ProductID = extension->pid; + attr->VersionNumber = extension->version; + irp->IoStatus.u.Status = status = STATUS_SUCCESS; + irp->IoStatus.Information = sizeof(HID_DEVICE_ATTRIBUTES); + break; + } + default: + { + ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; + FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", + code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + break; + } + } + + IoCompleteRequest(irp, IO_NO_INCREMENT); + + return status; +} + NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { static const WCHAR udevW[] = {'\\','D','r','i','v','e','r','\\','U','D','E','V',0};

1 0

Jacek Caban : mshtml: Fixed leak in get_nsstyle_attr_nsval.
by Alexandre Julliard 06 Oct '16

06 Oct '16

Module: wine Branch: master Commit: a6d35fdaa810de43c2f3f5d5dda422ab01f6e593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d35fdaa810de43c2f3f5d5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 6 17:04:02 2016 +0200 mshtml: Fixed leak in get_nsstyle_attr_nsval. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7a4ebe3..a445bc2 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -485,15 +485,13 @@ static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, stylei nsresult nsres; nsAString_InitDepend(&str_name, style_tbl[sid].name); - nsres = nsIDOMCSSStyleDeclaration_GetPropertyValue(nsstyle, &str_name, value); + nsAString_Finish(&str_name); if(NS_FAILED(nsres)) { ERR("SetProperty failed: %08x\n", nsres); return E_FAIL; } - nsAString_Finish(&str_name); - return S_OK; }

1 0

Hans Leidekker : wbemprox: Get rid of hard-coded OS version numbers.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: 1977baa79393ddc7a1240dee7b168aaa28b44003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1977baa79393ddc7a1240dee7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 5 09:46:28 2016 +0200 wbemprox: Get rid of hard-coded OS version numbers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 122 ++++++++++++++++++++++++++++++++--------- dlls/wbemprox/tests/query.c | 128 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 224 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1977baa79393ddc7a1240…

1 0

Michael Stefaniuc : dmusic/tests: Add basic COM tests for IDirectMusicPort.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: 1dc5cc3470c106dab95e03ea366b3954403e72cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc5cc3470c106dab95e03ea3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 5 10:27:56 2016 +0200 dmusic/tests: Add basic COM tests for IDirectMusicPort. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 5a0c095..69df51d 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -379,6 +379,65 @@ static BOOL missing_dmusic(void) return TRUE; } +static void test_COM_synthport(void) +{ + IDirectMusic *dmusic = NULL; + IDirectMusicPort *port = NULL; + IDirectMusicPortDownload *dmpd; + IDirectMusicThru *dmt; + IKsControl *iksc; + IReferenceClock *clock; + IUnknown *unk; + DMUS_PORTPARAMS port_params; + ULONG refcount; + HRESULT hr; + + /* Create a IDirectMusicPort */ + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, + (void**)&dmusic); + ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); + port_params.dwSize = sizeof(port_params); + port_params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_AUDIOCHANNELS; + port_params.dwChannelGroups = 1; + port_params.dwAudioChannels = 2; + hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); + ok(hr == S_OK, "IDirectMusic_SetDirectSound returned: %x\n", hr); + hr = IDirectMusic_CreatePort(dmusic, &GUID_NULL, &port_params, &port, NULL); + ok(hr == S_OK, "IDirectMusic_CreatePort returned: %x\n", hr); + + /* Same refcount for all DirectMusicPort interfaces */ + refcount = IDirectMusicPort_AddRef(port); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicPort_QueryInterface(port, &IID_IDirectMusicPortDownload, (void**)&dmpd); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicPortDownload failed: %08x\n", hr); + refcount = IDirectMusicPortDownload_AddRef(dmpd); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + IDirectMusicPortDownload_Release(dmpd); + + hr = IDirectMusicPort_QueryInterface(port, &IID_IKsControl, (void**)&iksc); + todo_wine ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %08x\n", hr); + if (hr == S_OK) { + refcount = IKsControl_AddRef(iksc); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + IKsControl_Release(iksc); + } + + hr = IDirectMusicPort_QueryInterface(port, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + todo_wine ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + IUnknown_Release(unk); + + /* Unsupported interface */ + hr = IDirectMusicPort_QueryInterface(port, &IID_IDirectMusicThru, (void**)&dmt); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicThru failed: %08x\n", hr); + hr = IDirectMusicPort_QueryInterface(port, &IID_IReferenceClock, (void**)&clock); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IReferenceClock failed: %08x\n", hr); + + while (IDirectMusicPort_Release(port)); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -391,6 +450,7 @@ START_TEST(dmusic) } test_COM(); test_COM_dmcoll(); + test_COM_synthport(); test_dmusic(); test_dmbuffer(); test_dmcoll();

1 0

Michael Stefaniuc : dmusic: Simplify the IDirectMusicPort_QueryInterface implementation.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: ca87c493902e2e1fe18d1711bd3783fc75c445cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca87c493902e2e1fe18d1711b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 5 10:28:22 2016 +0200 dmusic: Simplify the IDirectMusicPort_QueryInterface implementation. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index d919c10..95db9e0 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -130,23 +130,21 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) { + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) *ret_iface = &This->IDirectMusicPort_iface; - IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ret_iface); - return S_OK; - } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) { + else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) *ret_iface = &This->IDirectMusicPortDownload_iface; - IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ret_iface); - return S_OK; - } else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) { + else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) *ret_iface = &This->IDirectMusicThru_iface; - IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface); - return S_OK; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + *ret_iface = NULL; + return E_NOINTERFACE; } - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + IUnknown_AddRef((IUnknown*)*ret_iface); - return E_NOINTERFACE; + return S_OK; } static ULONG WINAPI SynthPortImpl_IDirectMusicPort_AddRef(LPDIRECTMUSICPORT iface)

1 0

Michael Stefaniuc : dmusic: Move the SynthPortImpl struct to where it is used.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: 845bf2ff5994ba7208885c06b2b9863aa1d38dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=845bf2ff5994ba7208885c06b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 5 10:28:54 2016 +0200 dmusic: Move the SynthPortImpl struct to where it is used. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic_private.h | 24 ------------------------ dlls/dmusic/port.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 44d5d57..07f5f1d 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -53,8 +53,6 @@ typedef struct IReferenceClockImpl IReferenceClockImpl; typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl; -typedef struct SynthPortImpl SynthPortImpl; - /***************************************************************************** * Some stuff to make my life easier :=) */ @@ -159,28 +157,6 @@ struct IDirectMusicDownloadImpl { /* IDirectMusicDownloadImpl fields */ }; -/***************************************************************************** - * SynthPortImpl implementation structure - */ -struct SynthPortImpl { - /* IUnknown fields */ - IDirectMusicPort IDirectMusicPort_iface; - IDirectMusicPortDownload IDirectMusicPortDownload_iface; - IDirectMusicThru IDirectMusicThru_iface; - LONG ref; - - /* IDirectMusicPort fields */ - IDirectSound* pDirectSound; - IReferenceClock* pLatencyClock; - IDirectMusicSynth* synth; - IDirectMusicSynthSink* synth_sink; - BOOL fActive; - DMUS_PORTCAPS caps; - DMUS_PORTPARAMS params; - int nrofgroups; - DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; -}; - /** Internal factory */ extern HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; extern HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 95db9e0..b694ef7 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -24,6 +24,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +typedef struct SynthPortImpl { + IDirectMusicPort IDirectMusicPort_iface; + IDirectMusicPortDownload IDirectMusicPortDownload_iface; + IDirectMusicThru IDirectMusicThru_iface; + LONG ref; + IDirectSound *pDirectSound; + IReferenceClock *pLatencyClock; + IDirectMusicSynth *synth; + IDirectMusicSynthSink *synth_sink; + BOOL fActive; + DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; + int nrofgroups; + DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; +} SynthPortImpl; + static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface) { return CONTAINING_RECORD(iface, IDirectMusicDownloadedInstrumentImpl, IDirectMusicDownloadedInstrument_iface);

1 0

Michael Stefaniuc : dmusic: Support the IKsControl interface for the synth port.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: 883fe110ea5225c515c38bdd1e67f65cdeca4609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=883fe110ea5225c515c38bdd1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 5 10:36:59 2016 +0200 dmusic: Support the IKsControl interface for the synth port. Based on a patch by Michael Müller. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic_private.h | 1 + dlls/dmusic/port.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dmusic/tests/dmusic.c | 12 +++---- 3 files changed, 84 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 07f5f1d..cfe03fc 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -41,6 +41,7 @@ #include "dmusici.h" #include "dmusicf.h" #include "dmusics.h" +#include "dmksctrl.h" /***************************************************************************** * Interfaces diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index b694ef7..07da1ae 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -28,6 +28,7 @@ typedef struct SynthPortImpl { IDirectMusicPort IDirectMusicPort_iface; IDirectMusicPortDownload IDirectMusicPortDownload_iface; IDirectMusicThru IDirectMusicThru_iface; + IKsControl IKsControl_iface; LONG ref; IDirectSound *pDirectSound; IReferenceClock *pLatencyClock; @@ -60,6 +61,11 @@ static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicThru(IDirectMus return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicThru_iface); } +static inline SynthPortImpl *impl_from_IKsControl(IKsControl *iface) +{ + return CONTAINING_RECORD(iface, SynthPortImpl, IKsControl_iface); +} + /* IDirectMusicDownloadedInstrument IUnknown part follows: */ static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface(IDirectMusicDownloadedInstrument *iface, REFIID riid, VOID **ret_iface) { @@ -152,6 +158,8 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI *ret_iface = &This->IDirectMusicPortDownload_iface; else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) *ret_iface = &This->IDirectMusicThru_iface; + else if (IsEqualGUID(riid, &IID_IKsControl)) + *ret_iface = &This->IKsControl_iface; else { WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); *ret_iface = NULL; @@ -686,6 +694,75 @@ static const IDirectMusicThruVtbl SynthPortImpl_DirectMusicThru_Vtbl = { SynthPortImpl_IDirectMusicThru_ThruChannel }; +static HRESULT WINAPI IKsControlImpl_QueryInterface(IKsControl *iface, REFIID riid, + void **ret_iface) +{ + SynthPortImpl *This = impl_from_IKsControl(iface); + + return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); +} + +static ULONG WINAPI IKsControlImpl_AddRef(IKsControl *iface) +{ + SynthPortImpl *This = impl_from_IKsControl(iface); + + return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); +} + +static ULONG WINAPI IKsControlImpl_Release(IKsControl *iface) +{ + SynthPortImpl *This = impl_from_IKsControl(iface); + + return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); +} + +static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *prop, + ULONG prop_len, void *data, ULONG data_len, ULONG *ret_len) +{ + TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, prop, prop_len, data, data_len, ret_len); + TRACE("prop = %s - %u - %u\n", debugstr_guid(&prop->Set), prop->Id, prop->Flags); + + if (prop->Flags != KSPROPERTY_TYPE_GET) + { + FIXME("prop flags %u not yet supported\n", prop->Flags); + return S_FALSE; + } + + if (data_len < sizeof(DWORD)) + return E_NOT_SUFFICIENT_BUFFER; + + FIXME("Unknown property %s\n", debugstr_guid(&prop->Set)); + *(DWORD*)data = FALSE; + *ret_len = sizeof(DWORD); + + return S_OK; +} + +static HRESULT WINAPI IKsControlImpl_KsMethod(IKsControl *iface, KSMETHOD *method, + ULONG method_len, void *data, ULONG data_len, ULONG *ret_len) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, method, method_len, data, data_len, ret_len); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IKsControlImpl_KsEvent(IKsControl *iface, KSEVENT *event, ULONG event_len, + void *data, ULONG data_len, ULONG *ret_len) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, event, event_len, data, data_len, ret_len); + + return E_NOTIMPL; +} + +static const IKsControlVtbl ikscontrol_vtbl = { + IKsControlImpl_QueryInterface, + IKsControlImpl_AddRef, + IKsControlImpl_Release, + IKsControlImpl_KsProperty, + IKsControlImpl_KsMethod, + IKsControlImpl_KsEvent +}; + HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { SynthPortImpl *obj; @@ -704,6 +781,7 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou obj->IDirectMusicPort_iface.lpVtbl = &SynthPortImpl_DirectMusicPort_Vtbl; obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl; obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl; + obj->IKsControl_iface.lpVtbl = &ikscontrol_vtbl; obj->ref = 0; /* Will be inited by QueryInterface */ obj->fActive = FALSE; obj->params = *port_params; diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 69df51d..b56bba4 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -416,17 +416,15 @@ static void test_COM_synthport(void) IDirectMusicPortDownload_Release(dmpd); hr = IDirectMusicPort_QueryInterface(port, &IID_IKsControl, (void**)&iksc); - todo_wine ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %08x\n", hr); - if (hr == S_OK) { - refcount = IKsControl_AddRef(iksc); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); - IKsControl_Release(iksc); - } + ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %08x\n", hr); + refcount = IKsControl_AddRef(iksc); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + IKsControl_Release(iksc); hr = IDirectMusicPort_QueryInterface(port, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); - todo_wine ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); IUnknown_Release(unk); /* Unsupported interface */

1 0

Michael Stefaniuc : ws2_32: Use debugstr_guid() to trace GUIDs.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: 8581ae8cc5b2dd9f40cc1c09d1f6afa34f8d14ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8581ae8cc5b2dd9f40cc1c09d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 5 10:37:59 2016 +0200 ws2_32: Use debugstr_guid() to trace GUIDs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9d0b60e..e3c7507 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7880,7 +7880,7 @@ int WINAPI WSAInstallServiceClassW(LPWSASERVICECLASSINFOW info) */ int WINAPI WSARemoveServiceClass(LPGUID info) { - FIXME("Request to remove service %p\n",info); + FIXME("Request to remove service %s\n", debugstr_guid(info)); SetLastError(WSATYPE_NOT_FOUND); return SOCKET_ERROR; } @@ -8569,7 +8569,7 @@ INT WINAPI WSCInstallNameSpace( LPWSTR identifier, LPWSTR path, DWORD namespace, */ INT WINAPI WSCUnInstallNameSpace( LPGUID lpProviderId ) { - FIXME("(%p) Stub!\n", lpProviderId); + FIXME("(%s) Stub!\n", debugstr_guid(lpProviderId)); return NO_ERROR; }

1 0

Huw Davies : riched20: Use the provided style for the end-of-paragraph run.
by Alexandre Julliard 05 Oct '16

05 Oct '16

Module: wine Branch: master Commit: 4989c858a00a21fef41f652ec83d15889e0535f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4989c858a00a21fef41f652ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 10:08:24 2016 +0100 riched20: Use the provided style for the end-of-paragraph run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index a47930f..26af743 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -549,7 +549,6 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, pos++; } else { /* handle EOLs */ ME_DisplayItem *tp, *end_run, *run, *prev; - ME_Style *tmp_style; int eol_len = 0; /* Find number of CR and LF in end of paragraph run */ @@ -594,13 +593,9 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, run = p->pRun; } - tmp_style = ME_GetInsertStyle(editor, nCursor); - /* ME_SplitParagraph increases style refcount */ - tp = ME_SplitParagraph(editor, run, run->member.run.style, eol_str, eol_len, 0); + tp = ME_SplitParagraph(editor, run, style, eol_str, eol_len, 0); end_run = ME_FindItemBack(tp, diRun); - ME_ReleaseStyle(end_run->member.run.style); - end_run->member.run.style = tmp_style; /* Move any cursors that were at the end of the previous run to the beginning of the new para */ prev = ME_FindItemBack( end_run, diRun );

1 0