May 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Use the standard Interlocked* functions.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 39e4b788d6ca7d1e1ad045059ec7d088fde8a0db URL: https://source.winehq.org/git/wine.git/?a=commit;h=39e4b788d6ca7d1e1ad04505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:04 2020 +0200 ntdll: Use the standard Interlocked* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 20 +++++++++---------- dlls/ntdll/critsection.c | 28 +++++++++------------------ dlls/ntdll/file.c | 4 ++-- dlls/ntdll/large_int.c | 25 +++++++++++++++++++++++- dlls/ntdll/loader.c | 6 +++--- dlls/ntdll/locale.c | 2 +- dlls/ntdll/ntdll_misc.h | 4 ++++ dlls/ntdll/rtl.c | 45 ++++++++++++++++++++++++++++++------------- dlls/ntdll/server.c | 6 +++--- dlls/ntdll/signal_arm64.c | 4 ++-- dlls/ntdll/sync.c | 48 +++++++++++++++++++++++----------------------- dlls/ntdll/thread.c | 10 +++++----- dlls/ntdll/threadpool.c | 49 ++++++++++++++++++----------------------------- 13 files changed, 138 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39e4b788d6ca7d1e1ad0…

1 0

Nikolay Sivov : dwrite: Add a helper to collect gsub/gpos lookups.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 5eb742687defb83d7a792f1e5088c4a0e91f3ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb742687defb83d7a792f1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:33 2020 +0300 dwrite: Add a helper to collect gsub/gpos lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 81 +++++++++++++++++++++++++++++++++----------------- dlls/dwrite/shape.c | 6 ++-- 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b9db82d661..b5947a8960 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4054,43 +4054,41 @@ static int lookups_sorting_compare(const void *left, const void *right) return *(int *)left - *(int *)right; }; -void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, - unsigned int script_index, unsigned int language_index, const struct shaping_features *features) +static void opentype_layout_collect_lookups(struct scriptshaping_context *context, unsigned int script_index, + unsigned int language_index, const struct shaping_features *features, struct ot_gsubgpos_table *table, + struct lookups *lookups) { - WORD table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; - struct scriptshaping_cache *cache = context->cache; + UINT16 table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; const struct ot_feature_list *feature_list; - struct lookups lookups = { 0 }; unsigned int i, j, l; /* ScriptTable offset. */ - table_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + script_index * sizeof(struct ot_script_record) + - FIELD_OFFSET(struct ot_script_record, script)); + table_offset = table_read_be_word(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + script_index * sizeof(struct ot_script_record) + FIELD_OFFSET(struct ot_script_record, script)); if (!table_offset) return; if (language_index == ~0u) - langsys_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset); + langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset); else - langsys_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + + langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys) + language_index * sizeof(struct ot_langsys_record) + FIELD_OFFSET(struct ot_langsys_record, langsys)); - script_feature_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + - langsys_offset + FIELD_OFFSET(struct ot_langsys, feature_count)); + script_feature_count = table_read_be_word(&table->table, table->script_list + table_offset + langsys_offset + + FIELD_OFFSET(struct ot_langsys, feature_count)); if (!script_feature_count) return; - total_feature_count = table_read_be_word(&cache->gpos.table, cache->gpos.feature_list); + total_feature_count = table_read_be_word(&table->table, table->feature_list); if (!total_feature_count) return; - total_lookup_count = table_read_be_word(&cache->gpos.table, cache->gpos.lookup_list); + total_lookup_count = table_read_be_word(&table->table, table->lookup_list); if (!total_lookup_count) return; - feature_list = table_read_ensure(&cache->gpos.table, cache->gpos.feature_list, + feature_list = table_read_ensure(&table->table, table->feature_list, FIELD_OFFSET(struct ot_feature_list, features[total_feature_count])); if (!feature_list) return; @@ -4100,7 +4098,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, { for (j = 0; j < script_feature_count; ++j) { - WORD feature_index = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + + UINT16 feature_index = table_read_be_word(&table->table, table->script_list + table_offset + langsys_offset + FIELD_OFFSET(struct ot_langsys, feature_index[j])); if (feature_index >= total_feature_count) continue; @@ -4110,49 +4108,78 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, WORD feature_offset = GET_BE_WORD(feature_list->features[feature_index].offset); WORD lookup_count; - lookup_count = table_read_be_word(&cache->gpos.table, cache->gpos.feature_list + feature_offset + + lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + FIELD_OFFSET(struct ot_feature, lookup_count)); if (!lookup_count) continue; - if (!dwrite_array_reserve((void **)&lookups.indexes, &lookups.capacity, lookups.count + lookup_count, - sizeof(*lookups.indexes))) + if (!dwrite_array_reserve((void **)&lookups->indexes, &lookups->capacity, lookups->count + lookup_count, + sizeof(*lookups->indexes))) { - heap_free(lookups.indexes); return; } for (l = 0; l < lookup_count; ++l) { - WORD lookup_index = table_read_be_word(&cache->gpos.table, cache->gpos.feature_list + - feature_offset + FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); + UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); if (lookup_index >= total_lookup_count) continue; - lookups.indexes[lookups.count++] = lookup_index; + lookups->indexes[lookups->count++] = lookup_index; } } } } /* Sort lookups. */ - qsort(lookups.indexes, lookups.count, sizeof(*lookups.indexes), lookups_sorting_compare); + qsort(lookups->indexes, lookups->count, sizeof(*lookups->indexes), lookups_sorting_compare); +} - for (l = 0; l < lookups.count; ++l) +void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, + unsigned int language_index, const struct shaping_features *features) +{ + struct lookups lookups = { 0 }; + unsigned int i; + + opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); + + for (i = 0; i < lookups.count; ++i) { /* Skip duplicates. */ - if (l && lookups.indexes[l] == lookups.indexes[l - 1]) + if (i && lookups.indexes[i] == lookups.indexes[i - 1]) continue; - opentype_layout_apply_gpos_lookup(context, lookups.indexes[l]); + opentype_layout_apply_gpos_lookup(context, lookups.indexes[i]); } heap_free(lookups.indexes); } +static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, unsigned int first_glyph, + unsigned int glyph_count, int lookup_index) +{ +} + HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) { + struct lookups lookups = { 0 }; + unsigned int i; + + opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gsub, &lookups); + + for (i = 0; i < lookups.count; ++i) + { + /* Skip duplicates. */ + if (i && lookups.indexes[i] == lookups.indexes[i - 1]) + continue; + + opentype_layout_apply_gsub_lookup(context, 0, context->glyph_count, lookups.indexes[i]); + } + + heap_free(lookups.indexes); + return S_OK; } diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index dd7c45e3e7..533efe6cc7 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -189,7 +189,7 @@ const struct scriptshaping_ops default_shaping_ops = default_set_text_glyphs_props }; -static DWORD shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, +static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, unsigned int *script_index) { static const DWORD fallback_scripts[] = @@ -199,10 +199,10 @@ static DWORD shape_select_script(const struct scriptshaping_cache *cache, DWORD DWRITE_MAKE_OPENTYPE_TAG('l','a','t','n'), 0, }; - DWORD script; + unsigned int script; /* Passed scripts in ascending priority. */ - while (*scripts) + while (scripts && *scripts) { if ((script = opentype_layout_find_script(cache, kind, *scripts, script_index))) return script;

1 0

Zebediah Figura : quartz/tests: Add some tests for IVMRWindowlessControl9::SetVideoClippingWindow().
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: 218d2a5119002d9a89513830826c097785c64614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=218d2a5119002d9a89513830… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 22:51:59 2020 -0500 quartz/tests: Add some tests for IVMRWindowlessControl9::SetVideoClippingWindow(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index cb04d0b4aa..a098416bb2 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3191,6 +3191,68 @@ static void test_mixing_mode(void) DestroyWindow(window); } +static void test_clipping_window(void) +{ + VIDEOINFOHEADER vih = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 32, + .bmiHeader.biHeight = 16, + .bmiHeader.biBitCount = 32, + }; + AM_MEDIA_TYPE mt = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_RGB32, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(vih), + .pbFormat = (BYTE *)&vih, + }; + IBaseFilter *filter = create_vmr9(VMR9Mode_Windowless); + IVMRWindowlessControl9 *windowless_control; + IFilterGraph2 *graph = create_graph(); + struct testfilter source; + HWND window; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_QueryInterface(filter, &IID_IVMRWindowlessControl9, (void **)&windowless_control); + IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + testfilter_init(&source); + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"vmr9"); + window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create a window.\n"); + + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, (HWND)0xdeadbeef); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IVMRWindowlessControl9_Release(windowless_control); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + DestroyWindow(window); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3221,6 +3283,7 @@ START_TEST(vmr9) test_allocate_surface_helper(); test_renderless_formats(); test_mixing_mode(); + test_clipping_window(); CoUninitialize(); }

