From: Victor Chiletto <vchiletto@codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 3 ++- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index f5c259191b4..a9cb535c629 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -86,7 +86,8 @@ static HRESULT WINAPI d3dcompiler_include_from_file_open(ID3DInclude *iface, D3D ULONG read; DWORD len; - if ((initial_dir = strrchr(include->initial_filename, '\\'))) + if ((initial_dir = strrchr(include->initial_filename, '\\')) || + (initial_dir = strrchr(include->initial_filename, '/'))) { len = initial_dir - include->initial_filename + 1; initial_dir = include->initial_filename; diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index ce64e8f3041..9ea999029cd 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -1812,9 +1812,9 @@ static void test_forward_slash_includes(void) SetCurrentDirectoryW(temp_dir); hr = D3DCompileFromFile(L"sources/source.ps", NULL, D3D_COMPILE_STANDARD_FILE_INCLUDE, "main", "ps_2_0", 0, 0, &blob, &errors); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!!blob, "Got unexpected blob.\n"); - todo_wine ok(!errors, "Got unexpected errors.\n"); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); ID3D10Blob_Release(blob); blob = NULL; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10662