November 2019 - Wine-Commits

Zebediah Figura : strmbase: Get rid of BaseRendererImpl_EndOfStream().
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 4d221c3108d4bc6528acbeef0616c8686d7d2d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d221c3108d4bc6528acbeef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 19:27:17 2019 -0600 strmbase: Get rid of BaseRendererImpl_EndOfStream(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 15 +------------ dlls/strmbase/renderer.c | 52 ++++++++++++++++++---------------------------- include/wine/strmbase.h | 1 - 3 files changed, 21 insertions(+), 47 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 3979853b8b..b6757fa76a 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -500,20 +500,7 @@ static HRESULT WINAPI DSoundRender_BreakConnect(struct strmbase_renderer *iface) static HRESULT WINAPI DSoundRender_EndOfStream(struct strmbase_renderer *iface) { DSoundRenderImpl *This = impl_from_strmbase_renderer(iface); - HRESULT hr; - - TRACE("(%p)->()\n",iface); - - hr = BaseRendererImpl_EndOfStream(iface); - if (hr != S_OK) - { - ERR("%08x\n", hr); - return hr; - } - - hr = DSoundRender_HandleEndOfStream(This); - - return hr; + return DSoundRender_HandleEndOfStream(This); } static HRESULT WINAPI DSoundRender_EndFlush(struct strmbase_renderer *iface) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 5aee4380f2..50bd33715d 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -82,18 +82,29 @@ static HRESULT WINAPI BaseRenderer_InputPin_Disconnect(IPin * iface) static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) { - struct strmbase_renderer *pFilter = impl_from_IPin(iface); - HRESULT hr; + struct strmbase_renderer *filter = impl_from_IPin(iface); + IFilterGraph *graph = filter->filter.filterInfo.pGraph; + IMediaEventSink *event_sink; + HRESULT hr = S_OK; TRACE("iface %p.\n", iface); - EnterCriticalSection(&pFilter->csRenderLock); - pFilter->eos = TRUE; - if (pFilter->pFuncsTable->pfnEndOfStream) - hr = pFilter->pFuncsTable->pfnEndOfStream(pFilter); - else - hr = BaseRendererImpl_EndOfStream(pFilter); - LeaveCriticalSection(&pFilter->csRenderLock); + EnterCriticalSection(&filter->csRenderLock); + filter->eos = TRUE; + + if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, + &IID_IMediaEventSink, (void **)&event_sink))) + { + IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter->filter.IBaseFilter_iface); + IMediaEventSink_Release(event_sink); + } + RendererPosPassThru_EOS(filter->pPosition); + SetEvent(filter->state_event); + + if (filter->pFuncsTable->pfnEndOfStream) + hr = filter->pFuncsTable->pfnEndOfStream(filter); + LeaveCriticalSection(&filter->csRenderLock); return hr; } @@ -458,29 +469,6 @@ static const IBaseFilterVtbl strmbase_renderer_vtbl = BaseFilterImpl_QueryVendorInfo }; -HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *iface) -{ - IMediaEventSink* pEventSink; - IFilterGraph *graph; - HRESULT hr = S_OK; - - TRACE("(%p)\n", iface); - - graph = iface->filter.filterInfo.pGraph; - if (graph) - { hr = IFilterGraph_QueryInterface(iface->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); - if (SUCCEEDED(hr)) - { - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)iface); - IMediaEventSink_Release(pEventSink); - } - } - RendererPosPassThru_EOS(iface->pPosition); - SetEvent(iface->state_event); - - return hr; -} - HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *iface) { if (iface->pMediaSample) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1dbc9ea4d8..b08303f93d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -568,7 +568,6 @@ struct strmbase_renderer_ops }; HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *filter); -HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample); HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer,

1 0

Alexandre Julliard : kernel32: Reimplement FoldStringW() to support composition.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: e89bbd52444050b0b37b8efedc35c4d04355a8a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e89bbd52444050b0b37b8efe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 09:04:33 2019 +0100 kernel32: Reimplement FoldStringW() to support composition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 170 +++++++++++++++++++++++++++++++++++++------ dlls/kernel32/tests/locale.c | 38 +++------- 2 files changed, 159 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e89bbd52444050b0b37b…

1 0

