wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 7f6634b2bd916b530e30ef8a850fefbc0dbdf687.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-11-18 20:30:23 +01:00
parent 9a2af99c65
commit 803e04c3fe
6 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/ntoskrnl-Stubs/0012-ntoskrnl.exe-Add-stub-for-PsRemoveLoadImageNotifyRou.patch
View File

@ -1,4 +1,4 @@
From b103fd3f5b4d21c2ac6e1e0039ff898a2ad7dcb4 Mon Sep 17 00:00:00 2001
From 0a2999e8266717769d3a8c245b70861552ad62fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 3 Apr 2015 17:08:20 +0200
Subject: ntoskrnl.exe: Add stub for PsRemoveLoadImageNotifyRoutine.
@ -9,10 +9,10 @@ Subject: ntoskrnl.exe: Add stub for PsRemoveLoadImageNotifyRoutine.
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 179da4e..10f8c44 100644
index 23c4c62..2692f47 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -2022,6 +2022,15 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Acti
@@ -2285,6 +2285,15 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Acti
}
/*****************************************************
@ -29,18 +29,18 @@ index 179da4e..10f8c44 100644
*/
NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine)
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index e206bac..1914b7f 100644
index 4d4320c..a284393 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -899,7 +899,7 @@
@ stub PsReferenceImpersonationToken
@ stub PsReferencePrimaryToken
@ stub PsRemoveCreateThreadNotifyRoutine
@ stdcall PsRemoveCreateThreadNotifyRoutine(ptr)
-@ stub PsRemoveLoadImageNotifyRoutine
+@ stdcall PsRemoveLoadImageNotifyRoutine(ptr)
@ stub PsRestoreImpersonation
@ stub PsReturnPoolQuota
@ stub PsReturnProcessNonPagedPoolQuota
--
2.1.0
2.6.2

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "19eaed6a3833a7bff780ccc31800cad2ecfd48d4"
echo "7f6634b2bd916b530e30ef8a850fefbc0dbdf687"
}
# Show version information

10
patches/wined3d-CSMT_Main/0157-Winex11-complain-about-glfinish.patch
View File

