Rebase against bd332f53f2d7b618e313572159cd7e70e4efb0fc.

[ieframe-ITargetFrame2]
Removed patch to fix implementation of impl_from_ITargetFrame2 (accepted
upstream).

[setupapi-Fix_Parser]
Removed patch to fix parsing of inf files containing garbage at the beginning
(accepted upstream).

[wined3d-MESA_GPU_Info]
Disabled patchset, a similar idea was integrated into the development branch.

patches/wined3d-Accounting/0001-wined3d-Use-real-values-for-memory-accounting-on-NVI.patch

@@ -1,16 +1,16 @@
-From c89131518dc8b8fd1995628ccf2832c6fd0e106a Mon Sep 17 00:00:00 2001
+From cc05161339b7fab594d8e7d68c4f52cb63b1ab17 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 6 Jun 2015 06:53:34 +0200
 Subject: wined3d: Use real values for memory accounting on NVIDIA cards.
 
 ---
  dlls/wined3d/device.c     | 23 +++++++++++++++++++++++
- dlls/wined3d/directx.c    | 16 ++++++++++++++--
+ dlls/wined3d/directx.c    | 10 ++++++++++
  dlls/wined3d/wined3d_gl.h |  1 +
- 3 files changed, 38 insertions(+), 2 deletions(-)
+ 3 files changed, 34 insertions(+)
 
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index c410a47..cb80e0b 100644
+index 37d9ee9..0437c81 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
 @@ -1244,8 +1244,31 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device)
@@ -46,7 +46,7 @@ index c410a47..cb80e0b 100644
              wine_dbgstr_longlong(device->adapter->vram_bytes),
              wine_dbgstr_longlong(device->adapter->vram_bytes_used),
 diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
-index 1aea568..999c7b3 100644
+index da66aac..36432af 100644
 --- a/dlls/wined3d/directx.c
 +++ b/dlls/wined3d/directx.c
 @@ -225,6 +225,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
@@ -57,44 +57,24 @@ index 1aea568..999c7b3 100644
  
      /* SGI */
      {"GL_SGIS_generate_mipmap",             SGIS_GENERATE_MIPMAP          },
-@@ -1401,7 +1402,8 @@ static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor
-     return NULL;
- }
- 
--static void init_driver_info(struct wined3d_driver_info *driver_info,
-+/* Context activation is done by the caller. */
-+static void init_driver_info(struct wined3d_gl_info *gl_info, struct wined3d_driver_info *driver_info,
-         enum wined3d_pci_vendor vendor, enum wined3d_pci_device device)
- {
-     OSVERSIONINFOW os_version;
-@@ -1522,6 +1524,16 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
-         driver_info->vram_bytes = LONG_MAX;
+@@ -1422,6 +1423,15 @@ static const struct gpu_description *query_gpu_description(const struct wined3d_
+         TRACE("Card reports vendor PCI ID 0x%04x, device PCI ID 0x%04x, 0x%s bytes of video memory.\n",
+                 vendor, device, wine_dbgstr_longlong(*vram_bytes));
      }
- 
-+    if (gl_info->supported[NVX_GPU_MEMORY_INFO])
++    else if (gl_info->supported[NVX_GPU_MEMORY_INFO])
 +    {
 +        GLint vram_kb;
 +        gl_info->gl_ops.gl.p_glGetIntegerv(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX, &vram_kb);
 +
-+        driver_info->vram_bytes = (UINT64)vram_kb * 1024;
++        *vram_bytes = (UINT64)vram_kb * 1024;
 +        TRACE("Got 0x%s as video memory from NVX_GPU_MEMORY_INFO extension.\n",
-+                wine_dbgstr_longlong(driver_info->vram_bytes));
++                wine_dbgstr_longlong(*vram_bytes));
 +    }
-+
-     if (wined3d_settings.emulated_textureram)
-     {
-         TRACE("Overriding amount of video memory with 0x%s bytes.\n",
-@@ -3848,7 +3860,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD
-     }
  
-     fixup_extensions(gl_info, gl_renderer_str, gl_vendor, card_vendor, device);
--    init_driver_info(driver_info, card_vendor, device);
-+    init_driver_info(gl_info, driver_info, card_vendor, device);
-     gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info)
-             | adapter->fragment_pipe->get_emul_mask(gl_info);
-     if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE)
+     if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE)
+     {
 diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
-index 51053c5..87eca96 100644
+index e344ff1..3b982f4 100644
 --- a/dlls/wined3d/wined3d_gl.h
 +++ b/dlls/wined3d/wined3d_gl.h
 @@ -158,6 +158,7 @@ enum wined3d_gl_extension