March 2018 - Wine-Commits - list.winehq.org

Francois Gouget : winevulkan: Fix some typos in comments.
by Alexandre Julliard March 16, 2018

March 16, 2018

Module: wine Branch: master Commit: f98d0764d5489cf1152af79a92a89dd07e337d7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f98d0764d5489cf1152af79a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 15 18:12:08 2018 +0100 winevulkan: Fix some typos in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 579c38a..35524f2 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -464,7 +464,7 @@ class VkFunction(object): else: proto += " {0}(".format(self.name) - # Add all the paremeters. + # Add all the parameters. proto += ", ".join([p.definition() for p in self.params]) if postfix is not None: diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b9326ba..41a45ef 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -153,7 +153,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo dst->pApplicationInfo = src->pApplicationInfo; /* Application and loader can pass in a chain of extensions through pNext. - * We can't blindy pass these through as often these contain callbacks or + * We can't blindly pass these through as often these contain callbacks or * they can even be pass structures for loader / ICD internal use. For now * we ignore everything in pNext chain, but we print FIXMEs. */ @@ -1011,7 +1011,7 @@ void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *na TRACE("%p %s\n", instance, debugstr_a(name)); /* Initial version of the Vulkan ICD spec required vkGetInstanceProcAddr to be - * exported. vk_icdGetInstanceProcAddr was added later to separete ICD calls from + * exported. vk_icdGetInstanceProcAddr was added later to separate ICD calls from * Vulkan API. One of them in our case should forward to the other, so just forward * to the older vkGetInstanceProcAddr. */

1 0

Francois Gouget : kernelbase/tests: Fix a couple of typos in skip messages.
by Alexandre Julliard March 16, 2018

March 16, 2018

Module: wine Branch: master Commit: f98a2da12309c92133fadd0178c769a4358ad81b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f98a2da12309c92133fadd01… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 15 18:12:49 2018 +0100 kernelbase/tests: Fix a couple of typos in skip messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 47c77b8..7c88513 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -149,7 +149,7 @@ static void test_PathCchAddBackslash(void) if (!pPathCchAddBackslash) { - win_skip("PathCchAddBackslash() is not availale.\n"); + win_skip("PathCchAddBackslash() is not available.\n"); return; } @@ -192,7 +192,7 @@ static void test_PathCchAddBackslashEx(void) if (!pPathCchAddBackslashEx) { - win_skip("PathCchAddBackslashEx() is not availale.\n"); + win_skip("PathCchAddBackslashEx() is not available.\n"); return; }

1 0

Gijs Vermeulen : msscript: Implement IScriptControl_[get|put]_State.
by Alexandre Julliard March 16, 2018

March 16, 2018

Module: wine Branch: master Commit: 3e0a6da5d38c37e1189cc6f9fd1d2bc8aa2e8fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e0a6da5d38c37e1189cc6f9… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Mar 15 21:28:41 2018 +0100 msscript: Implement IScriptControl_[get|put]_State. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 26 +++++++++++++++--- dlls/msscript.ocx/tests/msscript.c | 54 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index a020dd2..746c2d3 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -91,6 +91,7 @@ struct ScriptControl { LONG timeout; VARIANT_BOOL allow_ui; VARIANT_BOOL use_safe_subset; + ScriptControlStates state; /* connection points */ ConnectionPoint *cp_list; @@ -761,15 +762,31 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan static HRESULT WINAPI ScriptControl_get_State(IScriptControl *iface, ScriptControlStates *p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + if(!This->host) + return E_FAIL; + + *p = This->state; + return S_OK; } static HRESULT WINAPI ScriptControl_put_State(IScriptControl *iface, ScriptControlStates state) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%x)\n", This, state); - return E_NOTIMPL; + TRACE("(%p)->(%x)\n", This, state); + + if(!This->host) + return E_FAIL; + + if(state != Initialized && state != Connected) + return CTL_E_INVALIDPROPERTYVALUE; + + This->state = state; + return S_OK; } static HRESULT WINAPI ScriptControl_put_SitehWnd(IScriptControl *iface, LONG hwnd) @@ -1900,6 +1917,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->view_sink = NULL; script_control->allow_ui = VARIANT_TRUE; script_control->use_safe_subset = VARIANT_FALSE; + script_control->state = Initialized; ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index f6630c3..3110ea2 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1291,6 +1291,59 @@ static void test_UseSafeSubset(void) IScriptControl_Release(sc); } +static void test_State(void) +{ + IScriptControl *sc; + ScriptControlStates state; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_State(sc, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IScriptControl_get_State(sc, &state); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + + hr = IScriptControl_put_State(sc, Connected); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + + str = SysAllocString(vbW); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == Initialized, "got %d\n", state); + + hr = IScriptControl_put_State(sc, Connected); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == Connected, "got %d\n", state); + + hr = IScriptControl_put_State(sc, 2); + ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == Connected, "got %d\n", state); + + hr = IScriptControl_put_State(sc, -1); + ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); + + hr = IScriptControl_get_State(sc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == Connected, "got %d\n", state); + + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -1319,6 +1372,7 @@ START_TEST(msscript) test_AddObject(); test_AllowUI(); test_UseSafeSubset(); + test_State(); CoUninitialize(); }