Alexandre Julliard : kernel32: Move FoldStringW() function to kernelbase.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 7bb286ad9d04b456325f3ddedd893fbe8b9270b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb286ad9d04b456325f3dde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 09:05:13 2019 +0100 kernel32: Move FoldStringW() function to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 165 --------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/digitmap.c | 787 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 164 +++++++++ tools/make_unicode | 14 +- 7 files changed, 963 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bb286ad9d04b456325f…

1 0

Nikolay Sivov : comctl32/combo: Remove redundant argument from border painting helper.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: a1d7dc23151318d033d5fa803e66a90a0e5d5100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1d7dc23151318d033d5fa80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 28 09:06:35 2019 +0300 comctl32/combo: Remove redundant argument from border painting helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 827da37c0c..a82118bc07 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -736,16 +736,13 @@ static void CBPaintText(HEADCOMBO *lphc, HDC hdc_paint) /*********************************************************************** * CBPaintBorder */ -static void CBPaintBorder( - HWND hwnd, - const HEADCOMBO *lphc, - HDC hdc) +static void CBPaintBorder(const HEADCOMBO *lphc, HDC hdc) { RECT clientRect; if (CB_GETTYPE(lphc) != CBS_SIMPLE) { - GetClientRect(hwnd, &clientRect); + GetClientRect(lphc->self, &clientRect); } else { @@ -816,7 +813,7 @@ static LRESULT COMBO_Paint(HEADCOMBO *lphc, HDC hdc) /* * In non 3.1 look, there is a sunken border on the combobox */ - CBPaintBorder(lphc->self, lphc, hdc); + CBPaintBorder(lphc, hdc); CBPaintButton(lphc, hdc);

1 0

Alexandre Julliard : wineboot: Keep config directory path in Unicode.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 95c9dee30aa34020079ff0a614d34761db504333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95c9dee30aa34020079ff0a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:51:17 2019 +0100 wineboot: Keep config directory path in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 0a404c74a8..dd9a5bd8f6 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -160,21 +160,21 @@ done: } /* print the config directory in a more Unix-ish way */ -static const char *prettyprint_configdir(void) +static const WCHAR *prettyprint_configdir(void) { - static char buffer[MAX_PATH]; - WCHAR *path = _wgetenv( wineconfigdirW ); - char *p; + static WCHAR buffer[MAX_PATH]; + WCHAR *p, *path = _wgetenv( wineconfigdirW ); - if (!WideCharToMultiByte( CP_UNIXCP, 0, path, -1, buffer, ARRAY_SIZE(buffer), NULL, NULL )) - strcpy( buffer + ARRAY_SIZE(buffer) - 4, "..." ); + lstrcpynW( buffer, path, ARRAY_SIZE(buffer) ); + if (lstrlenW( wineconfigdirW ) >= ARRAY_SIZE(buffer) ) + lstrcpyW( buffer + ARRAY_SIZE(buffer) - 4, L"..." ); - if (!strncmp( buffer, "\\??\\unix\\", 9 )) + if (!wcsncmp( buffer, L"\\??\\unix\\", 9 )) { for (p = buffer + 9; *p; p++) if (*p == '\\') *p = '/'; return buffer + 9; } - else if (!strncmp( buffer, "\\??\\Z:\\", 7 )) + else if (!wcsncmp( buffer, L"\\??\\Z:\\", 7 )) { for (p = buffer + 6; *p; p++) if (*p == '\\') *p = '/'; return buffer + 6; @@ -1064,18 +1064,9 @@ static INT_PTR CALLBACK wait_dlgproc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp static HWND show_wait_window(void) { - const char *config_dir = prettyprint_configdir(); - WCHAR *name; - HWND hwnd; - DWORD len; - - len = MultiByteToWideChar( CP_UNIXCP, 0, config_dir, -1, NULL, 0 ); - name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_UNIXCP, 0, config_dir, -1, name, len ); - hwnd = CreateDialogParamW( GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_WAITDLG), 0, - wait_dlgproc, (LPARAM)name ); + HWND hwnd = CreateDialogParamW( GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_WAITDLG), 0, + wait_dlgproc, (LPARAM)prettyprint_configdir() ); ShowWindow( hwnd, SW_SHOWNORMAL ); - HeapFree( GetProcessHeap(), 0, name ); return hwnd; } @@ -1227,13 +1218,13 @@ static void update_wineprefix( BOOL force ) if (!inf_path) { - WINE_MESSAGE( "wine: failed to update %s, wine.inf not found\n", prettyprint_configdir() ); + WINE_MESSAGE( "wine: failed to update %s, wine.inf not found\n", debugstr_w( config_dir )); return; } if ((fd = _wopen( inf_path, O_RDONLY )) == -1) { WINE_MESSAGE( "wine: failed to update %s with %s: %s\n", - prettyprint_configdir(), debugstr_w(inf_path), strerror(errno) ); + debugstr_w(config_dir), debugstr_w(inf_path), strerror(errno) ); goto done; } fstat( fd, &st ); @@ -1263,7 +1254,7 @@ static void update_wineprefix( BOOL force ) install_root_pnp_devices(); update_user_profile(); - WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", prettyprint_configdir() ); + WINE_MESSAGE( "wine: configuration in %s has been updated.\n", debugstr_w(prettyprint_configdir()) ); } done:

