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

Rebase against a124064ce5e1c83fa453da5610712b303e65de30.

Browse Source 
[ntdll-NtQuerySystemInformationEx]
Removed patch to change return value of GetLogicalProcessorInformationEx to
TRUE (fixed upstream).

[wined3d-Invalid_Render_States]
Removed patch to ignore invalid render states in
wined3d_device_set_render_state (accepted upstream).
This commit is contained in:
Sebastian Lackner 2016-01-29 07:28:46 +01:00
parent 08db287ce8
commit c853702845
6 changed files with 136 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
patches/ntdll-NtQuerySystemInformationEx/0001-ntdll-Return-STATUS_SUCCESS-from-NtQuerySystemInform.patch
View File

@ -1,26 +0,0 @@
From 1b56ed8fa19d38ff6d17884da2b23ff38a3bd79c Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 6 Jan 2016 15:29:57 +0100
Subject: ntdll: Return STATUS_SUCCESS from NtQuerySystemInformationEx.
---
dlls/ntdll/nt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 9ee1923..1214978 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -2180,7 +2180,8 @@ NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS SystemInform
{
FIXME("(0x%08x,%p,%u,%p,%u,%p) stub\n", SystemInformationClass, Query, QueryLength, SystemInformation,
Length, ResultLength);
- return STATUS_NOT_IMPLEMENTED;
+ if (ResultLength) *ResultLength = 0;
+ return STATUS_SUCCESS;
}
/******************************************************************************
--
2.6.4

1
patches/ntdll-NtQuerySystemInformationEx/definition
View File

@ -1 +0,0 @@
Fixes: CPU-Z fails to start because GetLogicalProcessorInformationEx returns FALSE

37
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "8b2ba27c860da63c503f5d7dee08e2c9c01efd74"
echo "a124064ce5e1c83fa453da5610712b303e65de30"
}
# Show version information
@ -211,7 +211,6 @@ patch_enable_all ()
enable_ntdll_NtOpenSection="$1"
enable_ntdll_NtQueryEaFile="$1"
enable_ntdll_NtQuerySection="$1"
enable_ntdll_NtQuerySystemInformationEx="$1"
enable_ntdll_NtSetLdtEntries="$1"
enable_ntdll_Pipe_SpecialCharacters="$1"
enable_ntdll_ProcessQuotaLimits="$1"
@ -335,7 +334,6 @@ patch_enable_all ()
enable_wined3d_CSMT_Main="$1"
enable_wined3d_DXTn="$1"
enable_wined3d_Geforce_425M="$1"
enable_wined3d_Invalid_Render_States="$1"
enable_wined3d_MESA_GPU_Info="$1"
enable_wined3d_Revert_PixelFormat="$1"
enable_wined3d_UnhandledBlendFactor="$1"
@ -776,9 +774,6 @@ patch_enable ()
ntdll-NtQuerySection)
enable_ntdll_NtQuerySection="$2"
;;
ntdll-NtQuerySystemInformationEx)
enable_ntdll_NtQuerySystemInformationEx="$2"
;;
ntdll-NtSetLdtEntries)
enable_ntdll_NtSetLdtEntries="$2"
;;
@ -1148,9 +1143,6 @@ patch_enable ()
wined3d-Geforce_425M)
enable_wined3d_Geforce_425M="$2"
;;
wined3d-Invalid_Render_States)
enable_wined3d_Invalid_Render_States="$2"
;;
wined3d-MESA_GPU_Info)
enable_wined3d_MESA_GPU_Info="$2"
;;
@ -4743,18 +4735,6 @@ if test "$enable_ntdll_NtQuerySection" -eq 1; then
) >> "$patchlist"
fi
# Patchset ntdll-NtQuerySystemInformationEx
# |
# | Modified files:
# | * dlls/ntdll/nt.c
# |
if test "$enable_ntdll_NtQuerySystemInformationEx" -eq 1; then
patch_apply ntdll-NtQuerySystemInformationEx/0001-ntdll-Return-STATUS_SUCCESS-from-NtQuerySystemInform.patch
(
echo '+ { "Sebastian Lackner", "ntdll: Return STATUS_SUCCESS from NtQuerySystemInformationEx.", 1 },';
) >> "$patchlist"
fi
# Patchset ntdll-NtSetLdtEntries
# |
# | This patchset fixes the following Wine bugs:
@ -6617,21 +6597,6 @@ if test "$enable_wined3d_Geforce_425M" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-Invalid_Render_States
# |
# | This patchset fixes the following Wine bugs:
# | * [#33988] Ignore invalid render states in wined3d_device_set_render_state
# |
# | Modified files:
# | * dlls/wined3d/device.c
# |
if test "$enable_wined3d_Invalid_Render_States" -eq 1; then
patch_apply wined3d-Invalid_Render_States/0001-wined3d-Ignore-invalid-render-states.patch
(
echo '+ { "Józef Kucia", "wined3d: Ignore invalid render states.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-MESA_GPU_Info
# |
# | This patchset has the following (direct or indirect) dependencies:

270
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

File diff suppressed because it is too large Load Diff

35
patches/wined3d-Invalid_Render_States/0001-wined3d-Ignore-invalid-render-states.patch
View File

@ -1,35 +0,0 @@
From 7543fa04f189e57eb56c7d697920342e8f28b0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zef=20Kucia?= <jkucia@codeweavers.com>
Date: Sun, 10 Jan 2016 17:59:00 +0100
Subject: wined3d: Ignore invalid render states.
---
dlls/wined3d/device.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 7c5a4c2..b0f4bf4 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2027,10 +2027,17 @@ static void resolve_depth_buffer(struct wined3d_state *state)
void CDECL wined3d_device_set_render_state(struct wined3d_device *device,
enum wined3d_render_state state, DWORD value)
{
- DWORD old_value = device->state.render_states[state];
+ DWORD old_value;
TRACE("device %p, state %s (%#x), value %#x.\n", device, debug_d3drenderstate(state), state, value);
+ if (state > WINEHIGHEST_RENDER_STATE)
+ {
+ WARN("Ignoring unrecognized render state %#x, value %#x.\n", state, value);
+ return;
+ }
+
+ old_value = device->state.render_states[state];
device->update_state->render_states[state] = value;
/* Handle recording of state blocks. */
--
2.6.4

1
patches/wined3d-Invalid_Render_States/definition
View File

@ -1 +0,0 @@
Fixes: [33988] Ignore invalid render states in wined3d_device_set_render_state