wine-devel December 2019

wine-devel@winehq.org

73 participants
634 discussions

[PATCH v3] msxml3: all string passed to IXMLDOMDocument_load() need to be URL-unescaped
by Damjan Jovanovic 08 Dec '19

08 Dec '19

msxml3 allows URL escape sequences even for C:\ style paths. eg. C:\Program%20Files\... Try 3 preserves my tests from try 2, while using a simpler patch to bsc.c written by Nikolay Sivov and tested by me. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48242 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/msxml3/bsc.c | 10 +++++++--- dlls/msxml3/tests/domdoc.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-)

2 1

[PATCH 3/3] dmime/tests: Add segment GetParam/SetParam tests
by Michael Stefaniuc 08 Dec '19

08 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 2e0626cde4..5bb3a8b5b3 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -630,6 +630,47 @@ static void test_gettrack(void) IDirectMusicSegment8_Release(seg); } +static void test_segment_param(void) +{ + IDirectMusicSegment8 *seg; + char buf[64]; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment8, (void **)&seg); + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + + add_track(seg, LyricsTrack, 0x1); /* no params */ + add_track(seg, SegmentTriggerTrack, 0x1); /* all params "supported" */ + + hr = IDirectMusicSegment8_GetParam(seg, NULL, 0x1, 0, 0, NULL, buf); + ok(hr == E_POINTER, "GetParam failed: %08x, expected E_POINTER\n", hr); + hr = IDirectMusicSegment8_SetParam(seg, NULL, 0x1, 0, 0, buf); + todo_wine ok(hr == E_POINTER, "SetParam failed: %08x, expected E_POINTER\n", hr); + + hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, NULL, buf); + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, NULL, buf); + ok(hr == DMUS_E_TRACK_NOT_FOUND, + "GetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + hr = IDirectMusicSegment8_GetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ANYTRACK, 0, + NULL, buf); + ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", hr); + + hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 0, 0, buf); + ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, 1, 0, buf); + todo_wine ok(hr == DMUS_E_TRACK_NOT_FOUND, + "SetParam failed: %08x, expected DMUS_E_TRACK_NOT_FOUND\n", hr); + hr = IDirectMusicSegment8_SetParam(seg, &GUID_Valid_Start_Time, 0x1, DMUS_SEG_ALLTRACKS, + 0, buf); + ok(hr == S_OK, "SetParam failed: %08x, expected S_OK\n", hr); + + IDirectMusicSegment8_Release(seg); +} + static void expect_getparam(IDirectMusicTrack *track, REFGUID type, const char *name, HRESULT expect) { @@ -1117,6 +1158,7 @@ START_TEST(dmime) test_graph(); test_segment(); test_gettrack(); + test_segment_param(); test_track(); test_parsedescriptor(); -- 2.23.0

1 0

[PATCH 2/3] dmime: Fix index handling in segment GetParam()
by Michael Stefaniuc 08 Dec '19

08 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Fixes the last infinite loop in PlayMotif.exe and lets it start. dlls/dmime/segment.c | 55 +++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 5284ac5fec..b6357b6f5f 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -368,49 +368,36 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_RemoveNotificationType(IDirectMus return S_OK; } -static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface, - REFGUID type, DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next, - void *param) +static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *iface, REFGUID type, + DWORD group, DWORD index, MUSIC_TIME time, MUSIC_TIME *next, void *param) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - struct list *item; IDirectMusicTrack *track; - DMUS_PRIVATE_SEGMENT_TRACK *segment; - HRESULT hr; - - FIXME("(%p, %s, 0x%x, %d, %d, %p, %p) Semi-stub\n", This, debugstr_dmguid(type), group, - index, time, next, param); - - if (index == DMUS_SEG_ANYTRACK || group == 0xffffffff) { - if (group == 0xffffffff && index != DMUS_SEG_ANYTRACK) - WARN("Any group doesnt have DMUS_SEG_ANYTRACK index.\n"); + unsigned int i, count; + HRESULT hr = DMUS_E_TRACK_NOT_FOUND; - LIST_FOR_EACH (item, &This->Tracks) { - segment = LIST_ENTRY(item, DMUS_PRIVATE_SEGMENT_TRACK, entry); + TRACE("(%p, %s, %#x, %u, %d, %p, %p)\n", This, debugstr_dmguid(type), group, index, time, + next, param); - TRACE(" - %p -> 0x%x,%p\n", segment, segment->dwGroupBits, segment->pTrack); - - if (group != 0xffffffff && !(segment->dwGroupBits & group)) - continue; - if (FAILED(IDirectMusicTrack_IsParamSupported(segment->pTrack, type))) - continue; - hr = IDirectMusicTrack_GetParam(segment->pTrack, type, time, next, param); - if (SUCCEEDED(hr)) - return hr; - } + if (!type) + return E_POINTER; - WARN("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; - } + /* Index is relative to the search pattern: group bits and supported param type */ + for (i = 0, count = 0; i < DMUS_SEG_ANYTRACK && count <= index; i++) { + if (FAILED(IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, i, &track))) + break; + if (FAILED(IDirectMusicTrack_IsParamSupported(track, type))) + continue; + if (index == count || index == DMUS_SEG_ANYTRACK) + hr = IDirectMusicTrack_GetParam(track, type, time, next, param); + IDirectMusicTrack_Release(track); - hr = IDirectMusicSegment8Impl_GetTrack(iface, &GUID_NULL, group, index, &track); - if (FAILED(hr)) { - ERR("(%p): not found\n", This); - return DMUS_E_TRACK_NOT_FOUND; + if (SUCCEEDED(hr)) + return hr; + count++; } - hr = IDirectMusicTrack_GetParam(track, type, time, next, param); - IDirectMusicTrack_Release(track); + TRACE("(%p): not found\n", This); return hr; } -- 2.23.0

1 0

[PATCH 1/3] dmime/tests: Add more GetTrack() tests
by Michael Stefaniuc 08 Dec '19

08 Dec '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e8fa6a596d..2e0626cde4 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -543,14 +543,17 @@ static void _add_track(IDirectMusicSegment8 *seg, REFCLSID class, const char *na #define add_track(seg, class, group) _add_track(seg, &CLSID_DirectMusic ## class, #class, group) static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char *name, DWORD group, - DWORD index) + DWORD index, BOOL ignore_guid) { IDirectMusicTrack *track; IPersistStream *ps; CLSID class; HRESULT hr; - hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, group, index, &track); + if (ignore_guid) + hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, group, index, &track); + else + hr = IDirectMusicSegment8_GetTrack(seg, expect, group, index, &track); if (!expect) { ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); return; @@ -568,9 +571,12 @@ static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char IDirectMusicTrack_Release(track); } -#define expect_track(seg, class, group, index) _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index) +#define expect_track(seg, class, group, index) \ + _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, TRUE) +#define expect_guid_track(seg, class, group, index) \ + _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, FALSE) -static void test_track_identify(void) +static void test_gettrack(void) { IDirectMusicSegment8 *seg; IDirectMusicTrack *track; @@ -586,7 +592,9 @@ static void test_track_identify(void) add_track(seg, SegmentTriggerTrack, 0x2); /* idx 1 group 2 */ add_track(seg, SeqTrack, 0x1); /* idx 2 group 1 */ add_track(seg, TempoTrack, 0x7); /* idx 3 group 1, idx 2 group 2, idx 0 group 3 */ + add_track(seg, WaveTrack, 0xffffffff); /* idx 4 group 1, idx 3 group 2, idx 1 group 3 */ + /* Ignore GUID in GetTrack */ hr = IDirectMusicSegment8_GetTrack(seg, &GUID_NULL, 0, 0, &track); ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); @@ -594,12 +602,30 @@ static void test_track_identify(void) expect_track(seg, ParamControlTrack, 0x1, 1); expect_track(seg, SeqTrack, 0x1, 2); expect_track(seg, TempoTrack, 0x1, 3); - _expect_track(seg, NULL, "", 0x1, 4); + expect_track(seg, WaveTrack, 0x1, 4); + _expect_track(seg, NULL, "", 0x1, 5, TRUE); + _expect_track(seg, NULL, "", 0x1, DMUS_SEG_ANYTRACK, TRUE); expect_track(seg, ParamControlTrack, 0x2, 0); + expect_track(seg, WaveTrack, 0x80000000, 0); expect_track(seg, SegmentTriggerTrack, 0x3, 2); /* groups 1+2 combined index */ expect_track(seg, SeqTrack, 0x3, 3); /* groups 1+2 combined index */ expect_track(seg, TempoTrack, 0x7, 4); /* groups 1+2+3 combined index */ expect_track(seg, TempoTrack, 0xffffffff, 4); /* all groups combined index */ + _expect_track(seg, NULL, "", 0xffffffff, DMUS_SEG_ANYTRACK, TRUE); + + /* Use the GUID in GetTrack */ + hr = IDirectMusicSegment8_GetTrack(seg, &CLSID_DirectMusicLyricsTrack, 0, 0, &track); + ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + + expect_guid_track(seg, LyricsTrack, 0x1, 0); + expect_guid_track(seg, ParamControlTrack, 0x1, 0); + expect_guid_track(seg, SeqTrack, 0x1, 0); + expect_guid_track(seg, TempoTrack, 0x1, 0); + expect_guid_track(seg, ParamControlTrack, 0x2, 0); + expect_guid_track(seg, SegmentTriggerTrack, 0x3, 0); + expect_guid_track(seg, SeqTrack, 0x3, 0); + expect_guid_track(seg, TempoTrack, 0x7, 0); + expect_guid_track(seg, TempoTrack, 0xffffffff, 0); IDirectMusicSegment8_Release(seg); } @@ -1090,7 +1116,7 @@ START_TEST(dmime) test_audiopathconfig(); test_graph(); test_segment(); - test_track_identify(); + test_gettrack(); test_track(); test_parsedescriptor(); -- 2.23.0

1 0

[PATCH v2] msxml3: all string passed to IXMLDOMDocument_load() need to be URL-unescaped
by Damjan Jovanovic 08 Dec '19

08 Dec '19

msxml3 allows URL escape sequences even for C:\ style paths. eg. C:\Program%20Files\... Try 2 determines URL length dynamically, suppresses some compiler const warnings, and cleans up tests. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/msxml3/bsc.c | 33 ++++++++++++++++++++++++++++----- dlls/msxml3/tests/domdoc.c | 17 +++++++++++++++++ 2 files changed, 45 insertions(+), 5 deletions(-)

2 4

[PATCH] include: update thumbcache.idl file
by Biswapriyo Nath 08 Dec '19

08 Dec '19

2 2

[PATCH v2 1/8] wineqtdecoder: Fix some copy-paste errors.
by Zebediah Figura 08 Dec '19

08 Dec '19

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wineqtdecoder/qtsplitter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 5b1e82ebc9b..0dbc3d8bf19 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -285,7 +285,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE QTSplitter *filter = impl_from_strmbase_filter(iface); HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; - EnterCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); if (filter->pVideo_Pin) pin_hr = BaseOutputPinImpl_Active(&filter->pVideo_Pin->pin); @@ -297,7 +297,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE hr = pin_hr; SetEvent(filter->runEvent); - LeaveCriticalSection(&This->csReceive); + LeaveCriticalSection(&filter->csReceive); return hr; } @@ -306,10 +306,10 @@ static HRESULT qt_splitter_cleanup_stream(struct strmbase_filter *iface) { QTSplitter *filter = impl_from_strmbase_filter(iface); - EnterCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); IAsyncReader_BeginFlush(filter->pInputPin.pReader); IAsyncReader_EndFlush(filter->pInputPin.pReader); - LeaveCriticalSection(&This->csReceive); + LeaveCriticalSection(&filter->csReceive); return S_OK; } -- 2.24.0

