From: Matteo Bruni Subject: [PATCH 4/5] d3dx9: Account for include paths mixing '/' and '\'. Message-Id: <1403805155-23118-4-git-send-email-mbruni@codeweavers.com> Date: Thu, 26 Jun 2014 19:52:34 +0200 --- dlls/d3dx9_36/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index b36e7bb..5a6e1e2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -259,8 +259,10 @@ static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_T TRACE("Looking up for include file %s, parent %s\n", debugstr_a(filename), debugstr_a(parent_name)); - if ((p = strrchr(parent_name, '\\')) || (p = strrchr(parent_name, '/'))) p++; - else p = parent_name; + if ((p = max(strrchr(parent_name, '\\'), strrchr(parent_name, '/')))) + p++; + else + p = parent_name; pathname = HeapAlloc(GetProcessHeap(), 0, (p - parent_name) + strlen(filename) + 1); if(!pathname) return HRESULT_FROM_WIN32(GetLastError()); -- 1.8.5.5