October 2022 - Wine-commits

Connor McAdams : uiautomationcore: Add support for getting HWND providers to uia_node_from_lresult().
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: f36e1b9138aa5865ece2988d641767a4742c81a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f36e1b9138aa5865ece2988d641767… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 12 13:54:28 2022 -0400 uiautomationcore: Add support for getting HWND providers to uia_node_from_lresult(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 +++++----- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index d8271ea048c..c9ed575c1ae 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -5061,12 +5061,12 @@ static const struct prov_method_sequence node_from_hwnd7[] = { { &Provider_child, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, - { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { &Provider, PROV_GET_PROVIDER_OPTIONS }, { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, + { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, { &Provider, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ - { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, - { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { &Provider, PROV_GET_PROVIDER_OPTIONS }, + { &Provider, PROV_GET_PROVIDER_OPTIONS }, { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { 0 } }; @@ -5352,7 +5352,7 @@ static DWORD WINAPI uia_node_from_handle_test_thread(LPVOID param) SET_EXPECT(winproc_GETOBJECT_CLIENT); hr = UiaGetPropertyValue(node, UIA_LabeledByPropertyId, &v); ok(hr == S_OK, "Unexpected hr %#lx\n", hr); - todo_wine CHECK_CALLED(winproc_GETOBJECT_UiaRoot); + CHECK_CALLED(winproc_GETOBJECT_UiaRoot); called_winproc_GETOBJECT_CLIENT = expect_winproc_GETOBJECT_CLIENT = 0; ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider_child.ref); diff --git a/dlls/uiautomationcore/uia_classes.idl b/dlls/uiautomationcore/uia_classes.idl index 4540613bba2..a240534222a 100644 --- a/dlls/uiautomationcore/uia_classes.idl +++ b/dlls/uiautomationcore/uia_classes.idl @@ -58,5 +58,6 @@ library UIA_wine_private HRESULT get_provider([in]int idx, [out, retval]IWineUiaProvider **out_prov); HRESULT get_prop_val([in]const GUID *prop_guid, [out, retval]VARIANT *ret_val); HRESULT disconnect(); + HRESULT get_hwnd([out, retval]ULONG *out_hwnd); } } diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 8f4cb8b69ce..94046066354 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -523,6 +523,17 @@ static HRESULT WINAPI uia_node_disconnect(IWineUiaNode *iface) return S_OK; } +static HRESULT WINAPI uia_node_get_hwnd(IWineUiaNode *iface, ULONG *out_hwnd) +{ + struct uia_node *node = impl_from_IWineUiaNode(iface); + + TRACE("%p, %p\n", node, out_hwnd); + + *out_hwnd = HandleToUlong(node->hwnd); + + return S_OK; +} + static const IWineUiaNodeVtbl uia_node_vtbl = { uia_node_QueryInterface, uia_node_AddRef, @@ -530,6 +541,7 @@ static const IWineUiaNodeVtbl uia_node_vtbl = { uia_node_get_provider, uia_node_get_prop_val, uia_node_disconnect, + uia_node_get_hwnd, }; static struct uia_node *unsafe_impl_from_IWineUiaNode(IWineUiaNode *iface) @@ -1351,6 +1363,15 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU IWineUiaProvider_Release(&prov->IWineUiaProvider_iface); return hr; } + + if (!node->hwnd) + { + ULONG hwnd; + + hr = IWineUiaNode_get_hwnd(nested_node, &hwnd); + if (SUCCEEDED(hr)) + node->hwnd = UlongToHandle(hwnd); + } } node->prov[prov_type] = provider_iface; @@ -1383,6 +1404,13 @@ static HRESULT uia_node_from_lresult(LRESULT lr, HUIANODE *huianode) return hr; } + if (node->hwnd) + { + hr = uia_get_provider_from_hwnd(node); + if (FAILED(hr)) + WARN("uia_get_provider_from_hwnd failed with hr %#lx\n", hr); + } + hr = prepare_uia_node(node); if (FAILED(hr)) {

1 0

Nikolay Sivov : dwrite/tests: Use existing to create factory instance.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: e5bfd522d2a25b632bd721de2ccbe7bbbc4e119f URL: https://gitlab.winehq.org/wine/wine/-/commit/e5bfd522d2a25b632bd721de2ccbe7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 18 07:11:16 2022 +0300 dwrite/tests: Use existing to create factory instance. --- dlls/dwrite/tests/layout.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 93ae62ff92c..f9f4f46f584 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5008,7 +5008,6 @@ static void test_MapCharacters(void) UINT32 mappedlength, vs_length; IDWriteFontFallback *fallback; IDWriteFactory2 *factory2; - IDWriteFactory *factory; IDWriteFont *font; WCHAR buffW[50]; WCHAR name[64]; @@ -5019,12 +5018,10 @@ static void test_MapCharacters(void) WCHAR *ptr; HRESULT hr; - factory = create_factory(); - - hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); - IDWriteFactory_Release(factory); - if (hr != S_OK) { - win_skip("MapCharacters() is not supported\n"); + factory2 = create_factory_iid(&IID_IDWriteFactory2); + if (!factory2) + { + win_skip("MapCharacters() is not supported.\n"); return; } @@ -5160,15 +5157,15 @@ static void test_MapCharacters(void) resource_loader = create_resource_file_loader(); resource_collection_loader = create_resource_collection_loader(resource_loader); - hr = IDWriteFactory_RegisterFontFileLoader(factory, resource_loader); + hr = IDWriteFactory2_RegisterFontFileLoader(factory2, resource_loader); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IDWriteFactory_RegisterFontCollectionLoader(factory, resource_collection_loader); + hr = IDWriteFactory2_RegisterFontCollectionLoader(factory2, resource_collection_loader); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hrsrc = FindResourceA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(1), (LPCSTR)RT_RCDATA); ok(!!hrsrc, "Failed to find font resource\n"); - hr = IDWriteFactory_CreateCustomFontCollection(factory, resource_collection_loader, &hrsrc, sizeof(hrsrc), &collection); + hr = IDWriteFactory2_CreateCustomFontCollection(factory2, resource_collection_loader, &hrsrc, sizeof(hrsrc), &collection); ok(hr == S_OK, "Unexpected hr %#lx.\n",hr); /* Variation selectors are skipped. */ @@ -5257,9 +5254,9 @@ static void test_MapCharacters(void) IDWriteFontCollection_Release(collection); - hr = IDWriteFactory_UnregisterFontCollectionLoader(factory, resource_collection_loader); + hr = IDWriteFactory2_UnregisterFontCollectionLoader(factory2, resource_collection_loader); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IDWriteFactory_UnregisterFontFileLoader(factory, resource_loader); + hr = IDWriteFactory2_UnregisterFontFileLoader(factory2, resource_loader); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDWriteFontCollectionLoader_Release(resource_collection_loader);

1 0

Piotr Caban : comctl32: Add helper for calling PROPERTYSHEETPAGE callback.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: e05f6451bc29084cecee8a3cdc1e166d5dcc9edd URL: https://gitlab.winehq.org/wine/wine/-/commit/e05f6451bc29084cecee8a3cdc1e16… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 31 20:14:06 2022 +0200 comctl32: Add helper for calling PROPERTYSHEETPAGE callback. --- dlls/comctl32/propsheet.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index b0a011b2c55..601b1982ef8 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -106,7 +106,6 @@ typedef struct tagPropPageInfo BOOL isDirty; LPCWSTR pszText; BOOL hasHelp; - BOOL useCallback; BOOL hasIcon; } PropPageInfo; @@ -199,6 +198,15 @@ static WCHAR *heap_strdupAtoW(const char *str) return ret; } +static void HPSP_call_callback(HPROPSHEETPAGE hpsp, UINT msg) +{ + if (!(hpsp->psp.dwFlags & PSP_USECALLBACK) || !hpsp->psp.pfnCallback || + (msg == PSPCB_ADDREF && hpsp->psp.dwSize <= PROPSHEETPAGEA_V1_SIZE)) + return; + + hpsp->psp.pfnCallback(0, msg, &hpsp->callback_psp); +} + #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** * PROPSHEET_UnImplementedFlags @@ -419,7 +427,6 @@ static BOOL PROPSHEET_CollectPageInfo(HPROPSHEETPAGE hpsp, * Process property page flags. */ dwFlags = hpsp->psp.dwFlags; - psInfo->proppage[index].useCallback = (dwFlags & PSP_USECALLBACK) && (hpsp->psp.pfnCallback); psInfo->proppage[index].hasHelp = dwFlags & PSP_HASHELP; psInfo->proppage[index].hasIcon = dwFlags & (PSP_USEHICON | PSP_USEICONID); @@ -1436,8 +1443,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, pTemplateCopy->dwExtendedStyle |= WS_EX_CONTROLPARENT; } - if (psInfo->proppage[index].useCallback) - (*(hpsp->psp.pfnCallback))(0, PSPCB_CREATE, &hpsp->psp); + HPSP_call_callback(hpsp, PSPCB_CREATE); if(hpsp->psp.dwFlags & PSP_INTERNAL_UNICODE) hwndPage = CreateDialogIndirectParamW(hpsp->psp.hInstance, @@ -3013,9 +3019,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( else ppsp->pszHeaderSubTitle = NULL; - if ((ppsp->dwFlags & PSP_USECALLBACK) && ppsp->dwSize > PROPSHEETPAGEA_V1_SIZE && ppsp->pfnCallback) - ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp + 1); - + HPSP_call_callback(ret, PSPCB_ADDREF); return ret; } @@ -3074,9 +3078,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage else ppsp->pszHeaderSubTitle = NULL; - if ((ppsp->dwFlags & PSP_USECALLBACK) && ppsp->dwSize > PROPSHEETPAGEW_V1_SIZE && ppsp->pfnCallback) - ppsp->pfnCallback(0, PSPCB_ADDREF, ppsp + 1); - + HPSP_call_callback(ret, PSPCB_ADDREF); return ret; } @@ -3098,8 +3100,7 @@ BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage) if (!hPropPage) return FALSE; - if ((psp->dwFlags & PSP_USECALLBACK) && psp->pfnCallback) - psp->pfnCallback(0, PSPCB_RELEASE, &hPropPage->callback_psp); + HPSP_call_callback(hPropPage, PSPCB_RELEASE); if (!(psp->dwFlags & PSP_DLGINDIRECT) && !IS_INTRESOURCE( psp->u.pszTemplate )) Free((void*)psp->u.pszTemplate);

1 0

Piotr Caban : comctl32: Add helper for getting flags from HPROPSHEETPAGE.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: cf6de3e099667fd26f766749f3c1c5acf8fbf0aa URL: https://gitlab.winehq.org/wine/wine/-/commit/cf6de3e099667fd26f766749f3c1c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 31 20:19:17 2022 +0200 comctl32: Add helper for getting flags from HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 54 +++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 601b1982ef8..4b9d6b1d1c4 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -198,6 +198,12 @@ static WCHAR *heap_strdupAtoW(const char *str) return ret; } +static DWORD HPSP_get_flags(HPROPSHEETPAGE hpsp) +{ + if (!hpsp) return 0; + return hpsp->psp.dwFlags; +} + static void HPSP_call_callback(HPROPSHEETPAGE hpsp, UINT msg) { if (!(hpsp->psp.dwFlags & PSP_USECALLBACK) || !hpsp->psp.pfnCallback || @@ -248,7 +254,7 @@ static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg, if (((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && (psInfo->ppshheader.dwFlags & PSH_HEADER) && - !(hpsp->psp.dwFlags & PSP_HIDEHEADER)) || + !(HPSP_get_flags(hpsp) & PSP_HIDEHEADER)) || (psInfo->ppshheader.dwFlags & PSH_WIZARD)) { rc->left = rc->top = WIZARD_PADDING; @@ -263,7 +269,7 @@ static void PROPSHEET_GetPageRect(const PropSheetInfo * psInfo, HWND hwndDlg, if ((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && (psInfo->ppshheader.dwFlags & PSH_HEADER) && - !(hpsp->psp.dwFlags & PSP_HIDEHEADER)) + !(HPSP_get_flags(hpsp) & PSP_HIDEHEADER)) { hwndChild = GetDlgItem(hwndDlg, IDC_SUNKEN_LINEHEADER); GetClientRect(hwndChild, &r); @@ -426,7 +432,7 @@ static BOOL PROPSHEET_CollectPageInfo(HPROPSHEETPAGE hpsp, /* * Process property page flags. */ - dwFlags = hpsp->psp.dwFlags; + dwFlags = HPSP_get_flags(hpsp); psInfo->proppage[index].hasHelp = dwFlags & PSP_HASHELP; psInfo->proppage[index].hasIcon = dwFlags & (PSP_USEHICON | PSP_USEICONID); @@ -490,7 +496,7 @@ static BOOL PROPSHEET_CollectPageInfo(HPROPSHEETPAGE hpsp, width = (WORD)*p; p++; height = (WORD)*p; p++; - if (hpsp->psp.dwFlags & (PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE)) + if (HPSP_get_flags(hpsp) & (PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE)) psInfo->ppshheader.dwFlags |= PSH_HEADER; /* Special calculation for interior wizard pages so the largest page is @@ -1360,12 +1366,12 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, return FALSE; } - if (hpsp->psp.dwFlags & PSP_DLGINDIRECT) + if (HPSP_get_flags(hpsp) & PSP_DLGINDIRECT) { pTemplate = hpsp->psp.u.pResource; resSize = GetTemplateSize(pTemplate); } - else if(hpsp->psp.dwFlags & PSP_INTERNAL_UNICODE) + else if(HPSP_get_flags(hpsp) & PSP_INTERNAL_UNICODE) { HRSRC hResource; HANDLE hTemplate; @@ -1445,7 +1451,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, HPSP_call_callback(hpsp, PSPCB_CREATE); - if(hpsp->psp.dwFlags & PSP_INTERNAL_UNICODE) + if(HPSP_get_flags(hpsp) & PSP_INTERNAL_UNICODE) hwndPage = CreateDialogIndirectParamW(hpsp->psp.hInstance, pTemplateCopy, hwndParent, @@ -1468,7 +1474,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, /* Subclass exterior wizard pages */ if((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && - (hpsp->psp.dwFlags & PSP_HIDEHEADER)) + (HPSP_get_flags(hpsp) & PSP_HIDEHEADER)) { SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1, 0); } @@ -1559,7 +1565,7 @@ static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo) { hwndLineHeader = GetDlgItem(hwndDlg, IDC_SUNKEN_LINEHEADER); - if ((psInfo->proppage[index].hpage->psp.dwFlags & PSP_HIDEHEADER) || + if ((HPSP_get_flags(psInfo->proppage[index].hpage) & PSP_HIDEHEADER) || (!(psInfo->ppshheader.dwFlags & PSH_HEADER)) ) ShowWindow(hwndLineHeader, SW_HIDE); else @@ -2291,7 +2297,7 @@ static BOOL PROPSHEET_InsertPage(HWND hwndDlg, HPROPSHEETPAGE hpageInsertAfter, psInfo->proppage[index].hpage = hpage; - if (hpage->psp.dwFlags & PSP_PREMATURE) + if (HPSP_get_flags(hpage) & PSP_PREMATURE) { /* Create the page but don't show it */ if (!PROPSHEET_CreatePage(hwndDlg, index, psInfo, hpage)) @@ -2404,7 +2410,7 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, /* Unsubclass the page dialog window */ if((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && - (psInfo->proppage[index].hpage->psp.dwFlags & PSP_HIDEHEADER)) + (HPSP_get_flags(psInfo->proppage[index].hpage) & PSP_HIDEHEADER)) { RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_WizardSubclassProc, 1); @@ -2416,7 +2422,7 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, /* Free page resources */ if(psInfo->proppage[index].hpage) { - if (psInfo->proppage[index].hpage->psp.dwFlags & PSP_USETITLE) + if (HPSP_get_flags(psInfo->proppage[index].hpage) & PSP_USETITLE) Free ((LPVOID)psInfo->proppage[index].pszText); DestroyPropertySheetPage(psInfo->proppage[index].hpage); @@ -2712,12 +2718,12 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) for (i = 0; i < psInfo->nPages; i++) { - PROPSHEETPAGEW* psp = &psInfo->proppage[i].hpage->psp; + DWORD flags = HPSP_get_flags(psInfo->proppage[i].hpage); /* Unsubclass the page dialog window */ if((psInfo->ppshheader.dwFlags & (PSH_WIZARD97_NEW | PSH_WIZARD97_OLD)) && (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && - (psp->dwFlags & PSP_HIDEHEADER)) + (flags & PSP_HIDEHEADER)) { RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_WizardSubclassProc, 1); @@ -2726,13 +2732,10 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) if(psInfo->proppage[i].hwndPage) DestroyWindow(psInfo->proppage[i].hwndPage); - if(psp) - { - if (psp->dwFlags & PSP_USETITLE) - Free ((LPVOID)psInfo->proppage[i].pszText); + if (flags & PSP_USETITLE) + Free ((LPVOID)psInfo->proppage[i].pszText); - DestroyPropertySheetPage(psInfo->proppage[i].hpage); - } + DestroyPropertySheetPage(psInfo->proppage[i].hpage); } DeleteObject(psInfo->hFont); @@ -3251,7 +3254,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) int offsety = 0; HBRUSH hbr; RECT r, rzone; - LPCPROPSHEETPAGEW ppshpage; + HPROPSHEETPAGE hpsp; WCHAR szBuffer[256]; int nLength; @@ -3264,15 +3267,16 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) hOldPal = SelectPalette(hdc, psInfo->ppshheader.hplWatermark, FALSE); if (psInfo->active_page < 0) - ppshpage = NULL; + hpsp = NULL; else - ppshpage = &psInfo->proppage[psInfo->active_page].hpage->psp; + hpsp = psInfo->proppage[psInfo->active_page].hpage; - if ( (ppshpage && !(ppshpage->dwFlags & PSP_HIDEHEADER)) && + if ( hpsp && !(HPSP_get_flags(hpsp) & PSP_HIDEHEADER) && (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && (psInfo->ppshheader.dwFlags & PSH_HEADER) ) { HWND hwndLineHeader = GetDlgItem(hwnd, IDC_SUNKEN_LINEHEADER); + LPCPROPSHEETPAGEW ppshpage = &hpsp->psp; HFONT hOldFont; COLORREF clrOld = 0; int oldBkMode = 0; @@ -3378,7 +3382,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) SelectObject(hdc, hOldFont); } - if ( (ppshpage && (ppshpage->dwFlags & PSP_HIDEHEADER)) && + if ( (HPSP_get_flags(hpsp) & PSP_HIDEHEADER) && (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && (psInfo->ppshheader.dwFlags & PSH_WATERMARK) ) {

1 0

Piotr Caban : comctl32: Add helper for loading dialog template from HPROPSHEETPAGE.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: 91baf79a6cf7e44c764a19b6088e311d7006633e URL: https://gitlab.winehq.org/wine/wine/-/commit/91baf79a6cf7e44c764a19b6088e31… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 31 20:40:13 2022 +0200 comctl32: Add helper for loading dialog template from HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 368 +++++++++++++++++++++------------------------- 1 file changed, 165 insertions(+), 203 deletions(-)

1 0

Jacek Caban : user.exe: Pass resource ID as a string in DIALOG_CreateControls16.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: 8aa5b99627d3b27348ffaaceaa87dad7dba39a14 URL: https://gitlab.winehq.org/wine/wine/-/commit/8aa5b99627d3b27348ffaaceaa87da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 13 16:45:26 2022 +0200 user.exe: Pass resource ID as a string in DIALOG_CreateControls16. Based on commit 0739aa610cc07. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53646 --- dlls/user.exe16/dialog.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index ecd7acb9bfc..315f70dd6f3 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -181,13 +181,25 @@ static BOOL DIALOG_CreateControls16( HWND hwnd, LPCSTR template, TRACE(" BEGIN\n" ); while (items--) { + char *caption, caption_buf[4]; HINSTANCE16 instance = hInst; SEGPTR segptr; template = DIALOG_GetControl16( template, &info ); segptr = MapLS( info.data ); + + caption = (char *)info.windowName; + if (caption && IS_INTRESOURCE(caption)) + { + caption_buf[0] = 0xff; + caption_buf[1] = PtrToUlong( caption ); + caption_buf[2] = PtrToUlong( caption ) >> 8; + caption_buf[3] = 0; + caption = caption_buf; + } + hwndCtrl = WIN_Handle32( CreateWindowEx16( WS_EX_NOPARENTNOTIFY, - info.className, info.windowName, + info.className, caption, info.style | WS_CHILD, MulDiv(info.x, dlgInfo->xBaseUnit, 4), MulDiv(info.y, dlgInfo->yBaseUnit, 8),

1 0

Francois Gouget : testbot/TestLauncher: Add flaky to the stub test results line.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: tools Branch: master Commit: 495bb722925c87050545929b5400cda35b587cd1 URL: https://gitlab.winehq.org/winehq/tools/-/commit/495bb722925c87050545929b540… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 17 13:18:32 2022 +0200 testbot/TestLauncher: Add flaky to the stub test results line. --- testbot/src/TestLauncher/TestLauncher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 41fb9042..4976449a 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -436,7 +436,7 @@ int main(int argc, char *argv[]) ExitCode = RunTest(TestExeFileName, CommandLine, TimeOut, &Pid); if (Failures || Skips) - printf("%04lx:%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", Pid, Subtest, Failures, Failures, Skips); + printf("%04lx:%s: %u tests executed (0 marked as todo, 0 as flaky, %u failures), %u skipped.\n", Pid, Subtest, Failures, Failures, Skips); printf("%s:%s:%04lx done (%ld) in %lds\n", TestName, Subtest, Pid, ExitCode, (GetTickCount() - Start) / 1000);

1 0

Francois Gouget : reporttest: Update the TestWTBS expected error count.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: tools Branch: master Commit: 90f25cad3e43d2293cb5cb1dc74fc76d261fcb3c URL: https://gitlab.winehq.org/winehq/tools/-/commit/90f25cad3e43d2293cb5cb1dc74… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 17 16:09:40 2022 +0200 reporttest: Update the TestWTBS expected error count. This takes into acount the new test for timeouts during --list. --- testbot/src/reporttest/report.testwtbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 7b56e131..64a5ca13 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 70 +p tests.TestFailures 71 p build.HasTask 0 a wine.log.GrepV ^Applying patch

1 0

Francois Gouget : testbot/reporttest: Add the flaky count to the summary lines.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: tools Branch: master Commit: d6228b3d46503f7f4c0f68722c89d57bd92ec08d URL: https://gitlab.winehq.org/winehq/tools/-/commit/d6228b3d46503f7f4c0f68722c8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 20 10:20:38 2022 +0200 testbot/reporttest: Add the flaky count to the summary lines. --- testbot/src/reporttest/report.template | 112 ++++++++++++++++----------------- testbot/src/reporttest/reporttest.c | 2 +- 2 files changed, 57 insertions(+), 57 deletions(-)

1 0

Francois Gouget : testbot/reporttest: Test flaky failures.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: tools Branch: master Commit: 596e9e291e5645767819a44921c586714dc4ecd1 URL: https://gitlab.winehq.org/winehq/tools/-/commit/596e9e291e5645767819a44921c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 20 10:22:47 2022 +0200 testbot/reporttest: Test flaky failures. --- testbot/src/reporttest/report.template | 10 +++++++++- testbot/src/reporttest/report.testwtbs | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 8c726315..51d9869e 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -671,7 +671,15 @@ fontdlg.c:30: unhandled exception c0000005 in child process 3333 01bd:fontdlg: 10 tests executed (0 marked as todo, 0 as flaky, 0 as flaky, 6 failures), 0 skipped. comdlg32:fontdlg:01bd done (6) in 0s -stub comdlg32:itemdlg +comdlg32:itemdlg start dlls/comdlg32/tests/itemdlg.c +----- WTBS Flaky failures sampler +----- A test unit with flaky failures +----- Expected assessement: 2 flaky tests, 0 failure +itemdlg.c:1: Test marked flaky: A regular test which fails sometimes +itemdlg.c:2: Test succeeded inside flaky todo block: A todo which succeeds sometimes +031c:itemdlg: 108 tests executed (0 marked as todo, 2 as flaky, 0 failure), 0 skipped. +comdlg32:itemdlg:031c done (0) in 0s + stub comdlg32:printdlg stub credui:credui stub crypt32:base64 diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 64a5ca13..d7ed0ecd 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -77,6 +77,8 @@ n 0 fontdlg.c:10: unhandled exception c0000005 in child process 1111 n 0 01bd:fontdlg: unhandled exception c0000005 at 00003333 n 0 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00003333). n 0 fontdlg.c:30: unhandled exception c0000005 in child process 3333 +n 0 itemdlg.c:1: Test marked flaky: A regular test which fails sometimes +n 0 itemdlg.c:2: Test succeeded inside flaky todo block: A todo which succeeds sometimes g 0 tests.report.xmllite n 0 writer.c:20: Test failed: A delayed failure, typically in a subprocess

1 0