Rebase against be91fcd879a1de768a57b4a06be470c10313b08d.

[advapi32-RegNotifyChangeKeyValue]
Removed patch to fix return value of RegNotifyChangeKeyValue for pending events
(accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-04-05 18:20:22 +02:00
parent 1f66129ef4
commit 476a9c608e
8 changed files with 58 additions and 236 deletions

View File

@@ -1,4 +1,4 @@
From 8ab4cc3db3686130a15d6698675c836cebf5f78f Mon Sep 17 00:00:00 2001
From bf05198e84d5e154902542508e769163fcda3cc8 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 21 Mar 2016 18:27:59 +0100
Subject: wined3d: Silence extremely noisy FIXME in
@@ -9,10 +9,10 @@ Subject: wined3d: Silence extremely noisy FIXME in
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 4d2a94f..853564e 100644
index 3476b32e..ec2f372 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -898,7 +898,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
@@ -1036,7 +1036,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
}
if (dirty_region)
@@ -20,7 +20,7 @@ index 4d2a94f..853564e 100644
+ WARN("Ignoring dirty_region %s.\n", debug_box(dirty_region));
context = context_acquire(texture->resource.device, NULL);
if (!texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, sub_resource->map_binding))
if (!texture->texture_ops->texture_load_location(texture, sub_resource_idx,
--
2.7.1