wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

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

28 Nov '19

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

Michael Stefaniuc : dmime: At least trace the DMUS_FOURCC_TRACK_EXTRAS_CHUNK.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: 4ccdf3e58a816ebf9c58000e985fd21737ffd485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ccdf3e58a816ebf9c58000e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 27 23:06:48 2019 +0100 dmime: At least trace the DMUS_FOURCC_TRACK_EXTRAS_CHUNK. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 3c9d33af31..5284ac5fec 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -624,6 +624,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, IPersistStream *ps = NULL; IStream *clone; DMUS_IO_TRACK_HEADER thdr; + DMUS_IO_TRACK_EXTRAS_HEADER txhdr; HRESULT hr; TRACE("Parsing track form in %p: %s\n", stream, debugstr_chunk(riff)); @@ -654,8 +655,11 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, chunk.type == thdr.fccType)) break; - if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK) + if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK && + SUCCEEDED(stream_chunk_get_data(stream, &chunk, &txhdr, sizeof(txhdr)))) { FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not handled\n"); + TRACE("dwFlags: %#x, dwPriority: %u\n", txhdr.dwFlags, txhdr.dwPriority); + } } if (hr != S_OK) return hr == S_FALSE ? DMUS_E_TRACK_NOT_FOUND : hr;

1 0

Michael Stefaniuc : dmime: Print the track groups consistently in hexadecimal.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: f320ade54dd2ae0fbf4f77e0cca1999a3855962a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f320ade54dd2ae0fbf4f77e0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 27 23:06:47 2019 +0100 dmime: Print the track groups consistently in hexadecimal. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index e3acafe979..3c9d33af31 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> %d,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - %p -> %#x, %p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { *pdwGroupBits = pIt->dwGroupBits; return S_OK; @@ -637,7 +637,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, return hr; TRACE("Found DMUS_IO_TRACK_HEADER\n"); TRACE("\tclass: %s\n", debugstr_guid (&thdr.guidClassID)); - TRACE("\tdwGroup: %d\n", thdr.dwGroup); + TRACE("\tdwGroup: %#x\n", thdr.dwGroup); TRACE("\tckid: %s\n", debugstr_fourcc (thdr.ckid)); TRACE("\tfccType: %s\n", debugstr_fourcc (thdr.fccType));

1 0

Andrey Gusev : ddraw/tests: Fix a typo in comment.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: 420008cb154ae8fb55261318ff07d77bc123ff51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=420008cb154ae8fb55261318… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Nov 27 16:40:30 2019 +0200 ddraw/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 71d805d554..c3d575d31a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -14649,7 +14649,7 @@ static void test_depth_readback(void) * * Geforce 7 GPUs work only with D16. D24 and D24S8 return 0, D24X8 broken data. * - * Geforce 9 GPUs return return broken data for D16 that resembles the expected data in + * Geforce 9 GPUs return broken data for D16 that resembles the expected data in * the lower 8 bits and has 0xff in the upper 8 bits. D24X8 works, D24 and D24S8 return * 0x00ffffff. *

1 0

Andrey Gusev : crypt32: Fix a typo in comment.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: a966ee7f4efcf825f5fc041586aaf23a71bc525b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a966ee7f4efcf825f5fc0415… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Nov 27 16:34:48 2019 +0200 crypt32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ea96248bd7..f591a5e72e 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -922,7 +922,7 @@ typedef struct _CSignedMsgData } CSignedMsgData; /* Constructs the signer handles for the signerIndex'th signer of msg_data. - * Assumes signerIndex is a valid idnex, and that msg_data's info has already + * Assumes signerIndex is a valid index, and that msg_data's info has already * been constructed. */ static BOOL CSignedMsgData_ConstructSignerHandles(CSignedMsgData *msg_data,

1 0

Zebediah Figura : wined3d: Pass the client stateblock state to wined3d stateblock methods.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: da6ea7ddc0a829dcdd9f3b0035b6353ae35b5166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da6ea7ddc0a829dcdd9f3b00… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 22:58:26 2019 -0600 wined3d: Pass the client stateblock state to wined3d stateblock methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 10 +++++----- dlls/d3d9/device.c | 4 ++-- dlls/d3d9/stateblock.c | 6 +++--- dlls/ddraw/ddraw.c | 7 ++++--- dlls/ddraw/device.c | 8 ++++---- dlls/wined3d/stateblock.c | 32 +++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 6 +++--- include/wine/wined3d.h | 8 +++++--- 8 files changed, 43 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da6ea7ddc0a829dcdd9f…

1 0

Andrey Gusev : sapiaut.idl: Fix a typo.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: 52b93318195a99169fb30b89833e043333da857e URL: https://source.winehq.org/git/wine.git/?a=commit;h=52b93318195a99169fb30b89… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Nov 27 16:26:33 2019 +0200 sapiaut.idl: Fix a typo. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sapiaut.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sapiaut.idl b/include/sapiaut.idl index 8f2b1f9a10..4ae4ebe231 100644 --- a/include/sapiaut.idl +++ b/include/sapiaut.idl @@ -1956,7 +1956,7 @@ interface ISpeechRecognizer : IDispatch HRESULT State([out,retval] SpeechRecognizerState *state); [propget, id(DISPID_SRStatus)] - HRESULT Status([out,retval] ISpeechRecognizerStatus **satus); + HRESULT Status([out,retval] ISpeechRecognizerStatus **status); [propputref, id(DISPID_SRProfile)] HRESULT Profile([in,defaultvalue(0)] ISpeechObjectToken *profile);

1 0

Nikolay Sivov : comctl32/combo: Remove redundant argument from text height helper.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: 543ed11f249a3ea90fd7f79e705a8645a03dceca URL: https://source.winehq.org/git/wine.git/?a=commit;h=543ed11f249a3ea90fd7f79e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 27 13:27:22 2019 +0300 comctl32/combo: Remove redundant argument from text height helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 25fb38c4c3..1fa5f5ef21 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -181,9 +181,7 @@ 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( - HWND hwnd, - LPHEADCOMBO lphc) +static INT CBGetTextAreaHeight(HEADCOMBO *lphc) { INT iTextItemHeight; @@ -194,7 +192,7 @@ static INT CBGetTextAreaHeight( else { TEXTMETRICW tm; - HDC hDC = GetDC(hwnd); + HDC hDC = GetDC(lphc->self); HFONT hPrevFont = 0; INT baseUnitY; @@ -208,7 +206,7 @@ static INT CBGetTextAreaHeight( if( hPrevFont ) SelectObject( hDC, hPrevFont ); - ReleaseDC(hwnd, hDC); + ReleaseDC(lphc->self, hDC); iTextItemHeight = baseUnitY + 4; } @@ -228,7 +226,7 @@ static INT CBGetTextAreaHeight( /* * We use the client rect for the width of the item. */ - GetClientRect(hwnd, &clientRect); + GetClientRect(lphc->self, &clientRect); lphc->wState &= ~CBF_MEASUREITEM; @@ -282,7 +280,7 @@ static void CBForceDummyResize( RECT windowRect; int newComboHeight; - newComboHeight = CBGetTextAreaHeight(lphc->self,lphc) + 2*COMBO_YBORDERSIZE(); + newComboHeight = CBGetTextAreaHeight(lphc) + 2*COMBO_YBORDERSIZE(); GetWindowRect(lphc->self, &windowRect); @@ -316,7 +314,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->self, combo); + combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo); /* The button starts the same vertical position as the text area. */ combo->buttonRect = combo->textRect; @@ -1398,7 +1396,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) GetWindowRect(lphc->self, &rc); curComboHeight = rc.bottom - rc.top; curComboWidth = rc.right - rc.left; - newComboHeight = CBGetTextAreaHeight(lphc->self, lphc) + 2*COMBO_YBORDERSIZE(); + newComboHeight = CBGetTextAreaHeight(lphc) + 2*COMBO_YBORDERSIZE(); /* * Resizing a combobox has another side effect, it resizes the dropped @@ -1945,7 +1943,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(hwnd, lphc); + return CBGetTextAreaHeight(lphc); case CB_RESETCONTENT: SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0);

1 0

Nikolay Sivov : comctl32/combo: Simplify child controls position update helper.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: d4515e739b2ddcaea69e4d067aed26d76443a39a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4515e739b2ddcaea69e4d06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 27 13:27:21 2019 +0300 comctl32/combo: Simplify child controls position update helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 66 ++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 57fddefc93..25fb38c4c3 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1350,42 +1350,34 @@ static LRESULT COMBO_GetText( HEADCOMBO *lphc, INT count, LPWSTR buf ) * This function sets window positions according to the updated * component placement struct. */ -static void CBResetPos( - LPHEADCOMBO lphc, - const RECT *rectEdit, - const RECT *rectLB, - BOOL bRedraw) +static void CBResetPos(HEADCOMBO *combo) { - BOOL bDrop = (CB_GETTYPE(lphc) != CBS_SIMPLE); - - /* NOTE: logs sometimes have WM_LBUTTONUP before a cascade of - * sizing messages */ - - if( lphc->wState & CBF_EDIT ) - SetWindowPos( lphc->hWndEdit, 0, - rectEdit->left, rectEdit->top, - rectEdit->right - rectEdit->left, - rectEdit->bottom - rectEdit->top, - SWP_NOZORDER | SWP_NOACTIVATE | ((bDrop) ? SWP_NOREDRAW : 0) ); - - SetWindowPos( lphc->hWndLBox, 0, - rectLB->left, rectLB->top, - rectLB->right - rectLB->left, - rectLB->bottom - rectLB->top, - SWP_NOACTIVATE | SWP_NOZORDER | ((bDrop) ? SWP_NOREDRAW : 0) ); - - if( bDrop ) - { - if( lphc->wState & CBF_DROPPED ) - { - lphc->wState &= ~CBF_DROPPED; - ShowWindow( lphc->hWndLBox, SW_HIDE ); - } + BOOL drop = CB_GETTYPE(combo) != CBS_SIMPLE; + + /* NOTE: logs sometimes have WM_LBUTTONUP before a cascade of + * sizing messages */ + if (combo->wState & CBF_EDIT) + SetWindowPos(combo->hWndEdit, 0, combo->textRect.left, combo->textRect.top, + combo->textRect.right - combo->textRect.left, + combo->textRect.bottom - combo->textRect.top, + SWP_NOZORDER | SWP_NOACTIVATE | (drop ? SWP_NOREDRAW : 0)); + + SetWindowPos(combo->hWndLBox, 0, combo->droppedRect.left, combo->droppedRect.top, + combo->droppedRect.right - combo->droppedRect.left, + combo->droppedRect.bottom - combo->droppedRect.top, + SWP_NOACTIVATE | SWP_NOZORDER | (drop ? SWP_NOREDRAW : 0)); + + if (drop) + { + if (combo->wState & CBF_DROPPED) + { + combo->wState &= ~CBF_DROPPED; + ShowWindow(combo->hWndLBox, SW_HIDE); + } - if( bRedraw && !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, - RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); - } + if (!(combo->wState & CBF_NOREDRAW)) + RedrawWindow(combo->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW); + } } @@ -1433,7 +1425,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) CBCalcPlacement(lphc); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos(lphc); } @@ -1461,7 +1453,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw ) { CBCalcPlacement(lphc); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos(lphc); } else { @@ -1490,7 +1482,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) { CBCalcPlacement(lphc); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos(lphc); } else {

1 0

Nikolay Sivov : comctl32/combo: Simplify rectangles sizing helper.
by Alexandre Julliard 27 Nov '19

27 Nov '19

Module: wine Branch: master Commit: fc4b06815a7d12f0490a0ffce6d53772c26ff2d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc4b06815a7d12f0490a0ffc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 27 13:27:20 2019 +0300 comctl32/combo: Simplify rectangles sizing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 163 +++++++++++++++++--------------------------------- 1 file changed, 55 insertions(+), 108 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 599817aed4..57fddefc93 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -307,111 +307,70 @@ static void CBForceDummyResize( * * Set up component coordinates given valid lphc->RectCombo. */ -static void CBCalcPlacement( - HWND hwnd, - LPHEADCOMBO lphc, - LPRECT lprEdit, - LPRECT lprButton, - LPRECT lprLB) +static void CBCalcPlacement(HEADCOMBO *combo) { - /* - * Again, start with the client rectangle. - */ - GetClientRect(hwnd, lprEdit); + /* Start with the client rectangle. */ + GetClientRect(combo->self, &combo->textRect); - /* - * Remove the borders - */ - InflateRect(lprEdit, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); + /* Remove the borders */ + InflateRect(&combo->textRect, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); - /* - * Chop off the bottom part to fit with the height of the text area. - */ - lprEdit->bottom = lprEdit->top + CBGetTextAreaHeight(hwnd, lphc); + /* Chop off the bottom part to fit with the height of the text area. */ + combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo->self, combo); - /* - * The button starts the same vertical position as the text area. - */ - CopyRect(lprButton, lprEdit); + /* The button starts the same vertical position as the text area. */ + combo->buttonRect = combo->textRect; - /* - * If the combobox is "simple" there is no button. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - lprButton->left = lprButton->right = lprButton->bottom = 0; - else - { - /* - * Let's assume the combobox button is the same width as the - * scrollbar button. - * size the button horizontally and cut-off the text area. - */ - lprButton->left = lprButton->right - GetSystemMetrics(SM_CXVSCROLL); - lprEdit->right = lprButton->left; - } + /* If the combobox is "simple" there is no button. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) + combo->buttonRect.left = combo->buttonRect.right = combo->buttonRect.bottom = 0; + else + { + /* + * Let's assume the combobox button is the same width as the + * scrollbar button. + * size the button horizontally and cut-off the text area. + */ + combo->buttonRect.left = combo->buttonRect.right - GetSystemMetrics(SM_CXVSCROLL); + combo->textRect.right = combo->buttonRect.left; + } - /* - * In the case of a dropdown, there is an additional spacing between the - * text area and the button. - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - { - lprEdit->right -= COMBO_EDITBUTTONSPACE(); - } + /* In the case of a dropdown, there is an additional spacing between the text area and the button. */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->textRect.right -= COMBO_EDITBUTTONSPACE(); - /* - * If we have an edit control, we space it away from the borders slightly. - */ - if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST) - { - InflateRect(lprEdit, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - } + /* If we have an edit control, we space it away from the borders slightly. */ + if (CB_GETTYPE(combo) != CBS_DROPDOWNLIST) + InflateRect(&combo->textRect, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - /* - * Adjust the size of the listbox popup. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - { - /* - * Use the client rectangle to initialize the listbox rectangle - */ - GetClientRect(hwnd, lprLB); - - /* - * Then, chop-off the top part. - */ - lprLB->top = lprEdit->bottom + COMBO_YBORDERSIZE(); - } - else - { - /* - * Make sure the dropped width is as large as the combobox itself. - */ - if (lphc->droppedWidth < (lprButton->right + COMBO_XBORDERSIZE())) + /* Adjust the size of the listbox popup. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) { - lprLB->right = lprLB->left + (lprButton->right + COMBO_XBORDERSIZE()); - - /* - * In the case of a dropdown, the popup listbox is offset to the right. - * so, we want to make sure it's flush with the right side of the - * combobox - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - lprLB->right -= COMBO_EDITBUTTONSPACE(); + GetClientRect(combo->self, &combo->droppedRect); + combo->droppedRect.top = combo->textRect.bottom + COMBO_YBORDERSIZE(); } else - lprLB->right = lprLB->left + lphc->droppedWidth; - } - - /* don't allow negative window width */ - if (lprEdit->right < lprEdit->left) - lprEdit->right = lprEdit->left; + { + /* Make sure the dropped width is as large as the combobox itself. */ + if (combo->droppedWidth < (combo->buttonRect.right + COMBO_XBORDERSIZE())) + { + combo->droppedRect.right = combo->droppedRect.left + (combo->buttonRect.right + COMBO_XBORDERSIZE()); - TRACE("\ttext\t= (%s)\n", wine_dbgstr_rect(lprEdit)); + /* In the case of a dropdown, the popup listbox is offset to the right. We want to make sure it's flush + with the right side of the combobox */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->droppedRect.right -= COMBO_EDITBUTTONSPACE(); + } + else + combo->droppedRect.right = combo->droppedRect.left + combo->droppedWidth; + } - TRACE("\tbutton\t= (%s)\n", wine_dbgstr_rect(lprButton)); + /* Disallow negative window width */ + if (combo->textRect.right < combo->textRect.left) + combo->textRect.right = combo->textRect.left; - TRACE("\tlbox\t= (%s)\n", wine_dbgstr_rect(lprLB)); + TRACE("text %s, button %s, lbox %s.\n", wine_dbgstr_rect(&combo->textRect), wine_dbgstr_rect(&combo->buttonRect), + wine_dbgstr_rect(&combo->droppedRect)); } /*********************************************************************** @@ -472,7 +431,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG * recalculated. */ GetClientRect( hwnd, &lphc->droppedRect ); - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* * Adjust the position of the popup listbox if it's necessary @@ -1472,11 +1431,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); } - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1504,11 +1459,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1537,11 +1488,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -2049,7 +1996,7 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam lphc->droppedWidth = 0; /* recalculate the combobox area */ - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* fall through */ case CB_GETDROPPEDWIDTH:

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019