October 2022 - wine-commits

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

18 Oct '22

Module: wine Branch: master Commit: f6fcb16765d0f8fdb25da751aad022fab99f9ca0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6fcb16765d0f8fdb25da751aad022… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 11:37:08 2022 +0200 comctl32: Add helper for getting title from HPROPSHEETPAGE. --- dlls/comctl32/propsheet.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index fc67b5f0b68..2429e28cb0b 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -376,6 +376,26 @@ static const DLGTEMPLATE* HPSP_load_template(HPROPSHEETPAGE hpsp, DWORD *size) return LockResource(template); } +static WCHAR* HPSP_get_title(HPROPSHEETPAGE hpsp, const WCHAR *template_title) +{ + const WCHAR *pTitle; + WCHAR szTitle[256]; + + if (IS_INTRESOURCE(hpsp->psp.pszTitle)) + { + if (LoadStringW(hpsp->psp.hInstance, (DWORD_PTR)hpsp->psp.pszTitle, szTitle, ARRAY_SIZE(szTitle))) + pTitle = szTitle; + else if (*template_title) + pTitle = template_title; + else + pTitle = L"(null)"; + } + else + pTitle = hpsp->psp.pszTitle; + + return heap_strdupW(pTitle); +} + #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** * PROPSHEET_UnImplementedFlags @@ -703,24 +723,7 @@ static BOOL PROPSHEET_CollectPageInfo(HPROPSHEETPAGE hpsp, TRACE("Tab %d %s\n",index,debugstr_w( p )); if (dwFlags & PSP_USETITLE) - { - WCHAR szTitle[256]; - const WCHAR *pTitle; - - if (IS_INTRESOURCE( hpsp->psp.pszTitle )) - { - if (LoadStringW( hpsp->psp.hInstance, (DWORD_PTR)hpsp->psp.pszTitle, szTitle, ARRAY_SIZE(szTitle))) - pTitle = szTitle; - else if (*p) - pTitle = p; - else - pTitle = L"(null)"; - } - else - pTitle = hpsp->psp.pszTitle; - - psInfo->proppage[index].pszText = heap_strdupW( pTitle ); - } + psInfo->proppage[index].pszText = HPSP_get_title(hpsp, p); /* * Build the image list for icons

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

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 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

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

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

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

18 Oct '22

Module: wine Branch: master Commit: 750d11a49ab28597909bd1788cda2bda38b364be URL: https://gitlab.winehq.org/wine/wine/-/commit/750d11a49ab28597909bd1788cda2b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 12 13:44:41 2022 -0400 uiautomationcore: Add support for getting HWND providers to UiaNodeFromProvider(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 34 ++++++++++++------------ dlls/uiautomationcore/uia_client.c | 42 +++++++++++++++++++++--------- dlls/uiautomationcore/uia_private.h | 2 ++ dlls/uiautomationcore/uia_provider.c | 4 +-- 4 files changed, 51 insertions(+), 31 deletions(-)

1 0

