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

Re: [PATCH 03/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_capacity.
by Piotr Caban Aug. 4, 2018

Aug. 4, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0

Re: [PATCH 02/13 v3] msvcp90: Add implementation of _Concurrent_vector_dtor.
by Piotr Caban Aug. 4, 2018

Aug. 4, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0

Re: [PATCH 01/13 v3] msvcp120: Add tests for _Concurrent_vector->segment.
by Piotr Caban Aug. 4, 2018

Aug. 4, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0

[PATCH 1/2] setupapi: Set LastError on success in SetupInstallFromInfSectionW.
by Gijs Vermeulen Aug. 3, 2018

Aug. 3, 2018

From: Austin English <austinenglish(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45167 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/setupapi/install.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 0593df892e..5a76e3a581 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1188,6 +1188,7 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, return FALSE; } + SetLastError(ERROR_SUCCESS); return TRUE; } -- 2.13.7

1 1

[PATCH v4] winmm: Don't crash in waveOutOpen when nSamplesPerSec is 0 and add tests
by Andrew Eikum Aug. 3, 2018

Aug. 3, 2018

From: Fabian Maurer <dark.shadow4(a)web.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45530 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v4: Test specific devices, not 0th device dlls/winmm/tests/wave.c | 22 ++++++++++++++++++++++ dlls/winmm/waveform.c | 7 +++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index b402e21917..c106594b3f 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1415,6 +1415,28 @@ static void wave_out_test_device(UINT_PTR device) } else trace("waveOutOpen(%s): 32 bit float samples not supported\n", dev_name(device)); + + /* Test invalid parameters */ + + format.wFormatTag = WAVE_FORMAT_PCM; + format.nChannels = 1; + format.nSamplesPerSec = 11025; + format.nBlockAlign = 1; + format.nAvgBytesPerSec = 11025 * 1; + format.wBitsPerSample = 8; + format.cbSize = 0; + + format.nAvgBytesPerSec = 0; + rc = waveOutOpen(&wout, device, &format, 0, 0, 0); + ok(rc == MMSYSERR_NOERROR, + "waveOutOpen(%s): returned %s\n",dev_name(device),wave_out_error(rc)); + waveOutClose(wout); + format.nAvgBytesPerSec = 11025 * 1; + + format.nSamplesPerSec = 0; + rc = waveOutOpen(&wout, device, &format, 0, 0, 0); + ok(rc == MMSYSERR_INVALPARAM || rc == WAVERR_BADFORMAT, /* XP and lower return WAVERR_BADFORMAT */ + "waveOutOpen(%s): returned %s\n",dev_name(device),wave_out_error(rc)); } static void wave_out_tests(void) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 045bf4ac20..0a259c0f74 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1088,6 +1088,13 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, } if(info->format->wFormatTag == WAVE_FORMAT_PCM){ + + if (info->format->nSamplesPerSec == 0) + { + ret = MMSYSERR_INVALPARAM; + goto error; + } + /* we aren't guaranteed that the struct in lpFormat is a full * WAVEFORMATEX struct, which IAC::IsFormatSupported requires */ device->orig_fmt = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX)); -- 2.18.0

1 0

[PATCH vkd3d 1/3] vkd3d: Fix pthread_setname_np(3) call on Mac OS.
by Chip Davis Aug. 3, 2018

Aug. 3, 2018

That function exists on Mac, but it only takes a single argument, the thread's new name. That's OK for our purposes, since we were calling it on pthread_self anyhow. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4db9967..353f42c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -200,7 +200,11 @@ static void *vkd3d_fence_worker_main(void *arg) int rc; #ifdef HAVE_PTHREAD_SETNAME_NP +#ifdef __APPLE__ + pthread_setname_np("vkd3d_worker"); +#else pthread_setname_np(pthread_self(), "vkd3d_worker"); +#endif #endif for (;;) -- 2.18.0

4 9

[PATCH 1/3] bugzilla: Update next milestone to Wine 4.0
by Detlef Riekenberg Aug. 2, 2018

Aug. 2, 2018