1 0

Zebediah Figura : advapi32: Move string SID/SD conversion functions to sechost.
by Alexandre Julliard May 4, 2020

May 4, 2020

Module: wine Branch: master Commit: a67af66aead0cd19e80186ab635c2b698c58aff2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a67af66aead0cd19e80186ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 16:51:40 2020 -0500 advapi32: Move string SID/SD conversion functions to sechost. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 8 +- dlls/advapi32/security.c | 1314 ------------------------------------------- dlls/sechost/Makefile.in | 1 + dlls/sechost/sechost.spec | 8 +- dlls/sechost/security.c | 1247 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 1256 insertions(+), 1322 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a67af66aead0cd19e801…

1 0

Nikolay Sivov : comctl32/ipaddress: Use wide string literals.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: e9e8b77d2d34f6a2f7f1ef5a37048528724b6bca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9e8b77d2d34f6a2f7f1ef5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:41:59 2020 +0300 comctl32/ipaddress: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index d88cd88f31..c75a108565 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -59,8 +59,7 @@ typedef struct IPPART_INFO Part[4]; } IPADDRESS_INFO; -static const WCHAR IP_SUBCLASS_PROP[] = - { 'C', 'C', 'I', 'P', '3', '2', 'S', 'u', 'b', 'c', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 }; +static const WCHAR IP_SUBCLASS_PROP[] = L"CCIP32SubclassInfo"; #define POS_DEFAULT 0 #define POS_LEFT 1 @@ -72,8 +71,6 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static void IPADDRESS_UpdateText (const IPADDRESS_INFO *infoPtr) { - static const WCHAR zero[] = {'0', 0}; - static const WCHAR dot[] = {'.', 0}; WCHAR field[4]; WCHAR ip[16]; INT i; @@ -85,9 +82,9 @@ static void IPADDRESS_UpdateText (const IPADDRESS_INFO *infoPtr) lstrcatW(ip, field); else /* empty edit treated as zero */ - lstrcatW(ip, zero); + lstrcatW(ip, L"0"); if (i != 3) - lstrcatW(ip, dot); + lstrcatW(ip, L"."); } SetWindowTextW(infoPtr->Self, ip); @@ -140,7 +137,6 @@ static int IPADDRESS_GetPartIndex(const IPADDRESS_INFO *infoPtr, HWND hwnd) static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) { - static const WCHAR dotW[] = { '.', 0 }; RECT rect, rcPart; COLORREF bgCol, fgCol; HTHEME theme; @@ -193,9 +189,9 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) rect.right = rcPart.left; if (theme) - DrawThemeText(theme, hdc, EP_EDITTEXT, state, dotW, 1, DT_SINGLELINE | DT_CENTER | DT_BOTTOM, 0, &rect); + DrawThemeText(theme, hdc, EP_EDITTEXT, state, L".", 1, DT_SINGLELINE | DT_CENTER | DT_BOTTOM, 0, &rect); else - DrawTextW(hdc, dotW, 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); + DrawTextW(hdc, L".", 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); } if (theme) @@ -360,20 +356,18 @@ static BOOL IPADDRESS_SetRange (IPADDRESS_INFO *infoPtr, int index, WORD range) static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) { - static const WCHAR nil[] = { 0 }; int i; TRACE("\n"); for (i = 0; i < 4; i++) - SetWindowTextW (infoPtr->Part[i].EditHwnd, nil); + SetWindowTextW (infoPtr->Part[i].EditHwnd, L""); } static LRESULT IPADDRESS_SetAddress (const IPADDRESS_INFO *infoPtr, DWORD ip_address) { WCHAR buf[20]; - static const WCHAR fmt[] = { '%', 'd', 0 }; int i; TRACE("\n"); @@ -382,7 +376,7 @@ static LRESULT IPADDRESS_SetAddress (const IPADDRESS_INFO *infoPtr, DWORD ip_add const IPPART_INFO* part = &infoPtr->Part[i]; int value = ip_address & 0xff; if ( (value >= part->LowerLimit) && (value <= part->UpperLimit) ) { - wsprintfW (buf, fmt, value); + wsprintfW (buf, L"%d", value); SetWindowTextW (part->EditHwnd, buf); IPADDRESS_Notify (infoPtr, EN_CHANGE); } @@ -405,7 +399,6 @@ static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) static BOOL IPADDRESS_ConstrainField (const IPADDRESS_INFO *infoPtr, int currentfield) { - static const WCHAR fmt[] = { '%', 'd', 0 }; const IPPART_INFO *part; int curValue, newValue; WCHAR field[10]; @@ -428,7 +421,7 @@ static BOOL IPADDRESS_ConstrainField (const IPADDRESS_INFO *infoPtr, int current if (newValue == curValue) return FALSE; - wsprintfW (field, fmt, newValue); + wsprintfW (field, L"%d", newValue); TRACE(" field=%s\n", debugstr_w(field)); return SetWindowTextW (part->EditHwnd, field); }