@ -1,4 +1,4 @@
From 422cdfa68ac69e3bbbc08a70b13fdc2afc8fd505 Mon Sep 17 00:00:00 2001
From 7af302e360179e2ef395c66327876b276f30fe9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Fri, 29 Aug 2014 12:12:11 +0200
Subject: Winex11: complain about glfinish
@ -8,10 +8,10 @@ Subject: Winex11: complain about glfinish
1 file changed, 2 insertions(+)
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 7b8ba82..42a7498 100644
index 3d0bd24..069dcc5 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1983,6 +1983,7 @@ static void wglFinish(void)
@@ -1962,6 +1962,7 @@ static void wglFinish(void)
escape.code = X11DRV_FLUSH_GL_DRAWABLE;
escape.gl_drawable = 0;
@ -19,7 +19,7 @@ index 7b8ba82..42a7498 100644
if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 )))
{
switch (gl->type)
@@ -2008,6 +2009,7 @@ static void wglFlush(void)
@@ -1987,6 +1988,7 @@ static void wglFlush(void)
escape.code = X11DRV_FLUSH_GL_DRAWABLE;
escape.gl_drawable = 0;
@ -28,5 +28,5 @@ index 7b8ba82..42a7498 100644
{
switch (gl->type)
--
2.1.3
2.6.2

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

@ -2358,7 +2358,7 @@ diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -2002,7 +2002,9 @@
@@ -1980,7 +1980,9 @@
escape.code = X11DRV_FLUSH_GL_DRAWABLE;
escape.gl_drawable = 0;
@ -2368,7 +2368,7 @@ diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 )))
{
switch (gl->type)
@@ -2028,7 +2030,9 @@
@@ -2006,7 +2008,9 @@
escape.code = X11DRV_FLUSH_GL_DRAWABLE;
escape.gl_drawable = 0;

35
patches/wined3d-Revert_Prepare_GL_Resources/0001-Revert-wined3d-Prepare-GL-resources-before-calling-c.patch
View File

@ -1,4 +1,4 @@
From b0e2839c98b1b0f2a16b3382b1bd32fe60130700 Mon Sep 17 00:00:00 2001
From 204883cb596e0e0c2b2e1812df5c69247b870e1e Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 10 Nov 2015 00:36:45 +0100
Subject: Revert "wined3d: Prepare GL resources before calling
@ -6,15 +6,15 @@ Subject: Revert "wined3d: Prepare GL resources before calling
This reverts commit 1ca9dfc8ee25f4ae188fdacd4d3d56046cef8003.
---
dlls/wined3d/context.c | 7 +++++++
dlls/wined3d/context.c | 7 ++++++
dlls/wined3d/device.c | 13 ++++--------
dlls/wined3d/drawprim.c | 20 ++++++------------
dlls/wined3d/surface.c | 46 ++++++++++++++++--------------------------
dlls/wined3d/wined3d_private.h | 2 --
5 files changed, 34 insertions(+), 54 deletions(-)
dlls/wined3d/surface.c | 48 ++++++++++++++++--------------------------
dlls/wined3d/wined3d_private.h | 4 ++--
5 files changed, 37 insertions(+), 55 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 1692d0d..97f3c04 100644
index 80a9ba7..52533b7 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -141,6 +141,8 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context,
@ -64,7 +64,7 @@ index 1692d0d..97f3c04 100644
GL_RENDERBUFFER, surface->rb_resolved);
checkGLcall("glFramebufferRenderbuffer()");
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 2960e08..0da8607 100644
index 170536d..90f923f 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -317,15 +317,13 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c
@ -152,7 +152,7 @@ index 3761830..d2d3bce 100644
if (!context_apply_draw_state(context, device))
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c3ddc84..179ce02 100644
index 0a7112c..816bace 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -821,8 +821,6 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device,
@ -174,6 +174,15 @@ index c3ddc84..179ce02 100644
if (src_location == WINED3D_LOCATION_DRAWABLE) required_rt = src_surface;
else if (dst_location == WINED3D_LOCATION_DRAWABLE) required_rt = dst_surface;
@@ -2885,7 +2880,7 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct
context_restore(context, restore_rt);
}
-static void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample)
+void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample)
{
if (multisample)
{
@@ -3678,7 +3673,23 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
if (surface->locations & WINED3D_LOCATION_DISCARDED)
{
@ -227,18 +236,20 @@ index c3ddc84..179ce02 100644
- }
-}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index ac0b09a..49cc29f 100644
index a60919e..16fda97 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2459,8 +2459,6 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb,
@@ -2465,8 +2465,8 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb,
HRESULT surface_load_location(struct wined3d_surface *surface,
struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN;
void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN;
-void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context,
- DWORD location) DECLSPEC_HIDDEN;
void surface_prepare_rb(struct wined3d_surface *surface,
const struct wined3d_gl_info *gl_info, BOOL multisample) DECLSPEC_HIDDEN;
+void surface_prepare_rb(struct wined3d_surface *surface,
+ const struct wined3d_gl_info *gl_info, BOOL multisample) DECLSPEC_HIDDEN;
void surface_set_compatible_renderbuffer(struct wined3d_surface *surface,
const struct wined3d_surface *rt) DECLSPEC_HIDDEN;
void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) DECLSPEC_HIDDEN;
--
2.6.2

12
patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch
View File

@ -1,4 +1,4 @@
From 010ac80315ceb39ec7ff8656cb09c5bc794b7564 Mon Sep 17 00:00:00 2001
From 7424e54afd0424b8b436c78b8c30f2480980a5b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 28 Sep 2014 21:20:52 +0200
Subject: winex11.drv: Only warn about used contexts in wglShareLists.
@ -8,7 +8,7 @@ Subject: winex11.drv: Only warn about used contexts in wglShareLists.
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 71af3db..375aa5e 100644
index 3d0bd24..2589fd7 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -1927,18 +1927,16 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de
@ -31,9 +31,9 @@ index 71af3db..375aa5e 100644
+ if(dest->has_been_current)
+ ERR("Recreating OpenGL context to share display lists, although the context has been current!\n");
+
describeContext(org);
describeContext(dest);
/* Re-create the GLX context and share display lists */
pglXDestroyContext(gdi_display, dest->ctx);
dest->ctx = create_glxcontext(gdi_display, dest, org->ctx);
--
1.9.1
2.6.2