September 2018 - Wine-devel

[PATCH] dwmapi: return S_OK in DwmExtendFrameIntoClientArea
by Louis Lenders 21 Sep '18

21 Sep '18

Fix for bug 4583 To: wine-devel <wine-devel(a)winehq.org> (Note:also tested Steam that calls this function and didn`t see any negative side-effect of returning S_OK) Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 0e6ba3bed1..76e225f791 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -82,7 +82,7 @@ HRESULT WINAPI DwmExtendFrameIntoClientArea(HWND hwnd, const MARGINS* margins) { FIXME("(%p, %p) stub\n", hwnd, margins); - return E_NOTIMPL; + return S_OK; } /********************************************************************** -- 2.17.1

1 0

[PATCH v2 1/8] shell32/autocomplete: Fix going up through the suggestion listbox
by Gabriel Ivăncescu 21 Sep '18

21 Sep '18

When going up past the topmost item in the listbox, go through txtbackup first before wrapping around, just like when going down. This matches Windows behavior. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This series supersedes patches from 150637 to 150639. dlls/shell32/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index e3fe1fd..0471146 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -296,7 +296,7 @@ static LRESULT ACEditSubclassProc_KeyDown(IAutoCompleteImpl *ac, HWND hwnd, UINT /* Change the selection */ sel = SendMessageW(ac->hwndListBox, LB_GETCURSEL, 0, 0); if (wParam == VK_UP) - sel = ((sel - 1) < 0) ? count - 1 : sel - 1; + sel = ((sel - 1) < -1) ? count - 1 : sel - 1; else sel = ((sel + 1) >= count) ? -1 : sel + 1; SendMessageW(ac->hwndListBox, LB_SETCURSEL, sel, 0); -- 1.9.1

4 34

[PATCH v4 3/3] comctl32/pager: Support comboboxex notification conversion.
by Zhiyi Zhang 21 Sep '18

21 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 61 +++++++++++++++++++++++++++---- dlls/comctl32/tests/pager.c | 72 +++++++++++++++++++++++++++++++++++-- 2 files changed, 125 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index a6ef2eeadd..7fc0544ee4 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -101,7 +101,11 @@ enum conversion_flags /* Convert ANSI text from parent back to Unicode for children */ CONVERT_RECEIVE = 0x02, /* Send empty text to parent if text is NULL. Original text pointer still remains NULL */ - SEND_EMPTY_IF_NULL = 0x04 + SEND_EMPTY_IF_NULL = 0x04, + /* Set text to null after parent received the notification if the required mask is not set before sending notification */ + SET_NULL_IF_NO_MASK = 0x08, + /* Zero out the text buffer before sending it to parent */ + ZERO_SEND = 0x10 }; static void @@ -1038,6 +1042,10 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) { switch (code) { + /* ComboxBoxEx */ + case CBEN_DRAGBEGINW: return CBEN_DRAGBEGINA; + case CBEN_ENDEDITW: return CBEN_ENDEDITA; + case CBEN_GETDISPINFOW: return CBEN_GETDISPINFOA; /* Toolbar */ case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; @@ -1060,7 +1068,8 @@ static BOOL PAGER_AdjustBuffer(PAGER_INFO *infoPtr, INT size) return TRUE; } -static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, DWORD flags) +static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, UINT *mask, UINT requiredMask, WCHAR **text, + INT *textMax, DWORD flags) { CHAR *sendBuffer = NULL; CHAR *receiveBuffer; @@ -1074,14 +1083,21 @@ static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR hdr->code = PAGER_GetAnsiNtfCode(hdr->code); + if (mask && !(*mask & requiredMask)) + { + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + if (flags & SET_NULL_IF_NO_MASK) oldText = NULL; + goto done; + } + if (oldTextMax < 0) goto done; - if ((*text && (flags & CONVERT_SEND)) || (!*text && (flags & SEND_EMPTY_IF_NULL))) + if ((*text && flags & (CONVERT_SEND | ZERO_SEND)) || (!*text && flags & SEND_EMPTY_IF_NULL)) { bufferSize = textMax ? *textMax : lstrlenW(*text) + 1; sendBuffer = heap_alloc_zero(bufferSize); if (!sendBuffer) goto done; - WideCharToMultiByte(CP_ACP, 0, *text, -1, sendBuffer, bufferSize, NULL, FALSE); + if (!(flags & ZERO_SEND)) WideCharToMultiByte(CP_ACP, 0, *text, -1, sendBuffer, bufferSize, NULL, FALSE); *text = (WCHAR *)sendBuffer; } @@ -1117,17 +1133,50 @@ static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) switch (hdr->code) { + /* ComboBoxEx */ + case CBEN_GETDISPINFOW: + { + NMCOMBOBOXEXW *nmcbe = (NMCOMBOBOXEXW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmcbe->ceItem.mask, CBEIF_TEXT, &nmcbe->ceItem.pszText, + &nmcbe->ceItem.cchTextMax, ZERO_SEND | SET_NULL_IF_NO_MASK | CONVERT_RECEIVE); + } + case CBEN_DRAGBEGINW: + { + NMCBEDRAGBEGINW *nmdbW = (NMCBEDRAGBEGINW *)hdr; + NMCBEDRAGBEGINA nmdbA = {0}; + nmdbA.hdr.code = PAGER_GetAnsiNtfCode(nmdbW->hdr.code); + nmdbA.hdr.hwndFrom = nmdbW->hdr.hwndFrom; + nmdbA.hdr.idFrom = nmdbW->hdr.idFrom; + nmdbA.iItemid = nmdbW->iItemid; + WideCharToMultiByte(CP_ACP, 0, nmdbW->szText, ARRAY_SIZE(nmdbW->szText), nmdbA.szText, ARRAY_SIZE(nmdbA.szText), + NULL, FALSE); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmdbA); + } + case CBEN_ENDEDITW: + { + NMCBEENDEDITW *nmedW = (NMCBEENDEDITW *)hdr; + NMCBEENDEDITA nmedA = {0}; + nmedA.hdr.code = PAGER_GetAnsiNtfCode(nmedW->hdr.code); + nmedA.hdr.hwndFrom = nmedW->hdr.hwndFrom; + nmedA.hdr.idFrom = nmedW->hdr.idFrom; + nmedA.fChanged = nmedW->fChanged; + nmedA.iNewSelection = nmedW->iNewSelection; + nmedA.iWhy = nmedW->iWhy; + WideCharToMultiByte(CP_ACP, 0, nmedW->szText, ARRAY_SIZE(nmedW->szText), nmedA.szText, ARRAY_SIZE(nmedA.szText), + NULL, FALSE); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmedA); + } /* Toolbar */ case TBN_GETBUTTONINFOW: { NMTOOLBARW *nmtb = (NMTOOLBARW *)hdr; - return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtb->pszText, &nmtb->cchText, + return PAGER_SendConvertedNotify(infoPtr, hdr, NULL, 0, &nmtb->pszText, &nmtb->cchText, SEND_EMPTY_IF_NULL | CONVERT_SEND | CONVERT_RECEIVE); } case TBN_GETINFOTIPW: { NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; - return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, CONVERT_RECEIVE); + return PAGER_SendConvertedNotify(infoPtr, hdr, NULL, 0, &nmtbgit->pszText, &nmtbgit->cchTextMax, CONVERT_RECEIVE); } /* Tooltip */ case TTN_GETDISPINFOW: diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index cd7b637b91..b689549aa5 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -65,7 +65,9 @@ enum test_conversion_flags CONVERT_RECEIVE = 0x04, DONT_CONVERT_RECEIVE = 0x08, SEND_EMPTY_IF_NULL = 0x10, - DONT_SEND_EMPTY_IF_NULL = 0x20 + DONT_SEND_EMPTY_IF_NULL = 0x20, + SET_NULL_IF_NO_MASK = 0x40, + ZERO_SEND = 0x80 }; static struct notify_test_info @@ -578,7 +580,10 @@ static void notify_generic_text_handler(CHAR **text, INT *text_max) { send_data = (notify_test_info.test_id == CONVERT_SEND ? test_convert_send_data : test_dont_convert_send_data) + notify_test_info.sub_test_id; - if (notify_test_info.flags & CONVERT_SEND) + if (notify_test_info.flags & ZERO_SEND) + ok(!lstrcmpA(*text, empty_a), "Code 0x%08x test 0x%08x sub test %d expect empty text, got %s\n", + notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, *text); + else if (notify_test_info.flags & CONVERT_SEND) ok(!lstrcmpA(send_data->expect_text, *text), "Code 0x%08x test 0x%08x sub test %d expect %s, got %s\n", notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, (CHAR *)send_data->expect_text, *text); @@ -659,6 +664,32 @@ static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, L } switch (hdr->code) { + /* ComboBoxEx */ + case CBEN_INSERTITEM: + case CBEN_DELETEITEM: + { + NMCOMBOBOXEXW *nmcbe = (NMCOMBOBOXEXW *)hdr; + notify_generic_text_handler((CHAR **)&nmcbe->ceItem.pszText, NULL); + break; + } + case CBEN_DRAGBEGINA: + { + NMCBEDRAGBEGINA *nmcbedb = (NMCBEDRAGBEGINA *)hdr; + ok(!lstrcmpA(nmcbedb->szText, test_a), "Expect %s, got %s\n", nmcbedb->szText, test_a); + break; + } + case CBEN_ENDEDITA: + { + NMCBEENDEDITA *nmcbeed = (NMCBEENDEDITA *)hdr; + ok(!lstrcmpA(nmcbeed->szText, test_a), "Expect %s, got %s\n", nmcbeed->szText, test_a); + break; + } + case CBEN_GETDISPINFOA: + { + NMCOMBOBOXEXA *nmcbe = (NMCOMBOBOXEXA *)hdr; + notify_generic_text_handler(&nmcbe->ceItem.pszText, &nmcbe->ceItem.cchTextMax); + break; + } /* Toolbar */ case TBN_SAVE: { @@ -836,6 +867,33 @@ static void test_notify_generic_text_helper(HWND pager, const struct generic_tex else notify_test_info.test_id = DONT_SEND_EMPTY_IF_NULL; send_notify(pager, para->code_unicode, para->code_ansi, (LPARAM)para->ptr, TRUE); + + notify_test_info.test_id = SET_NULL_IF_NO_MASK; + memset(para->ptr, 0, para->size); + memset(buffer, 0, sizeof(buffer)); + *para->text = buffer; + if (para->text_max) *para->text_max = ARRAY_SIZE(buffer); + send_notify(pager, para->code_unicode, para->code_ansi, (LPARAM)para->ptr, TRUE); + if(para->flags & SET_NULL_IF_NO_MASK) + ok(!*para->text, "Expect null text\n"); +} + +static void test_wm_notify_comboboxex(HWND pager) +{ + static NMCBEDRAGBEGINW nmcbedb; + static NMCBEENDEDITW nmcbeed; + + /* CBEN_DRAGBEGIN */ + memset(&nmcbedb, 0, sizeof(nmcbedb)); + memcpy(nmcbedb.szText, test_w, sizeof(test_w)); + send_notify(pager, CBEN_DRAGBEGINW, CBEN_DRAGBEGINA, (LPARAM)&nmcbedb, FALSE); + ok(!lstrcmpW(nmcbedb.szText, test_w), "Expect %s, got %s\n", wine_dbgstr_w(test_w), wine_dbgstr_w(nmcbedb.szText)); + + /* CBEN_ENDEDIT */ + memset(&nmcbeed, 0, sizeof(nmcbeed)); + memcpy(nmcbeed.szText, test_w, sizeof(test_w)); + send_notify(pager, CBEN_ENDEDITW, CBEN_ENDEDITA, (LPARAM)&nmcbeed, FALSE); + ok(!lstrcmpW(nmcbeed.szText, test_w), "Expect %s, got %s\n", wine_dbgstr_w(test_w), wine_dbgstr_w(nmcbeed.szText)); } static void test_wm_notify_tooltip(HWND pager) @@ -880,6 +938,8 @@ static void test_wm_notify(void) { static const CHAR *class = "Pager notify class"; HWND parent, pager; + /* Combo Box Ex */ + static NMCOMBOBOXEXW nmcbe; /* Tool Bar */ static NMTBRESTORE nmtbr; static NMTBSAVE nmtbs; @@ -888,6 +948,13 @@ static void test_wm_notify(void) static NMTBGETINFOTIPW nmtbgit; static const struct generic_text_helper_para paras[] = { + /* Combo Box Ex */ + {&nmcbe, sizeof(nmcbe), &nmcbe.ceItem.mask, CBEIF_TEXT, &nmcbe.ceItem.pszText, &nmcbe.ceItem.cchTextMax, + CBEN_INSERTITEM, CBEN_INSERTITEM, DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, + {&nmcbe, sizeof(nmcbe), &nmcbe.ceItem.mask, CBEIF_TEXT, &nmcbe.ceItem.pszText, &nmcbe.ceItem.cchTextMax, + CBEN_DELETEITEM, CBEN_DELETEITEM, DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, + {&nmcbe, sizeof(nmcbe), &nmcbe.ceItem.mask, CBEIF_TEXT, &nmcbe.ceItem.pszText, &nmcbe.ceItem.cchTextMax, + CBEN_GETDISPINFOW, CBEN_GETDISPINFOA, ZERO_SEND | SET_NULL_IF_NO_MASK | DONT_CONVERT_SEND | CONVERT_RECEIVE}, /* Tool Bar */ {&nmtbs, sizeof(nmtbs), NULL, 0, (WCHAR **)&nmtbs.tbButton.iString, NULL, TBN_SAVE, TBN_SAVE, DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, @@ -916,6 +983,7 @@ static void test_wm_notify(void) test_notify_generic_text_helper(pager, paras + i); /* Tests for those that can't be covered by generic text test helper */ + test_wm_notify_comboboxex(pager); test_wm_notify_tooltip(pager); DestroyWindow(parent); -- 2.18.0

2 1

[PATCH v4 2/3] comctl32/pager: Support tooltip notification conversion.
by Zhiyi Zhang 21 Sep '18

21 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 72 ++++++++++++++++++++++++ dlls/comctl32/tests/pager.c | 106 ++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index ac63f1c07d..a6ef2eeadd 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -84,6 +84,8 @@ typedef struct INT TLbtnState; /* state of top or left btn */ INT BRbtnState; /* state of bottom or right btn */ INT direction; /* direction of the scroll, (e.g. PGF_SCROLLUP) */ + WCHAR *pwszBuffer;/* text buffer for converted notifications */ + INT nBufferSize;/* size of the above buffer */ } PAGER_INFO; #define TIMERID1 1 @@ -605,6 +607,7 @@ static LRESULT PAGER_Destroy (PAGER_INFO *infoPtr) { SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); + heap_free (infoPtr->pwszBuffer); heap_free (infoPtr); return 0; } @@ -1038,10 +1041,25 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) /* Toolbar */ case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; + /* Tooltip */ + case TTN_GETDISPINFOW: return TTN_GETDISPINFOA; } return code; } +static BOOL PAGER_AdjustBuffer(PAGER_INFO *infoPtr, INT size) +{ + if (!infoPtr->pwszBuffer) + infoPtr->pwszBuffer = heap_alloc(size); + else if (infoPtr->nBufferSize < size) + infoPtr->pwszBuffer = heap_realloc(infoPtr->pwszBuffer, size); + + if (!infoPtr->pwszBuffer) return FALSE; + if (infoPtr->nBufferSize < size) infoPtr->nBufferSize = size; + + return TRUE; +} + static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, DWORD flags) { CHAR *sendBuffer = NULL; @@ -1093,6 +1111,8 @@ done: static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) { + LRESULT ret; + if (infoPtr->bUnicode) return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); switch (hdr->code) @@ -1109,6 +1129,58 @@ static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, CONVERT_RECEIVE); } + /* Tooltip */ + case TTN_GETDISPINFOW: + { + NMTTDISPINFOW *nmttdiW = (NMTTDISPINFOW *)hdr; + NMTTDISPINFOA nmttdiA = {0}; + INT size; + + nmttdiA.hdr.code = PAGER_GetAnsiNtfCode(nmttdiW->hdr.code); + nmttdiA.hdr.hwndFrom = nmttdiW->hdr.hwndFrom; + nmttdiA.hdr.idFrom = nmttdiW->hdr.idFrom; + nmttdiA.hinst = nmttdiW->hinst; + nmttdiA.uFlags = nmttdiW->uFlags; + nmttdiA.lParam = nmttdiW->lParam; + nmttdiA.lpszText = nmttdiA.szText; + WideCharToMultiByte(CP_ACP, 0, nmttdiW->szText, ARRAY_SIZE(nmttdiW->szText), nmttdiA.szText, + ARRAY_SIZE(nmttdiA.szText), NULL, FALSE); + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmttdiA); + + nmttdiW->hinst = nmttdiA.hinst; + nmttdiW->uFlags = nmttdiA.uFlags; + nmttdiW->lParam = nmttdiA.lParam; + + MultiByteToWideChar(CP_ACP, 0, nmttdiA.szText, ARRAY_SIZE(nmttdiA.szText), nmttdiW->szText, + ARRAY_SIZE(nmttdiW->szText)); + if (!nmttdiA.lpszText) + nmttdiW->lpszText = nmttdiW->szText; + else if (!IS_INTRESOURCE(nmttdiA.lpszText)) + { + size = MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, 0, 0); + if (size > ARRAY_SIZE(nmttdiW->szText)) + { + if (!PAGER_AdjustBuffer(infoPtr, size * sizeof(WCHAR))) return ret; + MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, infoPtr->pwszBuffer, size); + nmttdiW->lpszText = infoPtr->pwszBuffer; + /* Override content in szText */ + memcpy(nmttdiW->szText, nmttdiW->lpszText, min(sizeof(nmttdiW->szText), size * sizeof(WCHAR))); + } + else + { + MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, nmttdiW->szText, ARRAY_SIZE(nmttdiW->szText)); + nmttdiW->lpszText = nmttdiW->szText; + } + } + else + { + nmttdiW->szText[0] = 0; + nmttdiW->lpszText = (WCHAR *)nmttdiA.lpszText; + } + + return ret; + } } /* Other notifications, no need to convert */ return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 6ff4e259ca..cd7b637b91 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -35,12 +35,26 @@ static CHAR test_a[] = {'t', 'e', 's', 't', 0}; static WCHAR empty_w[] = {0}; static CHAR empty_a[] = {0}; static CHAR large_a[] = "You should have received a copy of the GNU Lesser General Public License along with this ..."; +static WCHAR large_w[] = +{ + 'Y', 'o', 'u', ' ', 's', 'h', 'o', 'u', 'l', 'd', ' ', 'h', 'a', 'v', 'e', ' ', 'r', 'e', 'c', 'e', 'i', 'v', 'e', + 'd', ' ', 'a', ' ', 'c', 'o', 'p', 'y', ' ', 'o', 'f', ' ', 't', 'h', 'e', ' ', 'G', 'N', 'U', ' ', 'L', 'e', 's', + 's', 'e', 'r', ' ', 'G', 'e', 'n', 'e', 'r', 'a', 'l', ' ', 'P', 'u', 'b', 'l', 'i', 'c', ' ', 'L', 'i', 'c', 'e', + 'n', 's', 'e', ' ', 'a', 'l', 'o', 'n', 'g', ' ', 'w', 'i', 't', 'h', ' ', 't', 'h', 'i', 's', ' ', '.', '.', '.', 0 +}; static WCHAR large_truncated_65_w[65] = { 'Y', 'o', 'u', ' ', 's', 'h', 'o', 'u', 'l', 'd', ' ', 'h', 'a', 'v', 'e', ' ', 'r', 'e', 'c', 'e', 'i', 'v', 'e', 'd', ' ', 'a', ' ', 'c', 'o', 'p', 'y', ' ', 'o', 'f', ' ', 't', 'h', 'e', ' ', 'G', 'N', 'U', ' ', 'L', 'e', 's', 's', 'e', 'r', ' ', 'G', 'e', 'n', 'e', 'r', 'a', 'l', ' ', 'P', 'u', 'b', 'l', 'i', 'c', 0 }; +static WCHAR large_truncated_80_w[80] = +{ + 'Y', 'o', 'u', ' ', 's', 'h', 'o', 'u', 'l', 'd', ' ', 'h', 'a', 'v', 'e', ' ', 'r', 'e', 'c', 'e', + 'i', 'v', 'e', 'd', ' ', 'a', ' ', 'c', 'o', 'p', 'y', ' ', 'o', 'f', ' ', 't', 'h', 'e', ' ', 'G', + 'N', 'U', ' ', 'L', 'e', 's', 's', 'e', 'r', ' ', 'G', 'e', 'n', 'e', 'r', 'a', 'l', ' ', 'P', 'u', + 'b', 'l', 'i', 'c', ' ', 'L', 'i', 'c', 'e', 'n', 's', 'e', ' ', 'a', 'l', 'o', 'n', 'g', ' ', 'w' +}; static WCHAR buffer[64]; /* Text field conversion test behavior flags. */ @@ -132,6 +146,38 @@ static const struct notify_test_receive test_dont_convert_receive_data[] = {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_a, ARRAY_SIZE(buffer)}, }; +static const struct notify_test_tooltip +{ + /* Data for parent to write */ + CHAR *write_sztext; + INT write_sztext_size; + CHAR *write_lpsztext; + HMODULE write_hinst; + /* Data when message returned */ + WCHAR *return_sztext; + INT return_sztext_size; + WCHAR *return_lpsztext; + HMODULE return_hinst; + /* Data expected by parent */ + CHAR *expect_sztext; + /* Data send to parent */ + WCHAR *send_sztext; + INT send_sztext_size; + WCHAR *send_lpsztext; +} test_tooltip_data[] = +{ + {NULL, 0, NULL, NULL, empty_w, -1, empty_w}, + {test_a, sizeof(test_a), NULL, NULL, test_w, -1, test_w}, + {test_a, sizeof(test_a), test_a, NULL, test_w, -1, test_w}, + {test_a, sizeof(test_a), (CHAR *)1, (HMODULE)0xdeadbeef, empty_w, -1, (WCHAR *)1, (HMODULE)0xdeadbeef}, + {test_a, sizeof(test_a), test_a, (HMODULE)0xdeadbeef, test_w, -1, test_w, (HMODULE)0xdeadbeef}, + {NULL, 0, test_a, NULL, test_w, -1, test_w}, + {test_a, 2, test_a, NULL, test_w, -1, test_w}, + {NULL, 0, NULL, NULL, test_w, -1, test_w, NULL, test_a, test_w, sizeof(test_w)}, + {NULL, 0, NULL, NULL, empty_w, -1, empty_w, NULL, empty_a, NULL, 0, test_w}, + {NULL, 0, large_a, NULL, large_truncated_80_w, sizeof(large_truncated_80_w), large_w} +}; + #define CHILD1_ID 1 #define CHILD2_ID 2 @@ -575,6 +621,19 @@ static void notify_generic_text_handler(CHAR **text, INT *text_max) } } +static void notify_tooltip_handler(NMTTDISPINFOA *nm) +{ + const struct notify_test_tooltip *data = test_tooltip_data + notify_test_info.sub_test_id; + ok(nm->lpszText == nm->szText, "Sub test %d expect %p, got %p\n", notify_test_info.sub_test_id, nm->szText, + nm->lpszText); + if (data->expect_sztext) + ok(!lstrcmpA(data->expect_sztext, nm->szText), "Sub test %d expect %s, got %s\n", notify_test_info.sub_test_id, + data->expect_sztext, nm->szText); + if (data->write_sztext) memcpy(nm->szText, data->write_sztext, data->write_sztext_size); + if (data->write_lpsztext) nm->lpszText = data->write_lpsztext; + if (data->write_hinst) nm->hinst = data->write_hinst; +} + static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static const WCHAR test[] = {'t', 'e', 's', 't', 0}; @@ -631,6 +690,12 @@ static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, L notify_generic_text_handler(&nmtbgit->pszText, &nmtbgit->cchTextMax); break; } + /* Tooltip */ + case TTN_GETDISPINFOA: + { + notify_tooltip_handler((NMTTDISPINFOA *)hdr); + break; + } default: ok(0, "Unexpected message 0x%08x\n", hdr->code); } @@ -773,6 +838,44 @@ static void test_notify_generic_text_helper(HWND pager, const struct generic_tex send_notify(pager, para->code_unicode, para->code_ansi, (LPARAM)para->ptr, TRUE); } +static void test_wm_notify_tooltip(HWND pager) +{ + NMTTDISPINFOW nmttdi; + const struct notify_test_tooltip *data; + INT i; + + for (i = 0; i < ARRAY_SIZE(test_tooltip_data); i++) + { + data = test_tooltip_data + i; + notify_test_info.sub_test_id = i; + + memset(&nmttdi, 0, sizeof(nmttdi)); + if (data->send_sztext) memcpy(nmttdi.szText, data->send_sztext, data->send_sztext_size); + if (data->send_lpsztext) nmttdi.lpszText = data->send_lpsztext; + send_notify(pager, TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE); + if (data->return_sztext) + { + if (data->return_sztext_size == -1) + ok(!lstrcmpW(nmttdi.szText, data->return_sztext), "Sub test %d expect %s, got %s\n", i, + wine_dbgstr_w(data->return_sztext), wine_dbgstr_w(nmttdi.szText)); + else + ok(!memcmp(nmttdi.szText, data->return_sztext, data->return_sztext_size), "Wrong szText content\n"); + } + if (data->return_lpsztext) + { + if (IS_INTRESOURCE(data->return_lpsztext)) + ok(nmttdi.lpszText == data->return_lpsztext, "Sub test %d expect %s, got %s\n", i, + wine_dbgstr_w(data->return_lpsztext), wine_dbgstr_w(nmttdi.lpszText)); + else + ok(!lstrcmpW(nmttdi.lpszText, data->return_lpsztext), "Test %d expect %s, got %s\n", i, + wine_dbgstr_w(data->return_lpsztext), wine_dbgstr_w(nmttdi.lpszText)); + } + if (data->return_hinst) + ok(nmttdi.hinst == data->return_hinst, "Sub test %d expect %p, got %p\n", i, data->return_hinst, + nmttdi.hinst); + } +} + static void test_wm_notify(void) { static const CHAR *class = "Pager notify class"; @@ -812,6 +915,9 @@ static void test_wm_notify(void) for (i = 0; i < ARRAY_SIZE(paras); i++) test_notify_generic_text_helper(pager, paras + i); + /* Tests for those that can't be covered by generic text test helper */ + test_wm_notify_tooltip(pager); + DestroyWindow(parent); UnregisterClassA(class, GetModuleHandleA(NULL)); } -- 2.18.0

2 1

[PATCH v4 1/3] comctl32/pager: Support toolbar notification conversion.
by Zhiyi Zhang 21 Sep '18

21 Sep '18

Fix BibleWorks 10 not displaying toolbar. Pager always wants Unicode notifications from its children. And the parent of pager may want ANSI notifications. In this case, pager need to convert Unicode notifications to ANSI ones before sending them to parent and convert ANSI notifications from parent to Unicode before returning the result to its children. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v4: Supersede 150964,150965,150966. Minor changes as suggested by Nikolay. dlls/comctl32/pager.c | 96 +++++++++ dlls/comctl32/tests/pager.c | 398 ++++++++++++++++++++++++++++++++++++ 2 files changed, 494 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index de63cad717..ac63f1c07d 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -91,6 +91,17 @@ typedef struct #define INITIAL_DELAY 500 #define REPEAT_DELAY 50 +/* Text field conversion behavior flags for PAGER_SendConvertedNotify() */ +enum conversion_flags +{ + /* Convert Unicode text to ANSI for parent before sending. If not set, do nothing */ + CONVERT_SEND = 0x01, + /* Convert ANSI text from parent back to Unicode for children */ + CONVERT_RECEIVE = 0x02, + /* Send empty text to parent if text is NULL. Original text pointer still remains NULL */ + SEND_EMPTY_IF_NULL = 0x04 +}; + static void PAGER_GetButtonRects(const PAGER_INFO* infoPtr, RECT* prcTopLeft, RECT* prcBottomRight, BOOL bClientCoords) { @@ -1020,6 +1031,89 @@ static LRESULT PAGER_NotifyFormat(PAGER_INFO *infoPtr, INT command) } } +static UINT PAGER_GetAnsiNtfCode(UINT code) +{ + switch (code) + { + /* Toolbar */ + case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; + case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; + } + return code; +} + +static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, DWORD flags) +{ + CHAR *sendBuffer = NULL; + CHAR *receiveBuffer; + INT bufferSize; + WCHAR *oldText; + INT oldTextMax; + LRESULT ret = NO_ERROR; + + oldText = *text; + oldTextMax = textMax ? *textMax : 0; + + hdr->code = PAGER_GetAnsiNtfCode(hdr->code); + + if (oldTextMax < 0) goto done; + + if ((*text && (flags & CONVERT_SEND)) || (!*text && (flags & SEND_EMPTY_IF_NULL))) + { + bufferSize = textMax ? *textMax : lstrlenW(*text) + 1; + sendBuffer = heap_alloc_zero(bufferSize); + if (!sendBuffer) goto done; + WideCharToMultiByte(CP_ACP, 0, *text, -1, sendBuffer, bufferSize, NULL, FALSE); + *text = (WCHAR *)sendBuffer; + } + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + + if (*text && oldText && (flags & CONVERT_RECEIVE)) + { + /* MultiByteToWideChar requires that source and destination are not the same buffer */ + if (*text == oldText) + { + bufferSize = lstrlenA((CHAR *)*text) + 1; + receiveBuffer = heap_alloc(bufferSize); + if (!receiveBuffer) goto done; + memcpy(receiveBuffer, *text, bufferSize); + MultiByteToWideChar(CP_ACP, 0, receiveBuffer, bufferSize, oldText, oldTextMax); + heap_free(receiveBuffer); + } + else + MultiByteToWideChar(CP_ACP, 0, (CHAR *)*text, -1, oldText, oldTextMax); + } + +done: + heap_free(sendBuffer); + *text = oldText; + return ret; +} + +static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) +{ + if (infoPtr->bUnicode) return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + + switch (hdr->code) + { + /* Toolbar */ + case TBN_GETBUTTONINFOW: + { + NMTOOLBARW *nmtb = (NMTOOLBARW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtb->pszText, &nmtb->cchText, + SEND_EMPTY_IF_NULL | CONVERT_SEND | CONVERT_RECEIVE); + } + case TBN_GETINFOTIPW: + { + NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, CONVERT_RECEIVE); + } + } + /* Other notifications, no need to convert */ + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); +} + static LRESULT WINAPI PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1115,6 +1209,8 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return PAGER_NotifyFormat (infoPtr, lParam); case WM_NOTIFY: + return PAGER_Notify (infoPtr, (NMHDR *)lParam); + case WM_COMMAND: return SendMessageW (infoPtr->hwndNotify, uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index a1f6683a57..6ff4e259ca 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -30,6 +30,107 @@ static HWND parent_wnd, child1_wnd, child2_wnd; static INT notify_format; static BOOL notify_query_received; +static WCHAR test_w[] = {'t', 'e', 's', 't', 0}; +static CHAR test_a[] = {'t', 'e', 's', 't', 0}; +static WCHAR empty_w[] = {0}; +static CHAR empty_a[] = {0}; +static CHAR large_a[] = "You should have received a copy of the GNU Lesser General Public License along with this ..."; +static WCHAR large_truncated_65_w[65] = +{ + 'Y', 'o', 'u', ' ', 's', 'h', 'o', 'u', 'l', 'd', ' ', 'h', 'a', 'v', 'e', ' ', 'r', 'e', 'c', 'e', 'i', 'v', + 'e', 'd', ' ', 'a', ' ', 'c', 'o', 'p', 'y', ' ', 'o', 'f', ' ', 't', 'h', 'e', ' ', 'G', 'N', 'U', ' ', 'L', + 'e', 's', 's', 'e', 'r', ' ', 'G', 'e', 'n', 'e', 'r', 'a', 'l', ' ', 'P', 'u', 'b', 'l', 'i', 'c', 0 +}; +static WCHAR buffer[64]; + +/* Text field conversion test behavior flags. */ +enum test_conversion_flags +{ + CONVERT_SEND = 0x01, + DONT_CONVERT_SEND = 0x02, + CONVERT_RECEIVE = 0x04, + DONT_CONVERT_RECEIVE = 0x08, + SEND_EMPTY_IF_NULL = 0x10, + DONT_SEND_EMPTY_IF_NULL = 0x20 +}; + +static struct notify_test_info +{ + UINT unicode; + UINT ansi; + UINT_PTR id_from; + HWND hwnd_from; + /* Whether parent received notification */ + BOOL received; + UINT test_id; + UINT sub_test_id; + /* Text field conversion test behavior flag */ + DWORD flags; +} notify_test_info; + +struct notify_test_send +{ + /* Data sent to pager */ + WCHAR *send_text; + INT send_text_size; + INT send_text_max; + /* Data expected by parent of pager */ + void *expect_text; +}; + +struct notify_test_receive +{ + /* Data sent to pager */ + WCHAR *send_text; + INT send_text_size; + INT send_text_max; + /* Data for parent to write */ + CHAR *write_pointer; + CHAR *write_text; + INT write_text_size; + INT write_text_max; + /* Data when message returned */ + void *return_text; + INT return_text_max; +}; + +struct generic_text_helper_para +{ + void *ptr; + size_t size; + UINT *mask; + UINT required_mask; + WCHAR **text; + INT *text_max; + UINT code_unicode; + UINT code_ansi; + DWORD flags; +}; + +static const struct notify_test_send test_convert_send_data[] = +{ + {test_w, sizeof(test_w), ARRAY_SIZE(buffer), test_a} +}; + +static const struct notify_test_send test_dont_convert_send_data[] = +{ + {test_w, sizeof(test_w), ARRAY_SIZE(buffer), test_w} +}; + +static const struct notify_test_receive test_convert_receive_data[] = +{ + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_w, ARRAY_SIZE(buffer)}, + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_w, ARRAY_SIZE(buffer)}, + {NULL, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, NULL, ARRAY_SIZE(buffer)}, + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), large_a, NULL, 0, -1, large_truncated_65_w, ARRAY_SIZE(buffer)}, + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), empty_a, 0, 0, 1, empty_w, 1}, +}; + +static const struct notify_test_receive test_dont_convert_receive_data[] = +{ + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_a, ARRAY_SIZE(buffer)}, + {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_a, ARRAY_SIZE(buffer)}, +}; #define CHILD1_ID 1 #define CHILD2_ID 2 @@ -419,6 +520,302 @@ static void test_wm_notifyformat(void) UnregisterClassW(class_w, GetModuleHandleW(NULL)); } +static void notify_generic_text_handler(CHAR **text, INT *text_max) +{ + const struct notify_test_send *send_data; + const struct notify_test_receive *receive_data; + + switch (notify_test_info.test_id) + { + case CONVERT_SEND: + case DONT_CONVERT_SEND: + { + send_data = (notify_test_info.test_id == CONVERT_SEND ? test_convert_send_data : test_dont_convert_send_data) + + notify_test_info.sub_test_id; + if (notify_test_info.flags & CONVERT_SEND) + ok(!lstrcmpA(send_data->expect_text, *text), "Code 0x%08x test 0x%08x sub test %d expect %s, got %s\n", + notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, + (CHAR *)send_data->expect_text, *text); + else + ok(!lstrcmpW((WCHAR *)send_data->expect_text, (WCHAR *)*text), + "Code 0x%08x test 0x%08x sub test %d expect %s, got %s\n", notify_test_info.unicode, + notify_test_info.test_id, notify_test_info.sub_test_id, wine_dbgstr_w((WCHAR *)send_data->expect_text), + wine_dbgstr_w((WCHAR *)*text)); + if (text_max) + ok(*text_max == send_data->send_text_max, "Code 0x%08x test 0x%08x sub test %d expect %d, got %d\n", + notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, + send_data->send_text_max, *text_max); + break; + } + case CONVERT_RECEIVE: + case DONT_CONVERT_RECEIVE: + { + receive_data = (notify_test_info.test_id == CONVERT_RECEIVE ? test_convert_receive_data : test_dont_convert_receive_data) + + notify_test_info.sub_test_id; + if (text_max) + ok(*text_max == receive_data->send_text_max, "Code 0x%08x test 0x%08x sub test %d expect %d, got %d\n", + notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, + receive_data->send_text_max, *text_max); + + if (receive_data->write_text) + memcpy(*text, receive_data->write_text, receive_data->write_text_size); + else + *text = receive_data->write_pointer; + if (text_max && receive_data->write_text_max != -1) *text_max = receive_data->write_text_max; + break; + } + case SEND_EMPTY_IF_NULL: + ok(!lstrcmpA(*text, empty_a), "Code 0x%08x test 0x%08x sub test %d expect empty text, got %s\n", + notify_test_info.unicode, notify_test_info.test_id, notify_test_info.sub_test_id, *text); + break; + case DONT_SEND_EMPTY_IF_NULL: + ok(!*text, "Code 0x%08x test 0x%08x sub test %d expect null text\n", notify_test_info.unicode, + notify_test_info.test_id, notify_test_info.sub_test_id); + break; + } +} + +static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static const WCHAR test[] = {'t', 'e', 's', 't', 0}; + switch (message) + { + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR *)lParam; + + /* Not notifications we want to test */ + if (!notify_test_info.unicode) break; + ok(!notify_test_info.received, "Extra notification received\n"); + + ok(wParam == notify_test_info.id_from, "Expect %ld, got %ld\n", notify_test_info.id_from, wParam); + ok(hdr->code == notify_test_info.ansi, "Expect 0x%08x, got 0x%08x\n", notify_test_info.ansi, hdr->code); + ok(hdr->idFrom == notify_test_info.id_from, "Expect %ld, got %ld\n", notify_test_info.id_from, wParam); + ok(hdr->hwndFrom == notify_test_info.hwnd_from, "Expect %p, got %p\n", notify_test_info.hwnd_from, hdr->hwndFrom); + + if (hdr->code != notify_test_info.ansi) + { + skip("Notification code mismatch, skipping lParam check\n"); + return 0; + } + switch (hdr->code) + { + /* Toolbar */ + case TBN_SAVE: + { + NMTBSAVE *nmtbs = (NMTBSAVE *)hdr; + notify_generic_text_handler((CHAR **)&nmtbs->tbButton.iString, NULL); + break; + } + case TBN_RESTORE: + { + NMTBRESTORE *nmtbr = (NMTBRESTORE *)hdr; + notify_generic_text_handler((CHAR **)&nmtbr->tbButton.iString, NULL); + break; + } + case TBN_GETBUTTONINFOA: + { + NMTOOLBARA *nmtb = (NMTOOLBARA *)hdr; + notify_generic_text_handler(&nmtb->pszText, &nmtb->cchText); + break; + } + case TBN_GETDISPINFOW: + { + NMTBDISPINFOW *nmtbdi = (NMTBDISPINFOW *)hdr; + notify_generic_text_handler((CHAR **)&nmtbdi->pszText, &nmtbdi->cchText); + break; + } + case TBN_GETINFOTIPA: + { + NMTBGETINFOTIPA *nmtbgit = (NMTBGETINFOTIPA *)hdr; + notify_generic_text_handler(&nmtbgit->pszText, &nmtbgit->cchTextMax); + break; + } + default: + ok(0, "Unexpected message 0x%08x\n", hdr->code); + } + notify_test_info.received = TRUE; + ok(!lstrcmpA(test_a, "test"), "test_a got modified\n"); + ok(!lstrcmpW(test_w, test), "test_w got modified\n"); + return 0; + } + case WM_NOTIFYFORMAT: + if (lParam == NF_QUERY) return NFR_ANSI; + break; + } + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static BOOL register_test_notify_class(void) +{ + WNDCLASSA cls = {0}; + + cls.lpfnWndProc = test_notify_proc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = "Pager notify class"; + return RegisterClassA(&cls); +} + +static void send_notify(HWND pager, UINT unicode, UINT ansi, LPARAM lParam, BOOL code_change) +{ + NMHDR *hdr = (NMHDR *)lParam; + + notify_test_info.unicode = unicode; + notify_test_info.id_from = 1; + notify_test_info.hwnd_from = child1_wnd; + notify_test_info.ansi = ansi; + notify_test_info.received = FALSE; + + hdr->code = unicode; + hdr->idFrom = 1; + hdr->hwndFrom = child1_wnd; + + SendMessageW(pager, WM_NOTIFY, hdr->idFrom, lParam); + ok(notify_test_info.received, "Expect notification received\n"); + ok(hdr->code == code_change ? ansi : unicode, "Expect 0x%08x, got 0x%08x\n", hdr->code, + code_change ? ansi : unicode); +} + +/* Send notify to test text field conversion. In parent proc notify_generic_text_handler() handles these messages */ +static void test_notify_generic_text_helper(HWND pager, const struct generic_text_helper_para *para) +{ + const struct notify_test_send *send_data; + const struct notify_test_receive *receive_data; + INT array_size; + INT i; + + notify_test_info.flags = para->flags; + + if (para->flags & (CONVERT_SEND | DONT_CONVERT_SEND)) + { + if (para->flags & CONVERT_SEND) + { + notify_test_info.test_id = CONVERT_SEND; + send_data = test_convert_send_data; + array_size = ARRAY_SIZE(test_convert_send_data); + } + else + { + notify_test_info.test_id = DONT_CONVERT_SEND; + send_data = test_dont_convert_send_data; + array_size = ARRAY_SIZE(test_dont_convert_send_data); + } + + for (i = 0; i < array_size; i++) + { + const struct notify_test_send *data = send_data + i; + notify_test_info.sub_test_id = i; + + memset(para->ptr, 0, para->size); + if (para->mask) *para->mask = para->required_mask; + if (data->send_text) + { + memcpy(buffer, data->send_text, data->send_text_size); + *para->text = buffer; + } + if (para->text_max) *para->text_max = data->send_text_max; + send_notify(pager, para->code_unicode, para->code_ansi, (LPARAM)para->ptr, TRUE); + } + } + + if (para->flags & (CONVERT_RECEIVE | DONT_CONVERT_RECEIVE)) + { + if (para->flags & CONVERT_RECEIVE) + { + notify_test_info.test_id = CONVERT_RECEIVE; + receive_data = test_convert_receive_data; + array_size = ARRAY_SIZE(test_convert_receive_data); + } + else + { + notify_test_info.test_id = DONT_CONVERT_RECEIVE; + receive_data = test_dont_convert_receive_data; + array_size = ARRAY_SIZE(test_dont_convert_receive_data); + } + + for (i = 0; i < array_size; i++) + { + const struct notify_test_receive *data = receive_data + i; + notify_test_info.sub_test_id = i; + + memset(para->ptr, 0, para->size); + if (para->mask) *para->mask = para->required_mask; + if (data->send_text) + { + memcpy(buffer, data->send_text, data->send_text_size); + *para->text = buffer; + } + if (para->text_max) *para->text_max = data->send_text_max; + send_notify(pager, para->code_unicode, para->code_ansi, (LPARAM)para->ptr, TRUE); + if (data->return_text) + { + if (para->flags & CONVERT_RECEIVE) + ok(!lstrcmpW(data->return_text, *para->text), "Code 0x%08x sub test %d expect %s, got %s\n", + para->code_unicode, i, wine_dbgstr_w((WCHAR *)data->return_text), wine_dbgstr_w(*para->text)); + else + ok(!lstrcmpA(data->return_text, (CHAR *)*para->text), "Code 0x%08x sub test %d expect %s, got %s\n", + para->code_unicode, i, (CHAR *)data->return_text, (CHAR *)*para->text); + } + if (para->text_max) + ok(data->return_text_max == *para->text_max, "Code 0x%08x sub test %d expect %d, got %d\n", + para->code_unicode, i, data->return_text_max, *para->text_max); + } + } + + /* Extra tests for other behavior flags that are not worth it to create their own test arrays */ + memset(para->ptr, 0, para->size); + if (para->mask) *para->mask = para->required_mask; + if (para->text_max) *para->text_max = 1; + if (para->flags & SEND_EMPTY_IF_NULL) + notify_test_info.test_id = SEND_EMPTY_IF_NULL; + else + notify_test_info.test_id = DONT_SEND_EMPTY_IF_NULL; + send_notify(pager, para->code_unicode, para->code_ansi, (LPARAM)para->ptr, TRUE); +} + +static void test_wm_notify(void) +{ + static const CHAR *class = "Pager notify class"; + HWND parent, pager; + /* Tool Bar */ + static NMTBRESTORE nmtbr; + static NMTBSAVE nmtbs; + static NMTOOLBARW nmtb; + static NMTBDISPINFOW nmtbdi; + static NMTBGETINFOTIPW nmtbgit; + static const struct generic_text_helper_para paras[] = + { + /* Tool Bar */ + {&nmtbs, sizeof(nmtbs), NULL, 0, (WCHAR **)&nmtbs.tbButton.iString, NULL, TBN_SAVE, TBN_SAVE, + DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, + {&nmtbr, sizeof(nmtbr), NULL, 0, (WCHAR **)&nmtbr.tbButton.iString, NULL, TBN_RESTORE, TBN_RESTORE, + DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, + {&nmtbdi, sizeof(nmtbdi), &nmtbdi.dwMask, TBNF_TEXT, &nmtbdi.pszText, &nmtbdi.cchText, TBN_GETDISPINFOW, + TBN_GETDISPINFOW, DONT_CONVERT_SEND | DONT_CONVERT_RECEIVE}, + {&nmtb, sizeof(nmtb), NULL, 0, &nmtb.pszText, &nmtb.cchText, TBN_GETBUTTONINFOW, TBN_GETBUTTONINFOA, + SEND_EMPTY_IF_NULL | CONVERT_SEND | CONVERT_RECEIVE}, + {&nmtbgit, sizeof(nmtbgit), NULL, 0, &nmtbgit.pszText, &nmtbgit.cchTextMax, TBN_GETINFOTIPW, TBN_GETINFOTIPA, + DONT_CONVERT_SEND | CONVERT_RECEIVE} + }; + INT i; + + ok(register_test_notify_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + + parent = CreateWindowA(class, "parent", WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), 0); + ok(parent != NULL, "CreateWindow failed\n"); + pager = CreateWindowA(WC_PAGESCROLLERA, "pager", WS_CHILD, 0, 0, 100, 100, parent, 0, GetModuleHandleA(0), 0); + ok(pager != NULL, "CreateWindow failed\n"); + child1_wnd = CreateWindowA(class, "child", WS_CHILD, 0, 0, 100, 100, pager, (HMENU)1, GetModuleHandleA(0), 0); + ok(child1_wnd != NULL, "CreateWindow failed\n"); + SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); + + for (i = 0; i < ARRAY_SIZE(paras); i++) + test_notify_generic_text_helper(pager, paras + i); + + DestroyWindow(parent); + UnregisterClassA(class, GetModuleHandleA(NULL)); +} + static void init_functions(void) { HMODULE mod = LoadLibraryA("comctl32.dll"); @@ -447,6 +844,7 @@ START_TEST(pager) test_pager(); test_wm_notifyformat(); + test_wm_notify(); DestroyWindow(parent_wnd); } -- 2.18.0

2 1

[PATCH] dwrite/layout: Test resulting line width before adding inline trimming run.
by Nikolay Sivov 21 Sep '18

21 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This fixes out-of-bounds read in cluster array, for example when trimming is applied to single cluster layout. dlls/dwrite/layout.c | 3 +++ dlls/dwrite/tests/layout.c | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 10d591457c..5deae455b1 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1926,6 +1926,9 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust if (FAILED(hr)) return; + if (get_cluster_range_width(layout, start, i) + sign_metrics.width > layout->metrics.layoutWidth) + append_trimming_run = FALSE; + if (append_trimming_run) { struct layout_effective_inline *trimming_sign; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 652f6b78ac..c77a0ea51b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1636,6 +1636,11 @@ static const struct drawcall_entry draw_seq[] = { { DRAW_LAST_KIND } }; +static const struct drawcall_entry draw_trimmed_seq[] = { + { DRAW_GLYPHRUN, {'a',0}, {'e','n','-','u','s',0}, 1 }, + { DRAW_LAST_KIND } +}; + static const struct drawcall_entry draw_seq2[] = { { DRAW_GLYPHRUN, {'s',0}, {'r','u',0}, 1 }, { DRAW_GLYPHRUN, {'t',0}, {'r','u',0}, 1 }, @@ -2386,6 +2391,44 @@ todo_wine IDWriteTextLayout_Release(layout); + /* Single cluster layout, trigger trimming. */ + hr = IDWriteFactory_CreateTextLayout(factory, str6W, 1, format, 1000.0f, 200.0f, &layout); + ok(hr == S_OK, "Failed to create layout, hr %#x.\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 1, &count); + ok(hr == S_OK, "Failed to get cluster metrics, hr %#x.\n", hr); + ok(count == 1, "Unexpected cluster count %u.\n", count); + + hr = IDWriteTextLayout_SetMaxWidth(layout, metrics[0].width / 2.0f); + ok(hr == S_OK, "Failed to set layout width, hr %#x.\n", hr); + + trimming_options.granularity = DWRITE_TRIMMING_GRANULARITY_CHARACTER; + trimming_options.delimiter = 0; + trimming_options.delimiterCount = 0; + hr = IDWriteTextLayout_SetTrimming(layout, &trimming_options, trimm); + ok(hr == S_OK, "Failed to set trimming options, hr %#x.\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 1, &count); + ok(hr == S_OK, "Failed to get cluster metrics, hr %#x.\n", hr); + ok(count == 1, "Unexpected cluster count %u.\n", count); + + hr = IDWriteTextLayout_GetLineMetrics(layout, &line, 1, &count); + ok(hr == S_OK, "Failed to get line metrics, hr %#x.\n", hr); + ok(count == 1, "Unexpected line count %u.\n", count); + ok(line.length == 1, "Unexpected line length %u.\n", line.length); + ok(line.isTrimmed, "Unexpected trimming flag %x.\n", line.isTrimmed); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0f, 0.0f); + ok(hr == S_OK, "Draw() failed, hr %#x.\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_trimmed_seq, "Trimmed draw test", FALSE); + + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); -- 2.18.0

1 0

[PATCH 2/2] wined3d: Move the OpenGL view class to struct wined3d_format_gl.
by Henri Verbeet 21 Sep '18

21 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 16 ++++++++-------- dlls/wined3d/view.c | 11 +++++++++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 45d1f07b39c..8e9b6dfafd6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2991,23 +2991,23 @@ static GLenum lookup_gl_view_class(GLenum internal_format) return GL_NONE; } -static void query_view_class(struct wined3d_format *format) +static void query_view_class(struct wined3d_format_gl *format) { GLenum internal_view_class, gamma_view_class, rt_view_class; - internal_view_class = lookup_gl_view_class(format->glInternal); - gamma_view_class = lookup_gl_view_class(format->glGammaInternal); - rt_view_class = lookup_gl_view_class(format->rtInternal); + internal_view_class = lookup_gl_view_class(format->f.glInternal); + gamma_view_class = lookup_gl_view_class(format->f.glGammaInternal); + rt_view_class = lookup_gl_view_class(format->f.rtInternal); if (internal_view_class == gamma_view_class || gamma_view_class == rt_view_class) { - format->gl_view_class = internal_view_class; + format->view_class = internal_view_class; TRACE("Format %s is member of GL view class %#x.\n", - debug_d3dformat(format->id), format->gl_view_class); + debug_d3dformat(format->f.id), format->view_class); } else { - format->gl_view_class = GL_NONE; + format->view_class = GL_NONE; } } @@ -3083,7 +3083,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, } } - query_view_class(format); + query_view_class(wined3d_format_gl_mutable(format)); if (format->glInternal && format->flags[WINED3D_GL_RES_TYPE_RB] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index d1678670bfe..dedb9fc8047 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -531,7 +531,11 @@ static void wined3d_render_target_view_cs_init(void *object) if (resource->format->id != view->format->id || (view->layer_count != 1 && view->layer_count != depth_or_layer_count)) { - if (resource->format->gl_view_class != view->format->gl_view_class) + GLenum resource_class, view_class; + + resource_class = wined3d_format_gl(resource->format)->view_class; + view_class = wined3d_format_gl(view->format)->view_class; + if (resource_class != view_class) { FIXME("Render target view not supported, resource format %s, view format %s.\n", debug_d3dformat(resource->format->id), debug_d3dformat(view->format->id)); @@ -722,7 +726,10 @@ static void wined3d_shader_resource_view_cs_init(void *object) else { struct wined3d_texture *texture = texture_from_resource(resource); + GLenum resource_class, view_class; + resource_class = wined3d_format_gl(resource->format)->view_class; + view_class = wined3d_format_gl(view_format)->view_class; view_target = get_texture_view_target(gl_info, desc, texture); if (resource->format->id == view_format->id && texture->target == view_target @@ -737,7 +744,7 @@ static void wined3d_shader_resource_view_cs_init(void *object) FIXME("Swapchain shader resource views not supported.\n"); } else if (resource->format->typeless_id == view_format->typeless_id - && resource->format->gl_view_class == view_format->gl_view_class) + && resource_class == view_class) { create_texture_view(&view->gl_view, view_target, desc, texture, view_format); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e11d61379c2..cb2f44212c4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4359,7 +4359,6 @@ struct wined3d_format unsigned int width, unsigned int height, unsigned int depth); enum wined3d_format_id typeless_id; - GLenum gl_view_class; }; const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, @@ -4385,6 +4384,8 @@ struct wined3d_format_gl GLenum vtx_type; GLint vtx_format; + + GLenum view_class; }; static inline const struct wined3d_format_gl *wined3d_format_gl(const struct wined3d_format *format) -- 2.11.0

1 0

[PATCH 1/2] wined3d: Move the OpenGL vertex format to a separate structure.
by Henri Verbeet 21 Sep '18

21 Sep '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 38 +++++++++++++++++++++++++------------- dlls/wined3d/utils.c | 34 +++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 15 +++++++++++++-- 3 files changed, 63 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 19f0fcbd2b0..167241a6f0f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5045,6 +5045,7 @@ void context_load_tex_coords(const struct wined3d_context *context, const struct GLuint *current_bo, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_format_gl *format_gl; unsigned int mapped_stage = 0; unsigned int texture_idx; @@ -5079,7 +5080,8 @@ void context_load_tex_coords(const struct wined3d_context *context, const struct checkGLcall("glClientActiveTextureARB"); /* The coords to supply depend completely on the fvf/vertex shader. */ - gl_info->gl_ops.gl.p_glTexCoordPointer(e->format->gl_vtx_format, e->format->gl_vtx_type, e->stride, + format_gl = wined3d_format_gl(e->format); + gl_info->gl_ops.gl.p_glTexCoordPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, e->data.addr + state->load_base_vertex_index * e->stride); gl_info->gl_ops.gl.p_glEnableClientState(GL_TEXTURE_COORD_ARRAY); } @@ -5121,6 +5123,7 @@ static void context_load_vertex_data(struct wined3d_context *context, { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_stream_info_element *e; + const struct wined3d_format_gl *format_gl; GLuint current_bo; TRACE("context %p, si %p, state %p.\n", context, si, state); @@ -5151,6 +5154,7 @@ static void context_load_vertex_data(struct wined3d_context *context, if (si->use_map & (1u << WINED3D_FFP_POSITION)) { e = &si->elements[WINED3D_FFP_POSITION]; + format_gl = wined3d_format_gl(e->format); if (current_bo != e->data.buffer_object) { @@ -5160,9 +5164,9 @@ static void context_load_vertex_data(struct wined3d_context *context, } TRACE("glVertexPointer(%#x, %#x, %#x, %p);\n", - e->format->gl_vtx_format, e->format->gl_vtx_type, e->stride, + format_gl->vtx_format, format_gl->vtx_type, e->stride, e->data.addr + state->load_base_vertex_index * e->stride); - gl_info->gl_ops.gl.p_glVertexPointer(e->format->gl_vtx_format, e->format->gl_vtx_type, e->stride, + gl_info->gl_ops.gl.p_glVertexPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, e->data.addr + state->load_base_vertex_index * e->stride); checkGLcall("glVertexPointer(...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_VERTEX_ARRAY); @@ -5173,6 +5177,7 @@ static void context_load_vertex_data(struct wined3d_context *context, if (si->use_map & (1u << WINED3D_FFP_NORMAL)) { e = &si->elements[WINED3D_FFP_NORMAL]; + format_gl = wined3d_format_gl(e->format); if (current_bo != e->data.buffer_object) { @@ -5181,9 +5186,9 @@ static void context_load_vertex_data(struct wined3d_context *context, current_bo = e->data.buffer_object; } - TRACE("glNormalPointer(%#x, %#x, %p);\n", e->format->gl_vtx_type, e->stride, + TRACE("glNormalPointer(%#x, %#x, %p);\n", format_gl->vtx_type, e->stride, e->data.addr + state->load_base_vertex_index * e->stride); - gl_info->gl_ops.gl.p_glNormalPointer(e->format->gl_vtx_type, e->stride, + gl_info->gl_ops.gl.p_glNormalPointer(format_gl->vtx_type, e->stride, e->data.addr + state->load_base_vertex_index * e->stride); checkGLcall("glNormalPointer(...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_NORMAL_ARRAY); @@ -5200,6 +5205,7 @@ static void context_load_vertex_data(struct wined3d_context *context, if (si->use_map & (1u << WINED3D_FFP_DIFFUSE)) { e = &si->elements[WINED3D_FFP_DIFFUSE]; + format_gl = wined3d_format_gl(e->format); if (current_bo != e->data.buffer_object) { @@ -5209,9 +5215,9 @@ static void context_load_vertex_data(struct wined3d_context *context, } TRACE("glColorPointer(%#x, %#x %#x, %p);\n", - e->format->gl_vtx_format, e->format->gl_vtx_type, e->stride, + format_gl->vtx_format, format_gl->vtx_type, e->stride, e->data.addr + state->load_base_vertex_index * e->stride); - gl_info->gl_ops.gl.p_glColorPointer(e->format->gl_vtx_format, e->format->gl_vtx_type, e->stride, + gl_info->gl_ops.gl.p_glColorPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, e->data.addr + state->load_base_vertex_index * e->stride); checkGLcall("glColorPointer(4, GL_UNSIGNED_BYTE, ...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_COLOR_ARRAY); @@ -5233,8 +5239,12 @@ static void context_load_vertex_data(struct wined3d_context *context, if (gl_info->supported[EXT_SECONDARY_COLOR]) { - GLenum type = e->format->gl_vtx_type; - GLint format = e->format->gl_vtx_format; + GLint format; + GLenum type; + + format_gl = wined3d_format_gl(e->format); + type = format_gl->vtx_type; + format = format_gl->vtx_format; if (current_bo != e->data.buffer_object) { @@ -5342,6 +5352,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, { const struct wined3d_stream_info_element *element = &stream_info->elements[i]; const struct wined3d_stream_state *stream; + const struct wined3d_format_gl *format_gl; if (!(stream_info->use_map & (1u << i))) { @@ -5354,6 +5365,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, continue; } + format_gl = wined3d_format_gl(element->format); stream = &state->streams[element->stream_idx]; if ((stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) && !context->instance_count) @@ -5376,7 +5388,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, if (element->stride) { - DWORD format_flags = element->format->flags[WINED3D_GL_RES_TYPE_BUFFER]; + DWORD format_flags = format_gl->f.flags[WINED3D_GL_RES_TYPE_BUFFER]; if (current_bo != element->data.buffer_object) { @@ -5390,12 +5402,12 @@ static void context_load_numbered_arrays(struct wined3d_context *context, * won't be load converted attributes anyway. */ if (vs && vs->reg_maps.shader_version.major >= 4 && (format_flags & WINED3DFMT_FLAG_INTEGER)) { - GL_EXTCALL(glVertexAttribIPointer(i, element->format->gl_vtx_format, element->format->gl_vtx_type, + GL_EXTCALL(glVertexAttribIPointer(i, format_gl->vtx_format, format_gl->vtx_type, element->stride, element->data.addr + state->load_base_vertex_index * element->stride)); } else { - GL_EXTCALL(glVertexAttribPointer(i, element->format->gl_vtx_format, element->format->gl_vtx_type, + GL_EXTCALL(glVertexAttribPointer(i, format_gl->vtx_format, format_gl->vtx_type, !!(format_flags & WINED3DFMT_FLAG_NORMALISED), element->stride, element->data.addr + state->load_base_vertex_index * element->stride)); } @@ -5419,7 +5431,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, if (context->numbered_array_mask & (1u << i)) context_unload_numbered_array(context, i); - switch (element->format->id) + switch (format_gl->f.id) { case WINED3DFMT_R32_FLOAT: GL_EXTCALL(glVertexAttrib1fv(i, (const GLfloat *)ptr)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bf32953032e..45d1f07b39c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1925,6 +1925,11 @@ static inline int get_format_idx(enum wined3d_format_id format_id) return -1; } +static struct wined3d_format_gl *wined3d_format_gl_mutable(struct wined3d_format *format) +{ + return CONTAINING_RECORD(format, struct wined3d_format_gl, f); +} + static struct wined3d_format *get_format_by_idx(const struct wined3d_adapter *adapter, int fmt_idx) { return (struct wined3d_format *)((BYTE *)adapter->formats + fmt_idx * adapter->format_size); @@ -1944,6 +1949,17 @@ static struct wined3d_format *get_format_internal(const struct wined3d_adapter * return get_format_by_idx(adapter, fmt_idx); } +static struct wined3d_format_gl *get_format_gl_internal(const struct wined3d_adapter *adapter, + enum wined3d_format_id format_id) +{ + struct wined3d_format *format; + + if ((format = get_format_internal(adapter, format_id))) + return wined3d_format_gl_mutable(format); + + return NULL; +} + static void copy_format(const struct wined3d_adapter *adapter, struct wined3d_format *dst_format, const struct wined3d_format *src_format) { @@ -3665,27 +3681,27 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) { - struct wined3d_format *format; + struct wined3d_format_gl *format; unsigned int i; for (i = 0; i < ARRAY_SIZE(format_vertex_info); ++i) { - if (!(format = get_format_internal(adapter, format_vertex_info[i].id))) + if (!(format = get_format_gl_internal(adapter, format_vertex_info[i].id))) return FALSE; if (!gl_info->supported[format_vertex_info[i].extension]) continue; - format->emit_idx = format_vertex_info[i].emit_idx; - format->gl_vtx_type = format_vertex_info[i].gl_vtx_type; - format->gl_vtx_format = format->component_count; - format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE; + format->f.emit_idx = format_vertex_info[i].emit_idx; + format->vtx_type = format_vertex_info[i].gl_vtx_type; + format->vtx_format = format->f.component_count; + format->f.flags[WINED3D_GL_RES_TYPE_BUFFER] |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE; } if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) { - format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); - format->gl_vtx_format = GL_BGRA; + format = get_format_gl_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); + format->vtx_format = GL_BGRA; } return TRUE; @@ -3968,7 +3984,7 @@ BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct { struct wined3d_gl_info *gl_info = &adapter->gl_info; - if (!wined3d_adapter_init_format_info(adapter, sizeof(struct wined3d_format))) + if (!wined3d_adapter_init_format_info(adapter, sizeof(struct wined3d_format_gl))) return FALSE; if (!init_format_texture_info(adapter, gl_info)) goto fail; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 637c7218c18..e11d61379c2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4336,8 +4336,6 @@ struct wined3d_format UINT block_byte_count; enum wined3d_ffp_emit_idx emit_idx; - GLenum gl_vtx_type; - GLint gl_vtx_format; GLint glInternal; GLint glGammaInternal; @@ -4381,6 +4379,19 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1, enum wined3d_format_id format2) DECLSPEC_HIDDEN; +struct wined3d_format_gl +{ + struct wined3d_format f; + + GLenum vtx_type; + GLint vtx_format; +}; + +static inline const struct wined3d_format_gl *wined3d_format_gl(const struct wined3d_format *format) +{ + return CONTAINING_RECORD(format, struct wined3d_format_gl, f); +} + BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN; static inline BOOL wined3d_format_is_typeless(const struct wined3d_format *format) -- 2.11.0

1 0

[PATCH v2] gdi32: Avoid using GCC's typeof extension
by Alex Henrie 21 Sep '18

21 Sep '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/gdi32/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index ce60d110d9..8920b73f59 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -61,9 +61,9 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -static typeof(GetDesktopWindow) *pGetDesktopWindow; -static typeof(GetSystemMetrics) *pGetSystemMetrics; -static typeof(SetThreadDpiAwarenessContext) *pSetThreadDpiAwarenessContext; +static HWND (WINAPI *pGetDesktopWindow)(void); +static INT (WINAPI *pGetSystemMetrics)(INT); +static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); /********************************************************************** * create_driver -- 2.19.0

2 1

[PATCH 1/4] testbot: Add a ModuleBuild check in GetPatchImpacts().
by Francois Gouget 21 Sep '18

21 Sep '18

Patches that impact a single module can impact the Wine files list too. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 9e0e68980..602c80b7d 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -279,7 +279,8 @@ sub GetPatchImpacts($;$) if ($PastImpacts) { - if ($PastImpacts->{WineBuild} or $PastImpacts->{TestBuild}) + if ($PastImpacts->{WineBuild} or $PastImpacts->{ModuleBuild} or + $PastImpacts->{TestBuild}) { # Update the list of Wine files so we correctly recognize patchset parts # that modify new Wine files. -- 2.18.0

1 3