1 0

Nikolay Sivov : comctl32/monthcal: Use wide string literals.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: b2843f218f485bfe2ad8d67f47fb6772dd70b8aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2843f218f485bfe2ad8d67f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:41:58 2020 +0300 comctl32/monthcal: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1de13dab36..98c682df33 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -142,7 +142,7 @@ typedef struct SIZE dim; /* [cx,cy] - dimensions of calendars matrix, row/column count */ } MONTHCAL_INFO, *LPMONTHCAL_INFO; -static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; +static const WCHAR themeClass[] = L"Scrollbar"; /* empty SYSTEMTIME const */ static const SYSTEMTIME st_null; @@ -782,7 +782,6 @@ static void MONTHCAL_CircleDay(const MONTHCAL_INFO *infoPtr, HDC hdc, static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEMTIME *st, int bold, const PAINTSTRUCT *ps) { - static const WCHAR fmtW[] = { '%','d',0 }; WCHAR buf[10]; RECT r, r_temp; COLORREF oldCol = 0; @@ -811,7 +810,7 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM SelectObject(hdc, bold ? infoPtr->hBoldFont : infoPtr->hFont); old_bkmode = SetBkMode(hdc, TRANSPARENT); - wsprintfW(buf, fmtW, st->wDay); + wsprintfW(buf, L"%d", st->wDay); DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE ); SetBkMode(hdc, old_bkmode); @@ -862,12 +861,6 @@ static void MONTHCAL_PaintButton(MONTHCAL_INFO *infoPtr, HDC hdc, enum nav_direc /* paint a title with buttons and month/year string */ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { - static const WCHAR mmmmW[] = {'M','M','M','M',0}; - static const WCHAR mmmW[] = {'M','M','M',0}; - static const WCHAR mmW[] = {'M','M',0}; - static const WCHAR fmtyearW[] = {'%','l','d',0}; - static const WCHAR fmtmmW[] = {'%','0','2','d',0}; - static const WCHAR fmtmW[] = {'%','d',0}; RECT *title = &infoPtr->calendars[calIdx].title; const SYSTEMTIME *st = &infoPtr->calendars[calIdx].month; WCHAR monthW[80], strW[80], fmtW[80], yearW[6] /* valid year range is 1601-30827 */; @@ -887,18 +880,18 @@ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRU DrawTextW(hdc, strW, lstrlenW(strW), title, DT_CENTER | DT_VCENTER | DT_SINGLELINE); GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SYEARMONTH, fmtW, ARRAY_SIZE(fmtW)); - wsprintfW(yearW, fmtyearW, st->wYear); + wsprintfW(yearW, L"%ld", st->wYear); /* month is trickier as it's possible to have different format pictures, we'll test for M, MM, MMM, and MMMM */ - if (wcsstr(fmtW, mmmmW)) + if (wcsstr(fmtW, L"MMMM")) GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+st->wMonth-1, monthW, ARRAY_SIZE(monthW)); - else if (wcsstr(fmtW, mmmW)) + else if (wcsstr(fmtW, L"MMM")) GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVMONTHNAME1+st->wMonth-1, monthW, ARRAY_SIZE(monthW)); - else if (wcsstr(fmtW, mmW)) - wsprintfW(monthW, fmtmmW, st->wMonth); + else if (wcsstr(fmtW, L"MM")) + wsprintfW(monthW, L"%02d", st->wMonth); else - wsprintfW(monthW, fmtmW, st->wMonth); + wsprintfW(monthW, L"%d", st->wMonth); /* update hit boxes */ yearoffset = 0; @@ -946,7 +939,6 @@ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRU static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { const SYSTEMTIME *date = &infoPtr->calendars[calIdx].month; - static const WCHAR fmt_weekW[] = { '%','d',0 }; INT mindays, weeknum, weeknum1, startofprescal; INT i, prev_month; SYSTEMTIME st; @@ -1032,15 +1024,15 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con for(i = 0; i < 6; i++) { if((i == 0) && (weeknum > 50)) { - wsprintfW(buf, fmt_weekW, weeknum); + wsprintfW(buf, L"%d", weeknum); weeknum = 0; } else if((i == 5) && (weeknum > 47)) { - wsprintfW(buf, fmt_weekW, 1); + wsprintfW(buf, L"%d", 1); } else - wsprintfW(buf, fmt_weekW, weeknum + i); + wsprintfW(buf, L"%d", weeknum + i); DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE); OffsetRect(&r, 0, infoPtr->height_increment); @@ -1056,7 +1048,6 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con /* bottom today date */ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { - static const WCHAR fmt_todayW[] = { '%','s',' ','%','s',0 }; WCHAR buf_todayW[30], buf_dateW[20], buf[80]; RECT text_rect, box_rect; HFONT old_font; @@ -1075,7 +1066,7 @@ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, cons old_font = SelectObject(hdc, infoPtr->hBoldFont); SetTextColor(hdc, infoPtr->colors[MCSC_TEXT]); - wsprintfW(buf, fmt_todayW, buf_todayW, buf_dateW); + wsprintfW(buf, L"%s %s", buf_todayW, buf_dateW); DrawTextW(hdc, buf, -1, &text_rect, DT_CALCRECT | DT_LEFT | DT_VCENTER | DT_SINGLELINE); DrawTextW(hdc, buf, -1, &text_rect, DT_LEFT | DT_VCENTER | DT_SINGLELINE); @@ -2484,7 +2475,6 @@ MONTHCAL_SetFocus(const MONTHCAL_INFO *infoPtr) /* sets the size information */ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) { - static const WCHAR O0W[] = { '0','0',0 }; RECT *title=&infoPtr->calendars[0].title; RECT *prev=&infoPtr->titlebtnprev; RECT *next=&infoPtr->titlebtnnext; @@ -2526,8 +2516,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) } else /* locale independent fallback on failure */ { - static const WCHAR sunW[] = { 'S','u','n' }; - GetTextExtentPoint32W(hdc, sunW, ARRAY_SIZE(sunW), &sz); + GetTextExtentPoint32W(hdc, L"Sun", 3, &sz); day_width = sz.cx; break; } @@ -2537,7 +2526,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) /* recalculate the height and width increments and offsets */ size.cx = 0; - GetTextExtentPoint32W(hdc, O0W, 2, &size); + GetTextExtentPoint32W(hdc, L"00", 2, &size); /* restore the originally selected font */ SelectObject(hdc, font);