Connor McAdams : uiautomationcore: Determine provider type for nested node providers.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: 59a629810aa827927b30ffc167b3386b00ae92a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/59a629810aa827927b30ffc167b338… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 12 13:22:29 2022 -0400 uiautomationcore: Determine provider type for nested node providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 8 ++-- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 63 +++++++++++++++++++++++++++++- 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 54d6fa710b5..604e488601f 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -4988,7 +4988,7 @@ static const struct prov_method_sequence node_from_hwnd3[] = { { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, { &Provider, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ { &Provider, PROV_GET_PROVIDER_OPTIONS }, - { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { &Provider, PROV_GET_PROVIDER_OPTIONS }, { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { 0 } }; @@ -5040,7 +5040,7 @@ static const struct prov_method_sequence node_from_hwnd6[] = { { &Provider_child, FRAG_GET_FRAGMENT_ROOT, METHOD_OPTIONAL }, { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_OPTIONAL }, { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, - { &Provider_child, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, /* Next two are only done on Win10v1809+. */ { &Provider_child, FRAG_GET_FRAGMENT_ROOT, METHOD_OPTIONAL }, { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_OPTIONAL }, @@ -5060,7 +5060,7 @@ static const struct prov_method_sequence node_from_hwnd7[] = { { &Provider_child, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, { &Provider_child, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, - { &Provider_child, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { &Provider_child, PROV_GET_PROVIDER_OPTIONS }, { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_TODO }, @@ -5078,7 +5078,7 @@ static const struct prov_method_sequence node_from_hwnd8[] = { { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, { &Provider, FRAG_NAVIGATE, METHOD_TODO }, /* NavigateDirection_Parent */ { &Provider, PROV_GET_PROVIDER_OPTIONS }, - { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_TODO }, + { &Provider, PROV_GET_PROVIDER_OPTIONS }, { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_ProviderDescriptionPropertyId */ { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ControlTypePropertyId */ { 0 } diff --git a/dlls/uiautomationcore/uia_classes.idl b/dlls/uiautomationcore/uia_classes.idl index 5877d14b8e5..4540613bba2 100644 --- a/dlls/uiautomationcore/uia_classes.idl +++ b/dlls/uiautomationcore/uia_classes.idl @@ -44,6 +44,7 @@ library UIA_wine_private interface IWineUiaProvider : IUnknown { HRESULT get_prop_val([in]const struct uia_prop_info *prop_info, [out, retval]VARIANT *ret_val); + HRESULT get_prov_opts([out, retval]int *out_opts); } [ diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 1385e1f94ee..4f2cdfd6391 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -333,6 +333,22 @@ int get_node_provider_type_at_idx(struct uia_node *node, int idx) return 0; } +static HRESULT get_prov_opts_from_node_provider(IWineUiaNode *node, int idx, int *out_opts) +{ + IWineUiaProvider *prov; + HRESULT hr; + + *out_opts = 0; + hr = IWineUiaNode_get_provider(node, idx, &prov); + if (FAILED(hr)) + return hr; + + hr = IWineUiaProvider_get_prov_opts(prov, out_opts); + IWineUiaProvider_Release(prov); + + return hr; +} + /* * IWineUiaNode interface. */ @@ -839,11 +855,28 @@ static HRESULT WINAPI uia_provider_get_prop_val(IWineUiaProvider *iface, return S_OK; } +static HRESULT WINAPI uia_provider_get_prov_opts(IWineUiaProvider *iface, int *out_opts) +{ + struct uia_provider *prov = impl_from_IWineUiaProvider(iface); + enum ProviderOptions prov_opts; + HRESULT hr; + + TRACE("%p, %p\n", iface, out_opts); + + *out_opts = 0; + hr = IRawElementProviderSimple_get_ProviderOptions(prov->elprov, &prov_opts); + if (SUCCEEDED(hr)) + *out_opts = prov_opts; + + return S_OK; +} + static const IWineUiaProviderVtbl uia_provider_vtbl = { uia_provider_QueryInterface, uia_provider_AddRef, uia_provider_Release, uia_provider_get_prop_val, + uia_provider_get_prov_opts, }; static HRESULT create_wine_uia_provider(struct uia_node *node, IRawElementProviderSimple *elprov, @@ -1186,11 +1219,21 @@ static HRESULT WINAPI uia_nested_node_provider_get_prop_val(IWineUiaProvider *if return S_OK; } +static HRESULT WINAPI uia_nested_node_provider_get_prov_opts(IWineUiaProvider *iface, int *out_opts) +{ + struct uia_nested_node_provider *prov = impl_from_nested_node_IWineUiaProvider(iface); + + TRACE("%p, %p\n", iface, out_opts); + + return get_prov_opts_from_node_provider(prov->nested_node, 0, out_opts); +} + static const IWineUiaProviderVtbl uia_nested_node_provider_vtbl = { uia_nested_node_provider_QueryInterface, uia_nested_node_provider_AddRef, uia_nested_node_provider_Release, uia_nested_node_provider_get_prop_val, + uia_nested_node_provider_get_prov_opts, }; static BOOL is_nested_node_provider(IWineUiaProvider *iface) @@ -1208,6 +1251,7 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU struct uia_nested_node_provider *prov; IGlobalInterfaceTable *git; IWineUiaNode *nested_node; + int prov_opts, prov_type; DWORD git_cookie; HRESULT hr; @@ -1218,6 +1262,21 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU return hr; } + hr = get_prov_opts_from_node_provider(nested_node, 0, &prov_opts); + if (FAILED(hr)) + { + WARN("Failed to get provider options for node %p with hr %#lx\n", nested_node, hr); + IWineUiaNode_Release(nested_node); + uia_stop_client_thread(); + return hr; + } + + /* Nested nodes can only serve as override or main providers. */ + if (prov_opts & ProviderOptions_OverrideProvider) + prov_type = PROV_TYPE_OVERRIDE; + else + prov_type = PROV_TYPE_MAIN; + /* * If we're retrieving a node from an HWND that belongs to the same thread * as the client making the request, return a normal provider instead of a @@ -1276,8 +1335,8 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU } } - node->prov[PROV_TYPE_MAIN] = provider_iface; - node->git_cookie[PROV_TYPE_MAIN] = git_cookie; + node->prov[prov_type] = provider_iface; + node->git_cookie[prov_type] = git_cookie; node->prov_count++; return S_OK;

1 0

Connor McAdams : uiautomationcore: Add support for multiple providers on a single HUIANODE.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: edcd55bae27d5d6fcac8e4d8b8298cce0dcd0600 URL: https://gitlab.winehq.org/wine/wine/-/commit/edcd55bae27d5d6fcac8e4d8b8298c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 12 12:33:52 2022 -0400 uiautomationcore: Add support for multiple providers on a single HUIANODE. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 28 +-- dlls/uiautomationcore/uia_classes.idl | 2 +- dlls/uiautomationcore/uia_client.c | 273 ++++++++++++++++++++--------- dlls/uiautomationcore/uia_private.h | 28 ++- dlls/uiautomationcore/uia_provider.c | 4 +- 5 files changed, 231 insertions(+), 104 deletions(-)

1 0

Alex Henrie : include: Add WSANO_ADDRESS to winsock2.h.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: e9ff761d51d5072b271541ea05699ed2cae91ecf URL: https://gitlab.winehq.org/wine/wine/-/commit/e9ff761d51d5072b271541ea05699e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 17 20:32:27 2022 -0600 include: Add WSANO_ADDRESS to winsock2.h. Needed to compile Tera Term. --- include/winsock2.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winsock2.h b/include/winsock2.h index 86050025074..2e95733189e 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -782,6 +782,7 @@ typedef struct _OVERLAPPED* LPWSAOVERLAPPED; #define WSATRY_AGAIN (WSABASEERR + 1002) #define WSANO_RECOVERY (WSABASEERR + 1003) #define WSANO_DATA (WSABASEERR + 1004) +#define WSANO_ADDRESS WSANO_DATA #define WSA_IO_PENDING (ERROR_IO_PENDING) #define WSA_IO_INCOMPLETE (ERROR_IO_INCOMPLETE)

1 0

Stanislav Motylkov : hhctrl.ocx: Fix toolbar icons order.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: 4f4b342ad44f2d099a2546ad70e5616f2ef37619 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f4b342ad44f2d099a2546ad70e561… Author: Stanislav Motylkov <x86corez(a)gmail.com> Date: Tue Oct 18 04:36:08 2022 +0300 hhctrl.ocx: Fix toolbar icons order. In `hhtoolbar.bmp` the "Expand" icon comes first, then "Collapse". --- dlls/hhctrl.ocx/resource.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/resource.h b/dlls/hhctrl.ocx/resource.h index b35b7c75cdc..2630da760cb 100644 --- a/dlls/hhctrl.ocx/resource.h +++ b/dlls/hhctrl.ocx/resource.h @@ -39,9 +39,9 @@ #define HHTB_REFRESH 1 #define HHTB_HOME 2 #define HHTB_SYNC 3 -#define HHTB_CONTRACT 4 -#define HHTB_EXPAND 5 -#define HHTB_NUMBITMAPS HHTB_EXPAND +#define HHTB_EXPAND 4 +#define HHTB_CONTRACT 5 +#define HHTB_NUMBITMAPS HHTB_CONTRACT #define MIID_SELECTALL 10 #define MIID_VIEWSOURCE 11

1 0

Zhiyi Zhang : comctl32/listview: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: a8396d8b1e852276b6cea9f2c50834739d1170da URL: https://gitlab.winehq.org/wine/wine/-/commit/a8396d8b1e852276b6cea9f2c50834… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 16:06:09 2022 +0800 comctl32/listview: Don't repaint when handling WM_STYLECHANGED. Some applications subclass listview and change style multiple times when painting. Invalidating control when handling WM_STYLECHANGED causes infinite WM_PAINT messages in this case and end up stalling the message queue. --- dlls/comctl32/listview.c | 3 --- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 38d43a9f742..d060fd5c977 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11298,9 +11298,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, /* add scrollbars if needed */ LISTVIEW_UpdateScroll(infoPtr); - /* invalidate client area + erase background */ - LISTVIEW_InvalidateList(infoPtr); - return 0; } diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 73526020843..d9f07570fd0 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1096,7 +1096,7 @@ static void test_WM_STYLECHANGED(void) {HOTKEY_CLASSA, wm_stylechanged_seq}, {WC_IPADDRESSA, wm_stylechanged_seq}, {WC_LISTBOXA, wm_stylechanged_repaint_seq, TRUE}, - {WC_LISTVIEWA, wm_stylechanged_seq, TRUE}, + {WC_LISTVIEWA, wm_stylechanged_seq}, {MONTHCAL_CLASSA, wm_stylechanged_repaint_seq, TRUE}, {WC_NATIVEFONTCTLA, wm_stylechanged_seq}, {WC_PAGESCROLLERA, wm_stylechanged_pager_seq, TRUE},

1 0

Zhiyi Zhang : comctl32/treeview: Don't repaint when handling WM_STYLECHANGED.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: 44cfa3ec1af33f0f2560878c269405468f999a70 URL: https://gitlab.winehq.org/wine/wine/-/commit/44cfa3ec1af33f0f2560878c269405… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 15:36:43 2022 +0800 comctl32/treeview: Don't repaint when handling WM_STYLECHANGED. Some applications subclass treeview and change style multiple times when painting. Invalidating control when handling WM_STYLECHANGED causes infinite WM_PAINT messages in this case and end up stalling the message queue. --- dlls/comctl32/tests/misc.c | 2 +- dlls/comctl32/treeview.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5da44e7af8c..73526020843 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1109,7 +1109,7 @@ static void test_WM_STYLECHANGED(void) {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, {TOOLTIPS_CLASSA, wm_stylechanged_seq}, {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE}, - {WC_TREEVIEWA, wm_stylechanged_seq, TRUE}, + {WC_TREEVIEWA, wm_stylechanged_seq}, {UPDOWN_CLASSA, wm_stylechanged_seq, TRUE}, {WC_SCROLLBARA, wm_stylechanged_seq}, }; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 23e87bdce04..d3a69bb438e 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5627,7 +5627,6 @@ TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TREEVIEW_EndEditLabelNow(infoPtr, TRUE); TREEVIEW_UpdateSubTree(infoPtr, infoPtr->root); TREEVIEW_UpdateScrollBars(infoPtr); - TREEVIEW_Invalidate(infoPtr, NULL); return 0; }

1 0

Zhiyi Zhang : comctl32/tests: Test if WM_STYLECHANGED repaints controls.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: c8ec431fd4cd370daba96aa18d892fa8d7397ef8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8ec431fd4cd370daba96aa18d892f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Oct 17 15:20:58 2022 +0800 comctl32/tests: Test if WM_STYLECHANGED repaints controls. --- dlls/comctl32/tests/misc.c | 156 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index bc404c4b59a..5da44e7af8c 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -997,17 +997,171 @@ static void test_themed_background(void) pSetThreadDpiAwarenessContext(old_context); } +static WNDPROC old_proc; + +static const struct message wm_stylechanged_seq[] = +{ + {WM_STYLECHANGED, sent}, + {0} +}; + +static const struct message wm_stylechanged_repaint_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_PAINT, sent}, + {WM_ERASEBKGND, sent | defwinproc}, + {0} +}; + +static const struct message wm_stylechanged_combox_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_ERASEBKGND, sent | defwinproc}, + {WM_PAINT, sent}, + {0} +}; + +static const struct message wm_stylechanged_pager_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_PAINT, sent}, + {WM_NCPAINT, sent | defwinproc}, + {WM_ERASEBKGND, sent | defwinproc}, + {0} +}; + +static const struct message wm_stylechanged_progress_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_PAINT, sent | optional}, /* WM_PAINT and WM_ERASEBKGND are missing with comctl32 v5 */ + {WM_ERASEBKGND, sent | defwinproc | optional}, + {0} +}; + +static const struct message wm_stylechanged_trackbar_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_PAINT, sent | defwinproc}, + {WM_PAINT, sent}, + {0} +}; + +static LRESULT WINAPI test_wm_stylechanged_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +{ + static int defwndproc_counter = 0; + struct message msg = {0}; + LRESULT ret; + + if (message == WM_STYLECHANGED + || message == WM_PAINT + || message == WM_ERASEBKGND + || message == WM_NCPAINT) + { + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wp; + msg.lParam = lp; + add_message(sequences, CHILD_SEQ_INDEX, &msg); + } + + ++defwndproc_counter; + ret = CallWindowProcA(old_proc, hwnd, message, wp, lp); + --defwndproc_counter; + return ret; +} + +static void test_WM_STYLECHANGED(void) +{ + HWND parent, hwnd; + STYLESTRUCT style; + unsigned int i; + + static const struct test + { + const CHAR *class_name; + const struct message *seq; + BOOL todo; + } + tests[] = + { + {ANIMATE_CLASSA, wm_stylechanged_seq, TRUE}, + {WC_BUTTONA, wm_stylechanged_seq}, + {WC_COMBOBOXA, wm_stylechanged_combox_seq, TRUE}, + {WC_COMBOBOXEXA, wm_stylechanged_seq}, + {DATETIMEPICK_CLASSA, wm_stylechanged_seq, TRUE}, + {WC_EDITA, wm_stylechanged_seq}, + {WC_HEADERA, wm_stylechanged_repaint_seq, TRUE}, + {HOTKEY_CLASSA, wm_stylechanged_seq}, + {WC_IPADDRESSA, wm_stylechanged_seq}, + {WC_LISTBOXA, wm_stylechanged_repaint_seq, TRUE}, + {WC_LISTVIEWA, wm_stylechanged_seq, TRUE}, + {MONTHCAL_CLASSA, wm_stylechanged_repaint_seq, TRUE}, + {WC_NATIVEFONTCTLA, wm_stylechanged_seq}, + {WC_PAGESCROLLERA, wm_stylechanged_pager_seq, TRUE}, + {PROGRESS_CLASSA, wm_stylechanged_progress_seq}, + {REBARCLASSNAMEA, wm_stylechanged_seq}, + {WC_STATICA, wm_stylechanged_seq}, + {STATUSCLASSNAMEA, wm_stylechanged_seq}, + {"SysLink", wm_stylechanged_seq, TRUE}, + {WC_TABCONTROLA, wm_stylechanged_seq, TRUE}, + {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, + {TOOLTIPS_CLASSA, wm_stylechanged_seq}, + {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE}, + {WC_TREEVIEWA, wm_stylechanged_seq, TRUE}, + {UPDOWN_CLASSA, wm_stylechanged_seq, TRUE}, + {WC_SCROLLBARA, wm_stylechanged_seq}, + }; + + parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 100, 100, + 0, 0, 0, 0); + ok(parent != NULL, "CreateWindowA failed, error %lu.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("%s", tests[i].class_name); + + hwnd = CreateWindowA(tests[i].class_name, "test", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, + parent, 0, 0, 0); + /* SysLink is unavailable in comctl32 v5 */ + if (!hwnd && !lstrcmpA(tests[i].class_name, "SysLink")) + { + winetest_pop_context(); + continue; + } + ok(hwnd != NULL, "CreateWindowA failed, error %lu.\n", GetLastError()); + old_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)test_wm_stylechanged_proc); + ok(old_proc != NULL, "SetWindowLongPtrA failed, error %lu.\n", GetLastError()); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + style.styleOld = GetWindowLongA(hwnd, GWL_STYLE); + style.styleNew = style.styleOld | WS_TABSTOP; + SendMessageA(hwnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM)&style); + flush_events(); + ok_sequence(sequences, CHILD_SEQ_INDEX, tests[i].seq, "WM_STYLECHANGED", tests[i].todo); + + DestroyWindow(hwnd); + winetest_pop_context(); + } + + DestroyWindow(parent); +} + START_TEST(misc) { ULONG_PTR ctx_cookie; HANDLE hCtx; + init_msg_sequences(sequences, NUM_MSG_SEQUENCES); if(!InitFunctionPtrs()) return; test_GetPtrAW(); test_Alloc(); test_comctl32_classes(FALSE); + test_WM_STYLECHANGED(); FreeLibrary(hComctl32); @@ -1015,7 +1169,6 @@ START_TEST(misc) return; if(!init_functions_v6()) return; - init_msg_sequences(sequences, NUM_MSG_SEQUENCES); test_comctl32_classes(TRUE); test_builtin_classes(); @@ -1023,6 +1176,7 @@ START_TEST(misc) test_themed_background(); test_WM_THEMECHANGED(); test_WM_SYSCOLORCHANGE(); + test_WM_STYLECHANGED(); unload_v6_module(ctx_cookie, hCtx); FreeLibrary(hComctl32);

1 0

Zhiyi Zhang : comctl32/tests: Ignore WM_NCPAINT when testing WM_THEMECHANGED for updown control.
by Alexandre Julliard 18 Oct '22

18 Oct '22

Module: wine Branch: master Commit: d7c27e19f91b6d9145cc5e05fdca8fef15ae55f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7c27e19f91b6d9145cc5e05fdca8f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 18 10:52:40 2022 +0800 comctl32/tests: Ignore WM_NCPAINT when testing WM_THEMECHANGED for updown control. Fix a possible test failure. --- dlls/comctl32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index ac4c3abaf30..bc404c4b59a 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -581,7 +581,7 @@ static void test_WM_THEMECHANGED(void) {TOOLTIPS_CLASSA, wm_themechanged_no_paint_seq}, {TRACKBAR_CLASSA, wm_themechanged_paint_seq}, {WC_TREEVIEWA, wm_themechanged_paint_erase_seq, 1, {0x1128}}, - {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq}, + {UPDOWN_CLASSA, wm_themechanged_paint_erase_seq, 1, {WM_NCPAINT}}, {WC_SCROLLBARA, wm_themechanged_paint_erase_seq, 1, {SBM_GETSCROLLINFO}}, };

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/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

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 : 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/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

Hugh McMaster : kernel32/tests: Add tests for GetConsoleOriginalTitleA/W().
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 03f5f72c13aea7f677d1a2bb7f96f00eb4490d26 URL: https://gitlab.winehq.org/wine/wine/-/commit/03f5f72c13aea7f677d1a2bb7f96f0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 17 23:43:06 2022 +1100 kernel32/tests: Add tests for GetConsoleOriginalTitleA/W(). --- dlls/kernel32/tests/console.c | 79 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9eabd887f2c..c2b7eb63a1e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4194,6 +4194,77 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) CloseHandle(std_input); } +static void test_GetConsoleOriginalTitleA(void) +{ + char buf[64]; + DWORD ret; + char title[] = "Original Console Title"; + + ret = GetConsoleOriginalTitleA(NULL, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleA(buf, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); + todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); + + ret = SetConsoleTitleA("test"); + ok(ret, "SetConsoleTitleA failed: %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleA(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleA failed: %lu\n", GetLastError()); + todo_wine ok(!strcmp(buf, title), "got %s, expected %s\n", wine_dbgstr_a(buf), wine_dbgstr_a(title)); +} + +static void test_GetConsoleOriginalTitleW(void) +{ + WCHAR buf[64]; + DWORD ret; + WCHAR title[] = L"Original Console Title"; + + ret = GetConsoleOriginalTitleW(NULL, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleW(buf, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + buf[ret] = 0; + todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + + ret = SetConsoleTitleW(L"test"); + ok(ret, "SetConsoleTitleW failed: %lu\n", GetLastError()); + + ret = GetConsoleOriginalTitleW(buf, ARRAY_SIZE(buf)); + todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + todo_wine ok(!wcscmp(buf, title), "got %s, expected %s\n", wine_dbgstr_w(buf), wine_dbgstr_w(title)); + + ret = GetConsoleOriginalTitleW(buf, 5); + todo_wine ok(ret, "GetConsoleOriginalTitleW failed: %lu\n", GetLastError()); + todo_wine ok(!wcscmp(buf, L"Orig"), "got %s, expected 'Orig'\n", wine_dbgstr_w(buf)); +} + +static void test_GetConsoleOriginalTitle(void) +{ + STARTUPINFOA si = { sizeof(si) }; + PROCESS_INFORMATION info; + char **argv, buf[MAX_PATH]; + char title[] = "Original Console Title"; + BOOL ret; + + winetest_get_mainargs(&argv); + sprintf(buf, "\"%s\" console title_test", argv[0]); + si.lpTitle = title; + ret = CreateProcessA(NULL, buf, NULL, NULL, TRUE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &info); + ok(ret, "CreateProcess failed: %lu\n", GetLastError()); + CloseHandle(info.hThread); + wait_child_process(info.hProcess); + CloseHandle(info.hProcess); +} + static void test_GetConsoleTitleA(void) { char buf[64], str[] = "test"; @@ -4837,6 +4908,13 @@ START_TEST(console) ExitProcess(exit_code); } + if (argc == 3 && !strcmp(argv[2], "title_test")) + { + test_GetConsoleOriginalTitleA(); + test_GetConsoleOriginalTitleW(); + return; + } + test_current = argc >= 3 && !strcmp(argv[2], "--current"); using_pseudo_console = argc >= 3 && !strcmp(argv[2], "--pseudo-console"); @@ -5020,6 +5098,7 @@ START_TEST(console) test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); test_file_info(hConIn, hConOut); + test_GetConsoleOriginalTitle(); test_GetConsoleTitleA(); test_GetConsoleTitleW(); if (!test_current)

1 0

Hugh McMaster : kernelbase: Add stubs for GetConsoleOriginalTitleA/W().
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 4951ab64365aa701a8177c2e75fd532311427625 URL: https://gitlab.winehq.org/wine/wine/-/commit/4951ab64365aa701a8177c2e75fd53… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Oct 11 23:20:41 2022 +1100 kernelbase: Add stubs for GetConsoleOriginalTitleA/W(). --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernelbase/console.c | 22 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 ++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7c5fb8ed74f..a4bba1c6848 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -610,8 +610,8 @@ @ stdcall GetConsoleKeyboardLayoutNameW(ptr) @ stdcall -import GetConsoleMode(long ptr) @ stub GetConsoleNlsMode -# @ stub GetConsoleOriginalTitleA -# @ stub GetConsoleOriginalTitleW +@ stdcall -import GetConsoleOriginalTitleA(ptr long) +@ stdcall -import GetConsoleOriginalTitleW(ptr long) @ stdcall -import GetConsoleOutputCP() @ stdcall -import GetConsoleProcessList(ptr long) @ stdcall -import GetConsoleScreenBufferInfo(long ptr) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 434399b073a..e3b0ebead9e 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -886,6 +886,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleMode( HANDLE handle, DWORD *mode ) } +/*********************************************************************** + * GetConsoleOriginalTitleA (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleA( LPSTR title, DWORD size ) +{ + FIXME( ": (%p, %lu) stub!\n", title, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; +} + + +/*********************************************************************** + * GetConsoleOriginalTitleW (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleOriginalTitleW( LPWSTR title, DWORD size ) +{ + FIXME( ": (%p, %lu) stub!\n", title, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; +} + + /*********************************************************************** * GetConsoleOutputCP (kernelbase.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c9b8649c800..cbce448d3e9 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -466,6 +466,8 @@ @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleMode(long ptr) +@ stdcall GetConsoleOriginalTitleA(ptr long) +@ stdcall GetConsoleOriginalTitleW(ptr long) @ stdcall GetConsoleOutputCP() @ stdcall GetConsoleProcessList(ptr long) @ stdcall GetConsoleScreenBufferInfo(long ptr)

1 0

Fabian Maurer : ntdll: Prevent double free (Coverity).
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 173ffe5011d91e945d4e9ee8ed9619d7982a957c URL: https://gitlab.winehq.org/wine/wine/-/commit/173ffe5011d91e945d4e9ee8ed9619… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon May 16 18:39:35 2022 +0200 ntdll: Prevent double free (Coverity). The fd gets overwritten, therefore we need to close it before doing so. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e203ff6c41d..c7ba12a5c13 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4417,12 +4417,12 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, if (size > 0x10000) size = 0x10000; if ((tmpbuf = malloc( size ))) { + if (needs_close) close( fd ); if (!server_get_unix_fd( handle, FILE_READ_DATA, &fd, &needs_close, NULL, NULL )) { int res = recv( fd, tmpbuf, size, MSG_PEEK ); info->MessagesAvailable = (res > 0); info->NextMessageSize = (res >= 0) ? res : MAILSLOT_NO_MESSAGE; - if (needs_close) close( fd ); } free( tmpbuf ); }

1 0

Francisco Casas : tests: Test explicit casts between types that are component-wise compatible.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 09d7442cb18340ee2e8f85aa67882abaf1528e1e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/09d7442cb18340ee2e8f85aa67882… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 17:01:26 2022 -0300 tests: Test explicit casts between types that are component-wise compatible. --- Makefile.am | 1 + tests/cast-componentwise-compatible.shader_test | 185 ++++++++++++++++++++++++ 2 files changed, 186 insertions(+) diff --git a/Makefile.am b/Makefile.am index 83f75d64..b9068728 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,6 +59,7 @@ vkd3d_shader_tests = \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ tests/cast-componentwise-equal.shader_test \ + tests/cast-componentwise-compatible.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/tests/cast-componentwise-compatible.shader_test b/tests/cast-componentwise-compatible.shader_test new file mode 100644 index 00000000..c6402cf5 --- /dev/null +++ b/tests/cast-componentwise-compatible.shader_test @@ -0,0 +1,185 @@ +[pixel shader] +struct apple +{ + float3 aa; + int bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = (struct apple) f; + return a.aa.xyzx; +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 1.0) + + +[pixel shader] +struct apple +{ + float3 aa; + int bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {5, 6, 7, 8.8, 9.0}; + float f[4]; + + f = (float[4]) a; + return float4(f); +} + + +[test] +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) + + +[pixel shader] +float4 main() : sv_target +{ + float f[6] = {1, 2, 3, 4, 5, 6}; + int i[4]; + + i = (int[4]) f; + return float4(i[0], i[1], i[2], i[3]); +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 4.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + float aa[2]; + Texture2D bb; + int cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 7.2}; + struct banana b; + + b = (struct banana) a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (7.0, 7.0, 7.0, 7.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; + float4 dd; + Texture2D ee; +}; + +struct banana +{ + float aa[2]; + Texture2D bb; + int cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 3, 4, 5, 6, 7, tex}; + struct banana b; + + b = (struct banana) a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (3.0, 3.0, 3.0, 3.0) + + +[pixel shader fail] +struct apple +{ + int2 aa; + float bb; +}; + +struct banana +{ + int2 aa; + float bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, 3}; + struct banana b; + + b = (struct banana) a; + return b.bb; +} + + +[pixel shader] +float4 main() : sv_target +{ + float4 v = float4(10.1, 20.2, 30.3, 40.4); + int i[3]; + + i = (int[3]) v; + return float4(i[0], i[1], i[2], i[2]); +} + + +[test] +todo draw quad +todo probe all rgba (10.0, 20.0, 30.0, 30.0) + + +[pixel shader] +struct apple +{ + int aa; + float bb[2]; +}; + +float4 main() : sv_target +{ + float4 f = {10.4, 11.4, 12.4, 13.4}; + struct apple a; + + a = (struct apple) f; + return float4(a.aa, a.aa, a.bb[0], a.bb[1]); +} + + +[test] +todo draw quad +todo probe all rgba (10.0, 10.0, 11.4, 12.4)

1 0

Francisco Casas : tests: Test implicit casts between types that are equal component-wise.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 653b109d8f44dfc7287b5389d95a04c9bc732e21 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/653b109d8f44dfc7287b5389d95a0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 12:39:06 2022 -0300 tests: Test implicit casts between types that are equal component-wise. --- Makefile.am | 1 + tests/cast-componentwise-equal.shader_test | 226 +++++++++++++++++++++++++++++ 2 files changed, 227 insertions(+) diff --git a/Makefile.am b/Makefile.am index a0cd584f..83f75d64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ vkd3d_shader_tests = \ tests/arithmetic-uint.shader_test \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ + tests/cast-componentwise-equal.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/tests/cast-componentwise-equal.shader_test b/tests/cast-componentwise-equal.shader_test new file mode 100644 index 00000000..ac329112 --- /dev/null +++ b/tests/cast-componentwise-equal.shader_test @@ -0,0 +1,226 @@ +[pixel shader fail] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + float4 f = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[pixel shader fail] +struct apple +{ + float aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2}; + float2 f; + + f = a; + return f.xyxy; +} + + +[pixel shader] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 1.0) + + +[pixel shader fail] +struct apple +{ + float3 aa; + int bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[pixel shader] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {5, 6, 7, 8}; + float f[4]; + + f = a; + return float4(f); +} + + +[test] +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + int aa[2]; + Texture2D bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 4}; + struct banana b; + + b = a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (4.0, 4.0, 4.0, 4.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + int aa[2]; + Texture2D bb; + float cc; +}; + +float4 fun(struct banana b) +{ + return b.cc; +} + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 5}; + + return fun(a); +} + +[test] +todo draw quad +todo probe all rgba (5.0, 5.0, 5.0, 5.0) + + +[pixel shader] +struct apple +{ + float3 xx[2]; + int4 yy; +}; + +struct banana +{ + struct apple apples[2]; + int3 bb[2]; + int4 cc[3]; +}; + +struct cherry +{ + int2 xx; + int yy[3]; +}; + +struct donut +{ + float4 aa; + float2 bb; + int cc[4]; + float dd[6]; + struct cherry cherries[4]; + int2 ee; +}; + +float4 main() : sv_target +{ + struct banana b = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37}; + struct donut d; + + d = b; + return d.aa + d.cherries[3].yy[2] + d.ee.xyxx; +} + +[test] +todo draw quad +todo probe all rgba (71.0, 73.0, 73.0, 74.0) + + +[pixel shader fail] +struct apple +{ + float3 aa; + int bb; +}; + +struct banana +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, 3, 4}; + struct banana b; + + b = a; + return b.bb; +}