1 7

[PATCH v2 1/2] kernel32/tests: Trace the mapped string when FoldStringW fails.
by Mathew Hodson 08 Dec '19

08 Dec '19

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- dlls/kernel32/tests/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e43eee2..9328666 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3585,7 +3585,7 @@ static void test_FoldStringW(void) ok(ret == ARRAY_SIZE(foldczone_dst), "Got %d, error %d\n", ret, GetLastError()); ok(!memcmp(dst, foldczone_dst, sizeof(foldczone_dst)) || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), - "MAP_FOLDCZONE: Expanded incorrectly\n"); + "Got unexpected string %s.\n", wine_dbgstr_w(dst)); /* MAP_EXPAND_LIGATURES */ SetLastError(0); @@ -3594,7 +3594,7 @@ static void test_FoldStringW(void) if (!(ret == 0 && GetLastError() == ERROR_INVALID_FLAGS)) { ok(ret == ARRAY_SIZE(ligatures_dst), "Got %d, error %d\n", ret, GetLastError()); ok(!memcmp(dst, ligatures_dst, sizeof(ligatures_dst)), - "MAP_EXPAND_LIGATURES: Expanded incorrectly\n"); + "Got unexpected string %s.\n", wine_dbgstr_w(dst)); } /* FIXME: MAP_PRECOMPOSED : MAP_COMPOSITE */ -- 2.7.4

