https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2c536f5cc2f437407dea…
commit f2c536f5cc2f437407dea0e3016822b74335bccf
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 23:00:51 2020 +0200
Commit: Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:04 2021 +0100
[WINESYNC] d3dx9: WARN when the file doesn't exist in
D3DXCreateTextureFromFileExW().
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 81ababa864229a7e81abca76ef7e6a12fe5b256f by Matteo Bruni
<mbruni(a)codeweavers.com>
---
dll/directx/wine/d3dx9_36/texture.c | 3 +++
sdk/tools/winesync/d3dx9.cfg | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c
index 7773d2ad33b..c42ae7eb1c1 100644
--- a/dll/directx/wine/d3dx9_36/texture.c
+++ b/dll/directx/wine/d3dx9_36/texture.c
@@ -777,7 +777,10 @@ HRESULT WINAPI D3DXCreateTextureFromFileExW(struct IDirect3DDevice9
*device, con
hr = map_view_of_file(srcfile, &buffer, &size);
if (FAILED(hr))
+ {
+ WARN("Failed to open file.\n");
return D3DXERR_INVALIDDATA;
+ }
hr = D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, height,
miplevels, usage, format, pool,
filter, mipfilter, colorkey, srcinfo, palette, texture);
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index baaa7d70120..24ab0d03546 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h:
sdk/inc
include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h:
sdk/include/dxsdk/d3dx9of.h,
include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h:
sdk/include/dxsdk/d3dx9shape.h,
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h:
sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: f934ef1a14108aa535e76900b29cba0dd8253f80}
+tags: {wine: 81ababa864229a7e81abca76ef7e6a12fe5b256f}