November 2020 - Wine-Commits

Nikolay Sivov : mfmediaengine: Keep "preload" property.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: 113a4c4fa0ab266094ba44f53f79702a3cae3e00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=113a4c4fa0ab266094ba44f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 2 15:54:18 2020 +0300 mfmediaengine: Keep "preload" property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 22 ++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 9 ++++++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index d93e2b2f38c..64f0ae6d2a1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -87,6 +87,7 @@ struct media_engine MF_MEDIA_ENGINE_ERR error_code; HRESULT extended_code; MF_MEDIA_ENGINE_READY ready_state; + MF_MEDIA_ENGINE_PRELOAD preload; IMFMediaSession *session; IMFSourceResolver *resolver; BSTR current_source; @@ -717,16 +718,29 @@ static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface) static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + MF_MEDIA_ENGINE_PRELOAD preload; + + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + preload = engine->preload; + LeaveCriticalSection(&engine->cs); - return MF_MEDIA_ENGINE_PRELOAD_NONE; + return preload; } static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_ENGINE_PRELOAD preload) { - FIXME("(%p, %d): stub.\n", iface, preload); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, preload); + + EnterCriticalSection(&engine->cs); + engine->preload = preload; + LeaveCriticalSection(&engine->cs); + + return S_OK; } static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **buffered) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 660e5b95331..0394bcf6a0e 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -265,17 +265,20 @@ todo_wine /* Preload mode is still accessible. */ state = IMFMediaEngine_GetPreload(media_engine); -todo_wine ok(!state, "Unexpected state %d.\n", state); hr = IMFMediaEngine_SetPreload(media_engine, MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetPreload(media_engine); -todo_wine ok(state == MF_MEDIA_ENGINE_PRELOAD_AUTOMATIC, "Unexpected state %d.\n", state); + hr = IMFMediaEngine_SetPreload(media_engine, 100); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + state = IMFMediaEngine_GetPreload(media_engine); + ok(state == 100, "Unexpected state %d.\n", state); + hr = IMFMediaEngine_GetBuffered(media_engine, &time_range); todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mfplat: Implement MFFrameRateToAverageTimePerFrame().
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: abb8852077c6f74ae73ab430f3b2b5e7f42ef0df URL: https://source.winehq.org/git/wine.git/?a=commit;h=abb8852077c6f74ae73ab430… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 2 15:27:50 2020 +0300 mfplat: Implement MFFrameRateToAverageTimePerFrame(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 0217237d85a..fcaef110038 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3164,3 +3164,50 @@ HRESULT WINAPI MFConvertColorInfoToDXVA(DWORD *dxva_info, const MFVIDEOFORMAT *f return S_OK; } + +struct frame_rate +{ + UINT64 rate; + UINT64 frame_time; +}; + +static int __cdecl frame_rate_compare(const void *a, const void *b) +{ + const UINT64 *rate = a; + const struct frame_rate *known_rate = b; + return *rate == known_rate->rate ? 0 : ( *rate < known_rate->rate ? 1 : -1 ); +} + +/*********************************************************************** + * MFFrameRateToAverageTimePerFrame (mfplat.@) + */ +HRESULT WINAPI MFFrameRateToAverageTimePerFrame(UINT32 numerator, UINT32 denominator, UINT64 *avgframetime) +{ + static const struct frame_rate known_rates[] = + { +#define KNOWN_RATE(n,d,ft) { ((UINT64)n << 32) | d, ft } + KNOWN_RATE(60000, 1001, 166833), + KNOWN_RATE(30000, 1001, 333667), + KNOWN_RATE(24000, 1001, 417188), + KNOWN_RATE(60, 1, 166667), + KNOWN_RATE(50, 1, 200000), + KNOWN_RATE(30, 1, 333333), + KNOWN_RATE(25, 1, 400000), + KNOWN_RATE(24, 1, 416667), +#undef KNOWN_RATE + }; + UINT64 rate = ((UINT64)numerator << 32) | denominator; + const struct frame_rate *entry; + + TRACE("%u, %u, %p.\n", numerator, denominator, avgframetime); + + if ((entry = bsearch(&rate, known_rates, ARRAY_SIZE(known_rates), sizeof(*known_rates), + frame_rate_compare))) + { + *avgframetime = entry->frame_time; + } + else + *avgframetime = numerator ? denominator * (UINT64)10000000 / numerator : 0; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 80064e1980e..36e009c2db9 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -90,7 +90,7 @@ @ stub MFEndGetHostByName @ stdcall MFEndRegisterWorkQueueWithMMCSS(ptr ptr) rtworkq.RtwqEndRegisterWorkQueueWithMMCSS @ stdcall MFEndUnregisterWorkQueueWithMMCSS(ptr) rtworkq.RtwqEndUnregisterWorkQueueWithMMCSS -@ stub MFFrameRateToAverageTimePerFrame +@ stdcall MFFrameRateToAverageTimePerFrame(long long ptr) @ stub MFFreeAdaptersAddresses @ stub MFGetAdaptersAddresses @ stdcall MFGetAttributesAsBlob(ptr ptr long) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a0789ee6b2c..a6c8a10f777 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5865,6 +5865,52 @@ static void test_MFCreateTrackedSample(void) IMFTrackedSample_Release(tracked_sample); } +static void test_MFFrameRateToAverageTimePerFrame(void) +{ + static const struct frame_rate_test + { + unsigned int numerator; + unsigned int denominator; + UINT64 avgtime; + } frame_rate_tests[] = + { + { 60000, 1001, 166833 }, + { 30000, 1001, 333667 }, + { 24000, 1001, 417188 }, + { 60, 1, 166667 }, + { 30, 1, 333333 }, + { 50, 1, 200000 }, + { 25, 1, 400000 }, + { 24, 1, 416667 }, + + { 39, 1, 256410 }, + { 120, 1, 83333 }, + }; + unsigned int i; + UINT64 avgtime; + HRESULT hr; + + avgtime = 1; + hr = MFFrameRateToAverageTimePerFrame(0, 0, &avgtime); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!avgtime, "Unexpected frame time.\n"); + + avgtime = 1; + hr = MFFrameRateToAverageTimePerFrame(0, 1001, &avgtime); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!avgtime, "Unexpected frame time.\n"); + + for (i = 0; i < ARRAY_SIZE(frame_rate_tests); ++i) + { + avgtime = 0; + hr = MFFrameRateToAverageTimePerFrame(frame_rate_tests[i].numerator, + frame_rate_tests[i].denominator, &avgtime); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(avgtime == frame_rate_tests[i].avgtime, "%u: unexpected frame time %s, expected %s.\n", + i, wine_dbgstr_longlong(avgtime), wine_dbgstr_longlong(frame_rate_tests[i].avgtime)); + } +} + START_TEST(mfplat) { char **argv; @@ -5923,6 +5969,7 @@ START_TEST(mfplat) test_MFCreateMFVideoFormatFromMFMediaType(); test_MFCreateDXSurfaceBuffer(); test_MFCreateTrackedSample(); + test_MFFrameRateToAverageTimePerFrame(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 25fced1c7d6..8661b41fc4e 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -526,6 +526,7 @@ HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMA HRESULT WINAPI MFEndCreateFile(IMFAsyncResult *result, IMFByteStream **stream); HRESULT WINAPI MFEndRegisterWorkQueueWithMMCSS(IMFAsyncResult *result, DWORD *taskid); HRESULT WINAPI MFEndUnregisterWorkQueueWithMMCSS(IMFAsyncResult *result); +HRESULT WINAPI MFFrameRateToAverageTimePerFrame(UINT32 numerator, UINT32 denominator, UINT64 *avgtime); void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size);

1 0

Michael Stefaniuc : appwiz.cpl: Use zero terminated wide-char strings.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: 7d26ac0119ac9ad4c3300ffe6f36da71b3851d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d26ac0119ac9ad4c3300ffe… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 1 23:31:59 2020 +0100 appwiz.cpl: Use zero terminated wide-char strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index dd53d9e282e..67d61ea0d22 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -598,21 +598,18 @@ static IInternetBindInfo InstallCallbackBindInfo = { &InstallCallbackBindInfoVtb static void append_url_params( WCHAR *url ) { - static const WCHAR arch_formatW[] = {'?','a','r','c','h','='}; - static const WCHAR v_formatW[] = {'&','v','='}; - static const WCHAR winevW[] = {'&','w','i','n','e','v','='}; DWORD size = INTERNET_MAX_URL_LENGTH * sizeof(WCHAR); DWORD len = lstrlenW(url); - memcpy(url+len, arch_formatW, sizeof(arch_formatW)); - len += ARRAY_SIZE(arch_formatW); + lstrcpyW(url+len, L"?arch="); + len += lstrlenW(L"?arch="); len += MultiByteToWideChar(CP_ACP, 0, GECKO_ARCH, sizeof(GECKO_ARCH), url+len, size/sizeof(WCHAR)-len)-1; - memcpy(url+len, v_formatW, sizeof(v_formatW)); - len += ARRAY_SIZE(v_formatW); + lstrcpyW(url+len, L"&v="); + len += lstrlenW(L"&v="); len += MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len)-1; - memcpy(url+len, winevW, sizeof(winevW)); - len += ARRAY_SIZE(winevW); + lstrcpyW(url+len, L"&winev="); + len += lstrlenW(L"&winev="); MultiByteToWideChar(CP_ACP, 0, wine_get_version(), -1, url+len, size/sizeof(WCHAR)-len); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: c438a62ddf2ede2b323159ca052e545f8c0d5831 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c438a62ddf2ede2b323159ca… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Oct 30 23:36:22 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index 620e3e21b9b..3853dcb229c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-10-29 23:45+0200\n" +"PO-Revision-Date: 2020-10-30 23:36+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9902,16 +9902,12 @@ msgid "Iran Daylight Time" msgstr "Irano vasaros laikas" #: dlls/tzres/tzres.rc:200 -#, fuzzy -#| msgid "Haiti Standard Time" msgid "Saint Pierre Standard Time" -msgstr "Haičio juostinis laikas" +msgstr "Sen Pjero juostinis laikas" #: dlls/tzres/tzres.rc:201 -#, fuzzy -#| msgid "Haiti Daylight Time" msgid "Saint Pierre Daylight Time" -msgstr "Haičio vasaros laikas" +msgstr "Sen Pjero vasaros laikas" #: dlls/tzres/tzres.rc:166 msgid "Namibia Standard Time" @@ -10002,16 +9998,12 @@ msgid "Azerbaijan Daylight Time" msgstr "Azerbaidžano vasaros laikas" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Magadan Standard Time" msgid "Magallanes Standard Time" -msgstr "Magadano juostinis laikas" +msgstr "Magelano juostinis laikas" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Magadan Daylight Time" msgid "Magallanes Daylight Time" -msgstr "Magadano vasaros laikas" +msgstr "Magelano vasaros laikas" #: dlls/tzres/tzres.rc:202 msgid "Samoa Standard Time"

1 0

Huw Davies : riched20: Return a row ptr from the row from row number function.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: fe2fd44e0a30c519c3b650f69f0e94a6212cc7b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe2fd44e0a30c519c3b650f6… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 2 08:23:17 2020 +0000 riched20: Return a row ptr from the row from row number function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 48 +++++++++++++++++++++++++++--------------------- dlls/riched20/editor.h | 2 +- dlls/riched20/row.c | 42 +++++++++++++++--------------------------- 3 files changed, 43 insertions(+), 49 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 620cb4fedcb..c01bd873634 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4237,26 +4237,32 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_GETLINE: { - ME_DisplayItem *run; + ME_Row *row; + ME_Run *run; const unsigned int nMaxChars = *(WORD *) lParam; unsigned int nCharsLeft = nMaxChars; char *dest = (char *) lParam; BOOL wroteNull = FALSE; + ME_Cursor start, end; TRACE("EM_GETLINE: row=%d, nMaxChars=%d (%s)\n", (int) wParam, nMaxChars, unicode ? "Unicode" : "Ansi"); - run = ME_FindRowWithNumber(editor, wParam); - if (run == NULL) - return 0; + row = row_from_row_number( editor, wParam ); + if (row == NULL) return 0; - while (nCharsLeft && (run = ME_FindItemFwd(run, diRunOrStartRow)) - && run->type == diRun) + row_first_cursor( row, &start ); + row_end_cursor( row, &end, TRUE ); + run = &start.pRun->member.run; + while (nCharsLeft) { - WCHAR *str = get_text( &run->member.run, 0 ); + WCHAR *str; unsigned int nCopy; + int ofs = (run == &start.pRun->member.run) ? start.nOffset : 0; + int len = (run == &end.pRun->member.run) ? end.nOffset : run->len; - nCopy = min(nCharsLeft, run->member.run.len); + str = get_text( run, ofs ); + nCopy = min( nCharsLeft, len ); if (unicode) memcpy(dest, str, nCopy * sizeof(WCHAR)); @@ -4265,6 +4271,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, nCharsLeft, NULL, NULL); dest += nCopy * (unicode ? sizeof(WCHAR) : 1); nCharsLeft -= nCopy; + if (run == &end.pRun->member.run) break; + run = row_next_run( row, run ); } /* append line termination, space allowing */ @@ -4321,20 +4329,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_LINEINDEX: { - ME_DisplayItem *item, *para; - int nCharOfs; + ME_Row *row; + ME_Cursor cursor; + int ofs; - if (wParam == -1) - item = ME_FindItemBack(editor->pCursors[0].pRun, diStartRow); - else - item = ME_FindRowWithNumber(editor, wParam); - if (!item) - return -1; - para = ME_GetParagraph(item); - item = ME_FindItemFwd(item, diRun); - nCharOfs = para->member.para.nCharOfs + item->member.run.nCharOfs; - TRACE("EM_LINEINDEX: nCharOfs==%d\n", nCharOfs); - return nCharOfs; + if (wParam == -1) row = row_from_cursor( editor->pCursors ); + else row = row_from_row_number( editor, wParam ); + if (!row) return -1; + + row_first_cursor( row, &cursor ); + ofs = ME_GetCursorOfs( &cursor ); + TRACE( "EM_LINEINDEX: nCharOfs==%d\n", ofs ); + return ofs; } case EM_LINELENGTH: { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 5f93aa39db9..d0d34ac5afc 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -115,11 +115,11 @@ void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) DECLSPEC void row_first_cursor( ME_Row *row, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; +ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) DECLSPEC_HIDDEN; ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) DECLSPEC_HIDDEN; /* ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item); */ -ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) DECLSPEC_HIDDEN; int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; static inline ME_DisplayItem *row_get_di( ME_Row *row ) { diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index ba082244cfc..2c77962b56b 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -82,39 +82,27 @@ void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) cursor->nOffset = (item->type == diStartRow || include_eop) ? cursor->pRun->member.run.len : 0; } -/* I'm sure these functions would simplify some code in caret ops etc, - * I just didn't remember them when I wrote that code - */ - ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) { return ME_FindItemBackOrHere(item, diStartRow); } -/* -ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item) { - ME_DisplayItem *item2 = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); - if (!item2) return NULL; - return ME_FindItemBack(item, diRun); -} -*/ - -ME_DisplayItem * -ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) +ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) { - ME_DisplayItem *item = ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph); - int nCount = 0; + ME_Paragraph *para = editor_first_para( editor ); + ME_Row *row; + int count = 0; - while (item->type == diParagraph && - nCount + item->member.para.nRows <= nRow) - { - nCount += item->member.para.nRows; - item = item->member.para.next_para; - } - if (item->type != diParagraph) - return NULL; - for (item = ME_FindItemFwd(item, diStartRow); item && nCount < nRow; nCount++) - item = ME_FindItemFwd(item, diStartRow); - return item; + while (para_next( para ) && count + para->nRows <= row_num) + { + count += para->nRows; + para = para_next( para ); + } + if (!para_next( para )) return NULL; + + for (row = para_first_row( para ); row && count < row_num; count++) + row = row_next( row ); + + return row; }