1 0

Francisco Casas : vkd3d-shader/hlsl: Always go through implicit conversion in assignments.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 5a1b0dbf44dea826a3f95d2c1cad023207c491a5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5a1b0dbf44dea826a3f95d2c1cad0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 14:43:26 2022 -0300 vkd3d-shader/hlsl: Always go through implicit conversion in assignments. Otherwise we silently skip some type checks. --- libs/vkd3d-shader/hlsl.y | 6 ++---- tests/cast-broadcast.shader_test | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b804b45c..03004c60 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1636,12 +1636,10 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in } if (lhs_type->type <= HLSL_CLASS_LAST_NUMERIC) - { writemask = (1 << lhs_type->dimx) - 1; - if (!(rhs = add_implicit_conversion(ctx, instrs, rhs, lhs_type, &rhs->loc))) - return NULL; - } + if (!(rhs = add_implicit_conversion(ctx, instrs, rhs, lhs_type, &rhs->loc))) + return NULL; while (lhs->type != HLSL_IR_LOAD) { diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index f60eb758..e21e65b0 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -23,7 +23,7 @@ todo draw quad todo probe all rgba (84.0, 84.0, 84.0, 84.0) -[pixel shader fail todo] +[pixel shader fail] struct apple { float3 aa;

1 0

Francisco Casas : tests: Test for invalid complex broadcasts.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: e56db9bda5d11acd746449552da3aae9f5feb81b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e56db9bda5d11acd746449552da3a… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Oct 10 19:23:00 2022 -0300 tests: Test for invalid complex broadcasts. --- tests/cast-broadcast.shader_test | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index 26ae7997..f60eb758 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -21,3 +21,50 @@ float4 main() : SV_TARGET [test] todo draw quad todo probe all rgba (84.0, 84.0, 84.0, 84.0) + + +[pixel shader fail todo] +struct apple +{ + float3 aa; + float4 bb; +}; + +float4 main() : SV_TARGET +{ + struct apple f = 31; + return f.bb; +} + + +[pixel shader fail] +struct apple +{ + float3 aa; + float4 bb; +}; + +float4 fun(struct apple f) +{ + return f.bb; +} + +float4 main() : SV_TARGET +{ + return fun(31); +} + + +[pixel shader fail] +struct apple +{ + float4 foo; + Texture2D tex; +}; + +float4 PSMain() : SV_TARGET +{ + struct apple a1; + a1 = (struct apple)1; + return a1.foo; +}

1 0

Francisco Casas : tests: Rename structs for readability in broadcast test.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 791f8a8faa6c2c3fa9bda293f4982bef407bdc6e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/791f8a8faa6c2c3fa9bda293f4982… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 14 11:09:36 2022 -0300 tests: Rename structs for readability in broadcast test. --- tests/cast-broadcast.shader_test | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index 02d14c0b..26ae7997 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -1,21 +1,20 @@ [pixel shader] - -struct foo +struct apple { float3 aa; float4 bb; }; -struct bar +struct banana { - struct foo aa; + struct apple aa; int2 bb; int4 cc[8]; }; float4 main() : SV_TARGET { - struct bar p = (struct bar)42; + struct banana p = (struct banana)42; return p.aa.bb + p.cc[5]; }

1 0

Francisco Casas : tests: Set ULPs to 2 in normalize() test.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 3bae0c92c7e6eeb21acebd60e9229bb23dc8998d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3bae0c92c7e6eeb21acebd60e9229… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Oct 10 20:55:15 2022 -0300 tests: Set ULPs to 2 in normalize() test. Otherwise the test fails on a NVIDIA GeForce GTX 1050 Ti GPU. The error being: shader_runner:535:Section [test], line 9: Test failed: Got {2.72165507e-01, 4.08248246e-01, 5.44331014e-01, 6.80413783e-01}, expected {2.72165537e-01, 4.08248305e-01, 5.44331074e-01, 6.80413842e-01} at (0, 0). --- tests/hlsl-normalize.shader_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/hlsl-normalize.shader_test b/tests/hlsl-normalize.shader_test index 71b900e8..359a7590 100644 --- a/tests/hlsl-normalize.shader_test +++ b/tests/hlsl-normalize.shader_test @@ -9,7 +9,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 draw quad -probe all rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 1 +probe all rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 2 [pixel shader] uniform float3 x;

1 0

Francisco Casas : tests: Add missing backslash to restore skipped tests.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: ab8f418207c30c5e4d2f04faeff086af62e374c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ab8f418207c30c5e4d2f04faeff08… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 14 10:09:21 2022 -0300 tests: Add missing backslash to restore skipped tests. Tests after this missing backslash are not being executed since e9829fdc6524e455f85893445ad8a2d703f02a2e. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 24602862..a0cd584f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,7 +117,7 @@ vkd3d_shader_tests = \ tests/matrix-semantics.shader_test \ tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ - tests/object-references.shader_test + tests/object-references.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Lower int division.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: eb7b594002df9f403aa0a15dc1682a340a4146a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eb7b594002df9f403aa0a15dc1682… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 21 17:12:31 2021 +0200 vkd3d-shader/hlsl: Lower int division. --- libs/vkd3d-shader/hlsl_codegen.c | 105 +++++++++++++++++++++++++++++++ tests/arithmetic-int-uniform.shader_test | 2 +- 2 files changed, 106 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index ef67e39b..656e2e93 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1284,6 +1284,110 @@ static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static struct hlsl_ir_load *add_conditional(struct hlsl_ctx *ctx, struct list *instrs, + struct hlsl_ir_node *condition, struct hlsl_ir_node *if_true, struct hlsl_ir_node *if_false) +{ + struct hlsl_ir_store *store; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + struct hlsl_ir_if *iff; + + assert(hlsl_types_are_equal(if_true->data_type, if_false->data_type)); + + if (!(var = hlsl_new_synthetic_var(ctx, "conditional", if_true->data_type, &condition->loc))) + return NULL; + + if (!(iff = hlsl_new_if(ctx, condition, condition->loc))) + return NULL; + list_add_tail(instrs, &iff->node.entry); + + if (!(store = hlsl_new_simple_store(ctx, var, if_true))) + return NULL; + list_add_tail(&iff->then_instrs.instrs, &store->node.entry); + + if (!(store = hlsl_new_simple_store(ctx, var, if_false))) + return NULL; + list_add_tail(&iff->else_instrs.instrs, &store->node.entry); + + if (!(load = hlsl_new_var_load(ctx, var, condition->loc))) + return NULL; + list_add_tail(instrs, &load->node.entry); + + return load; +} + +static bool lower_int_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_node *arg1, *arg2, *xor, *and, *abs1, *abs2, *div, *neg; + struct hlsl_type *type = instr->data_type, *utype; + struct hlsl_ir_expr *cast1, *cast2, *cast3; + struct hlsl_ir_constant *high_bit; + struct hlsl_ir_expr *expr; + struct hlsl_ir_load *cond; + unsigned int i; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + arg1 = expr->operands[0].node; + arg2 = expr->operands[1].node; + if (expr->op != HLSL_OP2_DIV) + return false; + if (type->type != HLSL_CLASS_SCALAR && type->type != HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_INT) + return false; + utype = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_UINT, type->dimx, type->dimy); + + if (!(xor = hlsl_new_binary_expr(ctx, HLSL_OP2_BIT_XOR, arg1, arg2))) + return false; + list_add_before(&instr->entry, &xor->entry); + + if (!(high_bit = hlsl_new_constant(ctx, type, &instr->loc))) + return false; + for (i = 0; i < type->dimx; ++i) + high_bit->value[i].u = 0x80000000; + list_add_before(&instr->entry, &high_bit->node.entry); + + if (!(and = hlsl_new_binary_expr(ctx, HLSL_OP2_BIT_AND, xor, &high_bit->node))) + return false; + list_add_before(&instr->entry, &and->entry); + + if (!(abs1 = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, arg1, instr->loc))) + return false; + list_add_before(&instr->entry, &abs1->entry); + + if (!(cast1 = hlsl_new_cast(ctx, abs1, utype, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast1->node.entry); + + if (!(abs2 = hlsl_new_unary_expr(ctx, HLSL_OP1_ABS, arg2, instr->loc))) + return false; + list_add_before(&instr->entry, &abs2->entry); + + if (!(cast2 = hlsl_new_cast(ctx, abs2, utype, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast2->node.entry); + + if (!(div = hlsl_new_binary_expr(ctx, HLSL_OP2_DIV, &cast1->node, &cast2->node))) + return false; + list_add_before(&instr->entry, &div->entry); + + if (!(cast3 = hlsl_new_cast(ctx, div, type, &instr->loc))) + return false; + list_add_before(&instr->entry, &cast3->node.entry); + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, &cast3->node, instr->loc))) + return false; + list_add_before(&instr->entry, &neg->entry); + + if (!(cond = add_conditional(ctx, &instr->entry, and, neg, &cast3->node))) + return false; + hlsl_replace_node(instr, &cond->node); + + return true; +} + static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_type *type = instr->data_type; @@ -2297,6 +2401,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry transform_ir(ctx, lower_narrowing_casts, body, NULL); transform_ir(ctx, lower_casts_to_bool, body, NULL); + transform_ir(ctx, lower_int_division, body, NULL); transform_ir(ctx, lower_int_abs, body, NULL); do { diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test index f7fe8291..3190be00 100644 --- a/tests/arithmetic-int-uniform.shader_test +++ b/tests/arithmetic-int-uniform.shader_test @@ -10,7 +10,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 16.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (21.0, -11.0, 80.0, 0.0) [pixel shader]

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Lower int absolute value.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 4c13ae576403b9e6f516eefa3a93ba25fe221779 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4c13ae576403b9e6f516eefa3a93b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 21 17:21:44 2021 +0200 vkd3d-shader/hlsl: Lower int absolute value. --- libs/vkd3d-shader/hlsl_codegen.c | 30 ++++++++++++++++++++++++++++++ tests/arithmetic-int-uniform.shader_test | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 289c5a11..ef67e39b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1284,6 +1284,35 @@ static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr return true; } +static bool lower_int_abs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_type *type = instr->data_type; + struct hlsl_ir_node *arg, *neg; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + + if (expr->op != HLSL_OP1_ABS) + return false; + if (type->type != HLSL_CLASS_SCALAR && type->type != HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_INT) + return false; + + arg = expr->operands[0].node; + + if (!(neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, arg, instr->loc))) + return false; + list_add_before(&instr->entry, &neg->entry); + + expr->op = HLSL_OP2_MAX; + hlsl_src_from_node(&expr->operands[1], neg); + + return true; +} + static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { switch (instr->type) @@ -2268,6 +2297,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry transform_ir(ctx, lower_narrowing_casts, body, NULL); transform_ir(ctx, lower_casts_to_bool, body, NULL); + transform_ir(ctx, lower_int_abs, body, NULL); do { progress = transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test index 643c910b..f7fe8291 100644 --- a/tests/arithmetic-int-uniform.shader_test +++ b/tests/arithmetic-int-uniform.shader_test @@ -38,5 +38,5 @@ float4 main() : SV_TARGET [test] uniform 0 float4 5.0 -7.0 0.0 -10.0 -todo draw quad +draw quad probe all rgba (5.0, 7.0, 0.0, 10.0)

1 0

Giovanni Mascellani : tests: Test int absolute value.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: ef4990d9966df3aeb17a517582d97b0f770e9b9b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ef4990d9966df3aeb17a517582d97… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Oct 5 13:59:43 2022 +0200 tests: Test int absolute value. --- tests/arithmetic-int-uniform.shader_test | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test index ff80a9b0..643c910b 100644 --- a/tests/arithmetic-int-uniform.shader_test +++ b/tests/arithmetic-int-uniform.shader_test @@ -27,3 +27,16 @@ float4 main() : SV_TARGET uniform 0 float4 5.0 16.0 0.0 0.0 todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) + +[pixel shader] +uniform float4 a; + +float4 main() : SV_TARGET +{ + return abs(int4(a)); +} + +[test] +uniform 0 float4 5.0 -7.0 0.0 -10.0 +todo draw quad +probe all rgba (5.0, 7.0, 0.0, 10.0)

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 square root instructions.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 5442f4236c0387765b9346de7275f99de709ce86 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5442f4236c0387765b9346de7275f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 4 23:40:30 2022 +0200 vkd3d-shader/hlsl: Write SM4 square root instructions. --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ tests/hlsl-length.shader_test | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index b6d5e92c..aa89b6a0 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1685,6 +1685,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, &expr->node, arg1, 0); break; + case HLSL_OP1_SQRT: + assert(type_is_float(dst_type)); + write_sm4_unary_op(buffer, VKD3D_SM4_OP_SQRT, &expr->node, arg1, 0); + break; + case HLSL_OP2_ADD: switch (dst_type->base_type) { diff --git a/tests/hlsl-length.shader_test b/tests/hlsl-length.shader_test index e9f7c8ae..d5a708e2 100644 --- a/tests/hlsl-length.shader_test +++ b/tests/hlsl-length.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 -todo draw quad +draw quad probe all rgba (7.34846926, 7.34846926, 7.34846926, 7.34846926) 1 [pixel shader] @@ -21,7 +21,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 0.0 -todo draw quad +draw quad probe all rgba (5.38516474, 5.38516474, 5.38516474, 5.38516474) 1 [pixel shader] @@ -34,7 +34,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (3.60555124, 3.60555124, 3.60555124, 3.60555124) 1 [pixel shader] @@ -47,7 +47,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 2.0) [pixel shader] @@ -60,7 +60,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 0.0 0.0 0.0 -todo draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 2.0) [pixel shader fail]

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse length() intrinsic.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 8e5aefb30989a22a2472a9dfb82ec1706d1e3d98 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8e5aefb30989a22a2472a9dfb82ec… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 1 10:54:03 2021 +0200 vkd3d-shader/hlsl: Parse length() intrinsic. --- libs/vkd3d-shader/hlsl.y | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 60ca09ce..b804b45c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2188,6 +2188,31 @@ static bool intrinsic_ldexp(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[0], arg, loc); } +static bool intrinsic_length(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = params->args[0]->data_type; + struct hlsl_ir_node *arg, *dot; + + if (type->type == HLSL_CLASS_MATRIX) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Invalid type %s.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(dot = add_binary_dot_expr(ctx, params->instrs, arg, arg, loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SQRT, dot, loc); +} + static bool intrinsic_lerp(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2407,6 +2432,7 @@ intrinsic_functions[] = {"dot", 2, true, intrinsic_dot}, {"floor", 1, true, intrinsic_floor}, {"ldexp", 2, true, intrinsic_ldexp}, + {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min},

1 0

Giovanni Mascellani : tests: Test length() intrinsic.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: a43242a3e6fb73090d7bb0a9cf66d55be029445e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a43242a3e6fb73090d7bb0a9cf66d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Oct 4 23:31:42 2022 +0200 tests: Test length() intrinsic. --- Makefile.am | 1 + tests/hlsl-length.shader_test | 80 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/Makefile.am b/Makefile.am index 110b66f6..24602862 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,6 +90,7 @@ vkd3d_shader_tests = \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-ldexp.shader_test \ + tests/hlsl-length.shader_test \ tests/hlsl-lerp.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ diff --git a/tests/hlsl-length.shader_test b/tests/hlsl-length.shader_test new file mode 100644 index 00000000..e9f7c8ae --- /dev/null +++ b/tests/hlsl-length.shader_test @@ -0,0 +1,80 @@ +[pixel shader] +uniform float4 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 3.0 4.0 5.0 +todo draw quad +probe all rgba (7.34846926, 7.34846926, 7.34846926, 7.34846926) 1 + +[pixel shader] +uniform float3 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 3.0 4.0 0.0 +todo draw quad +probe all rgba (5.38516474, 5.38516474, 5.38516474, 5.38516474) 1 + +[pixel shader] +uniform float2 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 3.0 0.0 0.0 +todo draw quad +probe all rgba (3.60555124, 3.60555124, 3.60555124, 3.60555124) 1 + +[pixel shader] +uniform float1 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 0.0 0.0 0.0 +todo draw quad +probe all rgba (2.0, 2.0, 2.0, 2.0) + +[pixel shader] +uniform float x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[test] +uniform 0 float4 2.0 0.0 0.0 0.0 +todo draw quad +probe all rgba (2.0, 2.0, 2.0, 2.0) + +[pixel shader fail] +uniform float1x3 x; + +float4 main() : SV_TARGET +{ + return length(x); +} + +[pixel shader fail] +uniform float4x1 x; + +float4 main() : SV_TARGET +{ + return length(x); +}

1 0

Hugh McMaster : kernel32/tests: Remove tests comparing expected output in certain functions.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: c7b8da649d899ad90f6949b6d6bd96d0e760cdcd URL: https://gitlab.winehq.org/wine/wine/-/commit/c7b8da649d899ad90f6949b6d6bd96… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 17 22:28:34 2022 +1100 kernel32/tests: Remove tests comparing expected output in certain functions. The Windows versions of [Read|Write]ConsoleOutput[Attribute|Character] appear to assign an uninitialized internal DWORD to the given pointer address before returning. As the functions fail (intentionally) in these tests, the value of the DWORD is never set, so the tests end up comparing the expected value of zero with random values. This value of this test is very limited and is best removed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53686 --- dlls/kernel32/tests/console.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c145aa4cb59..9eabd887f2c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2347,12 +2347,6 @@ static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].lpNumCharsWritten); ok(!ret, "[%d] Expected WriteConsoleOutputCharacterA to return FALSE, got %d\n", i, ret); - if (invalid_table[i].lpNumCharsWritten) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -2437,12 +2431,6 @@ static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].lpNumCharsWritten); ok(!ret, "[%d] Expected WriteConsoleOutputCharacterW to return FALSE, got %d\n", i, ret); - if (invalid_table[i].lpNumCharsWritten) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -2527,12 +2515,6 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].lpNumAttrsWritten); ok(!ret, "[%d] Expected WriteConsoleOutputAttribute to return FALSE, got %d\n", i, ret); - if (invalid_table[i].lpNumAttrsWritten) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -2943,12 +2925,6 @@ static void test_ReadConsoleOutputCharacterA(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].read_count); ok(!ret, "[%d] Expected ReadConsoleOutputCharacterA to return FALSE, got %d\n", i, ret); - if (invalid_table[i].read_count) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -3033,12 +3009,6 @@ static void test_ReadConsoleOutputCharacterW(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].read_count); ok(!ret, "[%d] Expected ReadConsoleOutputCharacterW to return FALSE, got %d\n", i, ret); - if (invalid_table[i].read_count) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError()); @@ -3122,12 +3092,6 @@ static void test_ReadConsoleOutputAttribute(HANDLE output_handle) invalid_table[i].coord, invalid_table[i].read_count); ok(!ret, "[%d] Expected ReadConsoleOutputAttribute to return FALSE, got %d\n", i, ret); - if (invalid_table[i].read_count) - { - ok(count == invalid_table[i].expected_count, - "[%d] Expected count to be %lu, got %lu\n", - i, invalid_table[i].expected_count, count); - } ok(GetLastError() == invalid_table[i].last_error, "[%d] Expected last error to be %lu, got %lu\n", i, invalid_table[i].last_error, GetLastError());

1 0

Ziqing Hui : win32u: Add more linked fonts for Tahoma.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: a32782d28b744e228f21f61bb3d94c5371ff3f99 URL: https://gitlab.winehq.org/wine/wine/-/commit/a32782d28b744e228f21f61bb3d94c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 11 18:00:59 2022 +0800 win32u: Add more linked fonts for Tahoma. --- dlls/win32u/font.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 6086fa79609..5762d55eab5 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1555,31 +1555,56 @@ static const char system_link_tahoma_sc[] = "SIMSUN.TTC,SimSun\0" "MINGLIU.TTC,PMingLiu\0" "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; + "BATANG.TTC,Batang\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_tahoma_tc[] = "MINGLIU.TTC,PMingLiu\0" "SIMSUN.TTC,SimSun\0" "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; + "BATANG.TTC,Batang\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_tahoma_jp[] = "MSGOTHIC.TTC,MS UI Gothic\0" "MINGLIU.TTC,PMingLiU\0" "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; + "GULIM.TTC,Gulim\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_tahoma_kr[] = "GULIM.TTC,Gulim\0" "MSGOTHIC.TTC,MS UI Gothic\0" "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0"; + "SIMSUN.TTC,SimSun\0" + "MALGUN.TTF,Malgun Gothic\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_tahoma_non_cjk[] = "MSGOTHIC.TTC,MS UI Gothic\0" "MINGLIU.TTC,PMingLiU\0" "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; + "GULIM.TTC,Gulim\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; static const char system_link_ms_ui_gothic[] = "MICROSS.TTF,Microsoft Sans Serif\0"

1 0

Ziqing Hui : win32u: Add font link for MS UI Gothic.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 71b1e636ecc8a63e4edb74b4c80cd4aef47bf013 URL: https://gitlab.winehq.org/wine/wine/-/commit/71b1e636ecc8a63e4edb74b4c80cd4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Oct 15 12:32:09 2022 +0800 win32u: Add font link for MS UI Gothic. Win10 has font link for most of the system default fonts, including MS UI Gothic. This fixes Korean text display issue for Romance of the There Kindoms XIII. --- dlls/win32u/font.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index d3e69cb5f8e..6086fa79609 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1581,6 +1581,16 @@ static const char system_link_tahoma_non_cjk[] = "SIMSUN.TTC,SimSun\0" "GULIM.TTC,Gulim\0"; +static const char system_link_ms_ui_gothic[] = + "MICROSS.TTF,Microsoft Sans Serif\0" + "MINGLIU.TTC,PMingLiU\0""SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0" + "YUGOTHM.TTC,Yu Gothic UI\0" + "MSJH.TTC,Microsoft JhengHei UI\0" + "MSYH.TTC,Microsoft YaHei UI\0" + "MALGUN.TTF,Malgun Gothic\0" + "SEGUISYM.TTF,Segoe UI Symbol\0"; + static const struct system_link_reg { const WCHAR *font_name; @@ -1621,6 +1631,14 @@ default_system_link[] = system_link_tahoma_kr, sizeof(system_link_tahoma_kr), system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), }, + { + ms_ui_gothicW, + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + system_link_ms_ui_gothic, sizeof(system_link_ms_ui_gothic), + }, }; static void populate_system_links( const WCHAR *name, const WCHAR * const *values )

1 0

Ziqing Hui : win32u: Add mechanism for font specific system links.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: a9cc68336c591d3d9bf915a3a74d9a3685d0ae4b URL: https://gitlab.winehq.org/wine/wine/-/commit/a9cc68336c591d3d9bf915a3a74d9a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Oct 11 12:38:38 2022 +0800 win32u: Add mechanism for font specific system links. --- dlls/win32u/font.c | 148 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 99 insertions(+), 49 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 7fc4a01eb64..d3e69cb5f8e 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1551,6 +1551,78 @@ static const struct font_links_defaults_list } }; +static const char system_link_tahoma_sc[] = + "SIMSUN.TTC,SimSun\0" + "MINGLIU.TTC,PMingLiu\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "BATANG.TTC,Batang\0"; + +static const char system_link_tahoma_tc[] = + "MINGLIU.TTC,PMingLiu\0" + "SIMSUN.TTC,SimSun\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "BATANG.TTC,Batang\0"; + +static const char system_link_tahoma_jp[] = + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0"; + +static const char system_link_tahoma_kr[] = + "GULIM.TTC,Gulim\0" + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0"; + +static const char system_link_tahoma_non_cjk[] = + "MSGOTHIC.TTC,MS UI Gothic\0" + "MINGLIU.TTC,PMingLiU\0" + "SIMSUN.TTC,SimSun\0" + "GULIM.TTC,Gulim\0"; + +static const struct system_link_reg +{ + const WCHAR *font_name; + const char *link_sc; + DWORD link_sc_len; + const char *link_tc; + DWORD link_tc_len; + const char *link_jp; + DWORD link_jp_len; + const char *link_kr; + DWORD link_kr_len; + const char *link_non_cjk; + DWORD link_non_cjk_len; +} +default_system_link[] = +{ + { + tahomaW, + system_link_tahoma_sc, sizeof(system_link_tahoma_sc), + system_link_tahoma_tc, sizeof(system_link_tahoma_tc), + system_link_tahoma_jp, sizeof(system_link_tahoma_jp), + system_link_tahoma_kr, sizeof(system_link_tahoma_kr), + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), + }, + { + microsoft_sans_serifW, + system_link_tahoma_sc, sizeof(system_link_tahoma_sc), + system_link_tahoma_tc, sizeof(system_link_tahoma_tc), + system_link_tahoma_jp, sizeof(system_link_tahoma_jp), + system_link_tahoma_kr, sizeof(system_link_tahoma_kr), + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), + }, + { + lucida_sans_unicodeW, + system_link_tahoma_sc, sizeof(system_link_tahoma_sc), + system_link_tahoma_tc, sizeof(system_link_tahoma_tc), + system_link_tahoma_jp, sizeof(system_link_tahoma_jp), + system_link_tahoma_kr, sizeof(system_link_tahoma_kr), + system_link_tahoma_non_cjk, sizeof(system_link_tahoma_non_cjk), + }, +}; + static void populate_system_links( const WCHAR *name, const WCHAR * const *values ) { struct gdi_font_family *family; @@ -2646,63 +2718,41 @@ static void set_multi_value_key( HKEY hkey, const WCHAR *name, const char *value static void update_font_system_link_info(void) { - static const char system_link_simplified_chinese[] = - "SIMSUN.TTC,SimSun\0" - "MINGLIU.TTC,PMingLiu\0" - "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; - static const char system_link_traditional_chinese[] = - "MINGLIU.TTC,PMingLiu\0" - "SIMSUN.TTC,SimSun\0" - "MSGOTHIC.TTC,MS UI Gothic\0" - "BATANG.TTC,Batang\0"; - static const char system_link_japanese[] = - "MSGOTHIC.TTC,MS UI Gothic\0" - "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; - static const char system_link_korean[] = - "GULIM.TTC,Gulim\0" - "MSGOTHIC.TTC,MS UI Gothic\0" - "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0"; - static const char system_link_non_cjk[] = - "MSGOTHIC.TTC,MS UI Gothic\0" - "MINGLIU.TTC,PMingLiU\0" - "SIMSUN.TTC,SimSun\0" - "GULIM.TTC,Gulim\0"; HKEY hkey; if ((hkey = reg_create_key( NULL, system_link_keyW, sizeof(system_link_keyW), 0, NULL ))) { const char *link; - DWORD len; + DWORD len, i; - switch (ansi_cp.CodePage) + for (i = 0; i < ARRAY_SIZE(default_system_link); ++i) { - case 932: - link = system_link_japanese; - len = sizeof(system_link_japanese); - break; - case 936: - link = system_link_simplified_chinese; - len = sizeof(system_link_simplified_chinese); - break; - case 949: - link = system_link_korean; - len = sizeof(system_link_korean); - break; - case 950: - link = system_link_traditional_chinese; - len = sizeof(system_link_traditional_chinese); - break; - default: - link = system_link_non_cjk; - len = sizeof(system_link_non_cjk); + const struct system_link_reg *link_reg = &default_system_link[i]; + + switch (ansi_cp.CodePage) + { + case 932: + link = link_reg->link_jp; + len = link_reg->link_jp_len; + break; + case 936: + link = link_reg->link_sc; + len = link_reg->link_sc_len; + break; + case 949: + link = link_reg->link_kr; + len = link_reg->link_kr_len; + break; + case 950: + link = link_reg->link_tc; + len = link_reg->link_tc_len; + break; + default: + link = link_reg->link_non_cjk; + len = link_reg->link_non_cjk_len; + } + set_multi_value_key(hkey, link_reg->font_name, link, len); } - set_multi_value_key(hkey, lucida_sans_unicodeW, link, len); - set_multi_value_key(hkey, microsoft_sans_serifW, link, len); - set_multi_value_key(hkey, tahomaW, link, len); NtClose( hkey ); } }

1 0

Alexandre Julliard : nls: Update locales that have been added in recent Windows versions.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: b591b3167cf98ccc6d70871f282d8b5f98013fff URL: https://gitlab.winehq.org/wine/wine/-/commit/b591b3167cf98ccc6d70871f282d8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 17 12:31:38 2022 +0200 nls: Update locales that have been added in recent Windows versions. --- nls/locale.nls | Bin 736194 -> 738990 bytes tools/make_unicode | 27 ++++++++++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/nls/locale.nls b/nls/locale.nls index 06d1982cf5a..8ee39e44222 100644 Binary files a/nls/locale.nls and b/nls/locale.nls differ diff --git a/tools/make_unicode b/tools/make_unicode index 667df5e186f..12076252e3d 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -614,8 +614,10 @@ my @locales = { name => "de-LU", lcid => 0x00001007, sabbrevlangname => "DEL" }, { name => "dje", sopentypelang => "DJR" }, { name => "dje-NE" }, - { name => "doi" }, - { name => "doi-IN" }, + { name => "doi", sopentypelang => "DGR" }, + { name => "doi-IN", alias => "doi-Deva-IN" }, + { name => "doi-Deva", file => "doi" }, + { name => "doi-Deva-IN", file => "doi_IN" }, { name => "dsb", lcid => 0x00007c2e, sparent => "hsb", oemcp => 850, ebcdiccp => 870, sabbrevlangname => "DSB", sopentypelang => "LSB" }, { name => "dsb-DE", lcid => 0x0000082e }, { name => "dua" }, @@ -790,7 +792,7 @@ my @locales = { name => "ff-MR", alias => "ff-Latn-MR" }, { name => "ff-NG", alias => "ff-Latn-NG" }, { name => "ff-SN", alias => "ff-Latn-SN" }, - { name => "ff-Adlm" }, + { name => "ff-Adlm", oemcp => 65001 }, { name => "ff-Adlm-BF" }, { name => "ff-Adlm-CM" }, { name => "ff-Adlm-GH" }, @@ -875,10 +877,11 @@ my @locales = { name => "fr-YT" }, { name => "fur", sopentypelang => "FRL" }, { name => "fur-IT" }, + { name => "fuv-NG", alias => "ff-Latn-NG" }, { name => "fy", lcid => 0x00000062, oemcp => 850, sabbrevlangname => "FYN", sopentypelang => "FRI" }, { name => "fy-NL", lcid => 0x00000462 }, { name => "ga", lcid => 0x0000003c, oemcp => 850, sabbrevlangname => "IRE", sopentypelang => "IRI" }, - { name => "ga-GB" }, + { name => "ga-GB", oemcp => 65001 }, { name => "ga-IE", lcid => 0x0000083c }, { name => "gd", lcid => 0x00000091, oemcp => 850, ebcdiccp => 20285, sopentypelang => "GAE" }, { name => "gd-GB", lcid => 0x00000491 }, @@ -896,6 +899,7 @@ my @locales = { name => "guz" }, { name => "guz-KE" }, { name => "gv", sopentypelang => "MNX" }, + { name => "gv-GB", file => "gv" }, { name => "gv-IM" }, { name => "ha", lcid => 0x00000068, oemcp => 437 }, { name => "ha-GH", alias => "ha-Latn-GH" }, @@ -1026,7 +1030,8 @@ my @locales = { name => "ky-Cyrl-KG", alias => "ky-KG" }, { name => "ky-KG", lcid => 0x00000440 }, { name => "la", lcid => 0x00000076, oemcp => 437, slist => ",", dir => "seed", sabbrevlangname => "ZZZ" }, - { name => "la-001", lcid => 0x00000476, file => "la", dir => "seed" }, + { name => "la-VA", lcid => 0x00000476, dir => "seed" }, + { name => "la-001", alias => "la-VA" }, { name => "lag" }, { name => "lag-TZ" }, { name => "lb", lcid => 0x0000006e, oemcp => 850, ebcdiccp => 20297, sabbrevlangname => "LBX" }, @@ -1087,6 +1092,8 @@ my @locales = { name => "mn-Mong-MN", lcid => 0x00000c50, dir => "seed", sabbrevlangname => "MNM" }, { name => "mni", lcid => 0x00000058, slist => ",", sabbrevlangname => "ZZZ" }, { name => "mni-IN", lcid => 0x00000458, file => "mni_Beng_IN" }, + { name => "mni-Beng" }, + { name => "mni-Beng-IN", alias => "mni-IN" }, { name => "moh", lcid => 0x0000007c, oemcp => 850, ebcdiccp => 37, slist => ",", dir => "seed", sabbrevlangname => "MWK" }, { name => "moh-CA", lcid => 0x0000047c, dir => "seed" }, { name => "moh-Latn", alias => "moh" }, @@ -1170,7 +1177,9 @@ my @locales = ## name => "pap", lcid => 0x00000079 }, ## name => "pap-029", lcid => 0x00000479 }, { name => "pcm" }, - { name => "pcm-NG" }, + { name => "pcm-NG", alias => "pcm-Latn-NG" }, + { name => "pcm-Latn", file => "pcm" }, + { name => "pcm-Latn-NG", file => "pcm_NG" }, { name => "pl", lcid => 0x00000015, oemcp => 852, ebcdiccp => 20880, group => 2, sabbrevlangname => "PLK", sopentypelang => "PLK" }, { name => "pl-PL", lcid => 0x00000415 }, ## name => "prg" }, @@ -1376,6 +1385,7 @@ my @locales = { name => "ti-ET", lcid => 0x00000473, sabbrevlangname => "TIE" }, { name => "tig", dir => "seed", sopentypelang => "TGR" }, { name => "tig-ER", dir => "seed" }, + { name => "tig-Ethi-ER", alias => "tig-ER" }, { name => "tk", lcid => 0x00000042, oemcp => 852, ebcdiccp => 20880, group => 2, sopentypelang => "TKM" }, { name => "tk-Latn", alias => "tk" }, { name => "tk-Latn-TM", alias => "tk-TM" }, @@ -1401,6 +1411,7 @@ my @locales = { name => "tzm-Latn-MA", file => "tzm_MA", oemcp => 65001 }, { name => "tzm-Latn-DZ", lcid => 0x0000085f, file => "tzm" }, { name => "tzm-MA", alias => "tzm-Latn-MA" }, + { name => "tzm-DZ", alias => "tzm-Latn-DZ" }, ## name => "tzm-Arab", group => 13 }, ## name => "tzm-Arab-MA", lcid => 0x0000045f }, ## name => "tzm-Tfng", lcid => 0x0000785f }, @@ -1434,6 +1445,8 @@ my @locales = { name => "vo-001", dir => "seed" }, { name => "vun" }, { name => "vun-TZ" }, + { name => "wa", dir => "seed", oemcp => 850 }, + { name => "wa-BE", dir => "seed" }, { name => "wae" }, { name => "wae-CH" }, { name => "wal", dir => "seed" }, @@ -4480,7 +4493,7 @@ sub build_locale_data() else { my $name = $loc->{file} || $loc->{name}; - $name =~ s/-(Arab|Cyrl|Deva|Guru|Hans|Hant|Latn|Tfng|Vaii)$//; + $name =~ s/-(Arab|Beng|Cyrl|Deva|Guru|Hans|Hant|Latn|Tfng|Vaii)$//; $name =~ s/-/_/g; $id = xml_query( $subtags, "/supplementalData/likelySubtags/likelySubtag[\@from='$name']/\@to" ); $id =~ s/_/-/g if $id;

1 0

Alex Henrie : shell32: Sanitize Program Manager icon and group names.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 52ffd611de9ec84727118b5caa5138dabeb69a68 URL: https://gitlab.winehq.org/wine/wine/-/commit/52ffd611de9ec84727118b5caa5138… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Sanitize Program Manager icon and group names. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 --- dlls/shell32/dde.c | 40 ++++++++++++++++++++++++++++------------ dlls/shell32/tests/progman_dde.c | 3 +-- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 51aa8f88927..24482d2c33f 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -91,16 +91,32 @@ static inline BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) return FALSE; } -static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHAR *extension) +static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHAR *extension, BOOL sanitize) { WCHAR *path; - int len; + int len, i; len = wcslen(directory) + 1 + wcslen(name); if (extension) len += wcslen(extension); path = malloc((len + 1) * sizeof(WCHAR)); - PathCombineW(path, directory, name); + if (sanitize) + { + WCHAR *sanitized_name = wcsdup(name); + + for (i = 0; i < wcslen(name); i++) + { + if (name[i] < ' ' || wcschr(L"*/:<>?\\|", name[i])) + sanitized_name[i] = '_'; + } + + PathCombineW(path, directory, sanitized_name); + free(sanitized_name); + } + else + { + PathCombineW(path, directory, name); + } if (extension) wcscat(path, extension); @@ -109,12 +125,12 @@ static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHA } /* Returned string must be freed by caller */ -static WCHAR *get_programs_path(const WCHAR *name) +static WCHAR *get_programs_path(const WCHAR *name, BOOL sanitize) { WCHAR *programs, *path; SHGetKnownFolderPath(&FOLDERID_Programs, 0, NULL, &programs); - path = combine_path(programs, name, NULL); + path = combine_path(programs, name, NULL, sanitize); CoTaskMemFree(programs); return path; @@ -134,7 +150,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, HDDEDATA ret; groups_data[0] = 0; - programs = get_programs_path(L"*"); + programs = get_programs_path(L"*", FALSE); hfind = FindFirstFileW(programs, &finddata); if (hfind) { @@ -185,7 +201,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - path = get_programs_path(argv[0]); + path = get_programs_path(argv[0], TRUE); CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); @@ -201,7 +217,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - path = get_programs_path(argv[0]); + path = get_programs_path(argv[0], TRUE); path2 = malloc((lstrlenW(path) + 2) * sizeof(*path)); lstrcpyW(path2, path); @@ -226,7 +242,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) * ignore its actual value. */ if (argc < 2) return DDE_FNOTPROCESSED; - path = get_programs_path(argv[0]); + path = get_programs_path(argv[0], TRUE); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); @@ -275,14 +291,14 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) } if (argc >= 2) { - name = combine_path(last_group, argv[1], L".lnk"); + name = combine_path(last_group, argv[1], L".lnk", TRUE); } else { WCHAR *filename = wcsdup(PathFindFileNameW(argv[0])); WCHAR *ext = PathFindExtensionW(filename); *ext = '\0'; - name = combine_path(last_group, filename, L".lnk"); + name = combine_path(last_group, filename, L".lnk", TRUE); free(filename); } hres = IPersistFile_Save(file, name, TRUE); @@ -300,7 +316,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - name = combine_path(last_group, argv[0], L".lnk"); + name = combine_path(last_group, argv[0], L".lnk", FALSE); ret = DeleteFileW(name); free(name); diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index cb1ff8ddb9f..5a7e8c912e5 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -459,8 +459,7 @@ static void test_name_sanitization(DWORD instance, HCONV hConv) error = dde_execute(instance, hConv, buf); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); sprintf(buf, "Group%s", sanitized_name); - todo_wine ok(check_exists(buf), "directory not created\n"); - if (!check_exists(buf)) return; + ok(check_exists(buf), "directory not created\n"); ok(check_window_exists(buf), "window not created\n"); sprintf(buf, "[ShowGroup(\"Group%s\", 0)]", original_name);

1 0

Alex Henrie : shell32: Introduce combine_path helper for DDE.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 6004f5b0da788c645535455a9ae6d4d2e3c163b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6004f5b0da788c645535455a9ae6d4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Introduce combine_path helper for DDE. --- dlls/shell32/dde.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 39e7de9c2c9..51aa8f88927 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -91,20 +91,30 @@ static inline BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) return FALSE; } +static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHAR *extension) +{ + WCHAR *path; + int len; + + len = wcslen(directory) + 1 + wcslen(name); + if (extension) len += wcslen(extension); + path = malloc((len + 1) * sizeof(WCHAR)); + + PathCombineW(path, directory, name); + + if (extension) + wcscat(path, extension); + + return path; +} + /* Returned string must be freed by caller */ static WCHAR *get_programs_path(const WCHAR *name) { WCHAR *programs, *path; - int len; SHGetKnownFolderPath(&FOLDERID_Programs, 0, NULL, &programs); - - len = lstrlenW(programs) + 1 + lstrlenW(name); - path = malloc((len + 1) * sizeof(*path)); - lstrcpyW(path, programs); - lstrcatW(path, L"/"); - lstrcatW(path, name); - + path = combine_path(programs, name, NULL); CoTaskMemFree(programs); return path; @@ -265,16 +275,15 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) } if (argc >= 2) { - len = lstrlenW(last_group) + 1 + lstrlenW(argv[1]) + 5; - name = malloc(len * sizeof(*name)); - swprintf( name, len, L"%s/%s.lnk", last_group, argv[1] ); + name = combine_path(last_group, argv[1], L".lnk"); } else { - const WCHAR *filename = PathFindFileNameW(argv[0]); - len = PathFindExtensionW(filename) - filename; - name = malloc((lstrlenW(last_group) + 1 + len + 5) * sizeof(*name)); - swprintf( name, lstrlenW(last_group) + 1 + len + 5, L"%s/%.*s.lnk", last_group, len, filename ); + WCHAR *filename = wcsdup(PathFindFileNameW(argv[0])); + WCHAR *ext = PathFindExtensionW(filename); + *ext = '\0'; + name = combine_path(last_group, filename, L".lnk"); + free(filename); } hres = IPersistFile_Save(file, name, TRUE); @@ -291,12 +300,8 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - len = lstrlenW(last_group) + 1 + lstrlenW(argv[0]) + 5; - name = malloc(len * sizeof(*name)); - swprintf( name, len, L"%s/%s.lnk", last_group, argv[0]); - + name = combine_path(last_group, argv[0], L".lnk"); ret = DeleteFileW(name); - free(name); if (!ret) return DDE_FNOTPROCESSED;

1 0

Alex Henrie : shell32: Use standard C functions for memory allocation in dde.c.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 0d90fa6348d0523a83bab91fc250ea684bc01239 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d90fa6348d0523a83bab91fc250ea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Use standard C functions for memory allocation in dde.c. --- dlls/shell32/dde.c | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index cd956def797..39e7de9c2c9 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -58,7 +58,7 @@ static WCHAR *strndupW(const WCHAR *src, DWORD len) { WCHAR *dest; if (!src) return NULL; - dest = heap_alloc((len + 1) * sizeof(*dest)); + dest = malloc((len + 1) * sizeof(*dest)); if (dest) { memcpy(dest, src, len * sizeof(WCHAR)); @@ -100,7 +100,7 @@ static WCHAR *get_programs_path(const WCHAR *name) SHGetKnownFolderPath(&FOLDERID_Programs, 0, NULL, &programs); len = lstrlenW(programs) + 1 + lstrlenW(name); - path = heap_alloc((len + 1) * sizeof(*path)); + path = malloc((len + 1) * sizeof(*path)); lstrcpyW(path, programs); lstrcatW(path, L"/"); lstrcatW(path, name); @@ -119,7 +119,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, WIN32_FIND_DATAW finddata; HANDLE hfind; int len = 1; - WCHAR *groups_data = heap_alloc(sizeof(WCHAR)); + WCHAR *groups_data = malloc(sizeof(WCHAR)); char *groups_dataA; HDDEDATA ret; @@ -134,7 +134,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, wcscmp(finddata.cFileName, L".") && wcscmp(finddata.cFileName, L"..")) { len += lstrlenW(finddata.cFileName) + 2; - groups_data = heap_realloc(groups_data, len * sizeof(WCHAR)); + groups_data = realloc(groups_data, len * sizeof(WCHAR)); lstrcatW(groups_data, finddata.cFileName); lstrcatW(groups_data, L"\r\n"); } @@ -143,13 +143,13 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, } len = WideCharToMultiByte(CP_ACP, 0, groups_data, -1, NULL, 0, NULL, NULL); - groups_dataA = heap_alloc(len * sizeof(WCHAR)); + groups_dataA = malloc(len * sizeof(WCHAR)); WideCharToMultiByte(CP_ACP, 0, groups_data, -1, groups_dataA, len, NULL, NULL); ret = DdeCreateDataHandle(dwDDEInst, (BYTE *)groups_dataA, len, 0, hszGroups, uFmt, 0); - heap_free(groups_dataA); - heap_free(groups_data); - heap_free(programs); + free(groups_dataA); + free(groups_data); + free(programs); return ret; } else if (hszTopic == hszProgmanTopic && hszItem == hszProgmanService && uFmt == CF_TEXT) @@ -180,7 +180,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - heap_free(last_group); + free(last_group); last_group = path; } else if (!wcsicmp(command, L"DeleteGroup")) @@ -193,7 +193,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) path = get_programs_path(argv[0]); - path2 = heap_alloc((lstrlenW(path) + 2) * sizeof(*path)); + path2 = malloc((lstrlenW(path) + 2) * sizeof(*path)); lstrcpyW(path2, path); path2[lstrlenW(path) + 1] = 0; @@ -203,8 +203,8 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ret = SHFileOperationW(&shfos); - heap_free(path2); - heap_free(path); + free(path2); + free(path); if (ret || shfos.fAnyOperationsAborted) return DDE_FNOTPROCESSED; } @@ -220,7 +220,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - heap_free(last_group); + free(last_group); last_group = path; } else if (!wcsicmp(command, L"AddItem")) @@ -242,10 +242,10 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) IShellLinkW_Release(link); return DDE_FNOTPROCESSED; } - path = heap_alloc(len * sizeof(WCHAR)); + path = malloc(len * sizeof(WCHAR)); SearchPathW(NULL, argv[0], L".exe", len, path, NULL); IShellLinkW_SetPath(link, path); - heap_free(path); + free(path); if (argc >= 2) IShellLinkW_SetDescription(link, argv[1]); if (argc >= 4) IShellLinkW_SetIconLocation(link, argv[2], wcstol(argv[3], NULL, 10)); @@ -266,19 +266,19 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc >= 2) { len = lstrlenW(last_group) + 1 + lstrlenW(argv[1]) + 5; - name = heap_alloc(len * sizeof(*name)); + name = malloc(len * sizeof(*name)); swprintf( name, len, L"%s/%s.lnk", last_group, argv[1] ); } else { const WCHAR *filename = PathFindFileNameW(argv[0]); len = PathFindExtensionW(filename) - filename; - name = heap_alloc((lstrlenW(last_group) + 1 + len + 5) * sizeof(*name)); + name = malloc((lstrlenW(last_group) + 1 + len + 5) * sizeof(*name)); swprintf( name, lstrlenW(last_group) + 1 + len + 5, L"%s/%.*s.lnk", last_group, len, filename ); } hres = IPersistFile_Save(file, name, TRUE); - heap_free(name); + free(name); IPersistFile_Release(file); IShellLinkW_Release(link); @@ -292,12 +292,12 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; len = lstrlenW(last_group) + 1 + lstrlenW(argv[0]) + 5; - name = heap_alloc(len * sizeof(*name)); + name = malloc(len * sizeof(*name)); swprintf( name, len, L"%s/%s.lnk", last_group, argv[0]); ret = DeleteFileW(name); - heap_free(name); + free(name); if (!ret) return DDE_FNOTPROCESSED; } @@ -326,7 +326,7 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) while (*command == '[') { argc = 0; - argv = heap_alloc(sizeof(*argv)); + argv = malloc(sizeof(*argv)); command++; while (*command == ' ') command++; @@ -355,7 +355,7 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) } argc++; - argv = heap_realloc(argv, argc * sizeof(*argv)); + argv = realloc(argv, argc * sizeof(*argv)); argv[argc-1] = strndupW(command, p - command); command = p; @@ -381,9 +381,9 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) ret = DDE_FNOTPROCESSED; } - heap_free(opcode); - for (i = 0; i < argc; i++) heap_free(argv[i]); - heap_free(argv); + free(opcode); + for (i = 0; i < argc; i++) free(argv[i]); + free(argv); if (ret == DDE_FNOTPROCESSED) break; } @@ -392,9 +392,9 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) error: ERR("failed to parse command %s\n", debugstr_w(original)); - heap_free(opcode); - for (i = 0; i < argc; i++) heap_free(argv[i]); - heap_free(argv); + free(opcode); + for (i = 0; i < argc; i++) free(argv[i]); + free(argv); return DDE_FNOTPROCESSED; } @@ -406,14 +406,14 @@ static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) len = DdeGetData(hdata, NULL, 0, 0); if (!len) return DDE_FNOTPROCESSED; - command = heap_alloc(len); + command = malloc(len); DdeGetData(hdata, (BYTE *)command, len, 0); TRACE("conv=%p topic=%s data=%s\n", hconv, debugstr_hsz(hszTopic), debugstr_w(command)); ret = parse_dde_command(hszTopic, command); - heap_free(command); + free(command); return ret; }

