From 4e02a7a17bcf3ac272846e1fd1b19810d5503b14 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 21 Mar 2016 16:25:32 +0100 Subject: [PATCH] wined3d-CSMT_Helper: Add warning that CSMT patchset is disabled. --- patches/patchinstall.sh | 6 ++-- ...d-dll-with-STAGING_CSMT-definition-.patch} | 0 ...rning-that-CSMT-patchset-is-disabled.patch | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) rename patches/wined3d-CSMT_Helper/{0002-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch => 0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch} (100%) create mode 100644 patches/wined3d-CSMT_Helper/0002-wined3d-Add-warning-that-CSMT-patchset-is-disabled.patch diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 239e23d1..ec788e12 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -7069,12 +7069,14 @@ fi # | resource_map # | # | Modified files: -# | * configure.ac, dlls/wined3d-csmt/Makefile.in, dlls/wined3d-csmt/version.rc +# | * configure.ac, dlls/wined3d-csmt/Makefile.in, dlls/wined3d-csmt/version.rc, dlls/wined3d/wined3d_main.c # | if test "$enable_wined3d_CSMT_Helper" -eq 1; then - patch_apply wined3d-CSMT_Helper/0002-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch + patch_apply wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch + patch_apply wined3d-CSMT_Helper/0002-wined3d-Add-warning-that-CSMT-patchset-is-disabled.patch ( echo '+ { "Sebastian Lackner", "wined3d: Add second dll with STAGING_CSMT definition set.", 1 },'; + echo '+ { "Sebastian Lackner", "wined3d: Add warning that CSMT patchset is disabled.", 1 },'; ) >> "$patchlist" fi diff --git a/patches/wined3d-CSMT_Helper/0002-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch b/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch similarity index 100% rename from patches/wined3d-CSMT_Helper/0002-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch rename to patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch diff --git a/patches/wined3d-CSMT_Helper/0002-wined3d-Add-warning-that-CSMT-patchset-is-disabled.patch b/patches/wined3d-CSMT_Helper/0002-wined3d-Add-warning-that-CSMT-patchset-is-disabled.patch new file mode 100644 index 00000000..006a8904 --- /dev/null +++ b/patches/wined3d-CSMT_Helper/0002-wined3d-Add-warning-that-CSMT-patchset-is-disabled.patch @@ -0,0 +1,28 @@ +From 351506a226133691c2dac3e83e964b304b5ddd90 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Mon, 21 Mar 2016 16:23:21 +0100 +Subject: wined3d: Add warning that CSMT patchset is disabled. + +--- + dlls/wined3d/wined3d_main.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c +index fdb260e..d5c307e 100644 +--- a/dlls/wined3d/wined3d_main.c ++++ b/dlls/wined3d/wined3d_main.c +@@ -327,6 +327,11 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) + } + } + ++#if defined(STAGING_CSMT) ++ FIXME_(winediag)("Please note that the experimental wined3d CSMT patchset has been disabled in this\n"); ++ FIXME_(winediag)("version of Wine Staging. Check out the release notes for further information.\n"); ++#endif /* STAGING_CSMT */ ++ + if (appkey) RegCloseKey( appkey ); + if (hkey) RegCloseKey( hkey ); + +-- +2.7.1 +