August 2018 - Wine-Devel - list.winehq.org

[PATCH 4/4] dmusic: Add a stub IDirectMusicThru to the midi ports
by Michael Stefaniuc Aug. 19, 2018

Aug. 19, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 4df86649e9..9a18c8844d 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -906,6 +906,7 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param struct midi_port { IDirectMusicPort IDirectMusicPort_iface; + IDirectMusicThru IDirectMusicThru_iface; LONG ref; IReferenceClock *clock; }; @@ -918,17 +919,21 @@ static inline struct midi_port *impl_from_IDirectMusicPort(IDirectMusicPort *ifa static HRESULT WINAPI midi_IDirectMusicPort_QueryInterface(IDirectMusicPort *iface, REFIID riid, void **ret_iface) { + struct midi_port *This = impl_from_IDirectMusicPort(iface); + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicPort)) *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IDirectMusicThru)) + *ret_iface = &This->IDirectMusicThru_iface; else { WARN("no interface for %s\n", debugstr_dmguid(riid)); *ret_iface = NULL; return E_NOINTERFACE; } - IDirectMusicPort_AddRef(iface); + IUnknown_AddRef((IUnknown *)*ret_iface); return S_OK; } @@ -1126,6 +1131,49 @@ static const IDirectMusicPortVtbl midi_port_vtbl = { midi_IDirectMusicPort_GetFormat, }; +static inline struct midi_port *impl_from_IDirectMusicThru(IDirectMusicThru *iface) +{ + return CONTAINING_RECORD(iface, struct midi_port, IDirectMusicThru_iface); +} + +static HRESULT WINAPI midi_IDirectMusicThru_QueryInterface(IDirectMusicThru *iface, REFIID riid, + void **ret_iface) +{ + struct midi_port *This = impl_from_IDirectMusicThru(iface); + + return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); +} + +static ULONG WINAPI midi_IDirectMusicThru_AddRef(IDirectMusicThru *iface) +{ + struct midi_port *This = impl_from_IDirectMusicThru(iface); + + return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); +} + +static ULONG WINAPI midi_IDirectMusicThru_Release(IDirectMusicThru *iface) +{ + struct midi_port *This = impl_from_IDirectMusicThru(iface); + + return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); +} + +static HRESULT WINAPI midi_IDirectMusicThru_ThruChannel(IDirectMusicThru *iface, DWORD src_group, + DWORD src_channel, DWORD dest_group, DWORD dest_channel, IDirectMusicPort *dest_port) +{ + FIXME("(%p, %u, %u, %u, %u, %p) stub!\n", iface, src_group, src_channel, dest_group, + dest_channel, dest_port); + + return E_NOTIMPL; +} + +static const IDirectMusicThruVtbl midi_thru_vtbl = { + midi_IDirectMusicThru_QueryInterface, + midi_IDirectMusicThru_AddRef, + midi_IDirectMusicThru_Release, + midi_IDirectMusicThru_ThruChannel, +}; + HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, IDirectMusicPort **port) { @@ -1136,6 +1184,7 @@ HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMU return E_OUTOFMEMORY; obj->IDirectMusicPort_iface.lpVtbl = &midi_port_vtbl; + obj->IDirectMusicThru_iface.lpVtbl = &midi_thru_vtbl; obj->ref = 1; hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (void **)&obj->clock, NULL); -- 2.14.4

1 0

[PATCH 3/4] dmusic: Support midi in ports too
by Michael Stefaniuc Aug. 19, 2018

Aug. 19, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index ebc8506769..4df86649e9 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -1126,14 +1126,12 @@ static const IDirectMusicPortVtbl midi_port_vtbl = { midi_IDirectMusicPort_GetFormat, }; -HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, - DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) +HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, + IDirectMusicPort **port) { struct midi_port *obj; HRESULT hr; - TRACE("(%p, %p, %p)\n", port_params, port_caps, port); - if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY; @@ -1151,10 +1149,18 @@ HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_pa return S_OK; } -HRESULT midi_in_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, - DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) +HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, + DMUS_PORTCAPS *caps, IDirectMusicPort **port) { - FIXME("(%p, %p, %p): stub\n", port_params, port_caps, port); + TRACE("(%p, %p, %p, %p)\n", parent, params, caps, port); - return E_NOTIMPL; + return midi_port_create(parent, params, caps, port); +} + +HRESULT midi_in_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, + DMUS_PORTCAPS *caps, IDirectMusicPort **port) +{ + TRACE("(%p, %p, %p, %p)\n", parent, params, caps, port); + + return midi_port_create(parent, params, caps, port); } -- 2.14.4