2 3

[PATCH 2/2] kernel32/tests: Add broken result for Windows XP and 2003.
by Mathew Hodson 08 Dec '19

08 Dec '19

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- dlls/kernel32/tests/locale.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9328666..c8cc904 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3439,7 +3439,7 @@ static void test_FoldStringW(void) }; static const WCHAR foldczone_broken_dst[] = { - 'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e',0x3cb,0x1f0,0xa0,0xaa,0 + 'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e',0x03c5,0x0308,'j',0x030c,0x00a0,0x00aa,0 }; static const WCHAR ligatures_src[] = { @@ -3582,9 +3582,11 @@ static void test_FoldStringW(void) /* MAP_FOLDCZONE */ SetLastError(0); ret = pFoldStringW(MAP_FOLDCZONE, foldczone_src, -1, dst, 256); - ok(ret == ARRAY_SIZE(foldczone_dst), "Got %d, error %d\n", ret, GetLastError()); + ok(ret == ARRAY_SIZE(foldczone_dst) + || broken(ret == ARRAY_SIZE(foldczone_broken_dst)), /* winxp, win2003 */ + "Got %d, error %d.\n", ret, GetLastError()); ok(!memcmp(dst, foldczone_dst, sizeof(foldczone_dst)) - || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), + || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), /* winxp, win2003 */ "Got unexpected string %s.\n", wine_dbgstr_w(dst)); /* MAP_EXPAND_LIGATURES */ -- 2.7.4

1 0

[PATCH v2] ieframe: implement COM aggregation in WebBrowser
by Damjan Jovanovic 07 Dec '19

07 Dec '19

Wine's WebBrowser currently just ignores the "outer" it is passed. Support COM aggregation like Windows does instead. Try 2 renames the internal IUnknown functions, uses the hlink_frame to store the outer, and beefs up the unit tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12406 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ieframe/classinfo.c | 6 +- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/oleobject.c | 30 +-- dlls/ieframe/persist.c | 18 +- dlls/ieframe/tests/webbrowser.c | 60 ++++++ dlls/ieframe/view.c | 12 +- dlls/ieframe/webbrowser.c | 325 ++++++++++++++++++-------------- 7 files changed, 277 insertions(+), 175 deletions(-)

2 1

← Newer
1
...
39
40
41
42
43
44
45
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel December 2019