December 2019 - Wine-commits

Alexandre Julliard : kernel32: Move GetStringType functions to kernelbase.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 1b46da5c05ba0c1ab27506af27e31f0d0e7d3795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b46da5c05ba0c1ab27506af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 20:29:27 2019 +0100 kernel32: Move GetStringType functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/locale.c | 141 ++------------------------------- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/locale.c | 117 +++++++++++++++++++++++++++ dlls/{kernel32 => kernelbase}/wctype.c | 0 tools/make_unicode | 2 +- 8 files changed, 132 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b46da5c05ba0c1ab275…

1 0

Alexandre Julliard : kernelbase: Directly use the wctype table for the IsChar* functions.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: c7c8016b70f2af228f3b858fe816cb14cf7f6754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c8016b70f2af228f3b858f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 9 10:08:23 2019 +0100 kernelbase: Directly use the wctype table for the IsChar* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/string.c | 91 ------------------------------ 2 files changed, 140 insertions(+), 91 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2dbcb0db17..950e9e230d 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2901,6 +2901,146 @@ LANGID WINAPI DECLSPEC_HOTPATCH GetUserDefaultUILanguage(void) } +/****************************************************************************** + * IsCharAlphaA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_ALPHA); +} + + +/****************************************************************************** + * IsCharAlphaW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_ALPHA); +} + + +/****************************************************************************** + * IsCharAlphaNumericA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaNumericA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & (C1_ALPHA | C1_DIGIT)); +} + + +/****************************************************************************** + * IsCharAlphaNumericW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaNumericW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & (C1_ALPHA | C1_DIGIT)); +} + + +/****************************************************************************** + * IsCharBlankW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharBlankW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_BLANK); +} + + +/****************************************************************************** + * IsCharCntrlW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharCntrlW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_CNTRL); +} + + +/****************************************************************************** + * IsCharDigitW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharDigitW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_DIGIT); +} + + +/****************************************************************************** + * IsCharLowerA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharLowerA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_LOWER); +} + + +/****************************************************************************** + * IsCharLowerW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharLowerW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_LOWER); +} + + +/****************************************************************************** + * IsCharPunctW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharPunctW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_PUNCT); +} + + +/****************************************************************************** + * IsCharSpaceA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharSpaceA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_SPACE); +} + + +/****************************************************************************** + * IsCharSpaceW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharSpaceW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_SPACE); +} + + +/****************************************************************************** + * IsCharUpperA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharUpperA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_UPPER); +} + + +/****************************************************************************** + * IsCharUpperW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharUpperW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_UPPER); +} + + +/****************************************************************************** + * IsCharXDigitW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharXDigitW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_XDIGIT); +} + + /****************************************************************************** * IsDBCSLeadByte (kernelbase.@) */ diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 668fd4fa37..9a4d8c0827 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -33,13 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(string); ((ch) >= 'A' && (ch) <= 'F') || \ ((ch) >= 'a' && (ch) <= 'f')) -static WORD get_char_type(WCHAR ch) -{ - WORD type = 0; - GetStringTypeW(CT_CTYPE1, &ch, 1, &type); - return type; -} - static BOOL char_compare(WORD ch1, WORD ch2, DWORD flags) { char str1[3], str2[3]; @@ -219,90 +212,6 @@ DWORD WINAPI StrCmpNICW(const WCHAR *str, const WCHAR *cmp, DWORD len) return StrCmpNIW(str, cmp, len); } -BOOL WINAPI IsCharBlankW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_BLANK); -} - -BOOL WINAPI IsCharCntrlW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_CNTRL); -} - -BOOL WINAPI IsCharDigitW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_DIGIT); -} - -BOOL WINAPI IsCharPunctW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_PUNCT); -} - -BOOL WINAPI IsCharSpaceA(CHAR c) -{ - WORD type; - return GetStringTypeA(GetSystemDefaultLCID(), CT_CTYPE1, &c, 1, &type) && (type & C1_SPACE); -} - -BOOL WINAPI IsCharSpaceW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_SPACE); -} - -BOOL WINAPI IsCharXDigitW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_XDIGIT); -} - -BOOL WINAPI IsCharAlphaA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharAlphaW(wch); -} - -BOOL WINAPI IsCharAlphaW(WCHAR ch) -{ - return !!(get_char_type(ch) & C1_ALPHA); -} - -BOOL WINAPI IsCharLowerA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharLowerW(wch); -} - -BOOL WINAPI IsCharLowerW(WCHAR ch) -{ - return !!(get_char_type(ch) & C1_LOWER); -} - -BOOL WINAPI IsCharAlphaNumericA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharAlphaNumericW(wch); -} - -BOOL WINAPI IsCharAlphaNumericW(WCHAR ch) -{ - return !!(get_char_type(ch) & (C1_ALPHA | C1_DIGIT)); -} - -BOOL WINAPI IsCharUpperA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharUpperW(wch); -} - -BOOL WINAPI IsCharUpperW(WCHAR ch) -{ - return !!(get_char_type(ch) & C1_UPPER); -} - char * WINAPI StrChrA(const char *str, WORD ch) { TRACE("%s, %#x\n", wine_dbgstr_a(str), ch);

1 0

Zebediah Figura : strmbase: Get rid of the "vtbl" argument to strmbase_source_init().
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 675e0611426625226b3f3fe76bb396cb68727cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=675e0611426625226b3f3fe7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:38 2019 -0600 strmbase: Get rid of the "vtbl" argument to strmbase_source_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 24 +------------------- dlls/qcap/avimux.c | 24 +------------------- dlls/qcap/smartteefilter.c | 48 ++------------------------------------- dlls/qcap/vfwcapture.c | 25 +------------------- dlls/qedit/samplegrabber.c | 24 +------------------- dlls/quartz/filesource.c | 26 +-------------------- dlls/quartz/tests/videorenderer.c | 24 +------------------- dlls/quartz/tests/vmr7.c | 24 +------------------- dlls/quartz/tests/vmr9.c | 24 +------------------- dlls/strmbase/pin.c | 38 ++++++++++++++++++++++++------- dlls/strmbase/transform.c | 26 +-------------------- dlls/winegstreamer/gstdemux.c | 25 +------------------- dlls/wineqtdecoder/qtsplitter.c | 25 +------------------- include/wine/strmbase.h | 10 +------- 14 files changed, 44 insertions(+), 323 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=675e0611426625226b3f…

1 0

Damjan Jovanovic : msxml3: All string passed to IXMLDOMDocument_load() need to be URL-unescaped.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: e2f2ad0e81b854b5b18d029d309708d8ea7dd7bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f2ad0e81b854b5b18d029d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Dec 8 19:48:50 2019 +0200 msxml3: All string passed to IXMLDOMDocument_load() need to be URL-unescaped. msxml3 allows URL escape sequences even for C:\ style paths. eg. C:\Program%20Files\... Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48242 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/bsc.c | 10 +++++++--- dlls/msxml3/tests/domdoc.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index df4cf37346..0b9e679bda 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -253,15 +253,19 @@ HRESULT create_uri(const WCHAR *url, IUri **uri) WCHAR fullpath[MAX_PATH]; DWORD needed = ARRAY_SIZE(fileUrl); - if (!PathSearchAndQualifyW(url, fullpath, ARRAY_SIZE(fullpath))) + lstrcpynW(fileUrl, url, ARRAY_SIZE(fileUrl)); + UrlUnescapeW(fileUrl, NULL, NULL, URL_UNESCAPE_INPLACE); + + if (!PathSearchAndQualifyW(fileUrl, fullpath, ARRAY_SIZE(fullpath))) { WARN("can't find path\n"); return E_FAIL; } - if (FAILED(UrlCreateFromPathW(fullpath, fileUrl, &needed, 0))) + if (FAILED(UrlApplySchemeW(fullpath, fileUrl, &needed, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | + URL_APPLY_DEFAULT))) { - ERR("can't create url from path\n"); + ERR("Failed to apply url scheme.\n"); return E_FAIL; } url = fileUrl; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c4337ab191..aa4c7a2832 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10219,6 +10219,7 @@ static void test_load(void) VARIANT src; HRESULT hr; void* ptr; + int n; GetTempPathA(MAX_PATH, path); strcat(path, "winetest.xml"); @@ -10268,6 +10269,22 @@ static void test_load(void) ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(bstr1); + /* Regular local path with some URL encoded characters. */ + strcpy(path2, path); + n = strlen(path2); + strcpy(&path2[n-1], "%6C"); /* C:\path\to\winetest.xm%6C */ + test_doc_load_from_path(doc, path2); + + /* Both spaces and %20s work. */ + GetTempPathA(MAX_PATH, path2); + strcat(path2, "wine test.xml"); + write_to_file(path2, win1252xml); + test_doc_load_from_path(doc, path2); + GetTempPathA(MAX_PATH, path2); + strcat(path2, "wine%20test.xml"); + test_doc_load_from_path(doc, path2); + DeleteFileA(path2); + DeleteFileA(path); /* load from existing path, no xml content */

1 0

Michael Stefaniuc : dmime/tests: Add more GetTrack() tests.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 4649f2f1a0d739a08bb245f2b43d971397150072 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4649f2f1a0d739a08bb245f2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 8 18:53:51 2019 +0100 dmime/tests: Add more GetTrack() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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();

1 0

Michael Stefaniuc : dmime: Fix index handling in segment GetParam().
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 17bab664ce29728533ee5eda87941df33e74a9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17bab664ce29728533ee5eda… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 8 18:53:52 2019 +0100 dmime: Fix index handling in segment GetParam(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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; }

1 0

Michael Stefaniuc : dmime/tests: Add segment GetParam/SetParam tests.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 59600f9588c25d1a1777f1113e688d28d2f8bca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59600f9588c25d1a1777f111… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Dec 8 18:53:53 2019 +0100 dmime/tests: Add segment GetParam/SetParam tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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();

1 0

Alistair Leslie-Hughes : loader: Install msado15.dll into the correct location.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: d37a2c861ac5793b388d8a2633382b86ce3ea60d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d37a2c861ac5793b388d8a26… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Dec 8 22:21:40 2019 +0000 loader: Install msado15.dll into the correct location. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 19c034d7fd..c830525379 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2706,6 +2706,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Windows NT\Accessories,wordpad.exe 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\ADO,msado15.dll 11,,* [FakeDlls] @@ -2767,6 +2768,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,Microsoft Shared\TextConv, 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\ADO,msado15.dll 11,,* [SystemIni]

1 0

Nikolay Sivov : ntdll/tests: Enable some more string API tests.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: a5bc81ebe55ad9cef8fdc41718608c7aa6da9d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5bc81ebe55ad9cef8fdc417… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 11:07:22 2019 +0300 ntdll/tests: Enable some more string API tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtlstr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 6f59e956c2..d2091859b8 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -597,6 +597,7 @@ static void test_RtlUpcaseUnicodeChar(void) } else { expected_upper_ch = ch; } +todo_wine_if(ch == 0xb5) ok(upper_ch == expected_upper_ch, "RtlUpcaseUnicodeChar('%c'[=0x%x]) has result '%c'[=0x%x], expected: '%c'[=0x%x]\n", ch, ch, upper_ch, upper_ch, expected_upper_ch, expected_upper_ch); @@ -646,6 +647,7 @@ static void test_RtlUpcaseUnicodeString(void) pRtlUpcaseUnicodeString(&result_str, &ascii_str, 0); for (i = 0; i <= 255; i++) { +todo_wine_if(ascii_str.Buffer[i] == 0xb5) ok(result_str.Buffer[i] == upper_str.Buffer[i], "RtlUpcaseUnicodeString works wrong: '%c'[=0x%x] is converted to '%c'[=0x%x], expected: '%c'[=0x%x]\n", ascii_str.Buffer[i], ascii_str.Buffer[i], @@ -2615,10 +2617,10 @@ START_TEST(rtlstr) test_RtlStringFromGUID(); test_RtlIsTextUnicode(); test_RtlCompareUnicodeString(); + test_RtlUpcaseUnicodeChar(); + test_RtlUpcaseUnicodeString(); if(0) { - test_RtlUpcaseUnicodeChar(); - test_RtlUpcaseUnicodeString(); test_RtlDowncaseUnicodeString(); } test_RtlHashUnicodeString();

1 0

Nikolay Sivov : oleaut32/typelib: No need to query self for supported interface.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: ae67aa8bbfacc5da94d23b187b63b86bee407466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae67aa8bbfacc5da94d23b18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 9 11:08:46 2019 +0300 oleaut32/typelib: No need to query self for supported interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index eb713a4e2f..6e8a18c9d7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -11180,7 +11180,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeIdldesc(ICreateTypeInfo2 *iface, static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - ITypeInfo *tinfo; + ITypeInfo2 *tinfo = &This->ITypeInfo2_iface; TLBFuncDesc *func_desc; UINT user_vft = 0, i, depth = 0; HRESULT hres = S_OK; @@ -11189,25 +11189,20 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) This->needs_layout = FALSE; - hres = ICreateTypeInfo2_QueryInterface(iface, &IID_ITypeInfo, (LPVOID*)&tinfo); - if (FAILED(hres)) - return hres; - if (This->typeattr.typekind == TKIND_INTERFACE) { ITypeInfo *inh; TYPEATTR *attr; HREFTYPE inh_href; - hres = ITypeInfo_GetRefTypeOfImplType(tinfo, 0, &inh_href); + hres = ITypeInfo2_GetRefTypeOfImplType(tinfo, 0, &inh_href); if (SUCCEEDED(hres)) { - hres = ITypeInfo_GetRefTypeInfo(tinfo, inh_href, &inh); + hres = ITypeInfo2_GetRefTypeInfo(tinfo, inh_href, &inh); if (SUCCEEDED(hres)) { hres = ITypeInfo_GetTypeAttr(inh, &attr); if (FAILED(hres)) { ITypeInfo_Release(inh); - ITypeInfo_Release(tinfo); return hres; } This->typeattr.cbSizeVft = attr->cbSizeVft; @@ -11231,17 +11226,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) } else if (hres == TYPE_E_ELEMENTNOTFOUND) { This->typeattr.cbSizeVft = 0; hres = S_OK; - } else { - ITypeInfo_Release(tinfo); + } else return hres; - } } else if (hres == TYPE_E_ELEMENTNOTFOUND) { This->typeattr.cbSizeVft = 0; hres = S_OK; - } else { - ITypeInfo_Release(tinfo); + } else return hres; - } } else if (This->typeattr.typekind == TKIND_DISPATCH) This->typeattr.cbSizeVft = 7 * This->pTypeLib->ptr_size; else @@ -11316,7 +11307,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut(ICreateTypeInfo2 *iface) } } - ITypeInfo_Release(tinfo); return hres; }

1 0