1 0

[PATCH 2/4] dmusic: Implement IDirectMusicPort_GetLatencyClock() for the midi port
by Michael Stefaniuc Aug. 19, 2018

Aug. 19, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 2f8fb9288c..ebc8506769 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -907,6 +907,7 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param struct midi_port { IDirectMusicPort IDirectMusicPort_iface; LONG ref; + IReferenceClock *clock; }; static inline struct midi_port *impl_from_IDirectMusicPort(IDirectMusicPort *iface) @@ -949,8 +950,11 @@ static ULONG WINAPI midi_IDirectMusicPort_Release(IDirectMusicPort *iface) TRACE("(%p) ref = %u\n", iface, ref); - if (!ref) + if (!ref) { + if (This->clock) + IReferenceClock_Release(This->clock); heap_free(This); + } return ref; } @@ -999,9 +1003,17 @@ static HRESULT WINAPI midi_IDirectMusicPort_UnloadInstrument(IDirectMusicPort *i static HRESULT WINAPI midi_IDirectMusicPort_GetLatencyClock(IDirectMusicPort *iface, IReferenceClock **clock) { - FIXME("(%p, %p) stub!\n", iface, clock); + struct midi_port *This = impl_from_IDirectMusicPort(iface); - return E_NOTIMPL; + TRACE("(%p, %p)\n", iface, clock); + + if (!clock) + return E_POINTER; + + *clock = This->clock; + IReferenceClock_AddRef(*clock); + + return S_OK; } static HRESULT WINAPI midi_IDirectMusicPort_GetRunningStats(IDirectMusicPort *iface, @@ -1118,6 +1130,7 @@ HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_pa DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) { struct midi_port *obj; + HRESULT hr; TRACE("(%p, %p, %p)\n", port_params, port_caps, port); @@ -1127,6 +1140,12 @@ HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_pa obj->IDirectMusicPort_iface.lpVtbl = &midi_port_vtbl; obj->ref = 1; + hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (void **)&obj->clock, NULL); + if (hr != S_OK) { + HeapFree(GetProcessHeap(), 0, obj); + return hr; + } + *port = &obj->IDirectMusicPort_iface; return S_OK; -- 2.14.4

1 0

[PATCH 1/4] dmusic: Add a stub midi out port
by Michael Stefaniuc Aug. 19, 2018

Aug. 19, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- This series lets MidiStation, a DirectMidi test application, crash later. dlls/dmusic/port.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 223 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 713175650b..2f8fb9288c 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -21,6 +21,7 @@ #include <assert.h> #include "dmusic_private.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); @@ -903,12 +904,232 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param return hr; } +struct midi_port { + IDirectMusicPort IDirectMusicPort_iface; + LONG ref; +}; + +static inline struct midi_port *impl_from_IDirectMusicPort(IDirectMusicPort *iface) +{ + return CONTAINING_RECORD(iface, struct midi_port, IDirectMusicPort_iface); +} + +static HRESULT WINAPI midi_IDirectMusicPort_QueryInterface(IDirectMusicPort *iface, REFIID riid, + void **ret_iface) +{ + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicPort)) + *ret_iface = iface; + else { + WARN("no interface for %s\n", debugstr_dmguid(riid)); + *ret_iface = NULL; + return E_NOINTERFACE; + } + + IDirectMusicPort_AddRef(iface); + + return S_OK; +} + +static ULONG WINAPI midi_IDirectMusicPort_AddRef(IDirectMusicPort *iface) +{ + struct midi_port *This = impl_from_IDirectMusicPort(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref = %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI midi_IDirectMusicPort_Release(IDirectMusicPort *iface) +{ + struct midi_port *This = impl_from_IDirectMusicPort(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref = %u\n", iface, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI midi_IDirectMusicPort_PlayBuffer(IDirectMusicPort *iface, + IDirectMusicBuffer *buffer) +{ + FIXME("(%p, %p) stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_SetReadNotificationHandle(IDirectMusicPort *iface, + HANDLE event) +{ + FIXME("(%p, %p) stub!\n", iface, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_Read(IDirectMusicPort *iface, + IDirectMusicBuffer *buffer) +{ + FIXME("(%p, %p) stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_DownloadInstrument(IDirectMusicPort *iface, + IDirectMusicInstrument *instrument, IDirectMusicDownloadedInstrument **downloaded, + DMUS_NOTERANGE *ranges, DWORD num_ranges) +{ + FIXME("(%p, %p, %p, %p, %u) stub!\n", iface, instrument, downloaded, ranges, num_ranges); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_UnloadInstrument(IDirectMusicPort *iface, + IDirectMusicDownloadedInstrument *downloaded) +{ + FIXME("(%p, %p) stub!\n", iface, downloaded); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetLatencyClock(IDirectMusicPort *iface, + IReferenceClock **clock) +{ + FIXME("(%p, %p) stub!\n", iface, clock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetRunningStats(IDirectMusicPort *iface, + DMUS_SYNTHSTATS *stats) +{ + FIXME("(%p, %p) stub!\n", iface, stats); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_Compact(IDirectMusicPort *iface) +{ + FIXME("(%p) stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS *caps) +{ + FIXME("(%p, %p) stub!\n", iface, caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_DeviceIoControl(IDirectMusicPort *iface, + DWORD io_control_code, void *in, DWORD size_in, void *out, DWORD size_out, DWORD *ret_len, + OVERLAPPED *overlapped) +{ + FIXME("(%p, %u, %p, %u, %p, %u, %p, %p) stub!\n", iface, io_control_code, in, size_in, out + , size_out, ret_len, overlapped); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_SetNumChannelGroups(IDirectMusicPort *iface, + DWORD cgroups) +{ + FIXME("(%p, %u) stub!\n", iface, cgroups); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetNumChannelGroups(IDirectMusicPort *iface, + DWORD *cgroups) +{ + FIXME("(%p, %p) stub!\n", iface, cgroups); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_Activate(IDirectMusicPort *iface, BOOL active) +{ + FIXME("(%p, %u) stub!\n", iface, active); + + return S_OK; +} + +static HRESULT WINAPI midi_IDirectMusicPort_SetChannelPriority(IDirectMusicPort *iface, + DWORD channel_group, DWORD channel, DWORD priority) +{ + FIXME("(%p, %u, %u, %u) stub!\n", iface, channel_group, channel, priority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetChannelPriority(IDirectMusicPort *iface, + DWORD channel_group, DWORD channel, DWORD *priority) +{ + FIXME("(%p, %u, %u, %p) stub!\n", iface, channel_group, channel, priority); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_SetDirectSound(IDirectMusicPort *iface, + IDirectSound *dsound, IDirectSoundBuffer *dsbuffer) +{ + FIXME("(%p, %p, %p) stub!\n", iface, dsound, dsbuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI midi_IDirectMusicPort_GetFormat(IDirectMusicPort *iface, WAVEFORMATEX *format, + DWORD *format_size, DWORD *buffer_size) +{ + FIXME("(%p, %p, %p, %p) stub!\n", iface, format, format_size, buffer_size); + + return E_NOTIMPL; +} + +static const IDirectMusicPortVtbl midi_port_vtbl = { + midi_IDirectMusicPort_QueryInterface, + midi_IDirectMusicPort_AddRef, + midi_IDirectMusicPort_Release, + midi_IDirectMusicPort_PlayBuffer, + midi_IDirectMusicPort_SetReadNotificationHandle, + midi_IDirectMusicPort_Read, + midi_IDirectMusicPort_DownloadInstrument, + midi_IDirectMusicPort_UnloadInstrument, + midi_IDirectMusicPort_GetLatencyClock, + midi_IDirectMusicPort_GetRunningStats, + midi_IDirectMusicPort_Compact, + midi_IDirectMusicPort_GetCaps, + midi_IDirectMusicPort_DeviceIoControl, + midi_IDirectMusicPort_SetNumChannelGroups, + midi_IDirectMusicPort_GetNumChannelGroups, + midi_IDirectMusicPort_Activate, + midi_IDirectMusicPort_SetChannelPriority, + midi_IDirectMusicPort_GetChannelPriority, + midi_IDirectMusicPort_SetDirectSound, + midi_IDirectMusicPort_GetFormat, +}; + HRESULT midi_out_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) { - FIXME("(%p, %p, %p): stub\n", port_params, port_caps, port); + struct midi_port *obj; - return E_NOTIMPL; + TRACE("(%p, %p, %p)\n", port_params, port_caps, port); + + if (!(obj = heap_alloc_zero(sizeof(*obj)))) + return E_OUTOFMEMORY; + + obj->IDirectMusicPort_iface.lpVtbl = &midi_port_vtbl; + obj->ref = 1; + + *port = &obj->IDirectMusicPort_iface; + + return S_OK; } HRESULT midi_in_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, -- 2.14.4

1 0

[PATCH v2 1/2] user32/combo: Properly set dropdown height
by Fabian Maurer Aug. 19, 2018

Aug. 19, 2018

Now that user32 and comctl32 combo are separated, this won't lead to a regression anymore. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/combo.c | 8 -------- dlls/user32/tests/combo.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index dcfa661f97..31ec6af526 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1029,14 +1029,6 @@ static void CBDropDown( LPHEADCOMBO lphc ) if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE()) nDroppedHeight = nHeight + COMBO_YBORDERSIZE(); - - if (nDroppedHeight < nHeight) - { - if (nItems < 5) - nDroppedHeight = (nItems+1)*nIHeight; - else if (nDroppedHeight < 6*nIHeight) - nDroppedHeight = 6*nIHeight; - } } r.left = rect.left; diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 3358e846a0..0d3b1b170f 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -688,25 +688,25 @@ static void test_listbox_size(DWORD style) int height_combo; BOOL todo; } info_height[] = { - {2, 24, TRUE}, + {2, 24, FALSE}, {2, 41, TRUE}, - {2, 42, TRUE}, - {2, 50, TRUE}, + {2, 42, FALSE}, + {2, 50, FALSE}, {2, 60}, {2, 80}, {2, 89}, {2, 90}, {2, 100}, - {10, 24, TRUE}, + {10, 24, FALSE}, {10, 41, TRUE}, - {10, 42, TRUE}, - {10, 50, TRUE}, - {10, 60, TRUE}, - {10, 80, TRUE}, + {10, 42, FALSE}, + {10, 50, FALSE}, + {10, 60, FALSE}, + {10, 80, FALSE}, {10, 89, TRUE}, - {10, 90, TRUE}, - {10, 100, TRUE}, + {10, 90, FALSE}, + {10, 100, FALSE}, }; for(test = 0; test < ARRAY_SIZE(info_height); test++) -- 2.18.0

1 1

[PATCH 1/2] user32/combo: Properly set dropdown height
by Fabian Maurer Aug. 19, 2018

Aug. 19, 2018

Now that user32 and comctl32 combo are separated, this won't lead to a regression anymore. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/combo.c | 8 -------- dlls/user32/tests/combo.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index dcfa661f97..31ec6af526 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1029,14 +1029,6 @@ static void CBDropDown( LPHEADCOMBO lphc ) if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE()) nDroppedHeight = nHeight + COMBO_YBORDERSIZE(); - - if (nDroppedHeight < nHeight) - { - if (nItems < 5) - nDroppedHeight = (nItems+1)*nIHeight; - else if (nDroppedHeight < 6*nIHeight) - nDroppedHeight = 6*nIHeight; - } } r.left = rect.left; diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 3358e846a0..0d3b1b170f 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -688,25 +688,25 @@ static void test_listbox_size(DWORD style) int height_combo; BOOL todo; } info_height[] = { - {2, 24, TRUE}, + {2, 24, FALSE}, {2, 41, TRUE}, - {2, 42, TRUE}, - {2, 50, TRUE}, + {2, 42, FALSE}, + {2, 50, FALSE}, {2, 60}, {2, 80}, {2, 89}, {2, 90}, {2, 100}, - {10, 24, TRUE}, + {10, 24, FALSE}, {10, 41, TRUE}, - {10, 42, TRUE}, - {10, 50, TRUE}, - {10, 60, TRUE}, - {10, 80, TRUE}, + {10, 42, FALSE}, + {10, 50, FALSE}, + {10, 60, FALSE}, + {10, 80, FALSE}, {10, 89, TRUE}, - {10, 90, TRUE}, - {10, 100, TRUE}, + {10, 90, FALSE}, + {10, 100, FALSE}, }; for(test = 0; test < ARRAY_SIZE(info_height); test++) -- 2.18.0

1 1

[PATCH v3 1/4] ntdll/actctx: Don't stop looking for manifest if dll without manifest is found
by Fabian Maurer Aug. 18, 2018

Aug. 18, 2018

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v3: Fix test on XP --- dlls/kernel32/tests/Makefile.in | 2 ++ dlls/kernel32/tests/actctx.c | 37 ++++++++++++++++++++++++++++++++- dlls/kernel32/tests/dummy.c | 0 dlls/kernel32/tests/dummy.spec | 0 dlls/ntdll/actctx.c | 3 ++- 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 dlls/kernel32/tests/dummy.c create mode 100644 dlls/kernel32/tests/dummy.spec diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index 2f2ac5f8c3..ee0bbd2c8b 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -11,6 +11,8 @@ C_SRCS = \ debugger.c \ directory.c \ drive.c \ + dummy.c \ + dummy.spec \ environ.c \ fiber.c \ file.c \ diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 96d9b8cbb6..5f1c33f162 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2598,9 +2598,28 @@ static void delete_manifest_file(const char *filename) DeleteFileA(path); } +/* Copied from msi tests */ +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void test_CreateActCtx(void) { - CHAR path[MAX_PATH], dir[MAX_PATH]; + CHAR path[MAX_PATH], dir[MAX_PATH], dll[MAX_PATH]; ACTCTXA actctx; HANDLE handle; @@ -2637,6 +2656,22 @@ todo_wine { } if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); + /* with specified directory, that does contain dependent assembly */ + GetTempPathA(ARRAY_SIZE(dir), dir); + actctx.lpAssemblyDirectory = dir; + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + /* Should still work if we add a dll with the same name, but without manifest */ + strcpy(dll, dir); + strcat(dll, "testdep1.dll"); + extract_resource("dummy.dll", "TESTDLL", dll); + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) , "got error %d\n", GetLastError()); + pReleaseActCtx(handle); + DeleteFileA(dll); + delete_manifest_file("main_wndcls.manifest"); delete_manifest_file("testdep1.manifest"); delete_manifest_file("testdep2.manifest"); diff --git a/dlls/kernel32/tests/dummy.c b/dlls/kernel32/tests/dummy.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/dlls/kernel32/tests/dummy.spec b/dlls/kernel32/tests/dummy.spec new file mode 100644 index 0000000000..e69de29bb2 diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 53a8b06882..08b6c509ae 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3294,7 +3294,8 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); NtClose( file ); - break; + if (status == STATUS_SUCCESS) + break; } RtlFreeUnicodeString( &nameW ); } -- 2.18.0