1 0

John Alway : comctl32/tests: Add a test for combo resizing from smaller item height.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: ec8c949901c0d36e0662b948ebbb3db9eec4edf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8c949901c0d36e0662b948… Author: John Alway <thaleslv(a)yahoo.com> Date: Thu Nov 28 09:06:37 2019 +0300 comctl32/tests: Add a test for combo resizing from smaller item height. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 4757fa3cc6..64785326c9 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -614,7 +614,7 @@ static HWND create_combobox(DWORD style) return CreateWindowA(WC_COMBOBOXA, "Combo", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)COMBO_ID, NULL, 0); } -static int font_height(HFONT hFont) +static int get_font_height(HFONT hFont) { TEXTMETRICA tm; HFONT hFontOld; @@ -632,11 +632,12 @@ static int font_height(HFONT hFont) static void test_combo_setitemheight(DWORD style) { HWND hCombo = create_combobox(style); + int i, font_height, height; + HFONT hFont; RECT r; - int i; GetClientRect(hCombo, &r); - expect_rect(r, 0, 0, 100, font_height(GetStockObject(SYSTEM_FONT)) + 8); + expect_rect(r, 0, 0, 100, get_font_height(GetStockObject(SYSTEM_FONT)) + 8); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); todo_wine expect_rect(r, 5, 5, 105, 105); @@ -649,6 +650,22 @@ static void test_combo_setitemheight(DWORD style) } DestroyWindow(hCombo); + + /* Set item height below text height, force resize. */ + hCombo = create_combobox(style); + + hFont = (HFONT)SendMessageA(hCombo, WM_GETFONT, 0, 0); + font_height = get_font_height(hFont); + SendMessageA(hCombo, CB_SETITEMHEIGHT, -1, font_height / 2); + height = SendMessageA(hCombo, CB_GETITEMHEIGHT, -1, 0); +todo_wine + ok(height == font_height / 2, "Unexpected item height %d, expected %d.\n", height, font_height / 2); + + SetWindowPos(hCombo, NULL, 10, 10, 150, 5 * font_height, SWP_SHOWWINDOW); + height = SendMessageA(hCombo, CB_GETITEMHEIGHT, -1, 0); + ok(height > font_height, "Unexpected item height %d, font height %d.\n", height, font_height); + + DestroyWindow(hCombo); } static void test_combo_setfont(DWORD style) @@ -663,7 +680,7 @@ static void test_combo_setfont(DWORD style) hFont2 = CreateFontA(8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); GetClientRect(hCombo, &r); - expect_rect(r, 0, 0, 100, font_height(GetStockObject(SYSTEM_FONT)) + 8); + expect_rect(r, 0, 0, 100, get_font_height(GetStockObject(SYSTEM_FONT)) + 8); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); todo_wine expect_rect(r, 5, 5, 105, 105); @@ -672,39 +689,39 @@ static void test_combo_setfont(DWORD style) of the window when it was created. The size of the calculated dropped area changes only by how much the selection area changes, not by how much the list area changes. */ - if (font_height(hFont1) == 10 && font_height(hFont2) == 8) + if (get_font_height(hFont1) == 10 && get_font_height(hFont2) == 8) { SendMessageA(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE); GetClientRect(hCombo, &r); expect_rect(r, 0, 0, 100, 18); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); - todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont1))); + todo_wine expect_rect(r, 5, 5, 105, 105 - (get_font_height(GetStockObject(SYSTEM_FONT)) - get_font_height(hFont1))); SendMessageA(hCombo, WM_SETFONT, (WPARAM)hFont2, FALSE); GetClientRect(hCombo, &r); expect_rect(r, 0, 0, 100, 16); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); - todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont2))); + todo_wine expect_rect(r, 5, 5, 105, 105 - (get_font_height(GetStockObject(SYSTEM_FONT)) - get_font_height(hFont2))); SendMessageA(hCombo, WM_SETFONT, (WPARAM)hFont1, FALSE); GetClientRect(hCombo, &r); expect_rect(r, 0, 0, 100, 18); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); - todo_wine expect_rect(r, 5, 5, 105, 105 - (font_height(GetStockObject(SYSTEM_FONT)) - font_height(hFont1))); + todo_wine expect_rect(r, 5, 5, 105, 105 - (get_font_height(GetStockObject(SYSTEM_FONT)) - get_font_height(hFont1))); } else { ok(0, "Expected Marlett font heights 10/8, got %d/%d\n", - font_height(hFont1), font_height(hFont2)); + get_font_height(hFont1), get_font_height(hFont2)); } for (i = 1; i < 30; i++) { HFONT hFont = CreateFontA(i, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); - int height = font_height(hFont); + int height = get_font_height(hFont); SendMessageA(hCombo, WM_SETFONT, (WPARAM)hFont, FALSE); GetClientRect(hCombo, &r);

1 0

Zebediah Figura : quartz/dsoundrender: Avoid taking the filter lock in IPin::EndOfStream().
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 09b39646b05b856727faabdeabbae514da628074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09b39646b05b856727faabde… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 19:27:14 2019 -0600 quartz/dsoundrender: Avoid taking the filter lock in IPin::EndOfStream(). IPin::EndOfStream() is called from a streaming thread. The streaming thread should never take the filter lock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 -- dlls/strmbase/renderer.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index fca1a710de..71851f6b4a 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -236,11 +236,9 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) break; This->in_loop = 1; - LeaveCriticalSection(&This->renderer.filter.csFilter); LeaveCriticalSection(&This->renderer.csRenderLock); WaitForSingleObject(This->renderer.flush_event, 10); EnterCriticalSection(&This->renderer.csRenderLock); - EnterCriticalSection(&This->renderer.filter.csFilter); This->in_loop = 0; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index dbb677e9ad..98d27cc83a 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -88,13 +88,11 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) TRACE("iface %p.\n", iface); EnterCriticalSection(&pFilter->csRenderLock); - EnterCriticalSection(&pFilter->filter.csFilter); pFilter->eos = TRUE; if (pFilter->pFuncsTable->pfnEndOfStream) hr = pFilter->pFuncsTable->pfnEndOfStream(pFilter); else hr = BaseRendererImpl_EndOfStream(pFilter); - LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; }