Wine 2.0 is in the past for a long time Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- template/en/default/global/sidebar.html.tmpl | 2 +- template/en/default/index.html.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index f710221..f0f536f 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,7 +23,7 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=2.0.0&order=bugs.bug_severity">Wine 2.0</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=4.0.0&order=bugs.bug_severity">Wine 4.0</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 4c2dc95..9beceb4 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -150,8 +150,8 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=2.0.0&order=bugs.bug_severity">Wine 2.0</a> - These bugs are scheduled to be fixed before Wine 2.0 is released. + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&target_milestone=4.0.0&order=bugs.bug_severity">Wine 4.0</a> + These bugs are scheduled to be fixed before Wine 4.0 is released. </li> <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_status=STAGED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a> -- 2.14.1

1 2

[PATCH] dmscript/tests: Add some IDirectMusicObject::ParseDescriptor() tests
by Michael Stefaniuc Aug. 2, 2018

Aug. 2, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmscript/tests/dmscript.c | 98 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 13540ffd92..6784901cdd 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -22,7 +22,9 @@ #include <windef.h> #include <initguid.h> #include <wine/test.h> +#include <ole2.h> #include <dmusici.h> +#include <dmusicf.h> static BOOL missing_dmscript(void) { @@ -234,6 +236,101 @@ static void test_scripttrack(void) while (IDirectMusicTrack_Release(dmt)); } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + static const LARGE_INTEGER zero; + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_SCRIPT_FORM, 0}; + + hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicScript create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_VERSION), + "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicScript), + "Got class guid %s, expected CLSID_DirectMusicScript\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(!desc.vVersion.dwVersionMS && !desc.vVersion.dwVersionLS, + "Got DMUS_VERSION %u.%u, expected 0.0\n", desc.vVersion.dwVersionMS, + desc.vVersion.dwVersionLS); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + IStream_Release(stream); + + /* NULL pointers */ + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc); + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL); + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == DMUS_E_SCRIPT_INVALID_FILE, + "ParseDescriptor failed: %08x, expected DMUS_E_SCRIPT_INVALID_FILE\n", hr); + + IDirectMusicObject_Release(dmo); +} + START_TEST(dmscript) { CoInitialize(NULL); @@ -248,6 +345,7 @@ START_TEST(dmscript) test_COM_scripttrack(); test_dmscript(); test_scripttrack(); + test_parsedescriptor(); CoUninitialize(); } -- 2.14.4

1 0

[PATCH] dmscript: Reimplement ParseDescriptor() for IDirectMusicScript
by Michael Stefaniuc Aug. 2, 2018