3 8

[PATCH 1/2] iphlpapi/tests: Add tests for GetUdp6Table().
by Guillaume Charifi Aug. 18, 2018

Aug. 18, 2018

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/iphlpapi/tests/iphlpapi.c | 55 ++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 0d35c26219..1be9f3c5fa 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -74,6 +74,7 @@ static DWORD (WINAPI *pGetTcpStatisticsEx)(PMIB_TCPSTATS,DWORD); static DWORD (WINAPI *pGetUdpStatisticsEx)(PMIB_UDPSTATS,DWORD); static DWORD (WINAPI *pGetTcpTable)(PMIB_TCPTABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUdpTable)(PMIB_UDPTABLE,PDWORD,BOOL); +static DWORD (WINAPI *pGetUdp6Table)(PMIB_UDP6TABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetPerAdapterInfo)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); @@ -129,6 +130,7 @@ static void loadIPHlpApi(void) pGetUdpStatisticsEx = (void *)GetProcAddress(hLibrary, "GetUdpStatisticsEx"); pGetTcpTable = (void *)GetProcAddress(hLibrary, "GetTcpTable"); pGetUdpTable = (void *)GetProcAddress(hLibrary, "GetUdpTable"); + pGetUdp6Table = (void *)GetProcAddress(hLibrary, "GetUdp6Table"); pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); @@ -171,6 +173,23 @@ static const char *ntoa( DWORD ip ) return buffer; } +static const char *ntoa6( IN6_ADDR *ip ) +{ + static char buffer[40]; + char *buf = buffer; + unsigned short *p = ip->u.Word; + unsigned int i = 0; + + while (i < 8) + { + if (i > 0) + *buf++ = ':'; + buf += sprintf( buf, "%x", htons(p[i]) ); + i++; + } + return buffer; +} + /* still-to-be-tested 98-only functions: GetUniDirectionalAdapterInfo @@ -2220,6 +2239,41 @@ static void test_ConvertLengthToIpv4Mask(void) ok( mask == INADDR_NONE, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, INADDR_NONE ); } +static void test_GetUdp6Table(void) +{ + if (pGetUdp6Table) { + DWORD apiReturn; + ULONG dwSize = 0; + + apiReturn = pGetUdp6Table(NULL, &dwSize, FALSE); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetUdp6Table is not supported\n"); + return; + } + ok(apiReturn == ERROR_INSUFFICIENT_BUFFER, + "GetUdp6Table(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", + apiReturn); + if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { + PMIB_UDP6TABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); + + apiReturn = pGetUdp6Table(buf, &dwSize, FALSE); + ok(apiReturn == NO_ERROR, + "GetUdp6Table(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", + apiReturn); + + if (apiReturn == NO_ERROR && winetest_debug > 1) + { + DWORD i; + trace( "UDP6 table: %u entries\n", buf->dwNumEntries ); + for (i = 0; i < buf->dwNumEntries; i++) + trace( "%u: %s%%%u:%u\n", + i, ntoa6(&buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalScopeId), ntohs(buf->table[i].dwLocalPort) ); + } + HeapFree(GetProcessHeap(), 0, buf); + } + } +} + START_TEST(iphlpapi) { @@ -2248,6 +2302,7 @@ START_TEST(iphlpapi) test_GetUnicastIpAddressEntry(); test_GetUnicastIpAddressTable(); test_ConvertLengthToIpv4Mask(); + test_GetUdp6Table(); freeIPHlpApi(); } } -- Guillaume Charifi <guillaume.charifi(a)sfr.fr>

2 2

[PATCH] wbemprox: Fix the build on FreeBSD by including sys/socket.h.
by Gerald Pfeifer Aug. 18, 2018

Aug. 18, 2018

Commit 88d52edcc4d5a81965627905278d1212250ae84d Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 1 17:23:29 2018 +0200 wbemprox: Add Win32_NetworkAdapterConfiguration::IPSubnet property. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> broke the build on FreeBSD 10.x and likely other versions: builtin.c: In function 'get_ipsubnet': builtin.c:2499:55: error: 'AF_INET' undeclared (first use in this function) 2499 | if (address->Address.lpSockaddr->sa_family == AF_INET) | ^~~~~~~ This fixes it for me. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/wbemprox/builtin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 72c6b4e933..3b8b43e868 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -26,6 +26,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif -- 2.17.0

2 1

[PATCH] winedbg/gdbproxy: Silence some noisy debug messages.
by Zebediah Figura Aug. 18, 2018

Aug. 18, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- programs/winedbg/gdbproxy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 75654d3..512e011 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -434,7 +434,7 @@ static void handle_debug_event(struct gdb_context* gdbctx, DEBUG_EVENT* de) case EXCEPTION_DEBUG_EVENT: assert(dbg_curr_thread); - fprintf(stderr, "%08x:%08x: exception code=0x%08x\n", de->dwProcessId, + TRACE("%08x:%08x: exception code=0x%08x\n", de->dwProcessId, de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode); if (fetch_context(gdbctx, dbg_curr_thread->handle, &gdbctx->context)) @@ -1286,7 +1286,7 @@ static enum packet_return packet_read_register(struct gdb_context* gdbctx) reg = hex_to_int(gdbctx->in_packet, gdbctx->in_packet_len); if (reg >= gdbctx->process->be_cpu->gdb_num_regs) { - FIXME("Unhandled register %u\n", reg); + WARN("Unhandled register %u\n", reg); return packet_error; } if (dbg_curr_thread != gdbctx->other_thread && gdbctx->other_thread) @@ -1315,7 +1315,7 @@ static enum packet_return packet_write_register(struct gdb_context* gdbctx) reg = strtoul(gdbctx->in_packet, &ptr, 16); if (ptr == NULL || reg >= gdbctx->process->be_cpu->gdb_num_regs || *ptr++ != '=') { - FIXME("Unhandled register %s\n", + WARN("Unhandled register %s\n", debugstr_an(gdbctx->in_packet, gdbctx->in_packet_len)); /* FIXME: if just the reg is above cpu_num_regs, don't tell gdb * it wouldn't matter too much, and it fakes our support for all regs -- 2.7.4

1 0