1 0

Huw Davies : riched20: Use run ptrs in the EM_GETLINECOUNT handler.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: d55bc24001b3354150e69184177070b0277649f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d55bc24001b3354150e69184… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 2 08:23:18 2020 +0000 riched20: Use run ptrs in the EM_GETLINECOUNT handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c01bd873634..66f6bd5e114 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4291,27 +4291,24 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_GETLINECOUNT: { - ME_DisplayItem *item = editor->pBuffer->pLast; - int nRows = editor->total_rows; - ME_DisplayItem *prev_para = NULL, *last_para = NULL; - - last_para = ME_FindItemBack(item, diRun); - prev_para = ME_FindItemBack(last_para, diRun); - assert(last_para); - assert(last_para->member.run.nFlags & MERF_ENDPARA); - if (editor->bEmulateVersion10 && prev_para && - last_para->member.run.nCharOfs == 0 && - prev_para->member.run.len == 1 && - *get_text( &prev_para->member.run, 0 ) == '\r') + int count = editor->total_rows; + ME_Run *prev_run, *last_run; + + last_run = para_end_run( para_prev( editor_end_para( editor ) ) ); + prev_run = run_prev_all_paras( last_run ); + + if (editor->bEmulateVersion10 && prev_run && last_run->nCharOfs == 0 && + prev_run->len == 1 && *get_text( prev_run, 0 ) == '\r') { /* In 1.0 emulation, the last solitary \r at the very end of the text (if one exists) is NOT a line break. FIXME: this is an ugly hack. This should have a more regular model. */ - nRows--; + count--; } - TRACE("EM_GETLINECOUNT: nRows==%d\n", nRows); - return max(1, nRows); + count = max(1, count); + TRACE("EM_GETLINECOUNT: count==%d\n", count); + return count; } case EM_LINEFROMCHAR: {

1 0

Michael Stefaniuc : appwiz.cpl: Use wide-char string literals.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: dcf7a1f69eaa4d45f7a2ab10fbd0740f17d745c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcf7a1f69eaa4d45f7a2ab10… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 1 23:31:58 2020 +0100 appwiz.cpl: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 52 +++++++++----------------- dlls/appwiz.cpl/appwiz.c | 96 ++++++++++++++++-------------------------------- 2 files changed, 48 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dcf7a1f69eaa4d45f7a2…

1 0

Alexandre Julliard : gdi32: Add a helper function to create a font from a face.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: c9b21a57075d01297b320def739b85dd2c6ef100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9b21a57075d01297b320def… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 31 15:58:54 2020 +0100 gdi32: Add a helper function to create a font from a face. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 31 +++++++++++++++++++++---------- dlls/gdi32/freetype.c | 19 +++---------------- dlls/gdi32/gdi_private.h | 3 ++- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5cca897fd40..abc202afcc3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1016,7 +1016,7 @@ static void free_font_handle( DWORD handle ) } } -struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) +static struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) { UINT len = file ? strlenW(file) : 0; struct gdi_font *font = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -1083,6 +1083,25 @@ void set_gdi_font_names( struct gdi_font *font, const WCHAR *family_name, const font->otm.otmpFaceName = (char *)strdupW( full_name ); } +struct gdi_font *create_gdi_font( const struct gdi_font_face *face, const WCHAR *family_name, + const LOGFONTW *lf ) +{ + struct gdi_font *font; + + if (!(font = alloc_gdi_font( face->file, face->data_ptr, face->data_size ))) return NULL; + font->fs = face->fs; + font->lf = *lf; + font->fake_italic = (lf->lfItalic && !(face->ntmFlags & NTM_ITALIC)); + font->fake_bold = (lf->lfWeight > 550 && !(face->ntmFlags & NTM_BOLD)); + font->scalable = face->scalable; + font->face_index = face->face_index; + font->ntmFlags = face->ntmFlags; + font->aa_flags = HIWORD( face->flags ); + if (!family_name) family_name = face->family->family_name; + set_gdi_font_names( font, family_name, face->style_name, face->full_name ); + return font; +} + struct glyph_metrics { GLYPHMETRICS gm; @@ -1490,22 +1509,14 @@ static void add_child_font( struct gdi_font *font, const WCHAR *family_name ) } if (!best_face) return; - child = alloc_gdi_font( best_face->file, best_face->data_ptr, best_face->data_size ); - child->fake_italic = italic && !(best_face->ntmFlags & NTM_ITALIC); - child->fake_bold = bold && !(best_face->ntmFlags & NTM_BOLD); - child->lf = font->lf; + if (!(child = create_gdi_font( best_face, family_name, &font->lf ))) return; child->matrix = font->matrix; child->can_use_bitmap = font->can_use_bitmap; - child->face_index = best_face->face_index; - child->ntmFlags = best_face->ntmFlags; - child->aa_flags = HIWORD( best_face->flags ); child->scale_y = font->scale_y; child->aveWidth = font->aveWidth; child->charset = font->charset; child->codepage = font->codepage; child->base_font = font; - set_gdi_font_names( child, family_name, best_face->style_name, best_face->full_name ); - list_add_tail( &font->child_fonts, &child->entry ); TRACE( "created child font %p for base %p\n", child, font ); } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 59095d4e6d8..ff57a971976 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3274,20 +3274,10 @@ found_face: height = lf.lfHeight; TRACE("not in cache\n"); - font = alloc_gdi_font( face->file, face->data_ptr, face->data_size ); + font = create_gdi_font( face, orig_name, &lf ); font->matrix = dcmat; - font->lf = lf; font->can_use_bitmap = can_use_bitmap; - font->fake_italic = (it && !(face->ntmFlags & NTM_ITALIC)); - font->fake_bold = (bd && !(face->ntmFlags & NTM_BOLD)); - font->fs = face->fs; - font->face_index = face->face_index; - font->ntmFlags = face->ntmFlags; - font->aa_flags = HIWORD( face->flags ); - set_gdi_font_names( font, orig_name ? orig_name : family->family_name, - face->style_name, face->full_name ); - if(csi.fs.fsCsb[0]) { font->charset = lf.lfCharSet; font->codepage = csi.ciACP; @@ -3506,6 +3496,7 @@ static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEX NEWTEXTMETRICEXW *pntm) { struct gdi_font *font; + LOGFONTW lf = { .lfHeight = 100 }; if (face->cached_enum_data) { @@ -3515,11 +3506,7 @@ static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEX return; } - font = alloc_gdi_font( face->file, face->data_ptr, face->data_size ); - font->lf.lfHeight = 100; - font->face_index = face->face_index; - font->ntmFlags = face->ntmFlags; - set_gdi_font_names( font, family_name, face->style_name, face->full_name ); + if (!(font = create_gdi_font( face, family_name, &lf ))) return; if (!freetype_load_font( font )) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index fd3f434399e..6f5266c0053 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -474,7 +474,6 @@ extern struct gdi_font_family *find_family_from_font_links( const WCHAR *name, c FONTSIGNATURE fs ) DECLSPEC_HIDDEN; extern void create_child_font_list( struct gdi_font *font ) DECLSPEC_HIDDEN; -extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void cache_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern struct gdi_font *find_cached_gdi_font( const LOGFONTW *lf, const FMAT2 *matrix, @@ -482,6 +481,8 @@ extern struct gdi_font *find_cached_gdi_font( const LOGFONTW *lf, const FMAT2 *m static inline const WCHAR *get_gdi_font_name( struct gdi_font *font ) { return (WCHAR *)font->otm.otmpFamilyName; } extern void set_gdi_font_names( struct gdi_font *font, const WCHAR *family_name, const WCHAR *style_name, const WCHAR *full_name ) DECLSPEC_HIDDEN; +extern struct gdi_font *create_gdi_font( const struct gdi_font_face *face, const WCHAR *family_name, + const LOGFONTW *lf ) DECLSPEC_HIDDEN; extern void *get_GSUB_vert_feature( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void font_init(void) DECLSPEC_HIDDEN; extern CRITICAL_SECTION font_cs DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : mfplat: Consider first type entry when returning major type for stream descriptors.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: 74b10b2a4c81f5b0f43f4004783fa6055f719b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b10b2a4c81f5b0f43f4004… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 2 15:27:48 2020 +0300 mfplat: Consider first type entry when returning major type for stream descriptors. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 6 ++---- dlls/mfplat/tests/mfplat.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index ccae999b7d7..0217237d85a 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2003,10 +2003,8 @@ static HRESULT WINAPI mediatype_handler_GetMajorType(IMFMediaTypeHandler *iface, TRACE("%p, %p.\n", iface, type); EnterCriticalSection(&stream_desc->attributes.cs); - if (stream_desc->current_type) - hr = IMFMediaType_GetGUID(stream_desc->current_type, &MF_MT_MAJOR_TYPE, type); - else - hr = MF_E_ATTRIBUTENOTFOUND; + hr = IMFMediaType_GetGUID(stream_desc->current_type ? stream_desc->current_type : + stream_desc->media_types[0], &MF_MT_MAJOR_TYPE, type); LeaveCriticalSection(&stream_desc->attributes.cs); return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fed6b392b21..a0789ee6b2c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3679,6 +3679,42 @@ static void test_stream_descriptor(void) IMFMediaTypeHandler_Release(type_handler); IMFStreamDescriptor_Release(stream_desc); + + /* Major type is returned for first entry. */ + hr = MFCreateMediaType(&media_types[0]); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = MFCreateMediaType(&media_types[1]); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_types[0], &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_types[1], &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateStreamDescriptor(0, 2, media_types, &stream_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamDescriptor_GetMediaTypeHandler(stream_desc, &type_handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &major_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&major_type, &MFMediaType_Audio), "Unexpected major type %s.\n", wine_dbgstr_guid(&major_type)); + + hr = IMFMediaType_SetGUID(media_types[0], &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_types[1], &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &major_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&major_type, &MFMediaType_Video), "Unexpected major type %s.\n", wine_dbgstr_guid(&major_type)); + + IMFMediaType_Release(media_types[0]); + IMFMediaType_Release(media_types[1]); + + IMFMediaTypeHandler_Release(type_handler); + IMFStreamDescriptor_Release(stream_desc); } static void test_MFCalculateImageSize(void)

1 0

Alexandre Julliard : gdi32: Move the font link support out of freetype.c.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: bc19adf47406190b95266868f896c3d94789a255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc19adf47406190b95266868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 31 10:19:08 2020 +0100 gdi32: Move the font link support out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 286 +++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 420 ++++------------------------------------------- dlls/gdi32/gdi_private.h | 21 ++- 3 files changed, 336 insertions(+), 391 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc19adf47406190b9526…

1 0