wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to declare pDirectInputCreateEx in a MSVC compatible way (by Amine Khaldi, wine-patched/pull/5).

Browse Source
This commit is contained in:
Sebastian Lackner 2015-02-23 22:03:47 +01:00
parent a412b6082a
commit eaefcc8a3f
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -3,6 +3,7 @@ wine-staging (1.7.38) UNRELEASED; urgency=low
* Disabled patchset for reg.exe cleanup (partially accepted upstream).
* Added patch to mark DllCanUnloadNow and DllGetClassObject as private (by Amine Khaldi, wine-patched/pull/3).
* Added patch to skip Wine specific __wine_check_for_events calls in ReactOS (by Amine Khaldi, wine-patched/pull/4).
* Added patch to declare pDirectInputCreateEx in a MSVC compatible way (by Amine Khaldi, wine-patched/pull/5).
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 23 Feb 2015 18:24:51 +0100
wine-staging (1.7.37) unstable; urgency=low

25
patches/dinput-Compile_Fix/0001-dinput-tests-Declare-pDirectInputCreateEx-in-a-MSVC-.patch Normal file
View File

@ -0,0 +1,25 @@
From f7356c55fbeb2cc4d4ffa0b684e371ffc8183731 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 23 Feb 2015 21:40:25 +0100
Subject: dinput/tests: Declare pDirectInputCreateEx in a MSVC compatible way.
---
dlls/dinput/tests/dinput.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c
index 0490642..5ac55cf 100644
--- a/dlls/dinput/tests/dinput.c
+++ b/dlls/dinput/tests/dinput.c
@@ -50,7 +50,7 @@ static const DWORD directinput_version_list[] =
DIRECTINPUT_VERSION_700,
};
-static HRESULT WINAPI (*pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN);
+static HRESULT (WINAPI *pDirectInputCreateEx)(HINSTANCE, DWORD, REFIID, LPVOID *, LPUNKNOWN);
static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA *instance, void *context)
{
--
2.3.0

16
patches/patchinstall.sh
View File

@ -84,6 +84,7 @@ patch_enable_all ()
enable_d3dx9_36_UpdateSkinnedMesh="$1"
enable_dbghelp_Debug_Symbols="$1"
enable_ddraw_d3d_execute_buffer="$1"
enable_dinput_Compile_Fix="$1"
enable_dinput_Events="$1"
enable_dsound_Fast_Mixer="$1"
enable_dxgi_GetDesc="$1"
@ -284,6 +285,9 @@ patch_enable ()
ddraw-d3d_execute_buffer)
enable_ddraw_d3d_execute_buffer="$2"
;;
dinput-Compile_Fix)
enable_dinput_Compile_Fix="$2"
;;
dinput-Events)
enable_dinput_Events="$2"
;;
@ -1461,6 +1465,18 @@ if test "$enable_ddraw_d3d_execute_buffer" -eq 1; then
) >> "$patchlist"
fi
# Patchset dinput-Compile_Fix
# |
# | Modified files:
# | * dlls/dinput/tests/dinput.c
# |
if test "$enable_dinput_Compile_Fix" -eq 1; then
patch_apply dinput-Compile_Fix/0001-dinput-tests-Declare-pDirectInputCreateEx-in-a-MSVC-.patch
(
echo '+ { "Amine Khaldi", "dinput/tests: Declare pDirectInputCreateEx in a MSVC compatible way.", 1 },';
) >> "$patchlist"
fi
# Patchset dinput-Events
# |
# | This patchset fixes the following Wine bugs: