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

Huw Davies : riched32/tests: Use the system locale to determine rtl and multibyte behaviour.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 638dbc4b20661b5a3ce4c5de19684316cec1e16a URL: https://source.winehq.org/git/wine.git/?a=commit;h=638dbc4b20661b5a3ce4c5de… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 13:45:46 2021 +0000 riched32/tests: Use the system locale to determine rtl and multibyte behaviour. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 950c175bbbe..f361d49478e 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -53,7 +53,7 @@ static HWND new_richedit(HWND parent) { static BOOL is_rtl(void) { LOCALESIGNATURE sig; - return (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, + return (GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_FONTSIGNATURE, (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && (sig.lsUsb[3] & 0x08000000) != 0); } @@ -1440,7 +1440,7 @@ START_TEST( editor ) * RICHED32.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched32.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); - is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); + is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE); test_WM_SETTEXT(); test_EM_GETTEXTRANGE();

1 0

Huw Davies : riched32/tests: Add a todo_wine for a test that has always failed.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 8dbc40be14367f360db6d340382b42fa39f15812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dbc40be14367f360db6d340… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 13:45:47 2021 +0000 riched32/tests: Add a todo_wine for a test that has always failed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index f361d49478e..f4f6ebeb709 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -155,7 +155,7 @@ static void test_WM_GETTEXTLENGTH(void) { SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); result = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); + todo_wine ok(result == 8, "WM_GETTEXTLENGTH returned %d, expected 8\n", result); } DestroyWindow(hwndRichEdit);

1 0

Byeongsik Jeon : gdi32: Remove incoming_font argument of get_advance_metric().
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 64ca79529bb32f8f5496ded2fa2041a888587237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64ca79529bb32f8f5496ded2… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Mar 8 14:40:47 2021 +0000 gdi32: Remove incoming_font argument of get_advance_metric(). Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e25d4f726d6..4d858b2624e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2786,13 +2786,13 @@ static inline BYTE get_max_level( UINT format ) return 255; } -static FT_Vector get_advance_metric(struct gdi_font *incoming_font, struct gdi_font *font, - const FT_Glyph_Metrics *metrics, - const FT_Matrix *transMat, BOOL vertical_metrics) +static FT_Vector get_advance_metric( struct gdi_font *font, const FT_Glyph_Metrics *metrics, + const FT_Matrix *transMat, BOOL vertical_metrics ) { FT_Vector adv; FT_Fixed base_advance, em_scale = 0; BOOL fixed_pitch_full = FALSE; + struct gdi_font *incoming_font = font->base_font ? font->base_font : font; if (vertical_metrics) base_advance = metrics->vertAdvance; @@ -2895,8 +2895,7 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, return bbox; } -static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *font, - FT_BBox bbox, const FT_Glyph_Metrics *metrics, +static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph_Metrics *metrics, BOOL vertical, BOOL vertical_metrics, BOOL needs_transform, const FT_Matrix matrices[3], GLYPHMETRICS *gm, ABC *abc ) @@ -2905,7 +2904,7 @@ static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *fo if (!needs_transform) { - adv = get_advance_metric( incoming_font, font, metrics, NULL, vertical_metrics ); + adv = get_advance_metric( font, metrics, NULL, vertical_metrics ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = 0; origin.x = bbox.xMin; @@ -2938,13 +2937,11 @@ static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *fo lsb = metrics->horiBearingX; } - adv = get_advance_metric( incoming_font, font, metrics, &matrices[matrix_hori], - vertical_metrics ); + adv = get_advance_metric( font, metrics, &matrices[matrix_hori], vertical_metrics ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = adv.y >> 6; - adv = get_advance_metric( incoming_font, font, metrics, &matrices[matrix_unrotated], - vertical_metrics ); + adv = get_advance_metric( font, metrics, &matrices[matrix_unrotated], vertical_metrics ); adv.x = pFT_Vector_Length( &adv ); adv.y = 0; @@ -3566,8 +3563,8 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph } bbox = get_transformed_bbox( &metrics, needsTransform, matrices ); - compute_metrics( base_font, font, bbox, &metrics, tategaki, - vertical_metrics, needsTransform, matrices, lpgm, abc ); + compute_metrics( font, bbox, &metrics, tategaki, vertical_metrics, needsTransform, matrices, + lpgm, abc ); switch (format) {

1 0

Huw Davies : riched20: Remove an unused critsec.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 115c3ab2a254088d14d928404f5d166dd260c5cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=115c3ab2a254088d14d92840… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 13:45:48 2021 +0000 riched20: Remove an unused critsec. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txtsrv.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 3d0eec6f769..49d1c706076 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -34,14 +34,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); struct text_services { - IUnknown IUnknown_inner; - ITextServices ITextServices_iface; - IUnknown *outer_unk; - LONG ref; - ITextHost *host; - CRITICAL_SECTION csTxtSrv; - ME_TextEditor *editor; - char spare[256]; + IUnknown IUnknown_inner; + ITextServices ITextServices_iface; + IUnknown *outer_unk; + LONG ref; + ITextHost *host; + ME_TextEditor *editor; + char spare[256]; /* for bug #12179 */ }; static inline struct text_services *impl_from_IUnknown( IUnknown *iface ) @@ -95,8 +94,6 @@ static ULONG WINAPI ITextServicesImpl_Release(IUnknown *iface) if (!ref) { ME_DestroyEditor( services->editor ); - services->csTxtSrv.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &services->csTxtSrv ); CoTaskMemFree( services ); } return ref; @@ -378,8 +375,6 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** services = CoTaskMemAlloc( sizeof(*services) ); if (services == NULL) return E_OUTOFMEMORY; - InitializeCriticalSection( &services->csTxtSrv ); - services->csTxtSrv.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ITextServicesImpl.csTxtSrv"); services->ref = 1; services->host = text_host; /* Don't take a ref of the host - this would lead to a mutual dependency */ services->IUnknown_inner.lpVtbl = &textservices_inner_vtbl;