1 0

Nikolay Sivov : comctl32/combo: Force minimal item height.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 8dfd51b48770e1315b57eeb7df164ac17348dcce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dfd51b48770e1315b57eeb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 28 09:06:36 2019 +0300 comctl32/combo: Force minimal item height. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 111 ++++++++++++++++++++++++++--------------------- dlls/comctl32/comctl32.h | 4 +- 2 files changed, 63 insertions(+), 52 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index a82118bc07..765fc631e0 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -78,6 +78,9 @@ static UINT CBitHeight, CBitWidth; #define ID_CB_LISTBOX 1000 #define ID_CB_EDIT 1001 +static void CBCalcPlacement(HEADCOMBO *combo); +static void CBResetPos(HEADCOMBO *combo); + /*********************************************************************** * COMBO_Init * @@ -169,6 +172,25 @@ static LRESULT COMBO_NCDestroy( HEADCOMBO *lphc ) return 0; } +static INT combo_get_text_height(const HEADCOMBO *combo) +{ + HDC hdc = GetDC(combo->self); + HFONT prev_font = 0; + TEXTMETRICW tm; + + if (combo->hFont) + prev_font = SelectObject(hdc, combo->hFont); + + GetTextMetricsW(hdc, &tm); + + if (prev_font) + SelectObject(hdc, prev_font); + + ReleaseDC(combo->self, hdc); + + return tm.tmHeight + 4; +} + /*********************************************************************** * CBGetTextAreaHeight * @@ -181,35 +203,18 @@ static LRESULT COMBO_NCDestroy( HEADCOMBO *lphc ) * This height was determined through experimentation. * CBCalcPlacement will add 2*COMBO_YBORDERSIZE pixels for the border */ -static INT CBGetTextAreaHeight(HEADCOMBO *lphc) +static INT CBGetTextAreaHeight(HEADCOMBO *lphc, BOOL clip_item_height) { - INT iTextItemHeight; + INT item_height, text_height; - if( lphc->editHeight ) /* explicitly set height */ + if (clip_item_height && !CB_OWNERDRAWN(lphc)) { - iTextItemHeight = lphc->editHeight; + text_height = combo_get_text_height(lphc); + if (lphc->item_height < text_height) + lphc->item_height = text_height; } - else - { - TEXTMETRICW tm; - HDC hDC = GetDC(lphc->self); - HFONT hPrevFont = 0; - INT baseUnitY; - - if (lphc->hFont) - hPrevFont = SelectObject( hDC, lphc->hFont ); - - GetTextMetricsW(hDC, &tm); - - baseUnitY = tm.tmHeight; + item_height = lphc->item_height; - if( hPrevFont ) - SelectObject( hDC, hPrevFont ); - - ReleaseDC(lphc->self, hDC); - - iTextItemHeight = baseUnitY + 4; - } /* * Check the ownerdraw case if we haven't asked the parent the size @@ -220,7 +225,7 @@ static INT CBGetTextAreaHeight(HEADCOMBO *lphc) { MEASUREITEMSTRUCT measureItem; RECT clientRect; - INT originalItemHeight = iTextItemHeight; + INT originalItemHeight = item_height; UINT id = (UINT)GetWindowLongPtrW( lphc->self, GWLP_ID ); /* @@ -237,10 +242,10 @@ static INT CBGetTextAreaHeight(HEADCOMBO *lphc) measureItem.CtlID = id; measureItem.itemID = -1; measureItem.itemWidth = clientRect.right; - measureItem.itemHeight = iTextItemHeight - 6; /* ownerdrawn cb is taller */ + measureItem.itemHeight = item_height - 6; /* ownerdrawn cb is taller */ measureItem.itemData = 0; SendMessageW(lphc->owner, WM_MEASUREITEM, id, (LPARAM)&measureItem); - iTextItemHeight = 6 + measureItem.itemHeight; + item_height = 6 + measureItem.itemHeight; /* * Send a second one in the case of a fixed ownerdraw list to calculate the @@ -261,10 +266,10 @@ static INT CBGetTextAreaHeight(HEADCOMBO *lphc) /* * Keep the size for the next time */ - lphc->editHeight = iTextItemHeight; + lphc->item_height = item_height; } - return iTextItemHeight; + return item_height; } /*********************************************************************** @@ -274,13 +279,12 @@ static INT CBGetTextAreaHeight(HEADCOMBO *lphc) * a re-arranging of the contents of the combobox and the recalculation * of the size of the "real" control window. */ -static void CBForceDummyResize( - LPHEADCOMBO lphc) +static void CBForceDummyResize(LPHEADCOMBO lphc) { RECT windowRect; int newComboHeight; - newComboHeight = CBGetTextAreaHeight(lphc) + 2*COMBO_YBORDERSIZE(); + newComboHeight = CBGetTextAreaHeight(lphc, FALSE) + 2*COMBO_YBORDERSIZE(); GetWindowRect(lphc->self, &windowRect); @@ -292,12 +296,17 @@ static void CBForceDummyResize( * this will cancel-out in the processing of the WM_WINDOWPOSCHANGING * message. */ + lphc->wState |= CBF_NORESIZE; SetWindowPos( lphc->self, NULL, 0, 0, windowRect.right - windowRect.left, newComboHeight, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE ); + lphc->wState &= ~CBF_NORESIZE; + + CBCalcPlacement(lphc); + CBResetPos(lphc); } /*********************************************************************** @@ -314,7 +323,7 @@ static void CBCalcPlacement(HEADCOMBO *combo) InflateRect(&combo->textRect, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); /* Chop off the bottom part to fit with the height of the text area. */ - combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo); + combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo, FALSE); /* The button starts the same vertical position as the text area. */ combo->buttonRect = combo->textRect; @@ -400,11 +409,9 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG lphc->owner = hwndParent; - /* - * The item height and dropped width are not set when the control - * is created. - */ - lphc->droppedWidth = lphc->editHeight = 0; + lphc->droppedWidth = 0; + + lphc->item_height = combo_get_text_height(lphc); /* * The first time we go through, we want to measure the ownerdraw item @@ -1381,8 +1388,11 @@ static void CBResetPos(HEADCOMBO *combo) /*********************************************************************** * COMBO_Size */ -static void COMBO_Size( LPHEADCOMBO lphc ) +static void COMBO_Size( HEADCOMBO *lphc ) { + if (!lphc->hWndLBox || (lphc->wState & CBF_NORESIZE)) + return; + /* * Those controls are always the same height. So we have to make sure * they are not resized to another value. @@ -1395,7 +1405,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) GetWindowRect(lphc->self, &rc); curComboHeight = rc.bottom - rc.top; curComboWidth = rc.right - rc.left; - newComboHeight = CBGetTextAreaHeight(lphc) + 2*COMBO_YBORDERSIZE(); + newComboHeight = CBGetTextAreaHeight(lphc, TRUE) + 2*COMBO_YBORDERSIZE(); /* * Resizing a combobox has another side effect, it resizes the dropped @@ -1415,9 +1425,13 @@ static void COMBO_Size( LPHEADCOMBO lphc ) /* * Restore original height */ - if( curComboHeight != newComboHeight ) - SetWindowPos(lphc->self, 0, 0, 0, curComboWidth, newComboHeight, - SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); + if (curComboHeight != newComboHeight) + { + lphc->wState |= CBF_NORESIZE; + SetWindowPos(lphc->self, 0, 0, 0, curComboWidth, newComboHeight, + SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOREDRAW); + lphc->wState &= ~CBF_NORESIZE; + } } CBCalcPlacement(lphc); @@ -1431,10 +1445,8 @@ static void COMBO_Size( LPHEADCOMBO lphc ) */ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw ) { - /* - * Set the font - */ lphc->hFont = hFont; + lphc->item_height = combo_get_text_height(lphc); /* * Propagate to owned windows. @@ -1470,7 +1482,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) { if( height < 32768 ) { - lphc->editHeight = height + 2; /* Is the 2 for 2*EDIT_CONTROL_PADDING? */ + lphc->item_height = height + 2; /* Is the 2 for 2*EDIT_CONTROL_PADDING? */ /* * Redo the layout of the control. @@ -1730,8 +1742,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam } case WM_SIZE: - if (lphc->hWndLBox && !(lphc->wState & CBF_NORESIZE)) - COMBO_Size( lphc ); + COMBO_Size( lphc ); return TRUE; case WM_SETFONT: @@ -1942,7 +1953,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam case CB_GETITEMHEIGHT: if ((INT)wParam >= 0) /* listbox item */ return SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0); - return CBGetTextAreaHeight(lphc); + return CBGetTextAreaHeight(lphc, FALSE); case CB_RESETCONTENT: SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0); diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index f3e889c4bd..78e9798338 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -150,8 +150,8 @@ typedef struct RECT droppedRect; INT droppedIndex; INT fixedOwnerDrawHeight; - INT droppedWidth; /* last two are not used unless set */ - INT editHeight; /* explicitly */ + INT droppedWidth; /* not used unless set explicitly */ + INT item_height; INT visibleItems; } HEADCOMBO, *LPHEADCOMBO;

