Removed patches for UTF7 support (accepted upstream).

This commit is contained in:
Sebastian Lackner
2015-02-09 17:22:09 +01:00
parent e2cd273303
commit d329354032
7 changed files with 6 additions and 392 deletions

View File

@@ -8988,7 +8988,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1758,7 +1758,11 @@
@@ -1761,7 +1761,11 @@
}
}
@@ -9000,7 +9000,7 @@ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
{
HeapFree(GetProcessHeap(), 0, shader->signature_strings);
shader->device->shader_backend->shader_destroy(shader);
@@ -2013,10 +2017,16 @@
@@ -2016,10 +2020,16 @@
if (!refcount)
{
@@ -9017,7 +9017,7 @@ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
}
return refcount;
@@ -2241,7 +2251,11 @@
@@ -2244,7 +2254,11 @@
memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */
if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE])
{
@@ -9521,7 +9521,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -5345,9 +5345,15 @@
@@ -5347,9 +5347,15 @@
DebugBreak();
}