wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to fix function names in multiple ddraw ok messages.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-03-08 03:16:59 +01:00
parent fef3ce6d9e
commit f6d216d3f6
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
patches/ddraw-Fix_Typos/0001-ddraw-tests-Fix-function-name-in-multiple-ok-message.patch Normal file
View File

@ -0,0 +1,40 @@
From 022f6d01b0f3dc9a30aa12b34f85881c0a1dafc6 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 7 Mar 2016 08:40:24 +0100
Subject: ddraw/tests: Fix function name in multiple ok() messages. (resend)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Spotted by Michael Müller.
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
---
dlls/ddraw/tests/dsurface.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c
index 781fa56..c43d207 100644
--- a/dlls/ddraw/tests/dsurface.c
+++ b/dlls/ddraw/tests/dsurface.c
@@ -3238,7 +3238,7 @@ static void zbufferbitdepth_test(void)
U3(ddsd.ddpfPixelFormat).dwZBitMask = 0x0000ffff;
surface = NULL;
hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL);
- ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr);
reset_ddsd(&ddsd);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &ddsd);
ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr);
@@ -3313,7 +3313,7 @@ static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const
if (SUCCEEDED(hr))
{
hr = IDirectDrawSurface_Unlock(surface, NULL);
- ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr);
+ ok(SUCCEEDED(hr), "IDirectDrawSurface_Unlock failed, hr %#x.\n", hr);
/* DDSD_ZBUFFERBITDEPTH is never set on Nvidia, but follows GetSurfaceDesc rules on AMD */
if (!expect_zd)
--
2.7.1

16
patches/patchinstall.sh
View File

@ -129,6 +129,7 @@ patch_enable_all ()
enable_ddraw_D3DFINDDEVICERESULT="$1"
enable_ddraw_Device_Caps="$1"
enable_ddraw_EnumSurfaces="$1"
enable_ddraw_Fix_Typos="$1"
enable_ddraw_IDirect3DTexture2_Load="$1"
enable_ddraw_Rendering_Targets="$1"
enable_ddraw_Write_Vtable="$1"
@ -548,6 +549,9 @@ patch_enable ()
ddraw-EnumSurfaces)
enable_ddraw_EnumSurfaces="$2"
;;
ddraw-Fix_Typos)
enable_ddraw_Fix_Typos="$2"
;;
ddraw-IDirect3DTexture2_Load)
enable_ddraw_IDirect3DTexture2_Load="$2"
;;
@ -3323,6 +3327,18 @@ if test "$enable_ddraw_EnumSurfaces" -eq 1; then
) >> "$patchlist"
fi
# Patchset ddraw-Fix_Typos
# |
# | Modified files:
# | * dlls/ddraw/tests/dsurface.c
# |
if test "$enable_ddraw_Fix_Typos" -eq 1; then
patch_apply ddraw-Fix_Typos/0001-ddraw-tests-Fix-function-name-in-multiple-ok-message.patch
(
echo '+ { "Sebastian Lackner", "ddraw/tests: Fix function name in multiple ok() messages.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-resource_map
# |
# | Modified files: