May 2024 - Wine-Commits - list.winehq.org

Nikolay Sivov : d3dcompiler/fx: Write empty buffers for compiler versions 33-39.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: adb1f54c0291f3378ac2b4dd8b6c517ad5c2fea8 URL: https://gitlab.winehq.org/wine/wine/-/commit/adb1f54c0291f3378ac2b4dd8b6c51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 01:04:53 2024 +0200 d3dcompiler/fx: Write empty buffers for compiler versions 33-39. --- dlls/d3d10/tests/effect.c | 12 +++--------- dlls/d3dcompiler_43/compiler.c | 8 +++++++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 534ea00fa17..572493e3a40 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -9912,10 +9912,8 @@ static void test_effect_compiler(void) cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - ok(!strcmp(var_desc.Name, "$Globals"), "Unexpected variable name %s.\n", var_desc.Name); + ok(!strcmp(var_desc.Name, "$Globals"), "Unexpected variable name %s.\n", var_desc.Name); ID3D10Effect_Release(effect); ID3D10Blob_Release(blob); @@ -9936,21 +9934,17 @@ static void test_effect_compiler(void) cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); hr = cb->lpVtbl->GetDesc(cb, &var_desc); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(!strcmp(var_desc.Name, "$Globals"), "Unexpected variable name %s.\n", var_desc.Name); cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 1); hr = cb->lpVtbl->GetDesc(cb, &var_desc); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - ok(!strcmp(var_desc.Name, "cb1"), "Unexpected variable name %s.\n", var_desc.Name); + ok(!strcmp(var_desc.Name, "cb1"), "Unexpected variable name %s.\n", var_desc.Name); cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 2); hr = cb->lpVtbl->GetDesc(cb, &var_desc); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - ok(!strcmp(var_desc.Name, "cb2"), "Unexpected variable name %s.\n", var_desc.Name); + ok(!strcmp(var_desc.Name, "cb2"), "Unexpected variable name %s.\n", var_desc.Name); ID3D10Effect_Release(effect); ID3D10Blob_Release(blob); diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 4b2b05df917..6a829ae43d7 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -457,7 +457,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen struct d3dcompiler_include_from_file include_from_file; struct vkd3d_shader_preprocess_info preprocess_info; struct vkd3d_shader_hlsl_source_info hlsl_info; - struct vkd3d_shader_compile_option options[4]; + struct vkd3d_shader_compile_option options[5]; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; @@ -557,6 +557,12 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen option->value = VKD3D_SHADER_COMPILE_OPTION_BACKCOMPAT_MAP_SEMANTIC_NAMES; } +#if D3D_COMPILER_VERSION <= 39 + option = &options[compile_info.option_count++]; + option->name = VKD3D_SHADER_COMPILE_OPTION_INCLUDE_EMPTY_BUFFERS_IN_EFFECTS; + option->value = true; +#endif + ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); if (ret)

1 0

Nikolay Sivov : gdi32/text: Make GetTextExtentExPointW() return sizes consistent with ExtTextOutW().
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 3c1462afa0acee45127fe610db1c8258016e8bec URL: https://gitlab.winehq.org/wine/wine/-/commit/3c1462afa0acee45127fe610db1c82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 28 02:21:29 2024 +0200 gdi32/text: Make GetTextExtentExPointW() return sizes consistent with ExtTextOutW(). Observable issue before this change is that text extent does not match size of ExtTextOutW() output. The fix is to shape text in similar way before measuring. Individual extents returned in this case are arguably useless, they do not match visual output order, and only give an idea on how much each input character contributed to overall width. To match input character order all intra-line and intra-item reordering is disabled. --- dlls/gdi32/text.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 119 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index b61c8ed4542..085c5e3afbe 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -71,6 +71,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bidi); #define WINE_GCPW_LOOSE_RTL 3 #define WINE_GCPW_DIR_MASK 3 #define WINE_GCPW_LOOSE_MASK 2 +#define WINE_GCPW_DISABLE_REORDERING 0x10000000 #define odd(x) ((x) & 1) @@ -350,7 +351,8 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ INT uCountOut, /* [in] Size of output buffer */ UINT *lpOrder, /* [out] Logical -> Visual order map */ WORD **lpGlyphs, /* [out] reordered, mirrored, shaped glyphs to display */ - INT *cGlyphs ) /* [out] number of glyphs generated */ + INT *cGlyphs, /* [out] number of glyphs generated */ + WORD **cluster_map ) /* [out] cluster map for returned glyphs */ { WORD *chartype = NULL; BYTE *levels = NULL; @@ -588,19 +590,30 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ } for (j = 0; j < nItems; j++) + { runOrder[j] = pItems[j].a.s.uBidiLevel; + visOrder[j] = j; + if (dwWineGCP_Flags & WINE_GCPW_DISABLE_REORDERING) + pItems[j].a.fLogicalOrder = TRUE; + } - ScriptLayout(nItems, runOrder, visOrder, NULL); + if (!(dwWineGCP_Flags & WINE_GCPW_DISABLE_REORDERING)) + ScriptLayout(nItems, runOrder, visOrder, NULL); for (j = 0; j < nItems; j++) { + const WCHAR *text; + WORD *cluster_map; int k; int cChars,cOutGlyphs; + curItem = &pItems[visOrder[j]]; cChars = pItems[visOrder[j]+1].iCharPos - curItem->iCharPos; - res = ScriptShape(hDC, &psc, lpString + done + curItem->iCharPos, cChars, cMaxGlyphs, &curItem->a, run_glyphs, pwLogClust, psva, &cOutGlyphs); + text = lpString + done + curItem->iCharPos; + cluster_map = pwLogClust + done + curItem->iCharPos; + res = ScriptShape(hDC, &psc, text, cChars, cMaxGlyphs, &curItem->a, run_glyphs, cluster_map, psva, &cOutGlyphs); while (res == E_OUTOFMEMORY) { WORD *new_run_glyphs = HeapReAlloc(GetProcessHeap(), 0, run_glyphs, sizeof(*run_glyphs) * cMaxGlyphs * 2); @@ -621,7 +634,7 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ run_glyphs = new_run_glyphs; psva = new_psva; cMaxGlyphs *= 2; - res = ScriptShape(hDC, &psc, lpString + done + curItem->iCharPos, cChars, cMaxGlyphs, &curItem->a, run_glyphs, pwLogClust, psva, &cOutGlyphs); + res = ScriptShape(hDC, &psc, text, cChars, cMaxGlyphs, &curItem->a, run_glyphs, cluster_map, psva, &cOutGlyphs); } if (res) { @@ -653,6 +666,11 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ *lpGlyphs = new_glyphs; for (k = 0; k < cOutGlyphs; k++) (*lpGlyphs)[glyph_i+k] = run_glyphs[k]; + + /* Fix item cluster map indices to be usable with returned glyph array. */ + for (k = 0; k < cChars; ++k) + cluster_map[k] += glyph_i; + glyph_i += cOutGlyphs; } } @@ -664,6 +682,11 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ } if (cGlyphs) *cGlyphs = glyph_i; + if (cluster_map) + { + *cluster_map = pwLogClust; + pwLogClust = NULL; + } ret = TRUE; cleanup: @@ -952,7 +975,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR; BIDI_Reorder( hdc, str, count, GCP_REORDER, bidi_flags, NULL, 0, NULL, - &glyphs, &glyphs_count ); + &glyphs, &glyphs_count, NULL ); flags |= ETO_IGNORELANGUAGE; if (glyphs) @@ -1185,7 +1208,7 @@ DWORD WINAPI GetCharacterPlacementW( HDC hdc, const WCHAR *str, INT count, INT m else { BIDI_Reorder( NULL, str, count, flags, WINE_GCPW_FORCE_LTR, result->lpOutString, - set_cnt, result->lpOrder, NULL, NULL ); + set_cnt, result->lpOrder, NULL, NULL, NULL ); } if (flags & GCP_USEKERNING) @@ -1317,13 +1340,102 @@ INT WINAPI GetTextFaceW( HDC hdc, INT count, WCHAR *name ) return NtGdiGetTextFaceW( hdc, count, name, FALSE ); } +static unsigned int get_char_cluster_size(unsigned int start, unsigned int count, const WORD *cluster_map, + WORD *first_glyph, WORD *last_glyph) +{ + unsigned int i, size = 1; + + *first_glyph = cluster_map[start]; + *last_glyph = *first_glyph; + + for (i = start + 1; i < count; ++i) + { + if (cluster_map[i] != *first_glyph) + { + *last_glyph = cluster_map[i] - 1; + break; + } + size++; + } + + return size; +} + +static int get_cluster_extent(const INT *dxs, WORD first_glyph, WORD last_glyph) +{ + int extent = dxs[last_glyph]; + + if (first_glyph) + extent -= dxs[first_glyph - 1]; + return extent; +} + /*********************************************************************** * GetTextExtentExPointW (GDI32.@) */ BOOL WINAPI GetTextExtentExPointW( HDC hdc, const WCHAR *str, INT count, INT max_ext, INT *nfit, INT *dxs, SIZE *size ) { - return NtGdiGetTextExtentExW( hdc, str, count, max_ext, nfit, dxs, size, 0 ); + WORD *glyphs = NULL, *cluster_map = NULL; + unsigned int i, j; + DC_ATTR *dc_attr; + int glyphs_count; + UINT bidi_flags; + BOOL ret = TRUE; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + + bidi_flags = dc_attr->text_align & TA_RTLREADING ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR; + bidi_flags |= WINE_GCPW_DISABLE_REORDERING; + + if (nfit) *nfit = 0; + + BIDI_Reorder( hdc, str, count, GCP_REORDER, bidi_flags, NULL, 0, NULL, + &glyphs, &glyphs_count, &cluster_map ); + + if (glyphs) + { + BOOL need_extents = dxs || nfit; + INT *glyph_dxs = NULL; + + if (need_extents) + { + if (!(glyph_dxs = HeapAlloc( GetProcessHeap(), 0, glyphs_count * sizeof(*glyph_dxs) ))) + ret = FALSE; + } + + if (ret) + ret = NtGdiGetTextExtentExW( hdc, glyphs, glyphs_count, 0, NULL, glyph_dxs, size, 1 ); + + if (ret && need_extents) + { + unsigned int cluster_size, cluster_extent; + WORD first_glyph, last_glyph; + int extents = 0; + + for (i = 0; i < count; i += cluster_size) + { + cluster_size = get_char_cluster_size(i, count, cluster_map, &first_glyph, &last_glyph); + cluster_extent = get_cluster_extent(glyph_dxs, first_glyph, last_glyph); + + if (extents + cluster_extent > max_ext) break; + if (nfit) *nfit += cluster_size; + + for (j = 0; j < cluster_size; ++j) + dxs[i + j] = extents + cluster_extent / cluster_size; + + extents += cluster_extent; + } + } + + HeapFree( GetProcessHeap(), 0, glyphs ); + HeapFree( GetProcessHeap(), 0, glyph_dxs ); + HeapFree( GetProcessHeap(), 0, cluster_map ); + } + else + ret = NtGdiGetTextExtentExW( hdc, str, count, max_ext, nfit, dxs, size, 0 ); + + return ret; } /***********************************************************************

1 0

Alexandre Julliard : msvcrt: Share a helper to find a catch block handler.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: b4d6270a51aa654f1f7fd7de3a12f565ec5cc97a URL: https://gitlab.winehq.org/wine/wine/-/commit/b4d6270a51aa654f1f7fd7de3a12f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 12:09:39 2024 +0200 msvcrt: Share a helper to find a catch block handler. --- dlls/msvcrt/cppexcept.h | 4 +++ dlls/msvcrt/except.c | 34 +++++++++++++++++++ dlls/msvcrt/except_i386.c | 81 ++++++++++++++++----------------------------- dlls/msvcrt/except_x86_64.c | 64 +++++++++++------------------------ 4 files changed, 85 insertions(+), 98 deletions(-)

1 0

Alexandre Julliard : msvcrt: Share the copy_exception() helper between platforms.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 8ed3d661e1d18e503b4916be65bbcf2f28e42872 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ed3d661e1d18e503b4916be65bbcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 12:08:59 2024 +0200 msvcrt: Share the copy_exception() helper between platforms. --- dlls/msvcrt/cppexcept.h | 31 +++++++++++++++++++++++++ dlls/msvcrt/except_i386.c | 33 ++------------------------ dlls/msvcrt/except_x86_64.c | 56 ++++++--------------------------------------- dlls/msvcrt/handler4.c | 54 ++++++------------------------------------- 4 files changed, 47 insertions(+), 127 deletions(-)

1 0

Connor McAdams : uiautomationcore: NULL initialize SAFEARRAY variable passed to IRawElementProviderFragment::GetRuntimeId().
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 81057913cd6073bfbd9665d0d96f453c3dd5e995 URL: https://gitlab.winehq.org/wine/wine/-/commit/81057913cd6073bfbd9665d0d96f45… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri May 31 12:06:54 2024 -0400 uiautomationcore: NULL initialize SAFEARRAY variable passed to IRawElementProviderFragment::GetRuntimeId(). Fixes a crash in Battle.net setup where success is returned but the variable is not set. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index df9b2b283e0..8d1e3c8c7dc 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -1542,7 +1542,7 @@ static HRESULT uia_provider_get_special_prop_val(struct uia_provider *prov, case UIA_RuntimeIdPropertyId: { IRawElementProviderFragment *elfrag; - SAFEARRAY *sa; + SAFEARRAY *sa = NULL; LONG lbound; int val;

1 0

Jacek Caban : mshtml: Return success in IHTMLWindow2::get_closed stub.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 0fb56a84b75bcb1bb8000a0d6570f08195fee5ed URL: https://gitlab.winehq.org/wine/wine/-/commit/0fb56a84b75bcb1bb8000a0d6570f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 29 22:40:43 2024 +0200 mshtml: Return success in IHTMLWindow2::get_closed stub. --- dlls/mshtml/htmlwindow.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5a4707153e5..59a0f6d023d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1321,8 +1321,11 @@ static HRESULT WINAPI HTMLWindow2_focus(IHTMLWindow2 *iface) static HRESULT WINAPI HTMLWindow2_get_closed(IHTMLWindow2 *iface, VARIANT_BOOL *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p) semi-stub\n", This, p); + + *p = VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLWindow2_blur(IHTMLWindow2 *iface)

1 0

Alistair Leslie-Hughes : include: Add missing TreeView_* defines.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 6f927b9e93f164c973c46200452109abe2aa79b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f927b9e93f164c973c46200452109… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 31 18:32:14 2024 +1000 include: Add missing TreeView_* defines. --- include/commctrl.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 7c5b09f6e72..ece751a0d35 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3022,6 +3022,8 @@ typedef struct tagTVKEYDOWN #define TreeView_GetCheckState(hwndTV, hti) \ ((((UINT)(SNDMSG((hwndTV), TVM_GETITEMSTATE, (WPARAM)(hti), \ TVIS_STATEIMAGEMASK))) >> 12) -1) +#define TreeView_SetCheckState(hwndTV, hti, check) \ + TreeView_SetItemState(hwndTV, hti, INDEXTOSTATEIMAGEMASK((check) ? 2 : 1), TVIS_STATEIMAGEMASK) #define TreeView_SetLineColor(hwnd, clr) \ (COLORREF)SNDMSG((hwnd), TVM_SETLINECOLOR, 0, (LPARAM)(clr)) @@ -3040,6 +3042,34 @@ typedef struct tagTVKEYDOWN #define TreeView_GetUnicodeFormat(hwnd) \ (BOOL)SNDMSG((hwnd), TVM_GETUNICODEFORMAT, 0, 0) +#define TreeView_SetExtendedStyle(hwnd, style, mask) \ + (DWORD)SNDMSG((hwnd), TVM_SETEXTENDEDSTYLE, mask, style) + +#define TreeView_GetExtendedStyle(hwnd) \ + (DWORD)SNDMSG((hwnd), TVM_GETEXTENDEDSTYLE, 0, 0) + +#define TreeView_SetAutoScrollInfo(hwnd, pps, updatetime) \ + SNDMSG((hwnd), TVM_SETAUTOSCROLLINFO, (WPARAM)(pps), (LPARAM)(updatetime)) + +#define TreeView_SetHot(hwnd, hitem) \ + SNDMSG((hwnd), TVM_SETHOT, 0, (LPARAM)(hitem)) + +#define TreeView_GetSelectedCount(hwnd) \ + (DWORD)SNDMSG((hwnd), TVM_GETSELECTEDCOUNT, 0, 0) + +#define TreeView_ShowInfoTip(hwnd, hitem) \ + (DWORD)SNDMSG((hwnd), TVM_SHOWINFOTIP, 0, (LPARAM)(hitem)) + +#define TreeView_GetItemPartRect(hwnd, hitem, rect, part) \ +{ \ + TVGETITEMPARTRECTINFO info; \ + info.hti = (hitem); \ + info.prc = (rect); \ + info.partID = (part); \ + SNDMSG((hwnd), TVM_GETITEMPARTRECT, 0, (LPARAM)&info); \ +} + + /* Listview control */ #define WC_LISTVIEWA "SysListView32"

1 0

Yuxuan Shui : shell32: Fix ShellExecute for non-filespec paths.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 0bad544aab9e2c9ee93bbabac0386e02c58a39c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/0bad544aab9e2c9ee93bbabac0386e… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon May 20 09:51:07 2024 +0100 shell32: Fix ShellExecute for non-filespec paths. --- dlls/shell32/shlexec.c | 60 ++++++++++++++++++++++++++++++++++---------- dlls/shell32/tests/shlexec.c | 13 +++++++++- 2 files changed, 59 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index f0cf27c5098..828c7168a34 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(exec); typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, const SHELLEXECUTEINFOW *sei, LPSHELLEXECUTEINFOW sei_out); extern BOOL WINAPI PathResolveAW(void *path, const void **paths, DWORD flags); +extern BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath,DWORD dwWhich); static inline BOOL isSpace(WCHAR c) { @@ -627,24 +628,57 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, return 33; } - if (lpPath && *lpPath) + GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + if (!PathIsFileSpecW(lpFile)) { - search_paths[0] = lpPath; - search_paths[1] = curdir; + BOOL found = FALSE; + if (lpPath && *lpPath) + { + TRACE("ASDF %s\n", debugstr_w(lpPath)); + PathCombineW(xlpFile, lpPath, lpFile); + if (PathFileExistsDefExtW(xlpFile, 0xbf)) + { + GetFullPathNameW(xlpFile, ARRAY_SIZE(xlpFile), xlpFile, NULL); + found = TRUE; + } + } + if (!found) + { + lstrcpyW(xlpFile, lpFile); + if (PathFileExistsDefExtW(xlpFile, 0xbf)) + { + GetFullPathNameW(xlpFile, ARRAY_SIZE(xlpFile), xlpFile, NULL); + found = TRUE; + } + } + if (found) + { + lpFile = xlpFile; + lstrcpyW(lpResult, xlpFile); + } + else + xlpFile[0] = '\0'; } else - search_paths[0] = curdir; - GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); - lstrcpyW(xlpFile, lpFile); - if (PathResolveAW(xlpFile, (const void **)search_paths, PRF_TRYPROGRAMEXTENSIONS | PRF_VERIFYEXISTS)) { - TRACE("PathResolveAW returned non-zero\n"); - lpFile = xlpFile; - lstrcpyW(lpResult, xlpFile); - /* The file was found in lpPath or one of the directories in the system-wide search path */ + if (lpPath && *lpPath) + { + search_paths[0] = lpPath; + search_paths[1] = curdir; + } + else + search_paths[0] = curdir; + lstrcpyW(xlpFile, lpFile); + if (PathResolveAW(xlpFile, (const void **)search_paths, PRF_TRYPROGRAMEXTENSIONS | PRF_VERIFYEXISTS)) + { + TRACE("PathResolveAW returned non-zero\n"); + lpFile = xlpFile; + lstrcpyW(lpResult, xlpFile); + /* The file was found in lpPath or one of the directories in the system-wide search path */ + } + else + xlpFile[0] = '\0'; } - else - xlpFile[0] = '\0'; attribs = GetFileAttributesW(lpFile); if (attribs!=INVALID_FILE_ATTRIBUTES && (attribs&FILE_ATTRIBUTE_DIRECTORY)) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0f537d829f4..bd32ece8705 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2267,9 +2267,11 @@ static void test_exes(void) char filename[2 * MAX_PATH + 17]; char params[1024]; char curdir[MAX_PATH]; - char *basename = strrchr(argv0, '\\') + 1; + char relative_basename[MAX_PATH]; + char *basename = strrchr(argv0, '\\') + 1, *dirname = strdup(argv0); INT_PTR rc; + *strrchr(dirname, '\\') = '\0'; sprintf(params, "shlexec \"%s\" Exec", child_file); /* We need NOZONECHECKS on Win2003 to block a dialog */ @@ -2279,6 +2281,15 @@ static void test_exes(void) okChildInt("argcA", 4); okChildString("argvA3", "Exec"); + /* Check non-filespec paths */ + snprintf(relative_basename, ARRAY_SIZE(relative_basename), ".\\\\%s", basename); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS | SEE_MASK_FLAG_NO_UI, NULL, relative_basename, params, + dirname, NULL); + okShell(rc > 32, "returned %Iu\n", rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + free(dirname); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS | SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, NULL, argv0, params, NULL, ".exe"); okShell(rc > 32, "returned %Iu\n", rc);