1 0

Alex Henrie : shell32: Move strndupW to dde.c.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 6664991f2471004b3166397f6e2c3895d58ffa81 URL: https://gitlab.winehq.org/wine/wine/-/commit/6664991f2471004b3166397f6e2c38… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Move strndupW to dde.c. --- dlls/shell32/dde.c | 13 +++++++++++++ dlls/shell32/shell32_main.h | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 5ab63136092..cd956def797 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -54,6 +54,19 @@ static const char *debugstr_hsz( HSZ hsz ) return debugstr_w( buffer ); } +static WCHAR *strndupW(const WCHAR *src, DWORD len) +{ + WCHAR *dest; + if (!src) return NULL; + dest = heap_alloc((len + 1) * sizeof(*dest)); + if (dest) + { + memcpy(dest, src, len * sizeof(WCHAR)); + dest[len] = '\0'; + } + return dest; +} + static inline BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService) { if ((hszTopic == hszProgmanTopic) && (hszService == hszProgmanService)) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 7bb26e46a6e..33b85ee2726 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -241,19 +241,6 @@ static inline WCHAR *strdupW(const WCHAR *src) return dest; } -static inline WCHAR *strndupW(const WCHAR *src, DWORD len) -{ - WCHAR *dest; - if (!src) return NULL; - dest = heap_alloc((len + 1) * sizeof(*dest)); - if (dest) - { - memcpy(dest, src, len * sizeof(WCHAR)); - dest[len] = '\0'; - } - return dest; -} - static inline WCHAR *strdupAtoW(const char *str) { WCHAR *ret;