1 0

Alistair Leslie-Hughes : dmime: Parse lyric track data.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: d1f858e03da732c621504f90e349d5170ca3336e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1f858e03da732c621504f90… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 30 16:41:16 2020 +1000 dmime: Parse lyric track data. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/lyricstrack.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 49f44f52a3..b45041ca81 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -37,6 +37,11 @@ static inline IDirectMusicLyricsTrack *impl_from_IDirectMusicTrack8(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicLyricsTrack, IDirectMusicTrack8_iface); } +static inline IDirectMusicLyricsTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicLyricsTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI lyrics_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { @@ -236,10 +241,94 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { lyrics_track_Join }; +static HRESULT parse_lyrics_track_events(IDirectMusicLyricsTrack *This, IStream *stream, + struct chunk_entry *lyric) +{ + struct chunk_entry chunk = {.parent = lyric}; + HRESULT hr; + DMUS_IO_LYRICSTRACK_EVENTHEADER header; + WCHAR name[256]; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(lyric)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACKEVENT_LIST) { + struct chunk_entry child = {.parent = &chunk}; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_LYRICSTRACKEVENTHEADER_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_LYRICSTRACK_EVENTHEADER\n"); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - dwTimingFlags 0x%08x\n", header.dwTimingFlags); + TRACE(" - lTimeLogical %d\n", header.lTimeLogical); + TRACE(" - lTimePhysical %d\n", header.lTimePhysical); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_LYRICSTRACKEVENTTEXT_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &name, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_FOURCC_LYRICSTRACKEVENTTEXT_CHUNK\n"); + TRACE(" - name %s\n", debugstr_w(name)); + } + } + + return SUCCEEDED(hr) ? S_OK : hr; +} + +static HRESULT parse_lyricstrack_list(IDirectMusicLyricsTrack *This, IStream *stream, struct chunk_entry *lyric) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = lyric}; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(lyric)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACKEVENTS_LIST) + hr = parse_lyrics_track_events(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI lyrics_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicLyricsTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACK_LIST) + hr = parse_lyricstrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = {

1 0

Nikolay Sivov : comctl32/rebar: Use wide string literals.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: 4a0c440d30e6a089b0a6ba5bd297c35c2004b9a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a0c440d30e6a089b0a6ba5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:01 2020 +0300 comctl32/rebar: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 6bca2f1818..af35008b69 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -302,8 +302,7 @@ static const char * const band_maskname[] = { "RBBIM_CHEVRONSTATE", /* 0x00002000 */ NULL }; - -static const WCHAR themeClass[] = { 'R','e','b','a','r',0 }; +static const WCHAR themeClass[] = L"Rebar"; static CHAR * REBAR_FmtStyle(char *buffer, UINT style) @@ -1010,7 +1009,6 @@ REBAR_ForceResize (REBAR_INFO *infoPtr) static VOID REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus) { - static const WCHAR strComboBox[] = { 'C','o','m','b','o','B','o','x',0 }; REBAR_BAND *lpBand; WCHAR szClassName[40]; UINT i; @@ -1047,7 +1045,7 @@ REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus) } GetClassNameW (lpBand->hwndChild, szClassName, ARRAY_SIZE(szClassName)); - if (!lstrcmpW (szClassName, strComboBox) || + if (!lstrcmpW (szClassName, WC_COMBOBOXW) || !lstrcmpW (szClassName, WC_COMBOBOXEXW)) { INT nEditHeight, yPos; RECT rc;

1 0

Gijs Vermeulen : wineqtdecoder: Do not use wide string literals to fix warning.
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: 49f85ecbc4e6faafc1d63db0927aa4ef6d0f1a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49f85ecbc4e6faafc1d63db0… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 1 19:36:22 2020 +0200 wineqtdecoder: Do not use wide string literals to fix warning. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtvdecoder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 031b08e1de..a86cd432c2 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -602,6 +602,8 @@ static const struct strmbase_filter_ops filter_ops = HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) { + static const WCHAR inW[] = { 'I','n',0 }; + static const WCHAR outW[] = { 'O','u','t',0 }; QTVDecoderImpl *object; HRESULT hr; ISeekingPassThru *passthrough; @@ -614,9 +616,9 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) InitializeCriticalSection(&object->stream_cs); object->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTVDecoderImpl.stream_cs"); - strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, inW, &sink_ops, NULL); - strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + strmbase_source_init(&object->source, &object->filter, outW, &source_ops); if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown *)&object->source.pin.IPin_iface, CLSCTX_INPROC_SERVER,

1 0

Gijs Vermeulen : ntdll: Remove unused function fast_wait_cv().
by Alexandre Julliard May 1, 2020

May 1, 2020

Module: wine Branch: master Commit: d8ec1fb894bd8838ad93f244fadb2ee67a61b2e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8ec1fb894bd8838ad93f244… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 1 19:36:24 2020 +0200 ntdll: Remove unused function fast_wait_cv(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index fbfb8f893e..2aed1c78e7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2306,11 +2306,6 @@ static NTSTATUS fast_sleep_cs_cv( RTL_CONDITION_VARIABLE *variable, return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) -{ - return STATUS_NOT_IMPLEMENTED; -} - static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) { return STATUS_NOT_IMPLEMENTED;

1 0