Aug. 2, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Native is not happy with the standard generated tests; most likely it does a full Load(). So use the behavior of the changed code for now. dlls/dmscript/script.c | 173 ++++++++----------------------------------------- 1 file changed, 28 insertions(+), 145 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 98b9759c27..2a10fb2e4e 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -209,154 +209,37 @@ static inline IDirectMusicScriptImpl *impl_from_IDirectMusicObject(IDirectMusicO return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, dmobj.IDirectMusicObject_iface); } -static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, - IStream *pStream, DMUS_OBJECTDESC *pDesc) +static HRESULT WINAPI script_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface, + IStream *stream, DMUS_OBJECTDESC *desc) { - IDirectMusicScriptImpl *This = impl_from_IDirectMusicObject(iface); - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; - LARGE_INTEGER liMove; /* used when skipping chunks */ + struct chunk_entry riff = {0}; + HRESULT hr; - TRACE("(%p, %p, %p)\n", This, pStream, pDesc); + TRACE("(%p, %p, %p)\n", iface, stream, desc); - /* FIXME: should this be determined from stream? */ - pDesc->dwValidData |= DMUS_OBJ_CLASS; - pDesc->guidClass = CLSID_DirectMusicScript; + if (!stream || !desc) + return E_POINTER; - IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_RIFF: { - IStream_Read (pStream, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); - StreamSize = Chunk.dwSize - sizeof(FOURCC); - StreamCount = 0; - if (Chunk.fccID == DMUS_FOURCC_SCRIPT_FORM) { - TRACE_(dmfile)(": script form\n"); - do { - IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_GUID_CHUNK: { - TRACE_(dmfile)(": GUID chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStream, &pDesc->guidObject, Chunk.dwSize, NULL); - break; - } - case DMUS_FOURCC_VERSION_CHUNK: { - TRACE_(dmfile)(": version chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStream, &pDesc->vVersion, Chunk.dwSize, NULL); - break; - } - case DMUS_FOURCC_CATEGORY_CHUNK: { - TRACE_(dmfile)(": category chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStream, pDesc->wszCategory, Chunk.dwSize, NULL); - break; - } - case FOURCC_LIST: { - IStream_Read (pStream, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - ListCount[0] = 0; - switch (Chunk.fccID) { - /* evil M$ UNFO list, which can (!?) contain INFO elements */ - case DMUS_FOURCC_UNFO_LIST: { - TRACE_(dmfile)(": UNFO list\n"); - do { - IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - /* don't ask me why, but M$ puts INFO elements in UNFO list sometimes - (though strings seem to be valid unicode) */ - case mmioFOURCC('I','N','A','M'): - case DMUS_FOURCC_UNAM_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStream, pDesc->wszName, Chunk.dwSize, NULL); - break; - } - case mmioFOURCC('I','A','R','T'): - case DMUS_FOURCC_UART_CHUNK: { - TRACE_(dmfile)(": artist chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','O','P'): - case DMUS_FOURCC_UCOP_CHUNK: { - TRACE_(dmfile)(": copyright chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','S','B','J'): - case DMUS_FOURCC_USBJ_CHUNK: { - TRACE_(dmfile)(": subject chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','M','T'): - case DMUS_FOURCC_UCMT_CHUNK: { - TRACE_(dmfile)(": comment chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - } else { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return E_FAIL; - } - - TRACE_(dmfile)(": reading finished\n"); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return DMUS_E_INVALIDFILE; - } - } - - TRACE(": returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (pDesc)); - - return S_OK; + if ((hr = stream_get_chunk(stream, &riff)) != S_OK) + return hr; + if (riff.id != FOURCC_RIFF || riff.type != DMUS_FOURCC_SCRIPT_FORM) { + TRACE("loading failed: unexpected %s\n", debugstr_chunk(&riff)); + stream_skip_chunk(stream, &riff); + return DMUS_E_SCRIPT_INVALID_FILE; + } + + hr = dmobj_parsedescriptor(stream, &riff, desc, + DMUS_OBJ_OBJECT|DMUS_OBJ_NAME|DMUS_OBJ_NAME_INAM|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION); + if (FAILED(hr)) + return hr; + + if (desc->dwValidData) { + desc->guidClass = CLSID_DirectMusicScript; + desc->dwValidData |= DMUS_OBJ_CLASS; + } + + TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC(desc)); + return S_OK; } static const IDirectMusicObjectVtbl dmobject_vtbl = { @@ -365,7 +248,7 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_SetDescriptor, - IDirectMusicObjectImpl_ParseDescriptor + script_IDirectMusicObject_ParseDescriptor }; /* IDirectMusicScriptImpl IPersistStream part: */ -- 2.14.4

1 0

[PATCH] dmstyle: Remove an unused impl_from_ helper
by Michael Stefaniuc Aug. 2, 2018

Aug. 2, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/style.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 6757d37aa7..b3a3b83f39 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -207,11 +207,6 @@ static const IDirectMusicStyle8Vtbl dmstyle8_vtbl = { }; /* IDirectMusicStyle8Impl IDirectMusicObject part: */ -static inline IDirectMusicStyle8Impl *impl_from_IDirectMusicObject(IDirectMusicObject *iface) -{ - return CONTAINING_RECORD(iface, IDirectMusicStyle8Impl, dmobj.IDirectMusicObject_iface); -} - static HRESULT WINAPI style_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface, IStream *stream, DMUS_OBJECTDESC *desc) { -- 2.14.4

1 0