1 0

Huw Davies : riched20: Store the host as the window prop.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: c2c3961ceab6eb0e05ebbaf4542f3c39c671c649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2c3961ceab6eb0e05ebbaf4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 13:45:49 2021 +0000 riched20: Store the host as the window prop. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 1da34555352..291c9a3b677 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -67,6 +67,7 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->para_fmt.wAlignment = PFA_RIGHT; if (cs->style & ES_CENTER) texthost->para_fmt.wAlignment = PFA_CENTER; + texthost->editor = NULL; return texthost; } @@ -315,16 +316,17 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetScrollBars,8) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetScrollBars( ITextHost *iface, DWORD *scrollbar ) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongPtrW( host->window, 0 ); const DWORD mask = WS_VSCROLL| WS_HSCROLL| ES_AUTOVSCROLL| ES_AUTOHSCROLL| ES_DISABLENOSCROLL; - if (editor) + if (host->editor) + { + *scrollbar = host->editor->styleFlags & mask; + } + else { - *scrollbar = editor->styleFlags & mask; - } else { DWORD style = GetWindowLongW( host->window, GWL_STYLE ); if (style & WS_VSCROLL) style |= ES_AUTOVSCROLL; @@ -371,20 +373,21 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetPropertyBits,12) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetPropertyBits( ITextHost *iface, DWORD mask, DWORD *bits ) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW( host->window, 0 ); DWORD style; DWORD dwBits = 0; - if (editor) + if (host->editor) { - style = editor->styleFlags; - if (editor->mode & TM_RICHTEXT) + style = host->editor->styleFlags; + if (host->editor->mode & TM_RICHTEXT) dwBits |= TXTBIT_RICHTEXT; - if (editor->bWordWrap) + if (host->editor->bWordWrap) dwBits |= TXTBIT_WORDWRAP; if (style & ECO_AUTOWORDSELECTION) dwBits |= TXTBIT_AUTOWORDSEL; - } else { + } + else + { DWORD dwScrollBar; style = GetWindowLongW( host->window, GWL_STYLE ); @@ -438,11 +441,10 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWORD iNotify, void *pv) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongPtrW( host->window, 0 ); HWND hwnd = host->window; UINT id; - if (!editor || !editor->hwndParent) return S_OK; + if (!host->editor || !host->editor->hwndParent) return S_OK; id = GetWindowLongW(hwnd, GWLP_ID); @@ -465,7 +467,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWOR info->hwndFrom = hwnd; info->idFrom = id; info->code = iNotify; - SendMessageW(editor->hwndParent, WM_NOTIFY, id, (LPARAM)info); + SendMessageW( host->editor->hwndParent, WM_NOTIFY, id, (LPARAM)info ); break; } @@ -481,7 +483,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify(ITextHost *iface, DWOR case EN_MAXTEXT: case EN_SETFOCUS: case EN_VSCROLL: - SendMessageW(editor->hwndParent, WM_COMMAND, MAKEWPARAM(id, iNotify), (LPARAM)hwnd); + SendMessageW( host->editor->hwndParent, WM_COMMAND, MAKEWPARAM( id, iNotify ), (LPARAM)hwnd ); break; case EN_MSGFILTER: @@ -511,10 +513,8 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxGetSelectionBarWidth,8) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxGetSelectionBarWidth( ITextHost *iface, LONG *width ) { struct host *host = impl_from_ITextHost( iface ); - ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW( host->window, 0 ); - DWORD style = editor ? editor->styleFlags - : GetWindowLongW( host->window, GWL_STYLE ); + DWORD style = host->editor ? host->editor->styleFlags : GetWindowLongW( host->window, GWL_STYLE ); *width = (style & ES_SELECTIONBAR) ? 225 : 0; /* in HIMETRIC */ return S_OK; } @@ -746,7 +746,7 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula host->editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ host->editor->hwndParent = create->hwndParent; - SetWindowLongPtrW( hwnd, 0, (LONG_PTR)host->editor ); + SetWindowLongPtrW( hwnd, 0, (LONG_PTR)host ); return TRUE; } @@ -754,6 +754,7 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode ) { + struct host *host; ME_TextEditor *editor; HRESULT hr; LRESULT res = 0; @@ -761,8 +762,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, TRACE( "enter hwnd %p msg %04x (%s) %lx %lx, unicode %d\n", hwnd, msg, get_msg_name(msg), wparam, lparam, unicode ); - editor = (ME_TextEditor *)GetWindowLongPtrW( hwnd, 0 ); - if (!editor) + host = (struct host *)GetWindowLongPtrW( hwnd, 0 ); + if (!host) { if (msg == WM_NCCREATE) { @@ -774,6 +775,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, else return DefWindowProcW( hwnd, msg, wparam, lparam ); } + editor = host->editor; switch (msg) { case WM_ERASEBKGND:

1 0

Byeongsik Jeon : gdi32: Remove metrics, vertical_metrics arguments of get_advance_metric().
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: bb86ae80c8c3795f9c23d0d65c4f8afa35345726 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb86ae80c8c3795f9c23d0d6… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Mon Mar 8 14:40:48 2021 +0000 gdi32: Remove metrics, vertical_metrics arguments of get_advance_metric(). Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4d858b2624e..620fc62a96a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2786,19 +2786,14 @@ static inline BYTE get_max_level( UINT format ) return 255; } -static FT_Vector get_advance_metric( struct gdi_font *font, const FT_Glyph_Metrics *metrics, - const FT_Matrix *transMat, BOOL vertical_metrics ) +static FT_Vector get_advance_metric( struct gdi_font *font, FT_Pos base_advance, + const FT_Matrix *transMat ) { FT_Vector adv; - FT_Fixed base_advance, em_scale = 0; + FT_Fixed em_scale = 0; BOOL fixed_pitch_full = FALSE; struct gdi_font *incoming_font = font->base_font ? font->base_font : font; - if (vertical_metrics) - base_advance = metrics->vertAdvance; - else - base_advance = metrics->horiAdvance; - adv.x = base_advance; adv.y = 0; @@ -2901,10 +2896,11 @@ static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph GLYPHMETRICS *gm, ABC *abc ) { FT_Vector adv, vec, origin; + FT_Fixed base_advance = vertical_metrics ? metrics->vertAdvance : metrics->horiAdvance; if (!needs_transform) { - adv = get_advance_metric( font, metrics, NULL, vertical_metrics ); + adv = get_advance_metric( font, base_advance, NULL ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = 0; origin.x = bbox.xMin; @@ -2937,11 +2933,11 @@ static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph lsb = metrics->horiBearingX; } - adv = get_advance_metric( font, metrics, &matrices[matrix_hori], vertical_metrics ); + adv = get_advance_metric( font, base_advance, &matrices[matrix_hori] ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = adv.y >> 6; - adv = get_advance_metric( font, metrics, &matrices[matrix_unrotated], vertical_metrics ); + adv = get_advance_metric( font, base_advance, &matrices[matrix_unrotated] ); adv.x = pFT_Vector_Length( &adv ); adv.y = 0;

1 0

Huw Davies : riched20/tests: Use the system locale to determine rtl and multibyte behaviour.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: dc85e70be0b141ff9ea1b01ee55acec3d11c54a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc85e70be0b141ff9ea1b01e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 8 13:45:45 2021 +0000 riched20/tests: Use the system locale to determine rtl and multibyte behaviour. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index f6158d9a3d1..4c87869c4a3 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -615,7 +615,7 @@ static void test_EM_POSFROMCHAR(void) "gg\n" "hh\n"; - rtl = (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, + rtl = (GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_FONTSIGNATURE, (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && (sig.lsUsb[3] & 0x08000000) != 0); @@ -771,7 +771,7 @@ static void test_EM_SETCHARFORMAT(void) BOOL rtl; DWORD expect_effects; - rtl = (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, + rtl = (GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_FONTSIGNATURE, (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && (sig.lsUsb[3] & 0x08000000) != 0); @@ -5609,7 +5609,7 @@ static void test_EM_FORMATRANGE(void) {"WINE\r\n\r\nwine\r\nwine", 5, 6} }; - skip_non_english = (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH); + skip_non_english = (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH); if (skip_non_english) skip("Skipping some tests on non-English platform\n"); @@ -8964,7 +8964,7 @@ START_TEST( editor ) * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched20.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); - is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); + is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE); test_WM_CHAR(); test_EM_FINDTEXT(FALSE);

1 0

Zebediah Figura : strmbase: Remove the unused "rendered" field from struct strmbase_qc.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 09081737ef6aea41597ad8c1e8f43f9c7adf9c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09081737ef6aea41597ad8c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:49:05 2021 -0600 strmbase: Remove the unused "rendered" field from struct strmbase_qc. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 4 +--- include/wine/strmbase.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 5af3fca4e5f..c9325e5c93d 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -62,7 +62,7 @@ static void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; - This->rendered = This->dropped = 0; + This->dropped = 0; This->is_dropped = FALSE; } @@ -240,8 +240,6 @@ static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); if (This->is_dropped) This->dropped++; - else - This->rendered++; if (!This->pin->filter->clock) return; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 848f4bac35b..d2877477321 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -282,7 +282,7 @@ struct strmbase_qc REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt, avg_render, start, stop; REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; double avg_rate; - LONG64 rendered, dropped; + LONG64 dropped; BOOL is_dropped; };

1 0

Zebediah Figura : setupapi: Set the CabinetFile field to the name of the next cabinet.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 811da7bf1a37fc4e3851971a7e96e28b445efebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=811da7bf1a37fc4e3851971a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:57:48 2021 -0600 setupapi: Set the CabinetFile field to the name of the next cabinet. Verified through manual testing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupcab.c | 6 +++--- dlls/setupapi/tests/setupcab.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 4824170d587..daf23ad31ad 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -166,9 +166,9 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p switch (fdint) { case fdintCABINET_INFO: - TRACE("New cabinet, path %s, set %u, number %u, next disk %s.\n", - debugstr_a(pfdin->psz3), pfdin->setID, pfdin->iCabinet, debugstr_a(pfdin->psz2)); - ci.CabinetFile = phsc->most_recent_cabinet_name; + TRACE("New cabinet, path %s, set %u, number %u, next disk %s, next cabinet %s.\n", + debugstr_a(pfdin->psz3), pfdin->setID, pfdin->iCabinet, debugstr_a(pfdin->psz2), debugstr_a(pfdin->psz1)); + ci.CabinetFile = pfdin->psz1; ci.CabinetPath = pfdin->psz3; ci.DiskName = pfdin->psz2; ci.SetId = pfdin->setID; diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index 6ead90206f8..c76ca465fca 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -324,7 +324,7 @@ static UINT CALLBACK simple_callbackA(void *context, UINT message, UINT_PTR para GetTempPathA(ARRAY_SIZE(temp), temp); ok(!strcmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_a(info->CabinetPath)); - todo_wine ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_a(info->CabinetFile)); + ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_a(info->CabinetFile)); ok(!info->DiskName[0], "Got disk name %s.\n", debugstr_a(info->DiskName)); ok(!info->SetId, "Got set ID %#x.\n", info->SetId); ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber); @@ -432,7 +432,7 @@ static UINT CALLBACK simple_callbackW(void *context, UINT message, UINT_PTR para GetTempPathW(ARRAY_SIZE(temp), temp); ok(!wcscmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_w(info->CabinetPath)); - todo_wine ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_w(info->CabinetFile)); + ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_w(info->CabinetFile)); ok(!info->DiskName[0], "Got disk name %s.\n", debugstr_w(info->DiskName)); ok(!info->SetId, "Got set ID %#x.\n", info->SetId); ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber);

1 0

Nikolay Sivov : dwrite: Read legacy kerning table directly.
by Alexandre Julliard March 9, 2021

March 9, 2021

Module: wine Branch: master Commit: 968a9e6b0cd5c2df4a522ba525b83d198b077bae URL: https://source.winehq.org/git/wine.git/?a=commit;h=968a9e6b0cd5c2df4a522ba5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 11:30:50 2021 +0300 dwrite: Read legacy kerning table directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 19 +++--- dlls/dwrite/font.c | 32 ++++------ dlls/dwrite/freetype.c | 41 ------------- dlls/dwrite/opentype.c | 143 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=968a9e6b0cd5c2df4a52…

1 0