1 0

Alexandre Julliard : cabarc: Avoid some conversion to Unix codepage.
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: e87c84f56d505dba2e2ecc76a831458e9650c686 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87c84f56d505dba2e2ecc76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:50:49 2019 +0100 cabarc: Avoid some conversion to Unix codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cabarc/cabarc.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 5337b1e009..d244d6ce27 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -335,21 +335,19 @@ static INT_PTR CDECL list_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf nameW = strdupAtoW( (pfdin->attribs & _A_NAME_IS_UTF) ? CP_UTF8 : CP_ACP, pfdin->psz1 ); if (match_files( nameW )) { - char *nameU = strdupWtoA( CP_UNIXCP, nameW ); if (opt_verbose) { - char attrs[] = "rxash"; + WCHAR attrs[] = L"rxash"; if (!(pfdin->attribs & _A_RDONLY)) attrs[0] = '-'; if (!(pfdin->attribs & _A_EXEC)) attrs[1] = '-'; if (!(pfdin->attribs & _A_ARCH)) attrs[2] = '-'; if (!(pfdin->attribs & _A_SYSTEM)) attrs[3] = '-'; if (!(pfdin->attribs & _A_HIDDEN)) attrs[4] = '-'; - printf( " %s %9u %04u/%02u/%02u %02u:%02u:%02u ", attrs, pfdin->cb, + wprintf( L" %s %9u %04u/%02u/%02u %02u:%02u:%02u ", attrs, pfdin->cb, (pfdin->date >> 9) + 1980, (pfdin->date >> 5) & 0x0f, pfdin->date & 0x1f, pfdin->time >> 11, (pfdin->time >> 5) & 0x3f, (pfdin->time & 0x1f) * 2 ); } - printf( "%s\n", nameU ); - cab_free( nameU ); + wprintf( L"%s\n", nameW ); } cab_free( nameW ); return 0; @@ -404,12 +402,7 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION if (match_files( file )) { - if (opt_verbose) - { - char *nameU = strdupWtoA( CP_UNIXCP, path ); - printf( "extracting %s\n", nameU ); - cab_free( nameU ); - } + if (opt_verbose) wprintf( L"extracting %s\n", path ); create_directories( path ); /* FIXME: check for existing file and overwrite mode */ ret = (INT_PTR)CreateFileW( path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -628,8 +621,7 @@ int __cdecl wmain( int argc, WCHAR *argv[] ) else if (!wcscmp( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; else { - char *arg = strdupWtoA( CP_ACP, argv[1] ); - WINE_MESSAGE( "cabarc: Unknown compression type '%s'\n", arg); + WINE_MESSAGE( "cabarc: Unknown compression type %s\n", debugstr_w(argv[1])); return 1; } break;

1 0

Zebediah Figura : strmbase: Get rid of BaseRendererImpl_BeginFlush().
by Alexandre Julliard Nov. 28, 2019

Nov. 28, 2019

Module: wine Branch: master Commit: 0011be7fdd606134c6c155552e9aeea227a120af URL: https://source.winehq.org/git/wine.git/?a=commit;h=0011be7fdd606134c6c15555… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 19:27:15 2019 -0600 strmbase: Get rid of BaseRendererImpl_BeginFlush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 13 ++++--------- include/wine/strmbase.h | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 98d27cc83a..2f09cadf13 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -108,7 +108,10 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) EnterCriticalSection(&pFilter->filter.csFilter); hr = BaseInputPinImpl_BeginFlush(iface); if (SUCCEEDED(hr)) - hr = BaseRendererImpl_BeginFlush(pFilter); + { + BaseRendererImpl_ClearPendingSample(pFilter); + SetEvent(pFilter->flush_event); + } LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; @@ -476,14 +479,6 @@ HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *iface) return hr; } -HRESULT WINAPI BaseRendererImpl_BeginFlush(struct strmbase_renderer *iface) -{ - TRACE("(%p)\n", iface); - BaseRendererImpl_ClearPendingSample(iface); - SetEvent(iface->flush_event); - return S_OK; -} - HRESULT WINAPI BaseRendererImpl_EndFlush(struct strmbase_renderer *iface) { TRACE("(%p)\n", iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d0a0da1b10..cf209ae892 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -567,7 +567,6 @@ struct strmbase_renderer_ops HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); }; -HRESULT WINAPI BaseRendererImpl_BeginFlush(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_EndFlush(struct strmbase_renderer *filter);

1 0