1 0

Alexandre Julliard : msvcrt: Move common exception handling types to the header.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: f3a35da445953cb48cf1854129fec0a96085de24 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3a35da445953cb48cf1854129fec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 12:07:02 2024 +0200 msvcrt: Move common exception handling types to the header. --- dlls/msvcrt/cppexcept.h | 109 +++++++++++++++++++++++++++++++++++++++----- dlls/msvcrt/except_i386.c | 48 ++----------------- dlls/msvcrt/except_x86_64.c | 47 ------------------- dlls/msvcrt/handler4.c | 61 +++++++++---------------- 4 files changed, 123 insertions(+), 142 deletions(-)

1 0

Alexandre Julliard : msvcrt: Share the find_caught_type() helper between platforms.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 28f5e7ac9ad054ec3c7723be4d718834c83d03c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/28f5e7ac9ad054ec3c7723be4d7188… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 12:08:14 2024 +0200 msvcrt: Share the find_caught_type() helper between platforms. --- dlls/msvcrt/cppexcept.h | 27 +++++++++++++++++++++++++++ dlls/msvcrt/except_i386.c | 30 ++---------------------------- dlls/msvcrt/except_x86_64.c | 27 --------------------------- dlls/msvcrt/handler4.c | 26 -------------------------- 4 files changed, 29 insertions(+), 81 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index ef8a2944c04..37a498c41d8 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -203,6 +203,33 @@ static inline void call_dtor( void *func, void *this ) } #endif +/* check if the exception type is caught by a given catch block, and return the type that matched */ +static inline const cxx_type_info *find_caught_type( cxx_exception_type *exc_type, uintptr_t base, + const type_info *catch_ti, UINT catch_flags ) +{ + const cxx_type_info_table *type_info_table = rtti_rva( exc_type->type_info_table, base ); + UINT i; + + for (i = 0; i < type_info_table->count; i++) + { + const cxx_type_info *type = rtti_rva( type_info_table->info[i], base ); + const type_info *ti = rtti_rva( type->type_info, base ); + + if (!catch_ti) return type; /* catch(...) matches any type */ + if (catch_ti != ti) + { + if (strcmp( catch_ti->mangled, ti->mangled )) continue; + } + /* type is the same, now check the flags */ + if ((exc_type->flags & TYPE_FLAG_CONST) && + !(catch_flags & TYPE_FLAG_CONST)) continue; + if ((exc_type->flags & TYPE_FLAG_VOLATILE) && + !(catch_flags & TYPE_FLAG_VOLATILE)) continue; + return type; /* it matched */ + } + return NULL; +} + #if _MSVCR_VER >= 80 #define EXCEPTION_MANGLED_NAME ".?AVexception(a)std@@" #else diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index d20b08d00c3..c326b24d54c 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -206,32 +206,6 @@ static void dump_function_descr( const cxx_function_descr *descr ) TRACE( "flags: %08x\n", descr->flags ); } -/* check if the exception type is caught by a given catch block, and return the type that matched */ -static const cxx_type_info *find_caught_type( cxx_exception_type *exc_type, - const type_info *catch_ti, UINT catch_flags ) -{ - UINT i; - - for (i = 0; i < exc_type->type_info_table->count; i++) - { - const cxx_type_info *type = exc_type->type_info_table->info[i]; - - if (!catch_ti) return type; /* catch(...) matches any type */ - if (catch_ti != type->type_info) - { - if (strcmp( catch_ti->mangled, type->type_info->mangled )) continue; - } - /* type is the same, now check the flags */ - if ((exc_type->flags & TYPE_FLAG_CONST) && - !(catch_flags & TYPE_FLAG_CONST)) continue; - if ((exc_type->flags & TYPE_FLAG_VOLATILE) && - !(catch_flags & TYPE_FLAG_VOLATILE)) continue; - return type; /* it matched */ - } - return NULL; -} - - /* copy the exception object where the catch block wants it */ static void copy_exception( void *object, cxx_exception_frame *frame, const catchblock_info *catchblock, const cxx_type_info *type ) @@ -363,7 +337,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, const catchblock_info *catchblock = &tryblock->catchblock[j]; if(info) { - const cxx_type_info *type = find_caught_type( info, + const cxx_type_info *type = find_caught_type( info, 0, catchblock->type_info, catchblock->flags ); if (!type) continue; @@ -444,7 +418,7 @@ int CDECL __CxxExceptionFilter( PEXCEPTION_POINTERS ptrs, if (!rec) return EXCEPTION_CONTINUE_SEARCH; } - type = find_caught_type( (cxx_exception_type*)rec->ExceptionInformation[2], ti, flags ); + type = find_caught_type( (cxx_exception_type*)rec->ExceptionInformation[2], 0, ti, flags ); if (!type) return EXCEPTION_CONTINUE_SEARCH; if (copy) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index ed82755e182..2afbdc821da 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -151,33 +151,6 @@ static inline int ip_to_state(ipmap_info *ipmap, UINT count, int ip) return ipmap[low].state; } -/* check if the exception type is caught by a given catch block, and return the type that matched */ -static const cxx_type_info *find_caught_type(cxx_exception_type *exc_type, ULONG64 exc_base, - const type_info *catch_ti, UINT catch_flags) -{ - const cxx_type_info_table *type_info_table = rva_to_ptr(exc_type->type_info_table, exc_base); - UINT i; - - for (i = 0; i < type_info_table->count; i++) - { - const cxx_type_info *type = rva_to_ptr(type_info_table->info[i], exc_base); - const type_info *ti = rva_to_ptr(type->type_info, exc_base); - - if (!catch_ti) return type; /* catch(...) matches any type */ - if (catch_ti != ti) - { - if (strcmp( catch_ti->mangled, ti->mangled )) continue; - } - /* type is the same, now check the flags */ - if ((exc_type->flags & TYPE_FLAG_CONST) && - !(catch_flags & TYPE_FLAG_CONST)) continue; - if ((exc_type->flags & TYPE_FLAG_VOLATILE) && - !(catch_flags & TYPE_FLAG_VOLATILE)) continue; - return type; /* it matched */ - } - return NULL; -} - static inline void copy_exception(void *object, ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const catchblock_info *catchblock, diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c index 560302d7d64..9bfde4b7ca2 100644 --- a/dlls/msvcrt/handler4.c +++ b/dlls/msvcrt/handler4.c @@ -359,32 +359,6 @@ static inline int ip_to_state4(BYTE *ip_map, UINT count, DISPATCHER_CONTEXT *dis return ret; } -static const cxx_type_info *find_caught_type(cxx_exception_type *exc_type, ULONG64 exc_base, - const type_info *catch_ti, UINT catch_flags) -{ - const cxx_type_info_table *type_info_table = rva_to_ptr(exc_type->type_info_table, exc_base); - UINT i; - - for (i = 0; i < type_info_table->count; i++) - { - const cxx_type_info *type = rva_to_ptr(type_info_table->info[i], exc_base); - const type_info *ti = rva_to_ptr(type->type_info, exc_base); - - if (!catch_ti) return type; /* catch(...) matches any type */ - if (catch_ti != ti) - { - if (strcmp( catch_ti->mangled, ti->mangled )) continue; - } - /* type is the same, now check the flags */ - if ((exc_type->flags & TYPE_FLAG_CONST) && - !(catch_flags & TYPE_FLAG_CONST)) continue; - if ((exc_type->flags & TYPE_FLAG_VOLATILE) && - !(catch_flags & TYPE_FLAG_VOLATILE)) continue; - return type; /* it matched */ - } - return NULL; -} - static inline void copy_exception(void *object, ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const catchblock_info_v4 *catchblock, const cxx_type_info *type, ULONG64 exc_base) {

1 0