1 0

Gijs Vermeulen : msscript: Implement IScriptControl_[get|put] _UseSafeSubset.
by Alexandre Julliard March 16, 2018

March 16, 2018

Module: wine Branch: master Commit: 0b4688e198be2e14d91f8b82c8269374d785eb22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b4688e198be2e14d91f8b82… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Mar 15 21:28:40 2018 +0100 msscript: Implement IScriptControl_[get|put]_UseSafeSubset. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 19 ++++++++++++++----- dlls/msscript.ocx/tests/msscript.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index e8cde9d..a020dd2 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -90,6 +90,7 @@ struct ScriptControl { SIZEL extent; LONG timeout; VARIANT_BOOL allow_ui; + VARIANT_BOOL use_safe_subset; /* connection points */ ConnectionPoint *cp_list; @@ -838,15 +839,22 @@ static HRESULT WINAPI ScriptControl_put_AllowUI(IScriptControl *iface, VARIANT_B static HRESULT WINAPI ScriptControl_get_UseSafeSubset(IScriptControl *iface, VARIANT_BOOL *p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + *p = This->use_safe_subset; + return S_OK; } -static HRESULT WINAPI ScriptControl_put_UseSafeSubset(IScriptControl *iface, VARIANT_BOOL v) +static HRESULT WINAPI ScriptControl_put_UseSafeSubset(IScriptControl *iface, VARIANT_BOOL use_safe_subset) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + TRACE("(%p)->(%x)\n", This, use_safe_subset); + + This->use_safe_subset = use_safe_subset; + return S_OK; } static HRESULT WINAPI ScriptControl_get_Modules(IScriptControl *iface, IScriptModuleCollection **p) @@ -1891,6 +1899,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->view_sink_flags = 0; script_control->view_sink = NULL; script_control->allow_ui = VARIANT_TRUE; + script_control->use_safe_subset = VARIANT_FALSE; ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 576a6b1..f6630c3 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1254,6 +1254,43 @@ static void test_AllowUI(void) IScriptControl_Release(sc); } +static void test_UseSafeSubset(void) +{ + IScriptControl *sc; + VARIANT_BOOL use_safe_subset; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_UseSafeSubset(sc, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IScriptControl_get_UseSafeSubset(sc, &use_safe_subset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(use_safe_subset == VARIANT_FALSE, "got %d\n", use_safe_subset); + + hr = IScriptControl_put_UseSafeSubset(sc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_UseSafeSubset(sc, &use_safe_subset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(use_safe_subset == VARIANT_TRUE, "got %d\n", use_safe_subset); + + str = SysAllocString(vbW); + hr = IScriptControl_put_Language(sc, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + hr = IScriptControl_get_UseSafeSubset(sc, &use_safe_subset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(use_safe_subset == VARIANT_TRUE, "got %d\n", use_safe_subset); + + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -1281,6 +1318,7 @@ START_TEST(msscript) test_Reset(); test_AddObject(); test_AllowUI(); + test_UseSafeSubset(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmime: Reimplement the segment form parser.
by Alexandre Julliard March 16, 2018

March 16, 2018

Module: wine Branch: master Commit: bb88427e4ee0f5e65b6acfaaf35e1a81f5fbbe9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb88427e4ee0f5e65b6acfaa… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 16 01:32:26 2018 +0100 dmime: Reimplement the segment form parser. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 157 +++++++++++++++++++++------------------------------ 1 file changed, 63 insertions(+), 94 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 88ca212..cbc2b3c 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -819,20 +819,14 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DWORD StreamSize, IStream *pStm) { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, ListSize[3], ListCount[3]; + DWORD ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - if (pChunk->fccID != DMUS_FOURCC_TRACK_LIST) { - ERR_(dmfile)(": %s chunk should be a TRACK list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); + ListSize[0] = StreamSize - sizeof(FOURCC); ListCount[0] = 0; do { @@ -873,94 +867,69 @@ static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSize, IStream *pStm) -{ - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamCount; - LARGE_INTEGER liMove; /* used when skipping chunks */ - - StreamSize -= sizeof(FOURCC); - StreamCount = 0; +static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size) +{ + unsigned int dx = 9; + + if (size == offsetof(DMUS_IO_SEGMENT_HEADER, rtLength)) + dx = 7; + else if (size == offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart)) + dx = 8; + TRACE("Found DirectX%d DMUS_IO_SEGMENT_HEADER\n", dx); + TRACE("\tdwRepeats: %u\n", h->dwRepeats); + TRACE("\tmtLength: %u\n", h->mtLength); + TRACE("\tmtPlayStart: %u\n", h->mtPlayStart); + TRACE("\tmtLoopStart: %u\n", h->mtLoopStart); + TRACE("\tmtLoopEnd: %u\n", h->mtLoopEnd); + TRACE("\tdwResolution: %u\n", h->dwResolution); + if (dx >= 8) { + TRACE("\trtLength: %s\n", wine_dbgstr_longlong(h->rtLength)); + TRACE("\tdwFlags: %u\n", h->dwFlags); + TRACE("\tdwReserved: %u\n", h->dwReserved); + } + if (dx == 9) { + TRACE("\trtLoopStart: %s\n", wine_dbgstr_longlong(h->rtLoopStart)); + TRACE("\trtLoopEnd: %s\n", wine_dbgstr_longlong(h->rtLoopEnd)); + TRACE("\trtPlayStart: %s\n", wine_dbgstr_longlong(h->rtPlayStart)); + } +} - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); +static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *stream, + const struct chunk_entry *riff) +{ + struct chunk_entry chunk = {.parent = riff}; + HRESULT hr; - switch (Chunk.fccID) { - case DMUS_FOURCC_SEGMENT_CHUNK: { - DWORD checkSz = sizeof(FOURCC); - TRACE_(dmfile)(": segment chunk\n"); - /** DX 7 */ - IStream_Read (pStm, &This->header.dwRepeats, sizeof(This->header.dwRepeats), NULL); - checkSz += sizeof(This->header.dwRepeats); - IStream_Read (pStm, &This->header.mtLength, sizeof(This->header.mtLength), NULL); - checkSz += sizeof(This->header.mtLength); - IStream_Read (pStm, &This->header.mtPlayStart, sizeof(This->header.mtPlayStart), NULL); - checkSz += sizeof(This->header.mtPlayStart); - IStream_Read (pStm, &This->header.mtLoopStart, sizeof(This->header.mtLoopStart), NULL); - checkSz += sizeof(This->header.mtLoopStart); - IStream_Read (pStm, &This->header.mtLoopEnd, sizeof(This->header.mtLoopEnd), NULL); - checkSz += sizeof(This->header.mtLoopEnd); - IStream_Read (pStm, &This->header.dwResolution, sizeof(This->header.dwResolution), NULL); - checkSz += sizeof(This->header.dwResolution); - TRACE_(dmfile)("dwRepeats: %u\n", This->header.dwRepeats); - TRACE_(dmfile)("mtLength: %u\n", This->header.mtLength); - TRACE_(dmfile)("mtPlayStart: %u\n", This->header.mtPlayStart); - TRACE_(dmfile)("mtLoopStart: %u\n", This->header.mtLoopStart); - TRACE_(dmfile)("mtLoopEnd: %u\n", This->header.mtLoopEnd); - TRACE_(dmfile)("dwResolution: %u\n", This->header.dwResolution); - /** DX 8 */ - if (Chunk.dwSize > checkSz) { - IStream_Read (pStm, &This->header.rtLength, sizeof(This->header.rtLength), NULL); - checkSz += sizeof(This->header.rtLength); - IStream_Read (pStm, &This->header.dwFlags, sizeof(This->header.dwFlags), NULL); - checkSz += sizeof(This->header.dwFlags); - } - /** DX 9 */ - if (Chunk.dwSize > checkSz) { - IStream_Read (pStm, &This->header.rtLoopStart, sizeof(This->header.rtLoopStart), NULL); - checkSz += sizeof(This->header.rtLoopStart); - IStream_Read (pStm, &This->header.rtLoopEnd, sizeof(This->header.rtLoopEnd), NULL); - checkSz += sizeof(This->header.rtLoopEnd); - IStream_Read (pStm, &This->header.rtPlayStart, sizeof(This->header.rtPlayStart), NULL); - checkSz += sizeof(This->header.rtPlayStart); - } - liMove.QuadPart = Chunk.dwSize - checkSz + sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - switch (Chunk.fccID) { - case DMUS_FOURCC_TRACK_LIST: { - TRACE_(dmfile)(": TRACK list\n"); - hr = parse_track_list(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(riff)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + switch (chunk.id) { + case DMUS_FOURCC_SEGMENT_CHUNK: + /* DX7, DX8 and DX9 structure sizes */ + if (chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLength) && + chunk.size != offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart) && + chunk.size != sizeof(DMUS_IO_SEGMENT_HEADER)) { + WARN("Invalid size of %s\n", debugstr_chunk(&chunk)); + break; + } + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &This->header, chunk.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); + return hr; + } + dump_segment_header(&This->header, chunk.size); + break; + case FOURCC_LIST: + if (chunk.type == DMUS_FOURCC_TRACK_LIST) + if (FAILED(hr = parse_track_list(This, chunk.size, stream))) + return hr; + break; + case FOURCC_RIFF: + FIXME("Loading of embedded RIFF form %s", debugstr_fourcc(chunk.type)); + break; + } } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - return S_OK; + return SUCCEEDED(hr) ? S_OK : hr; } static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream *iface) @@ -990,7 +959,7 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *st stream_reset_chunk_data(stream, &riff); if (riff.type == DMUS_FOURCC_SEGMENT_FORM) - hr = parse_segment_form(This, riff.size, stream); + hr = parse_segment_form(This, stream, &riff); else { FIXME("WAVE form loading not implemented\n"); hr = S_OK;

1 0

Michael Stefaniuc : dmime: The descriptor is already parsed for the segment form.
by Alexandre Julliard March 16, 2018

March 16, 2018

Module: wine Branch: master Commit: 117a2081d5ddbcc20f6c61bff9949de685628b59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=117a2081d5ddbcc20f6c61bf… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 16 01:32:25 2018 +0100 dmime: The descriptor is already parsed for the segment form. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmutils.c | 55 ---------------------------------------------------- dlls/dmime/dmutils.h | 2 -- dlls/dmime/segment.c | 36 ++-------------------------------- 3 files changed, 2 insertions(+), 91 deletions(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 75a62a4..9bb8df3 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -92,61 +92,6 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* p return S_OK; } -HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { - - LARGE_INTEGER liMove; /* used when skipping chunks */ - - /** - * don't ask me why, but M$ puts INFO elements in UNFO list sometimes - * (though strings seem to be valid unicode) - */ - switch (pChunk->fccID) { - - case mmioFOURCC('I','N','A','M'): - case DMUS_FOURCC_UNAM_CHUNK: { - TRACE(": name chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, pDesc->wszName, pChunk->dwSize, NULL); - TRACE(" - wszName: %s\n", debugstr_w(pDesc->wszName)); - break; - } - - case mmioFOURCC('I','A','R','T'): - case DMUS_FOURCC_UART_CHUNK: { - TRACE(": artist chunk (ignored)\n"); - liMove.QuadPart = pChunk->dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','O','P'): - case DMUS_FOURCC_UCOP_CHUNK: { - TRACE(": copyright chunk (ignored)\n"); - liMove.QuadPart = pChunk->dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','S','B','J'): - case DMUS_FOURCC_USBJ_CHUNK: { - TRACE(": subject chunk (ignored)\n"); - liMove.QuadPart = pChunk->dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','M','T'): - case DMUS_FOURCC_UCMT_CHUNK: { - TRACE(": comment chunk (ignored)\n"); - liMove.QuadPart = pChunk->dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - default: - /* not handled */ - return S_FALSE; - } - - return S_OK; -} - HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) { DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; diff --git a/dlls/dmime/dmutils.h b/dlls/dmime/dmutils.h index e290287..187c9ed 100644 --- a/dlls/dmime/dmutils.h +++ b/dlls/dmime/dmutils.h @@ -30,8 +30,6 @@ typedef struct _DMUS_PRIVATE_CHUNK { /** * Parsing utilities */ -extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; -extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; /** diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 3122d22..88ca212 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -877,7 +877,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSi { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamCount, ListSize[3], ListCount[3]; + DWORD StreamCount; LARGE_INTEGER liMove; /* used when skipping chunks */ StreamSize -= sizeof(FOURCC); @@ -888,11 +888,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSi StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc); - if (FAILED(hr)) return hr; - - if (hr == S_FALSE) { - switch (Chunk.fccID) { + switch (Chunk.fccID) { case DMUS_FOURCC_SEGMENT_CHUNK: { DWORD checkSz = sizeof(FOURCC); TRACE_(dmfile)(": segment chunk\n"); @@ -938,34 +934,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSi case FOURCC_LIST: { IStream_Read (pStm, &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) { - case DMUS_FOURCC_UNFO_LIST: { - TRACE_(dmfile)(": UNFO list\n"); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - - hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc); - if (FAILED(hr)) return hr; - - if (hr == S_FALSE) { - switch (Chunk.fccID) { - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, 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; - } case DMUS_FOURCC_TRACK_LIST: { TRACE_(dmfile)(": TRACK list\n"); hr = parse_track_list(This, &Chunk, pStm); @@ -987,7 +956,6 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSi IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; } - } } TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); } while (StreamCount < StreamSize);

1 0

Michael Stefaniuc : dmime: Reimplement IPersistStream_Load() for DMSegment.
by Alexandre Julliard March 16, 2018

March 16, 2018

Module: wine Branch: master Commit: b73c4ec4406a8e9f55fcfb63831b3281b19176ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=b73c4ec4406a8e9f55fcfb63… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 16 01:32:24 2018 +0100 dmime: Reimplement IPersistStream_Load() for DMSegment. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmobject.h | 20 ++++++++++++ dlls/dmime/segment.c | 86 +++++++++++++++++---------------------------------- 2 files changed, 49 insertions(+), 57 deletions(-) diff --git a/dlls/dmime/dmobject.h b/dlls/dmime/dmobject.h index 2940225..4a721cc 100644 --- a/dlls/dmime/dmobject.h +++ b/dlls/dmime/dmobject.h @@ -40,6 +40,26 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str, ULONG size) DECLSPEC_HIDDEN; +static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk) +{ + LARGE_INTEGER offset; + + offset.QuadPart = chunk->offset.QuadPart + sizeof(FOURCC) + sizeof(DWORD); + if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST) + offset.QuadPart += sizeof(FOURCC); + + return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); +} + +static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chunk_entry *chunk) +{ + LARGE_INTEGER offset; + + offset.QuadPart = chunk->offset.QuadPart; + + return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); +} + const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index fcb97be..3122d22 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -873,20 +873,14 @@ static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, DWORD StreamSize, IStream *pStm) { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; + DWORD StreamCount, ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - if (pChunk->fccID != DMUS_FOURCC_SEGMENT_FORM) { - ERR_(dmfile)(": %s chunk should be a segment form\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - StreamSize = pChunk->dwSize - sizeof(FOURCC); + StreamSize -= sizeof(FOURCC); StreamCount = 0; do { @@ -1006,57 +1000,35 @@ static inline IDirectMusicSegment8Impl *impl_from_IPersistStream(IPersistStream return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, dmobj.IPersistStream_iface); } -static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface); - HRESULT hr; - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize; - /*DWORD ListSize[3], ListCount[3];*/ - LARGE_INTEGER liMove; /* used when skipping chunks */ + IDirectMusicSegment8Impl *This = impl_from_IPersistStream(iface); + struct chunk_entry riff = {0}; + HRESULT hr; - TRACE("(%p, %p): Loading\n", This, pStm); - hr = IStream_Read (pStm, &Chunk, sizeof(Chunk), NULL); - if(hr != S_OK){ - WARN("IStream_Read failed: %08x\n", hr); - return DMUS_E_UNSUPPORTED_STREAM; - } - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_RIFF: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); - StreamSize = Chunk.dwSize - sizeof(FOURCC); - switch (Chunk.fccID) { - case DMUS_FOURCC_SEGMENT_FORM: { - TRACE_(dmfile)(": segment form\n"); - hr = parse_segment_form(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - case mmioFOURCC('W','A','V','E'): { - FIXME(": WAVE form loading not implemented\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk (loading failed)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return DMUS_E_UNSUPPORTED_STREAM; - } + TRACE("(%p, %p): Loading\n", This, stream); + + if (!stream) + return E_POINTER; + + if (stream_get_chunk(stream, &riff) != S_OK || riff.id != FOURCC_RIFF) + return DMUS_E_UNSUPPORTED_STREAM; + + stream_reset_chunk_start(stream, &riff); + hr = IDirectMusicObject_ParseDescriptor(&This->dmobj.IDirectMusicObject_iface, stream, + &This->dmobj.desc); + if (FAILED(hr)) + return hr; + stream_reset_chunk_data(stream, &riff); + + if (riff.type == DMUS_FOURCC_SEGMENT_FORM) + hr = parse_segment_form(This, riff.size, stream); + else { + FIXME("WAVE form loading not implemented\n"); + hr = S_OK; } - TRACE_(dmfile)(": reading finished\n"); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - return DMUS_E_UNSUPPORTED_STREAM; - } - } - - return S_OK; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = {

1 0

Francois Gouget : wmp/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard March 16, 2018

March 16, 2018

Module: wine Branch: master Commit: abf6841ae279080e235dce2fa905045164491964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abf6841ae279080e235dce2f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 15 18:14:04 2018 +0100 wmp/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/oleobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 937960c..e4c2294 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -956,7 +956,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) SET_EXPECT(Invoke_USERMODE); hres = IWMPPlayer4_get_URL(player4, &url); ok(hres == S_OK, "IWMPPlayer4_get_URL failed: %08x\n", hres); - ok(0 == lstrcmpW(url, filename), "%s != %s", wine_dbgstr_w(url), wine_dbgstr_w(filename)); + ok(0 == lstrcmpW(url, filename), "%s != %s\n", wine_dbgstr_w(url), wine_dbgstr_w(filename)); todo_wine CHECK_CALLED(Invoke_USERMODE); SysFreeString(url); @@ -967,7 +967,7 @@ static void test_wmp_ifaces(IOleObject *oleobj) url = NULL; hres = IWMPMedia_get_sourceURL(media, &url); ok(hres == S_OK, "IWMPMedia_get_sourceURL failed: %08x\n", hres); - ok(0 == lstrcmpW(url, filename), "%s != %s", wine_dbgstr_w(url), wine_dbgstr_w(filename)); + ok(0 == lstrcmpW(url, filename), "%s != %s\n", wine_dbgstr_w(url), wine_dbgstr_w(filename)); SysFreeString(url); SET_EXPECT(GetContainer);

1 0

Zebediah Figura : ieframe: Clean up InternetExplorerManager server process.
by Alexandre Julliard March 16, 2018

March 16, 2018

Module: wine Branch: master Commit: b5b3146e4f701fe6273003fae609bec03d7d10e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b3146e4f701fe6273003fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 14 12:10:07 2018 -0500 ieframe: Clean up InternetExplorerManager server process. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/iexplore.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 23d61f9..aac1436 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -887,7 +887,10 @@ static ULONG WINAPI InternetExplorerManager_Release(IInternetExplorerManager *if TRACE("(%p) decreasing refcount to %u\n", iface, ref); if (ref == 0) + { HeapFree(GetProcessHeap(), 0, This); + released_obj(); + } return ref; } @@ -923,6 +926,7 @@ HRESULT WINAPI InternetExplorerManager_Create(IClassFactory *iface, IUnknown *pO hr = IInternetExplorerManager_QueryInterface(&ret->IInternetExplorerManager_iface, riid, ppv); IInternetExplorerManager_Release(&ret->IInternetExplorerManager_iface); + InterlockedIncrement(&obj_cnt); return hr; }

1 0

Anton Romanov : wmp: Handle allocation failure in IWMPMedia_get_sourceURL.
by Alexandre Julliard March 15, 2018

March 15, 2018

Module: wine Branch: master Commit: bf7b21ec7b587215385c210e695cfa42e19efe4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf7b21ec7b587215385c210e… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Wed Mar 14 23:19:06 2018 -0700 wmp: Handle allocation failure in IWMPMedia_get_sourceURL. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 6c68240..4a0d074 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1577,9 +1577,14 @@ static HRESULT WINAPI WMPMedia_get_isIdentical(IWMPMedia *iface, IWMPMedia *othe static HRESULT WINAPI WMPMedia_get_sourceURL(IWMPMedia *iface, BSTR *pbstrSourceUrl) { WMPMedia *This = impl_from_IWMPMedia(iface); + BSTR url; TRACE("(%p)->(%p)\n", This, pbstrSourceUrl); - *pbstrSourceUrl = SysAllocString(This->url); - return S_OK; + url = SysAllocString(This->url); + if (url) { + *pbstrSourceUrl = url; + return S_OK; + } + return E_OUTOFMEMORY; } static HRESULT WINAPI WMPMedia_get_name(IWMPMedia *iface, BSTR *pbstrName)

1 0