1 0

Gabriel Ivăncescu : jscript: Implement `reviver` argument for JSON.parse.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 2dcc5a70269e8bb875c76dcf4c4a906de52975b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2dcc5a70269e8bb875c76dcf4c4a90… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 14 22:14:43 2022 +0300 jscript: Implement `reviver` argument for JSON.parse. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 2 +- dlls/jscript/jscript.h | 1 + dlls/jscript/json.c | 120 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 57 +++++++++++++++++++++- 4 files changed, 173 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 5a8131f092c..d69c9f7edf4 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -93,7 +93,7 @@ static HRESULT set_length(jsdisp_t *obj, DWORD length) return jsdisp_propput_name(obj, L"length", jsval_number(length)); } -static WCHAR *idx_to_str(DWORD idx, WCHAR *ptr) +WCHAR *idx_to_str(DWORD idx, WCHAR *ptr) { if(!idx) { *ptr = '0'; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 0f8baea0188..757abf8aa6d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -318,6 +318,7 @@ HRESULT variant_date_to_string(script_ctx_t*,double,jsstr_t**) DECLSPEC_HIDDEN; HRESULT decode_source(WCHAR*) DECLSPEC_HIDDEN; HRESULT double_to_string(double,jsstr_t**) DECLSPEC_HIDDEN; +WCHAR *idx_to_str(DWORD,WCHAR*) DECLSPEC_HIDDEN; static inline BOOL is_digit(WCHAR c) { diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index dfcc39daa2a..d354768b486 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -267,20 +267,104 @@ static HRESULT parse_json_value(json_parse_ctx_t *ctx, jsval_t *r) return E_FAIL; } +struct transform_json_object_ctx +{ + script_ctx_t *ctx; + IDispatch *reviver; + HRESULT hres; +}; + +static jsval_t transform_json_object(struct transform_json_object_ctx *proc_ctx, jsdisp_t *holder, jsstr_t *name) +{ + jsval_t res, args[2]; + const WCHAR *str; + + if(!(str = jsstr_flatten(name))) + proc_ctx->hres = E_OUTOFMEMORY; + else + proc_ctx->hres = jsdisp_propget_name(holder, str, &args[1]); + if(FAILED(proc_ctx->hres)) + return jsval_undefined(); + + if(is_object_instance(args[1])) { + jsdisp_t *obj = to_jsdisp(get_object(args[1])); + jsstr_t *jsstr; + DISPID id; + BOOL b; + + if(!obj) { + FIXME("non-JS obj in JSON object: %p\n", get_object(args[1])); + proc_ctx->hres = E_NOTIMPL; + return jsval_undefined(); + }else if(is_class(obj, JSCLASS_ARRAY)) { + unsigned i, length = array_get_length(obj); + WCHAR buf[14], *buf_end; + + buf_end = buf + ARRAY_SIZE(buf) - 1; + *buf_end-- = 0; + for(i = 0; i < length; i++) { + str = idx_to_str(i, buf_end); + if(!(jsstr = jsstr_alloc(str))) { + proc_ctx->hres = E_OUTOFMEMORY; + return jsval_undefined(); + } + res = transform_json_object(proc_ctx, obj, jsstr); + jsstr_release(jsstr); + if(is_undefined(res)) { + if(FAILED(proc_ctx->hres)) + return jsval_undefined(); + if(FAILED(jsdisp_get_id(obj, str, 0, &id))) + continue; + proc_ctx->hres = disp_delete((IDispatch*)&obj->IDispatchEx_iface, id, &b); + }else { + proc_ctx->hres = jsdisp_define_data_property(obj, str, PROPF_WRITABLE | PROPF_ENUMERABLE | PROPF_CONFIGURABLE, res); + jsval_release(res); + } + if(FAILED(proc_ctx->hres)) + return jsval_undefined(); + } + }else { + id = DISPID_STARTENUM; + for(;;) { + proc_ctx->hres = jsdisp_next_prop(obj, id, JSDISP_ENUM_OWN_ENUMERABLE, &id); + if(proc_ctx->hres == S_FALSE) + break; + if(FAILED(proc_ctx->hres) || FAILED(proc_ctx->hres = jsdisp_get_prop_name(obj, id, &jsstr))) + return jsval_undefined(); + res = transform_json_object(proc_ctx, obj, jsstr); + if(is_undefined(res)) { + if(SUCCEEDED(proc_ctx->hres)) + proc_ctx->hres = disp_delete((IDispatch*)&obj->IDispatchEx_iface, id, &b); + }else { + if(!(str = jsstr_flatten(jsstr))) + proc_ctx->hres = E_OUTOFMEMORY; + else + proc_ctx->hres = jsdisp_define_data_property(obj, str, PROPF_WRITABLE | PROPF_ENUMERABLE | PROPF_CONFIGURABLE, res); + jsval_release(res); + } + jsstr_release(jsstr); + if(FAILED(proc_ctx->hres)) + return jsval_undefined(); + } + } + } + + args[0] = jsval_string(name); + proc_ctx->hres = disp_call_value(proc_ctx->ctx, proc_ctx->reviver, (IDispatch*)&holder->IDispatchEx_iface, + DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); + return FAILED(proc_ctx->hres) ? jsval_undefined() : res; +} + /* ECMA-262 5.1 Edition 15.12.2 */ static HRESULT JSON_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { json_parse_ctx_t parse_ctx; const WCHAR *buf; + jsdisp_t *root; jsstr_t *str; jsval_t ret; HRESULT hres; - if(argc != 1) { - FIXME("Unsupported args\n"); - return E_INVALIDARG; - } - hres = to_flat_string(ctx, argv[0], &str, &buf); if(FAILED(hres)) return hres; @@ -293,12 +377,38 @@ static HRESULT JSON_parse(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned hres = parse_json_value(&parse_ctx, &ret); if(SUCCEEDED(hres) && skip_spaces(&parse_ctx)) { FIXME("syntax error\n"); + jsval_release(ret); hres = E_FAIL; } jsstr_release(str); if(FAILED(hres)) return hres; + /* FIXME: check IsCallable */ + if(argc > 1 && is_object_instance(argv[1])) { + hres = create_object(ctx, NULL, &root); + if(FAILED(hres)) { + jsval_release(ret); + return hres; + } + hres = jsdisp_define_data_property(root, L"", PROPF_WRITABLE | PROPF_ENUMERABLE | PROPF_CONFIGURABLE, ret); + jsval_release(ret); + + if(SUCCEEDED(hres)) { + struct transform_json_object_ctx proc_ctx = { ctx, get_object(argv[1]), S_OK }; + if(!(str = jsstr_alloc(L""))) + hres = E_OUTOFMEMORY; + else { + ret = transform_json_object(&proc_ctx, root, str); + jsstr_release(str); + hres = proc_ctx.hres; + } + } + jsdisp_release(root); + if(FAILED(hres)) + return hres; + } + if(r) *r = ret; else diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e47e2759abb..c33791f1fb1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1960,7 +1960,7 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); [[[,2,undefined,3,{prop:0},],undefined," "],"[\n null,\n 2,\n null,\n 3,\n {\n \"prop\": 0\n },\n null\n]"] ]; - var i, s, v; + var i, s, v, t; for(i=0; i < stringify_tests.length; i++) { s = JSON.stringify.apply(null, stringify_tests[i][0]); @@ -2043,6 +2043,61 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); v = JSON.parse(parse_tests[i][0]); ok(json_cmp(v, parse_tests[i][1]), "parse[" + i + "] returned " + v + ", expected " + parse_tests[i][1]); } + + v = [ [-1, "b"], {"length": -2, "0": -4, "1": -5}, [{}], [{"x": [null]}] ]; + s = + '{' + + '"foo": true,' + + '"bar": [],' + + '"baz": "remove_me",' + + '"obj": {' + + ' "arr": [ [1, "b"], {"length": 2, "0": 4, "1": 5}, [{}], [{"x": [null]}] ],' + + ' "": "empty"' + + '},' + + '"last": false' + + '}'; + o = JSON.parse(s), t = JSON.parse(s), i = new Object(); + i[""] = t; + delete t.baz; /* baz gets removed */ + t.obj.arr = v; /* has negative values */ + + var walk_expect = [ + [ o, "foo", true ], + [ o, "bar", [] ], + [ o, "baz", "remove_me" ], + [ [1, "b"], "0", 1 ], + [ [-1, "b"], "1", "b" ], + [ [ [-1, "b"], {"length": 2, "0": 4, "1": 5}, [{}], [{"x": [null]}] ], "0", [-1, "b"] ], + [ {"length": 2, "0": 4, "1": 5}, "length", 2 ], + [ {"length": -2, "0": 4, "1": 5}, "0", 4 ], + [ {"length": -2, "0": -4, "1": 5}, "1", 5 ], + [ v, "1", {"length": -2, "0": -4, "1": -5} ], + [ [{}], "0", {} ], + [ v, "2", [{}] ], + [ [null], "0", null ], + [ {"x": [null]}, "x", [null] ], + [ [{"x": [null]}], "0", {"x": [null]} ], + [ v, "3", [{"x": [null]}] ], + [ { "arr": v, "": "empty" }, "arr", v ], + [ { "arr": v, "": "empty" }, "", "empty" ], + [ t, "obj", { "arr": v, "": "empty" } ], + [ t, "last", false ], + [ i, "", t ] + ]; + i = 0; + v = JSON.parse(s, function(prop, value) { + var a = [this, prop, value]; + ok(json_cmp(a, walk_expect[i]), "[walk step " + i + "] got [" + a + "], expected [" + walk_expect[i] + "]"); + i++; + return (typeof value === 'number') ? -value : (value === "remove_me" ? undefined : value); + }); + ok(i === walk_expect.length, "parse with reviver walked " + i + " steps, expected " + walk_expect.length); + ok(json_cmp(v, t), "parse with reviver returned wrong object"); + + v = JSON.parse('true', function(prop, value) { return prop === "" ? undefined : value; }); + ok(v === undefined, "parse with reviver removing last prop returned " + v); + v = JSON.parse('true', function(prop, value) { return prop === "" ? false : value; }); + ok(v === false, "parse with reviver setting last prop to false returned " + v); })(); var func = function (a) {

1 0

Gabriel Ivăncescu : jscript/tests: Fix copy paste mistake in JSON test.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: a4697901ccef210d8f6690772a42b948bac8912f URL: https://gitlab.winehq.org/wine/wine/-/commit/a4697901ccef210d8f6690772a42b9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 14 22:14:43 2022 +0300 jscript/tests: Fix copy paste mistake in JSON test. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/tests/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 123665cfdde..e47e2759abb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2025,7 +2025,7 @@ ok(isNaN(tmp), "Math.tan(-Infinity) is not NaN"); for(var prop in x) { if(!x.hasOwnProperty(prop)) continue; - if(!x.hasOwnProperty(prop)) + if(!y.hasOwnProperty(prop)) return false; if(!json_cmp(x[prop], y[prop])) return false;

1 0

Gabriel Ivăncescu : jscript: Implement Function.prototype.bind's `thisArg` properly.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 35a65559293e6ef57f0423ab488d489939074204 URL: https://gitlab.winehq.org/wine/wine/-/commit/35a65559293e6ef57f0423ab488d48… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 14 22:14:43 2022 +0300 jscript: Implement Function.prototype.bind's `thisArg` properly. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/function.c | 40 +++++++++++++++++++++------------------- dlls/mshtml/tests/es5.js | 17 +++++++++++++++++ 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index bf152e22868..8009f3a5d8b 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -57,7 +57,7 @@ typedef struct { typedef struct { FunctionInstance function; FunctionInstance *target; - IDispatch *this; + jsval_t this; unsigned argc; jsval_t args[1]; } BindFunction; @@ -70,7 +70,7 @@ typedef struct { unsigned argc; } ArgumentsInstance; -static HRESULT create_bind_function(script_ctx_t*,FunctionInstance*,IDispatch*,unsigned,jsval_t*,jsdisp_t**r); +static HRESULT create_bind_function(script_ctx_t*,FunctionInstance*,jsval_t,unsigned,jsval_t*,jsdisp_t**r); static inline FunctionInstance *function_from_jsdisp(jsdisp_t *jsdisp) { @@ -448,7 +448,7 @@ static HRESULT Function_call(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig static HRESULT Function_bind(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - IDispatch *bound_this = NULL; + jsval_t bound_this = jsval_undefined(); FunctionInstance *function; jsdisp_t *new_function; HRESULT hres; @@ -459,18 +459,19 @@ static HRESULT Function_bind(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig return JS_E_FUNCTION_EXPECTED; if(argc < 1) { - FIXME("no this argument\n"); - return E_NOTIMPL; - } - - if(is_object_instance(argv[0])) { - bound_this = get_object(argv[0]); - }else if(!is_null(argv[0])) { - FIXME("%s is not an object instance\n", debugstr_jsval(argv[0])); - return E_NOTIMPL; + argc = 1; + }else if(is_null(argv[0])) { + bound_this = argv[0]; + }else if(!is_undefined(argv[0])) { + IDispatch *obj; + hres = to_object(ctx, argv[0], &obj); + if(FAILED(hres)) + return hres; + bound_this = jsval_disp(obj); } hres = create_bind_function(ctx, function, bound_this, argc - 1, argv + 1, &new_function); + jsval_release(bound_this); if(FAILED(hres)) return hres; @@ -849,8 +850,7 @@ static HRESULT BindFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsva memcpy(call_args + function->argc, argv, argc * sizeof(*call_args)); } - hres = function->target->vtbl->call(ctx, function->target, function->this ? jsval_disp(function->this) : jsval_null(), - flags, call_argc, call_args, r); + hres = function->target->vtbl->call(ctx, function->target, function->this, flags, call_argc, call_args, r); heap_free(call_args); return hres; @@ -877,8 +877,7 @@ static void BindFunction_destructor(FunctionInstance *func) for(i = 0; i < function->argc; i++) jsval_release(function->args[i]); jsdisp_release(&function->target->dispex); - if(function->this) - IDispatch_Release(function->this); + jsval_release(function->this); } static const function_vtbl_t BindFunctionVtbl = { @@ -888,7 +887,7 @@ static const function_vtbl_t BindFunctionVtbl = { BindFunction_destructor }; -static HRESULT create_bind_function(script_ctx_t *ctx, FunctionInstance *target, IDispatch *bound_this, unsigned argc, +static HRESULT create_bind_function(script_ctx_t *ctx, FunctionInstance *target, jsval_t bound_this, unsigned argc, jsval_t *argv, jsdisp_t **ret) { BindFunction *function; @@ -902,8 +901,11 @@ static HRESULT create_bind_function(script_ctx_t *ctx, FunctionInstance *target, jsdisp_addref(&target->dispex); function->target = target; - if(bound_this) - IDispatch_AddRef(function->this = bound_this); + hres = jsval_copy(bound_this, &function->this); + if(FAILED(hres)) { + jsdisp_release(&function->function.dispex); + return hres; + } for(function->argc = 0; function->argc < argc; function->argc++) { hres = jsval_copy(argv[function->argc], function->args + function->argc); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index bfaacd1bd5b..e22f610e197 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1188,6 +1188,23 @@ sync_test("bind", function() { ok(t != a, "t == a"); ok(Function.prototype.bind.length === 1, "Function.prototype.bind.length = " + Function.prototype.bind.length); + + ((function() { ok(this === window, "bind() this = " + this); }).bind())(); + ((function() { ok(this === window, "bind(undefined) = " + this); }).bind(undefined))(); + ((function() { ok(this === window, "bind(nullDisp) = " + this); }).bind(external.nullDisp))(); + ((function() { + ok(typeof(this) === "object", "bind(42) typeof(this) = " + typeof(this)); + ok(this.valueOf() === 42, "bind(42) this = " + this); + }).bind(42))(); + + r = (Object.prototype.toString.bind())(); + ok(r === "[object Undefined]", "toString.bind() returned " + r); + r = (Object.prototype.toString.bind(undefined))(); + ok(r === "[object Undefined]", "toString.bind(undefined) returned " + r); + r = (Object.prototype.toString.bind(null))(); + ok(r === "[object Null]", "toString.bind(null) returned " + r); + r = (Object.prototype.toString.bind(external.nullDisp))(); + ok(r === "[object Null]", "toString.bind(nullDisp) returned " + r); }); sync_test("keys", function() {

1 0

Piotr Caban : winedump: Add support for EMRI_METAFILE_EXT records.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 0e49547c7ae1ce33ffd293bb784650572bbd75cc URL: https://gitlab.winehq.org/wine/wine/-/commit/0e49547c7ae1ce33ffd293bb784650… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 20:52:44 2022 +0200 winedump: Add support for EMRI_METAFILE_EXT records. --- tools/winedump/emfspool.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/winedump/emfspool.c b/tools/winedump/emfspool.c index 9e591f6dd67..7d6344facd1 100644 --- a/tools/winedump/emfspool.c +++ b/tools/winedump/emfspool.c @@ -61,6 +61,14 @@ typedef struct unsigned int cjSize; } record_hdr; +static inline void print_longlong(ULONGLONG value) +{ + if (sizeof(value) > sizeof(unsigned long) && value >> 32) + printf("0x%lx%08lx", (unsigned long)(value >> 32), (unsigned long)value); + else + printf("0x%lx", (unsigned long)value); +} + static const WCHAR* read_wstr(unsigned long off) { const WCHAR *beg, *end; @@ -133,6 +141,20 @@ static unsigned long dump_emfspool_record(unsigned long off) break; } + case EMRI_METAFILE_EXT: + case EMRI_BW_METAFILE_EXT: + { + const ULONGLONG *emf_off = PRD(off + sizeof(*hdr), sizeof(*emf_off)); + if (!emf_off) + fatal("truncated file\n"); + printf(" %-20s ", "offset"); + print_longlong(*emf_off); + printf(" (absolute position "); + print_longlong(off - *emf_off); + printf(")\n"); + break; + } + default: dump_data((const unsigned char *)(hdr + 1), hdr->cjSize, ""); break;

1 0

Piotr Caban : winedump: Add prefix when dumping EMF files.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 893ac008735fe3a7f56771fb3a854e9d1eff2ef1 URL: https://gitlab.winehq.org/wine/wine/-/commit/893ac008735fe3a7f56771fb3a854e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 15 21:13:37 2022 +0200 winedump: Add prefix when dumping EMF files. --- tools/winedump/emf.c | 93 ++++++++++++++++++++++++----------------------- tools/winedump/emfspool.c | 2 +- tools/winedump/winedump.h | 2 +- 3 files changed, 49 insertions(+), 48 deletions(-)

1 0

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 October 2022