Release 1.9.13.

Added patch to remove duplicate definition in include/webservices.h.
ntoskrnl-DriverTest: Fix compile error caused by wrong import library.
2025-04-13 14:42:51 -07:00 · 2016-06-25 17:18:29 +02:00 · 2016-06-25 07:13:04 +02:00 · 2016-06-25 04:59:47 +02:00 · 2016-06-24 15:43:04 +02:00 · 2016-06-24 12:00:24 +02:00
143 changed files with 4932 additions and 9177 deletions
--- a/patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch
+++ b/patches/comctl32-Listview_DrawItem/0001-comctl32-Preserve-custom-colors-between-subitems.patch
@@ -1,17 +1,35 @@
-From 21f4e393d9843841f2038b09f88d6bcb96d9f539 Mon Sep 17 00:00:00 2001
-From: Daniel Jelinski <djelinski1@gmail.com>
+From 8113f7a7b3c214b5c9d07a4b6f5b0d97d6f576f1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 12 Jul 2014 23:58:19 +0200
-Subject: comctl32: Preserve custom colors between subitems.
+Subject: comctl32: Preserve custom colors between subitems. (v2)

 ---
- dlls/comctl32/listview.c | 5 -----
- 1 file changed, 5 deletions(-)
+ dlls/comctl32/listview.c       | 20 +++++++++-----------
+ dlls/comctl32/tests/listview.c | 27 ++++++++++++++++++++++-----
+ 2 files changed, 31 insertions(+), 16 deletions(-)

 diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
-index 38c376c..f83254a 100644
+index 784ca7b..2c4051d 100644
 --- a/dlls/comctl32/listview.c
 +++ b/dlls/comctl32/listview.c
-@@ -4794,11 +4794,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT
+@@ -1054,7 +1054,7 @@ static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRA
+     COLORREF backcolor, textcolor;
+ 
+     /* apparently, for selected items, we have to override the returned values */
+-    if (!SubItem)
+    if (!SubItem || (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT))
+     {
+         if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED)
+         {
+@@ -4767,6 +4767,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT
+         while (iterator_next(subitems))
+         {
+             DWORD subitemstage = CDRF_DODEFAULT;
+            NMLVCUSTOMDRAW temp_nmlvcd;
+ 
+             /* We need to query for each subitem, item's data (subitem == 0) is already here at this point */
+             if (subitems->nItem)
+@@ -4793,19 +4794,16 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT
 
             if (cdsubitemmode & CDRF_NOTIFYSUBITEMDRAW)
                 subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd);
@@ -21,8 +39,78 @@ index 38c376c..f83254a 100644
 -                nmlvcd.clrText   = infoPtr->clrText;
 -            }
 
-             if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW))
-                 prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE);
+-            if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW))
+-                prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE);
+-            else if (!(infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT))
+-                prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE);
+            /*
+             * A selection should neither affect the colors in the post paint notification nor
+             * affect the colors of the next drawn subitem. Copy the structure to prevent this.
+             */
+            temp_nmlvcd = nmlvcd;
+            prepaint_setup(infoPtr, hdc, &temp_nmlvcd, subitems->nItem);
+ 
+             if (!(subitemstage & CDRF_SKIPDEFAULT))
+-                LISTVIEW_DrawItemPart(infoPtr, &lvItem, &nmlvcd, &pos);
+                LISTVIEW_DrawItemPart(infoPtr, &lvItem, &temp_nmlvcd, &pos);
+ 
+             if (subitemstage & CDRF_NOTIFYPOSTPAINT)
+                 subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPOSTPAINT, &nmlvcd);
+diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
+index ed5d9f9..64cc214 100644
+--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
+@@ -1823,14 +1823,18 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
+                 clr = GetBkColor(nmlvcd->nmcd.hdc);
+                 ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk);
+                 ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText);
+-                if (nmlvcd->iSubItem)
+-                    todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr);
+-                else
+-                    ok(clr == c0ffee, "clr=%.8x\n", clr);
+                if (!(GetWindowLongW(nmhdr->hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS))
+                {
+                    if (nmlvcd->iSubItem)
+                        todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr);
+                    else
+                        ok(clr == c0ffee, "clr=%.8x\n", clr);
+                }
+                 return CDRF_NOTIFYPOSTPAINT;
+             case CDDS_ITEMPOSTPAINT | CDDS_SUBITEM:
+                 clr = GetBkColor(nmlvcd->nmcd.hdc);
+-                todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr);
+                if (!(GetWindowLongW(nmhdr->hwndFrom, GWL_STYLE) & LVS_SHOWSELALWAYS))
+                    todo_wine ok(clr == c0ffee, "clr=%.8x\n", clr);
+                 ok(nmlvcd->clrTextBk == CLR_DEFAULT, "got 0x%x\n", nmlvcd->clrTextBk);
+                 ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText);
+                 return CDRF_DODEFAULT;
+@@ -1846,6 +1850,7 @@ static void test_customdraw(void)
+ {
+     HWND hwnd;
+     WNDPROC oldwndproc;
+    LVITEMA item;
+ 
+     hwnd = create_listview_control(LVS_REPORT);
+ 
+@@ -1865,6 +1870,18 @@ static void test_customdraw(void)
+     UpdateWindow(hwnd);
+     ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT", FALSE);
+ 
+    /* check colors when item is selected */
+    SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) | LVS_SHOWSELALWAYS);
+    item.mask = LVIF_STATE;
+    item.stateMask = LVIS_SELECTED;
+    item.state = LVIS_SELECTED;
+    SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item);
+
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+    InvalidateRect(hwnd, NULL, TRUE);
+    UpdateWindow(hwnd);
+    ok_sequence(sequences, PARENT_CD_SEQ_INDEX, parent_report_cd_seq, "parent customdraw, LVS_REPORT, selection", FALSE);
+
+     DestroyWindow(hwnd);
+ 
+     hwnd = create_listview_control(LVS_LIST);
 -- 
 2.8.0

--- a/patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch
+++ b/patches/d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch
@@ -1,4 +1,4 @@
-From 3b07128afb354df0304f1164ed28084b4619b933 Mon Sep 17 00:00:00 2001
+From 26a7497a9fb1184080a1622f6a834bed50d2a239 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 3 Jun 2015 22:57:21 +0200
 Subject: winex11.drv: Allow changing the opengl pixel format on the desktop
@@ -43,7 +43,7 @@ index f5b1454..ac21f68 100644
     swapchain = (IDXGISwapChain *)0xdeadbeef;
     device = (ID3D10Device1 *)0xdeadbeef;
 diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
-index 03b6113..e1c2e37 100644
+index 04a369c..ee506f5 100644
 --- a/dlls/d3d11/tests/d3d11.c
 +++ b/dlls/d3d11/tests/d3d11.c
@@ -805,10 +805,22 @@ static void test_create_device(void)
@@ -74,10 +74,10 @@ index 03b6113..e1c2e37 100644
     swapchain = (IDXGISwapChain *)0xdeadbeef;
     device = (ID3D11Device *)0xdeadbeef;
 diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
-index 8860bce..f1d6488 100644
+index 4302f76..342f8d2 100644
 --- a/dlls/d3d9/tests/device.c
 +++ b/dlls/d3d9/tests/device.c
-@@ -11122,6 +11122,21 @@ done:
+@@ -11171,6 +11171,21 @@ static void test_get_render_target_data(void)
     DestroyWindow(window);
 }
 
@@ -99,10 +99,10 @@ index 8860bce..f1d6488 100644
 START_TEST(device)
 {
     WNDCLASSA wc = {0};
-@@ -11237,6 +11252,7 @@ START_TEST(device)
-     test_swapchain_parameters();
+@@ -11287,6 +11302,7 @@ START_TEST(device)
     test_check_device_format();
     test_miptree_layout();
+     test_get_render_target_data();
 +    test_desktop_window();
 
     UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL));
--- a/patches/d3dx9_24-ID3DXEffect/0001-d3dx9_24-Add-an-interface-wrapper-for-different-vers.patch
+++ b/patches/d3dx9_24-ID3DXEffect/0001-d3dx9_24-Add-an-interface-wrapper-for-different-vers.patch
@@ -1,58 +0,0 @@
-From 07b257223fda63414f00f3a658fcdce83a7991e4 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 14 Mar 2015 05:01:05 +0100
-Subject: d3dx9_24: Add an interface wrapper for different version of
- ID3DXEffect.
-
---
- dlls/d3dx9_24/d3dx9_24.spec | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
-index cfe26ce..1ddf219 100644
--- a/dlls/d3dx9_24/d3dx9_24.spec
-+++ b/dlls/d3dx9_24/d3dx9_24.spec
-@@ -43,21 +43,21 @@
- @ stdcall D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromResourceExW
- @ stdcall D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromResourceW
- @ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) d3dx9_36.D3DXCreateCylinder
-@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffect
-+@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) d3dx9_25.D3DXCreateEffect # don't forward
- @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompiler
- @ stdcall D3DXCreateEffectCompilerFromFileA(str ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompilerFromFileA
- @ stdcall D3DXCreateEffectCompilerFromFileW(wstr ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompilerFromFileW
- @ stdcall D3DXCreateEffectCompilerFromResourceA(long str ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompilerFromResourceA
- @ stdcall D3DXCreateEffectCompilerFromResourceW(long wstr ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompilerFromResourceW
-@ stdcall D3DXCreateEffectEx(ptr ptr long ptr ptr str long ptr ptr ptr) d3dx9_36.D3DXCreateEffectEx
-@ stdcall D3DXCreateEffectFromFileA(ptr str ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromFileA
-@ stdcall D3DXCreateEffectFromFileExA(ptr str ptr ptr str long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromFileExA
-@ stdcall D3DXCreateEffectFromFileExW(ptr str ptr ptr str long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromFileExW
-@ stdcall D3DXCreateEffectFromFileW(ptr wstr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromFileW
-@ stdcall D3DXCreateEffectFromResourceA(ptr long str ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromResourceA
-@ stdcall D3DXCreateEffectFromResourceExA(ptr long str ptr ptr str long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromResourceExA
-@ stdcall D3DXCreateEffectFromResourceExW(ptr long str ptr ptr str long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromResourceExW
-@ stdcall D3DXCreateEffectFromResourceW(ptr long wstr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromResourceW
-+@ stdcall D3DXCreateEffectEx(ptr ptr long ptr ptr str long ptr ptr ptr) d3dx9_25.D3DXCreateEffectEx # don't forward
-+@ stdcall D3DXCreateEffectFromFileA(ptr str ptr ptr long ptr ptr ptr) d3dx9_25.D3DXCreateEffectFromFileA # don't forward
-+@ stdcall D3DXCreateEffectFromFileExA(ptr str ptr ptr str long ptr ptr ptr) d3dx9_25.D3DXCreateEffectFromFileExA # don't forward
-+@ stdcall D3DXCreateEffectFromFileExW(ptr str ptr ptr str long ptr ptr ptr) d3dx9_25.D3DXCreateEffectFromFileExW # don't forward
-+@ stdcall D3DXCreateEffectFromFileW(ptr wstr ptr ptr long ptr ptr ptr) d3dx9_25.D3DXCreateEffectFromFileW # don't forward
-+@ stdcall D3DXCreateEffectFromResourceA(ptr long str ptr ptr long ptr ptr ptr) d3dx9_25.D3DXCreateEffectFromResourceA # don't forward
-+@ stdcall D3DXCreateEffectFromResourceExA(ptr long str ptr ptr str long ptr ptr ptr) d3dx9_25.D3DXCreateEffectFromResourceExA # don't forward
-+@ stdcall D3DXCreateEffectFromResourceExW(ptr long str ptr ptr str long ptr ptr ptr) d3dx9_25.D3DXCreateEffectFromResourceExW # don't forward
-+@ stdcall D3DXCreateEffectFromResourceW(ptr long wstr ptr ptr long ptr ptr ptr) d3dx9_25.D3DXCreateEffectFromResourceW # don't forward
- @ stdcall D3DXCreateEffectPool(ptr) d3dx9_36.D3DXCreateEffectPool
- @ stdcall D3DXCreateFontA(ptr long long long long long long long long long str ptr) d3dx9_36.D3DXCreateFontA
- @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) d3dx9_36.D3DXCreateFontIndirectA
-@@ -115,7 +115,7 @@
- @ stdcall D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) d3dx9_36.D3DXCreateVolumeTextureFromResourceW
- @ stdcall D3DXDebugMute(long) d3dx9_36.D3DXDebugMute
- @ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF
-@ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect
-+@ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_25.D3DXDisassembleEffect # don't forward
- @ stdcall D3DXDisassembleShader(ptr long str ptr) d3dx9_36.D3DXDisassembleShader
- @ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate
- @ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture
-- 
-2.6.4
-
--- a/patches/d3dx9_24-ID3DXEffect/definition
+++ b/patches/d3dx9_24-ID3DXEffect/definition
@@ -1,3 +0,0 @@
-Fixes: Fix wrong version of ID3DXEffect interface for d3dx9_24
-Depends: d3dx9_25-ID3DXEffect
-Category: stable
--- a/patches/d3dx9_25-ID3DXEffect/0001-d3dx9_-Adjust-ID3DXEffect-interface-based-on-DLL-ver.patch
+++ b/patches/d3dx9_25-ID3DXEffect/0001-d3dx9_-Adjust-ID3DXEffect-interface-based-on-DLL-ver.patch
@@ -0,0 +1,237 @@
+From d1229f450e5b7f7cdda6654010c520dc79f7951a Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sat, 14 Mar 2015 04:48:38 +0100
+Subject: d3dx9_*: Adjust ID3DXEffect interface based on DLL version.
+
+---
+ dlls/d3dx9_24/Makefile.in |  1 +
+ dlls/d3dx9_25/Makefile.in |  1 +
+ dlls/d3dx9_26/Makefile.in |  1 +
+ dlls/d3dx9_27/Makefile.in |  1 +
+ dlls/d3dx9_28/Makefile.in |  1 +
+ dlls/d3dx9_29/Makefile.in |  1 +
+ dlls/d3dx9_30/Makefile.in |  1 +
+ dlls/d3dx9_31/Makefile.in |  1 +
+ dlls/d3dx9_32/Makefile.in |  1 +
+ dlls/d3dx9_33/Makefile.in |  1 +
+ dlls/d3dx9_36/Makefile.in |  1 +
+ dlls/d3dx9_36/effect.c    |  8 ++++++++
+ include/d3dx9effect.h     | 12 ++++++++++++
+ 13 files changed, 31 insertions(+)
+
+diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
+index 71dee7f..7464bd1 100644
+--- a/dlls/d3dx9_24/Makefile.in
+++ b/dlls/d3dx9_24/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_24.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=24
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
+index 9b44be8..1531e66 100644
+--- a/dlls/d3dx9_25/Makefile.in
+++ b/dlls/d3dx9_25/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_25.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=25
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
+index 14a52d1..2a58c58 100644
+--- a/dlls/d3dx9_26/Makefile.in
+++ b/dlls/d3dx9_26/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_26.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=26
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
+index b2784fc..9ba1e2a 100644
+--- a/dlls/d3dx9_27/Makefile.in
+++ b/dlls/d3dx9_27/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_27.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=27
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
+index f6b31d6..15dec71 100644
+--- a/dlls/d3dx9_28/Makefile.in
+++ b/dlls/d3dx9_28/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_28.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=28
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
+index 9bd84be..5a5a8fc 100644
+--- a/dlls/d3dx9_29/Makefile.in
+++ b/dlls/d3dx9_29/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_29.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=29
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
+index a8ee15d..bafcdb4 100644
+--- a/dlls/d3dx9_30/Makefile.in
+++ b/dlls/d3dx9_30/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_30.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=30
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
+index 27bd337..f5df4d8 100644
+--- a/dlls/d3dx9_31/Makefile.in
+++ b/dlls/d3dx9_31/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_31.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=31
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
+index 1229c7f..cce9293 100644
+--- a/dlls/d3dx9_32/Makefile.in
+++ b/dlls/d3dx9_32/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_32.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=32
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
+index 44bd991..c9b6587 100644
+--- a/dlls/d3dx9_33/Makefile.in
+++ b/dlls/d3dx9_33/Makefile.in
+@@ -1,5 +1,6 @@
+ MODULE    = d3dx9_33.dll
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=33
+ PARENTSRC = ../d3dx9_36
+ 
+ C_SRCS = \
+diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
+index 83f7d1c..24ce09d 100644
+--- a/dlls/d3dx9_36/Makefile.in
+++ b/dlls/d3dx9_36/Makefile.in
+@@ -1,6 +1,7 @@
+ MODULE    = d3dx9_36.dll
+ IMPORTLIB = d3dx9
+ IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+EXTRADEFS = -D_D3DX9_VER=36
+ 
+ C_SRCS = \
+ 	animation.c \
+diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
+index fd8d59e..5b140fe 100644
+--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
+@@ -3888,6 +3888,7 @@ static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3
+     return E_NOTIMPL;
+ }
+ 
+#if _D3DX9_VER >= 26
+ static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D3DXHANDLE parameter_block)
+ {
+     struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface);
+@@ -3896,6 +3897,7 @@ static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D
+ 
+     return E_NOTIMPL;
+ }
+#endif
+ 
+ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
+         struct IDirect3DDevice9 *device, struct ID3DXEffect **effect)
+@@ -3907,6 +3909,7 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
+     return E_NOTIMPL;
+ }
+ 
+#if _D3DX9_VER >= 27
+ static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface,
+         D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes)
+ {
+@@ -3915,6 +3918,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface,
+ 
+     return E_NOTIMPL;
+ }
+#endif
+ 
+ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl =
+ {
+@@ -3997,9 +4001,13 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl =
+     ID3DXEffectImpl_BeginParameterBlock,
+     ID3DXEffectImpl_EndParameterBlock,
+     ID3DXEffectImpl_ApplyParameterBlock,
+#if _D3DX9_VER >= 26
+     ID3DXEffectImpl_DeleteParameterBlock,
+#endif
+     ID3DXEffectImpl_CloneEffect,
+#if _D3DX9_VER >= 27
+     ID3DXEffectImpl_SetRawValue
+#endif
+ };
+ 
+ static inline struct ID3DXEffectCompilerImpl *impl_from_ID3DXEffectCompiler(ID3DXEffectCompiler *iface)
+diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h
+index 3f527ed..b8259e4 100644
+--- a/include/d3dx9effect.h
+++ b/include/d3dx9effect.h
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright 2010 Christian Costa
+ * Copyright 2015 Sebastian Lackner
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -197,7 +198,13 @@ DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown)
+ 
+ typedef struct ID3DXEffect *LPD3DXEFFECT;
+ 
+#if defined(_D3DX9_VER) && _D3DX9_VER <= 25
+DEFINE_GUID(IID_ID3DXEffect, 0xd165ccb1, 0x62b0, 0x4a33, 0xb3, 0xfa, 0xa9, 0x23, 0x0, 0x30, 0x5a, 0x11);
+#elif defined(_D3DX9_VER) && _D3DX9_VER == 26
+DEFINE_GUID(IID_ID3DXEffect, 0xc7b17651, 0x5420, 0x490e, 0x8a, 0x7f, 0x92, 0x36, 0x75, 0xa2, 0xd6, 0x87);
+#else
+ DEFINE_GUID(IID_ID3DXEffect, 0xf6ceb4b3, 0x4e4c, 0x40dd, 0xb8, 0x83, 0x8d, 0x8d, 0xe5, 0xea, 0xc, 0xd5);
+#endif
+ 
+ #define INTERFACE ID3DXEffect
+ 
+@@ -282,10 +289,15 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
+     STDMETHOD(BeginParameterBlock)(THIS) PURE;
+     STDMETHOD_(D3DXHANDLE, EndParameterBlock)(THIS) PURE;
+     STDMETHOD(ApplyParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE;
+#if !defined(_D3DX9_VER) || _D3DX9_VER >= 26
+     STDMETHOD(DeleteParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE;
+#endif
+     STDMETHOD(CloneEffect)(THIS_ struct IDirect3DDevice9 *device, struct ID3DXEffect **effect) PURE;
+#if !defined(_D3DX9_VER) || _D3DX9_VER >= 27
+     STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes) PURE;
+#endif
+ };
+
+ #undef INTERFACE
+ 
+ typedef struct ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER;
+-- 
+2.8.0
+
--- a/patches/d3dx9_25-ID3DXEffect/0001-d3dx9_25-Add-an-interface-wrapper-for-different-vers.patch
+++ b/patches/d3dx9_25-ID3DXEffect/0001-d3dx9_25-Add-an-interface-wrapper-for-different-vers.patch
--- a/patches/d3dx9_25-ID3DXEffect/definition
+++ b/patches/d3dx9_25-ID3DXEffect/definition
@@ -1,2 +1,2 @@
 Fixes: [25138] Fix wrong version of ID3DXEffect interface for d3dx9_25
-Category: stable
+Fixes: Fix wrong version of ID3DXEffect interface for d3dx9_24
--- a/patches/d3dx9_26-ID3DXEffect/0001-d3dx9_36-Allow-to-query-for-d3dx9_26-specific-ID3DXE.patch
+++ b/patches/d3dx9_26-ID3DXEffect/0001-d3dx9_36-Allow-to-query-for-d3dx9_26-specific-ID3DXE.patch
@@ -1,38 +0,0 @@
-From 95470685fda5c2e5e74c88d2d689159c3af478e8 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 14 Mar 2015 17:00:08 +0100
-Subject: d3dx9_36: Allow to query for d3dx9_26 specific ID3DXEffect interface.
-
---
- dlls/d3dx9_36/effect.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
-index 8f82784..384af3f 100644
--- a/dlls/d3dx9_36/effect.c
-+++ b/dlls/d3dx9_36/effect.c
-@@ -22,6 +22,11 @@
- 
- #include "d3dx9_private.h"
- #include "d3dcompiler.h"
-+#include "initguid.h"
-+
-+/* d3dx9_26 provides an ID3DXEffect interface where the last function SetRawValue
-+ * is missing. Since its otherwise identical, we just use the same vtable. */
-+DEFINE_GUID(IID_ID3DXEffect26, 0xc7b17651, 0x5420, 0x490e, 0x8a, 0x7f, 0x92, 0x36, 0x75, 0xa2, 0xd6, 0x87);
- 
- /* Constants for special INT/FLOAT conversation */
- #define INT_FLOAT_MULTI 255.0f
-@@ -2862,7 +2867,8 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID
-     TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object);
- 
-     if (IsEqualGUID(riid, &IID_IUnknown) ||
-        IsEqualGUID(riid, &IID_ID3DXEffect))
-+        IsEqualGUID(riid, &IID_ID3DXEffect) ||
-+        IsEqualGUID(riid, &IID_ID3DXEffect26))
-     {
-         iface->lpVtbl->AddRef(iface);
-         *object = iface;
-- 
-2.7.1
-
--- a/patches/d3dx9_26-ID3DXEffect/definition
+++ b/patches/d3dx9_26-ID3DXEffect/definition
@@ -1 +0,0 @@
-Category: stable
--- a/patches/d3dx9_33-Share_Source/0001-d3dx9_33-Share-the-source-with-d3dx9_36.patch
+++ b/patches/d3dx9_33-Share_Source/0001-d3dx9_33-Share-the-source-with-d3dx9_36.patch
--- a/patches/d3dx9_33-Share_Source/definition
+++ b/patches/d3dx9_33-Share_Source/definition
@@ -1,4 +0,0 @@
-Fixes: [21817] Share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL forwards
-Apply-After: dlls/d3dx9_33/*
-Depends: d3dx9_36-D3DXStubs
-Depends: d3dx9_36-DXTn
--- a/patches/d3dx9_36-CloneEffect/0001-d3dx9_36-Improve-stub-for-ID3DXEffectImpl_CloneEffec.patch
+++ b/patches/d3dx9_36-CloneEffect/0001-d3dx9_36-Improve-stub-for-ID3DXEffectImpl_CloneEffec.patch
@@ -1,4 +1,4 @@
-From f820c1d1f8ef2a4d76f06515ecff8b45bae23d4e Mon Sep 17 00:00:00 2001
+From 8577047f9cdde21a8eb190eed9cc794132155830 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 16 Mar 2015 08:18:33 +0100
 Subject: d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.
@@ -8,10 +8,10 @@ Subject: d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.
 1 file changed, 6 insertions(+), 1 deletion(-)

 diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
-index 8e2f850..18d952f 100644
+index 5b140fe..efbcb92 100644
 --- a/dlls/d3dx9_36/effect.c
 +++ b/dlls/d3dx9_36/effect.c
-@@ -3363,7 +3363,12 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
+@@ -3906,7 +3906,12 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
 
     FIXME("(%p)->(%p, %p): stub\n", This, device, effect);
 
@@ -24,7 +24,7 @@ index 8e2f850..18d952f 100644
 +    return S_OK;
 }
 
- static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface,
+ #if _D3DX9_VER >= 27
 -- 
-2.3.2
+2.8.0

--- a/patches/d3dx9_36-CloneEffect/definition
+++ b/patches/d3dx9_36-CloneEffect/definition
@@ -1 +1,2 @@
 Fixes: Improve stub for ID3DXEffectImpl_CloneEffect
+Depends: d3dx9_25-ID3DXEffect
--- a/patches/d3dx9_36-D3DXStubs/0001-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch
+++ b/patches/d3dx9_36-D3DXStubs/0001-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch
@@ -1,206 +1,31 @@
-From 0716f14fd6b059f299494ff53d56ee2325ce1cdf Mon Sep 17 00:00:00 2001
+From 0dd9b5f8cdee5652916ddaa1f1673417229bc15b Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Wed, 31 Dec 2014 18:45:24 +0100
 Subject: d3dx9_36: Add stub for D3DXComputeNormalMap.

 ---
- dlls/d3dx9_24/d3dx9_24.spec |  2 +-
- dlls/d3dx9_25/d3dx9_25.spec |  2 +-
- dlls/d3dx9_26/d3dx9_26.spec |  2 +-
- dlls/d3dx9_27/d3dx9_27.spec |  2 +-
- dlls/d3dx9_28/d3dx9_28.spec |  2 +-
- dlls/d3dx9_29/d3dx9_29.spec |  2 +-
- dlls/d3dx9_30/d3dx9_30.spec |  2 +-
- dlls/d3dx9_31/d3dx9_31.spec |  2 +-
- dlls/d3dx9_32/d3dx9_32.spec |  2 +-
- dlls/d3dx9_33/d3dx9_33.spec |  2 +-
- dlls/d3dx9_34/d3dx9_34.spec |  2 +-
- dlls/d3dx9_35/d3dx9_35.spec |  2 +-
 dlls/d3dx9_36/d3dx9_36.spec |  2 +-
 dlls/d3dx9_36/mesh.c        | 12 ++++++++++++
- dlls/d3dx9_37/d3dx9_37.spec |  2 +-
- dlls/d3dx9_38/d3dx9_38.spec |  2 +-
- dlls/d3dx9_39/d3dx9_39.spec |  2 +-
- dlls/d3dx9_40/d3dx9_40.spec |  2 +-
- dlls/d3dx9_41/d3dx9_41.spec |  2 +-
- dlls/d3dx9_42/d3dx9_42.spec |  2 +-
- dlls/d3dx9_43/d3dx9_43.spec |  2 +-
- 21 files changed, 32 insertions(+), 20 deletions(-)
+ 2 files changed, 13 insertions(+), 1 deletion(-)

-diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
-index 0dcca42..d54c3f4 100644
--- a/dlls/d3dx9_24/d3dx9_24.spec
-+++ b/dlls/d3dx9_24/d3dx9_24.spec
-@@ -18,7 +18,7 @@
- @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) d3dx9_36.D3DXCompileShaderFromResourceW
- @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox
- @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
-index 7975803..699c212 100644
--- a/dlls/d3dx9_25/d3dx9_25.spec
-+++ b/dlls/d3dx9_25/d3dx9_25.spec
-@@ -18,7 +18,7 @@
- @ stdcall D3DXCompileShaderFromResourceW(ptr wstr ptr ptr str str long ptr ptr ptr) d3dx9_36.D3DXCompileShaderFromResourceW
- @ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox
- @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec
-index 1d7b802..827a3f3 100644
--- a/dlls/d3dx9_26/d3dx9_26.spec
-+++ b/dlls/d3dx9_26/d3dx9_26.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec
-index 1d7b802..827a3f3 100644
--- a/dlls/d3dx9_27/d3dx9_27.spec
-+++ b/dlls/d3dx9_27/d3dx9_27.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec
-index 083667c..c602d1d 100644
--- a/dlls/d3dx9_28/d3dx9_28.spec
-+++ b/dlls/d3dx9_28/d3dx9_28.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec
-index 083667c..c602d1d 100644
--- a/dlls/d3dx9_29/d3dx9_29.spec
-+++ b/dlls/d3dx9_29/d3dx9_29.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec
-index eb39c0f..bb28fad 100644
--- a/dlls/d3dx9_30/d3dx9_30.spec
-+++ b/dlls/d3dx9_30/d3dx9_30.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec
-index 1667a51..2cfa618 100644
--- a/dlls/d3dx9_31/d3dx9_31.spec
-+++ b/dlls/d3dx9_31/d3dx9_31.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec
-index f1c4b62..1889a47 100644
--- a/dlls/d3dx9_32/d3dx9_32.spec
-+++ b/dlls/d3dx9_32/d3dx9_32.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
-index f1c4b62..1889a47 100644
--- a/dlls/d3dx9_33/d3dx9_33.spec
-+++ b/dlls/d3dx9_33/d3dx9_33.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec
-index f1c4b62..1889a47 100644
--- a/dlls/d3dx9_34/d3dx9_34.spec
-+++ b/dlls/d3dx9_34/d3dx9_34.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec
-index f1c4b62..1889a47 100644
--- a/dlls/d3dx9_35/d3dx9_35.spec
-+++ b/dlls/d3dx9_35/d3dx9_35.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
 diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
-index 0c24882b..e3bb568 100644
+index 78b2969..4cadb53 100644
 --- a/dlls/d3dx9_36/d3dx9_36.spec
 +++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -22,7 +22,7 @@
 @ stub D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr)
 @ stub D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr)
 @ stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr)
-@ stub D3DXComputeNormalMap(ptr ptr ptr long long long)
+-@ stub D3DXComputeNormalMap(ptr ptr ptr long long float)
 +@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float)
 @ stdcall D3DXComputeNormals(ptr ptr)
 @ stub D3DXComputeTangent(ptr long long long long ptr)
 @ stub D3DXComputeTangentFrame(ptr long)
 diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
-index 29250cc..2647ace 100644
+index 3204ea7..b0b9846 100644
 --- a/dlls/d3dx9_36/mesh.c
 +++ b/dlls/d3dx9_36/mesh.c
-@@ -7268,6 +7268,18 @@ HRESULT WINAPI D3DXComputeNormals(ID3DXBaseMesh *mesh, const DWORD *adjacency)
+@@ -7528,6 +7528,18 @@ HRESULT WINAPI D3DXComputeNormals(struct ID3DXBaseMesh *mesh, const DWORD *adjac
 }
 
 /*************************************************************************
@@ -219,97 +44,6 @@ index 29250cc..2647ace 100644
  * D3DXIntersect    (D3DX9_36.@)
  */
 HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *mesh, const D3DXVECTOR3 *ray_pos, const D3DXVECTOR3 *ray_dir,
-diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec
-index 324855e..f5508c2 100644
--- a/dlls/d3dx9_37/d3dx9_37.spec
-+++ b/dlls/d3dx9_37/d3dx9_37.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec
-index 324855e..f5508c2 100644
--- a/dlls/d3dx9_38/d3dx9_38.spec
-+++ b/dlls/d3dx9_38/d3dx9_38.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec
-index 324855e..f5508c2 100644
--- a/dlls/d3dx9_39/d3dx9_39.spec
-+++ b/dlls/d3dx9_39/d3dx9_39.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec
-index 324855e..f5508c2 100644
--- a/dlls/d3dx9_40/d3dx9_40.spec
-+++ b/dlls/d3dx9_40/d3dx9_40.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec
-index 324855e..f5508c2 100644
--- a/dlls/d3dx9_41/d3dx9_41.spec
-+++ b/dlls/d3dx9_41/d3dx9_41.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
-index 324855e..f5508c2 100644
--- a/dlls/d3dx9_42/d3dx9_42.spec
-+++ b/dlls/d3dx9_42/d3dx9_42.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
-diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec
-index 9da1640..21d2cb4 100644
--- a/dlls/d3dx9_43/d3dx9_43.spec
-+++ b/dlls/d3dx9_43/d3dx9_43.spec
-@@ -22,7 +22,7 @@
- @ stdcall D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerVertexSignal
- @ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal
- @ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture
-@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap
-+@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) d3dx9_36.D3DXComputeNormalMap
- @ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals
- @ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent
- @ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame
 -- 
-2.4.5
+2.8.0

--- a/patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-D3DXFrameFind-stub.patch
+++ b/patches/d3dx9_36-D3DXStubs/0002-d3dx9_36-Add-D3DXFrameFind-stub.patch
@@ -1,206 +1,31 @@
-From 9a06378123e28e76159fc9ac2b199abdedbda30a Mon Sep 17 00:00:00 2001
+From 381bfb72fa46393989229619d21a2aa93c0a808c Mon Sep 17 00:00:00 2001
 From: Andrey Gusev <andrey.goosev@gmail.com>
 Date: Wed, 1 Apr 2015 20:59:49 +0300
 Subject: d3dx9_36: Add D3DXFrameFind stub.

 ---
- dlls/d3dx9_24/d3dx9_24.spec | 2 +-
- dlls/d3dx9_25/d3dx9_25.spec | 2 +-
- dlls/d3dx9_26/d3dx9_26.spec | 2 +-
- dlls/d3dx9_27/d3dx9_27.spec | 2 +-
- dlls/d3dx9_28/d3dx9_28.spec | 2 +-
- dlls/d3dx9_29/d3dx9_29.spec | 2 +-
- dlls/d3dx9_30/d3dx9_30.spec | 2 +-
- dlls/d3dx9_31/d3dx9_31.spec | 2 +-
- dlls/d3dx9_32/d3dx9_32.spec | 2 +-
- dlls/d3dx9_33/d3dx9_33.spec | 2 +-
- dlls/d3dx9_34/d3dx9_34.spec | 2 +-
- dlls/d3dx9_35/d3dx9_35.spec | 2 +-
 dlls/d3dx9_36/d3dx9_36.spec | 2 +-
 dlls/d3dx9_36/mesh.c        | 6 ++++++
- dlls/d3dx9_37/d3dx9_37.spec | 2 +-
- dlls/d3dx9_38/d3dx9_38.spec | 2 +-
- dlls/d3dx9_39/d3dx9_39.spec | 2 +-
- dlls/d3dx9_40/d3dx9_40.spec | 2 +-
- dlls/d3dx9_41/d3dx9_41.spec | 2 +-
- dlls/d3dx9_42/d3dx9_42.spec | 2 +-
- dlls/d3dx9_43/d3dx9_43.spec | 2 +-
- 21 files changed, 26 insertions(+), 20 deletions(-)
+ 2 files changed, 7 insertions(+), 1 deletion(-)

-diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
-index d54c3f4..c79e778 100644
--- a/dlls/d3dx9_24/d3dx9_24.spec
-+++ b/dlls/d3dx9_24/d3dx9_24.spec
-@@ -131,7 +131,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
-index 699c212..8244c77 100644
--- a/dlls/d3dx9_25/d3dx9_25.spec
-+++ b/dlls/d3dx9_25/d3dx9_25.spec
-@@ -131,7 +131,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec
-index 827a3f3..5b8528b 100644
--- a/dlls/d3dx9_26/d3dx9_26.spec
-+++ b/dlls/d3dx9_26/d3dx9_26.spec
-@@ -135,7 +135,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec
-index 827a3f3..5b8528b 100644
--- a/dlls/d3dx9_27/d3dx9_27.spec
-+++ b/dlls/d3dx9_27/d3dx9_27.spec
-@@ -135,7 +135,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec
-index c602d1d..c62b334 100644
--- a/dlls/d3dx9_28/d3dx9_28.spec
-+++ b/dlls/d3dx9_28/d3dx9_28.spec
-@@ -135,7 +135,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec
-index c602d1d..c62b334 100644
--- a/dlls/d3dx9_29/d3dx9_29.spec
-+++ b/dlls/d3dx9_29/d3dx9_29.spec
-@@ -135,7 +135,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec
-index bb28fad..365bd5b 100644
--- a/dlls/d3dx9_30/d3dx9_30.spec
-+++ b/dlls/d3dx9_30/d3dx9_30.spec
-@@ -135,7 +135,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec
-index 2cfa618..5133705 100644
--- a/dlls/d3dx9_31/d3dx9_31.spec
-+++ b/dlls/d3dx9_31/d3dx9_31.spec
-@@ -134,7 +134,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec
-index 1889a47..b93865b 100644
--- a/dlls/d3dx9_32/d3dx9_32.spec
-+++ b/dlls/d3dx9_32/d3dx9_32.spec
-@@ -134,7 +134,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
-index 1889a47..b93865b 100644
--- a/dlls/d3dx9_33/d3dx9_33.spec
-+++ b/dlls/d3dx9_33/d3dx9_33.spec
-@@ -134,7 +134,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec
-index 1889a47..b93865b 100644
--- a/dlls/d3dx9_34/d3dx9_34.spec
-+++ b/dlls/d3dx9_34/d3dx9_34.spec
-@@ -134,7 +134,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec
-index 1889a47..b93865b 100644
--- a/dlls/d3dx9_35/d3dx9_35.spec
-+++ b/dlls/d3dx9_35/d3dx9_35.spec
-@@ -134,7 +134,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
 diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
-index e3bb568..ea7e74c 100644
+index 4cadb53..9935352 100644
 --- a/dlls/d3dx9_36/d3dx9_36.spec
 +++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -135,7 +135,7 @@
 @ stub D3DXFrameAppendChild(ptr ptr)
 @ stub D3DXFrameCalculateBoundingSphere(ptr ptr ptr)
 @ stdcall D3DXFrameDestroy(ptr ptr)
-@ stub D3DXFrameFind(ptr ptr)
+-@ stub D3DXFrameFind(ptr str)
 +@ stdcall D3DXFrameFind(ptr str)
 @ stub D3DXFrameNumNamedMatrices(ptr)
 @ stub D3DXFrameRegisterNamedMatrices(ptr ptr)
 @ stdcall D3DXFresnelTerm(float float)
 diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
-index 2647ace..02931c7 100644
+index b0b9846..aa98b1a 100644
 --- a/dlls/d3dx9_36/mesh.c
 +++ b/dlls/d3dx9_36/mesh.c
-@@ -4044,6 +4044,12 @@ HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame, ID3DXAllocateHierarchy *alloc_
+@@ -4046,6 +4046,12 @@ HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame, ID3DXAllocateHierarchy *alloc_
     return D3D_OK;
 }
 
@@ -213,97 +38,6 @@ index 2647ace..02931c7 100644
 HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD options, struct IDirect3DDevice9 *device,
         struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,
         DWORD *num_materials, struct ID3DXMesh **mesh)
-diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec
-index f5508c2..9a5ed88 100644
--- a/dlls/d3dx9_37/d3dx9_37.spec
-+++ b/dlls/d3dx9_37/d3dx9_37.spec
-@@ -135,7 +135,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec
-index f5508c2..9a5ed88 100644
--- a/dlls/d3dx9_38/d3dx9_38.spec
-+++ b/dlls/d3dx9_38/d3dx9_38.spec
-@@ -135,7 +135,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec
-index f5508c2..9a5ed88 100644
--- a/dlls/d3dx9_39/d3dx9_39.spec
-+++ b/dlls/d3dx9_39/d3dx9_39.spec
-@@ -135,7 +135,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec
-index f5508c2..9a5ed88 100644
--- a/dlls/d3dx9_40/d3dx9_40.spec
-+++ b/dlls/d3dx9_40/d3dx9_40.spec
-@@ -135,7 +135,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec
-index f5508c2..9a5ed88 100644
--- a/dlls/d3dx9_41/d3dx9_41.spec
-+++ b/dlls/d3dx9_41/d3dx9_41.spec
-@@ -135,7 +135,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
-index f5508c2..9a5ed88 100644
--- a/dlls/d3dx9_42/d3dx9_42.spec
-+++ b/dlls/d3dx9_42/d3dx9_42.spec
-@@ -135,7 +135,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
-diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec
-index 21d2cb4..122dff4 100644
--- a/dlls/d3dx9_43/d3dx9_43.spec
-+++ b/dlls/d3dx9_43/d3dx9_43.spec
-@@ -133,7 +133,7 @@
- @ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild
- @ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere
- @ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy
-@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind
-+@ stdcall D3DXFrameFind(ptr str) d3dx9_36.D3DXFrameFind
- @ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices
- @ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices
- @ stdcall D3DXFresnelTerm(float float) d3dx9_36.D3DXFresnelTerm
 -- 
-2.4.5
+2.8.0

--- a/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch
+++ b/patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch
@@ -1,16 +1,136 @@
-From 14de286e5d59419e946e9459df0426c1c5ab7f7d Mon Sep 17 00:00:00 2001
+From 94ca9bf354be47b2fe57689a4a1479d1d53255b2 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sat, 1 Nov 2014 13:08:05 +0100
 Subject: d3dx9_36: Add dxtn support.

 ---
+ dlls/d3dx9_24/Makefile.in     |   2 +-
+ dlls/d3dx9_25/Makefile.in     |   2 +-
+ dlls/d3dx9_26/Makefile.in     |   2 +-
+ dlls/d3dx9_27/Makefile.in     |   2 +-
+ dlls/d3dx9_28/Makefile.in     |   2 +-
+ dlls/d3dx9_29/Makefile.in     |   2 +-
+ dlls/d3dx9_30/Makefile.in     |   2 +-
+ dlls/d3dx9_31/Makefile.in     |   2 +-
+ dlls/d3dx9_32/Makefile.in     |   2 +-
+ dlls/d3dx9_33/Makefile.in     |   2 +-
 dlls/d3dx9_36/Makefile.in     |   2 +-
 dlls/d3dx9_36/surface.c       | 103 +++++++++++++++++++++++++++++++++++++++---
 dlls/d3dx9_36/tests/surface.c |   8 ++--
- 3 files changed, 101 insertions(+), 12 deletions(-)
+ 13 files changed, 111 insertions(+), 22 deletions(-)

+diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
+index 7464bd1..bca7d82 100644
+--- a/dlls/d3dx9_24/Makefile.in
+++ b/dlls/d3dx9_24/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_24.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=24
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
+index 1531e66..5d847a2 100644
+--- a/dlls/d3dx9_25/Makefile.in
+++ b/dlls/d3dx9_25/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_25.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=25
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
+index 2a58c58..cf0c150 100644
+--- a/dlls/d3dx9_26/Makefile.in
+++ b/dlls/d3dx9_26/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_26.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=26
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
+index 9ba1e2a..7cc647c 100644
+--- a/dlls/d3dx9_27/Makefile.in
+++ b/dlls/d3dx9_27/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_27.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=27
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
+index 15dec71..bbf4140 100644
+--- a/dlls/d3dx9_28/Makefile.in
+++ b/dlls/d3dx9_28/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_28.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=28
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
+index 5a5a8fc..1aa1663 100644
+--- a/dlls/d3dx9_29/Makefile.in
+++ b/dlls/d3dx9_29/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_29.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=29
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
+index bafcdb4..df8f87b 100644
+--- a/dlls/d3dx9_30/Makefile.in
+++ b/dlls/d3dx9_30/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_30.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=30
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
+index f5df4d8..6ea8d15 100644
+--- a/dlls/d3dx9_31/Makefile.in
+++ b/dlls/d3dx9_31/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_31.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=31
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
+index cce9293..df0759f 100644
+--- a/dlls/d3dx9_32/Makefile.in
+++ b/dlls/d3dx9_32/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_32.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=32
+ PARENTSRC = ../d3dx9_36
+ 
+diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
+index c9b6587..ecf1b15 100644
+--- a/dlls/d3dx9_33/Makefile.in
+++ b/dlls/d3dx9_33/Makefile.in
+@@ -1,5 +1,5 @@
+ MODULE    = d3dx9_33.dll
+-IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=33
+ PARENTSRC = ../d3dx9_36
+ 
 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
-index 95e3045..fd710c2 100644
+index 24ce09d..6b78518 100644
 --- a/dlls/d3dx9_36/Makefile.in
 +++ b/dlls/d3dx9_36/Makefile.in
@@ -1,6 +1,6 @@
@@ -18,9 +138,9 @@ index 95e3045..fd710c2 100644
 IMPORTLIB = d3dx9
 -IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
 +IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d
+ EXTRADEFS = -D_D3DX9_VER=36
 
 C_SRCS = \
- 	animation.c \
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
 index 1bfe75a..4099cd5 100644
 --- a/dlls/d3dx9_36/surface.c
@@ -213,5 +333,5 @@ index f2855e8..2be48df 100644
             check_release((IUnknown*)newsurf, 1);
             check_release((IUnknown*)tex, 0);
 -- 
-2.7.1
+2.8.0

--- a/patches/d3dx9_36-DXTn/definition
+++ b/patches/d3dx9_36-DXTn/definition
@@ -1,4 +1,5 @@
 Depends: wined3d-DXTn
+Depends: d3dx9_25-ID3DXEffect
 Fixes: [33768] Fix texture corruption in CSI: Fatal Conspiracy
 Fixes: [37391] Exception during start of fr-043 caused by missing DXTn support
 Fixes: [34692] Fix wrong colors in Wolfenstein (2009)
--- a/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch
+++ b/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch
@@ -1,4 +1,4 @@
-From 4283d60c4b362e518c7028484b44d9df2ecd27cc Mon Sep 17 00:00:00 2001
+From 29ccadcb0e716255ac5e43b8784d129f3fc2a441 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Fri, 19 Dec 2014 22:31:46 +0100
 Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
@@ -9,10 +9,10 @@ Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
 2 files changed, 91 insertions(+), 3 deletions(-)

 diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
-index da7de54..809f11e 100644
+index 7772406..00c486c 100644
 --- a/dlls/d3dx9_36/effect.c
 +++ b/dlls/d3dx9_36/effect.c
-@@ -3542,13 +3542,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
+@@ -3538,13 +3538,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
     return D3D_OK;
 }
 
@@ -56,13 +56,13 @@ index da7de54..809f11e 100644
 +    return S_FALSE;
 }
 
- static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique)
+ static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func,
 diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
-index 4ef4d4c..59cd6cc 100644
+index 41db494..efc991e 100644
 --- a/dlls/d3dx9_36/tests/effect.c
 +++ b/dlls/d3dx9_36/tests/effect.c
-@@ -3983,6 +3983,65 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device)
-                 &op_tests[i]);
+@@ -4275,6 +4275,65 @@ static void test_effect_isparameterused(IDirect3DDevice9 *device)
+     effect->lpVtbl->Release(effect);
 }
 
 +/*
@@ -127,10 +127,10 @@ index 4ef4d4c..59cd6cc 100644
 START_TEST(effect)
 {
     HWND wnd;
-@@ -4025,6 +4084,7 @@ START_TEST(effect)
-     test_effect_states(device);
+@@ -4318,6 +4377,7 @@ START_TEST(effect)
     test_effect_preshader(device);
     test_effect_preshader_ops(device);
+     test_effect_isparameterused(device);
 +    test_effect_technique_validation(device);
 
     count = IDirect3DDevice9_Release(device);
--- a/patches/dbghelp-EnumerateLoadedModulesExW/0001-dbghelp-Implement-EnumerateLoadedModulesExW.patch
+++ b/patches/dbghelp-EnumerateLoadedModulesExW/0001-dbghelp-Implement-EnumerateLoadedModulesExW.patch
@@ -1,47 +0,0 @@
-From fe5d45b540dccdb589978118b7c2828414e21331 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Mon, 16 May 2016 18:00:49 +0200
-Subject: dbghelp: Implement EnumerateLoadedModulesExW.
-
---
- dlls/dbghelp/dbghelp.spec |  2 +-
- dlls/dbghelp/module.c     | 10 ++++++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec
-index 6004f95..624e023 100644
--- a/dlls/dbghelp/dbghelp.spec
-+++ b/dlls/dbghelp/dbghelp.spec
-@@ -5,7 +5,7 @@
- @ stdcall EnumerateLoadedModules(long ptr ptr)
- @ stdcall EnumerateLoadedModules64(long ptr ptr)
- @ stub EnumerateLoadedModulesEx
-@ stub EnumerateLoadedModulesExW
-+@ stub EnumerateLoadedModulesExW(long ptr ptr)
- @ stdcall EnumerateLoadedModulesW64(long ptr ptr)
- @ stdcall ExtensionApiVersion()
- @ stdcall FindDebugInfoFile(str str ptr)
-diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
-index 69a043c..f22ee65 100644
--- a/dlls/dbghelp/module.c
-+++ b/dlls/dbghelp/module.c
-@@ -921,6 +921,16 @@ BOOL  WINAPI EnumerateLoadedModulesW64(HANDLE hProcess,
- }
- 
- /******************************************************************
-+ *      EnumerateLoadedModulesExW (DBGHELP.@)
-+ *
-+ */
-+BOOL WINAPI EnumerateLoadedModulesExW(HANDLE process, PENUMLOADED_MODULES_CALLBACKW64 callback,
-+                                      PVOID context)
-+{
-+    return EnumerateLoadedModulesW64(process, callback, context);
-+}
-+
-+/******************************************************************
-  *		SymGetModuleInfo (DBGHELP.@)
-  *
-  */
-- 
-2.8.0
-
--- a/patches/dbghelp-EnumerateLoadedModulesExW/definition
+++ b/patches/dbghelp-EnumerateLoadedModulesExW/definition
@@ -1 +0,0 @@
-Fixes: [40614] Implement dbghelp.EnumerateLoadedModulesExW
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sebastian Lackner	7df2eaa22d	Release 1.9.13.	2016-06-25 17:18:29 +02:00
Sebastian Lackner	571ab663fd	Added patch to remove duplicate definition in include/webservices.h.	2016-06-25 07:13:04 +02:00
Sebastian Lackner	ddba27937a	ntoskrnl-DriverTest: Fix compile error caused by wrong import library.	2016-06-25 04:59:47 +02:00
Sebastian Lackner	f71c20b7f7	Rebase against af6f8ca4136ad937f8743494a8d3cea0b52d71cf. [msvcrt-_fstat32i64] Removed patch to implement msvcrt._fstat32i64 (accepted upstream).	2016-06-24 15:43:04 +02:00
Sebastian Lackner	8281fca8dc	Added patch to implement ole32.OleGetIconOfFile stub.	2016-06-24 12:00:24 +02:00
Sebastian Lackner	093f3b9818	gdiplus-GdipCreateMetafileFromStream: Update patchset and implement GdipCreateMetafileFromFile.	2016-06-24 11:53:34 +02:00
Sebastian Lackner	c8299873fb	wined3d-CSMT_Main: Remove patches with unnecessary 'Waiting for cs' warning.	2016-06-24 04:42:45 +02:00
Sebastian Lackner	60e6da65cd	Rebase against 82f3446c5d09aba0aa0cffcf7ece54d44d3b86ef.	2016-06-24 02:24:55 +02:00
Sebastian Lackner	08dca3b834	Rebase against 38fb1062daaf68afe4dc20e1aceddfa89fe1ea4f.	2016-06-24 01:13:57 +02:00
Sebastian Lackner	4f12cf4dc9	Rebase against 9ba058e94c2662f5296c95adeafd29c59b137249.	2016-06-23 17:37:04 +02:00
Sebastian Lackner	1d08851c35	Rebase against e3bd659be9b2868b121857fb2643d775bbf0d8c7. [d3dx9_33-Share_Source] Removed patch to share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL forwards (accepted upstream).	2016-06-23 16:17:27 +02:00
Sebastian Lackner	a8976086e5	Rebase against 0c83f4d5bec8b01e1e6dcbb0a9a9932b6c24570b.	2016-06-23 07:26:56 +02:00
Sebastian Lackner	c6a96f3e32	Rebase against 7fe9858988eabf377ab5e2c64d92f973574b1ae8. Also modifies a couple of other wined3d-CSMT_Main patches, and uses wined3d_cs_emit_destroy_object where appropriate.	2016-06-23 06:15:03 +02:00
Sebastian Lackner	6adf92cebb	Rebase against 4afc7470fb630035c911a1bf1d48f66bf16c230c.	2016-06-23 00:43:28 +02:00
Sebastian Lackner	e27647e4d5	Rebase against 9c1fbe509576d7cbaada3af9736888cfa1d02847.	2016-06-22 23:33:39 +02:00
Sebastian Lackner	2f3baafeca	Rebase against 025c54344230ca8b32e80f08b9af13a16dfd2445. [ws2_32-Sort_default_route] Removed patch to ensure default route IP addresses are returned first in gethostbyname.	2016-06-21 22:18:57 +02:00
Sebastian Lackner	5e5f21854b	Rebase against 754c68182623657b4862d7700afbf781b4555c77. [ucrtbase-Functions] Removed patch to forward _{calloc,malloc,free}_base to {calloc,malloc,free}.	2016-06-17 19:04:51 +02:00
Sebastian Lackner	6b9d38b61c	Remove disabled gdi32-PS_GEOMETRIC patchset. Bug 39172 already has been fixed in a different way.	2016-06-17 05:40:44 +02:00
Sebastian Lackner	45157d6bbe	Added patch with stubs for user-mode scheduling functions.	2016-06-17 03:44:38 +02:00
Sebastian Lackner	3cb1c835bc	Added patch to use root dialog for DM_SETDEFID/DM_GETDEFID in DefDlgProc.	2016-06-16 23:52:44 +02:00
Sebastian Lackner	243a9f7b89	Rebase against 41d01871fef296dc717cf2c4f0bdbb07f5266acd.	2016-06-16 22:56:56 +02:00
Sebastian Lackner	4f532d23bb	Rebase against 7cb3b72559745d94e7b7e3a0fbb40426f93d775f.	2016-06-16 22:02:21 +02:00
Sebastian Lackner	73d2e2a9e8	Rebase against 849163b1ed5e2586ee9f391e7a8b03f054bb620f.	2016-06-15 20:57:20 +02:00
Sebastian Lackner	7391ecfaa0	Release 1.9.12.	2016-06-13 19:02:12 +02:00
Sebastian Lackner	295deafca7	comctl32-Listview_DrawItem: Update patchset and fix a regression (thanks Michael Müller).	2016-06-13 02:12:53 +02:00
Sebastian Lackner	2dd175172b	Added patch to pass correct itemData to WM_MEASUREITEM when inserting an item to an owner-drawn listbox.	2016-06-12 19:58:05 +02:00
Sebastian Lackner	5924752fd9	Rebase against 50917e283629cbe994f2d7f091ed46ac8b25cda6.	2016-06-12 05:43:39 +02:00
Sebastian Lackner	57b298602e	Rebase against 03b06fb76ba4204df5c20fda8955da09e16ec095.	2016-06-12 05:00:55 +02:00
Sebastian Lackner	52f5a405e9	Rebase against 0c0c86a8c7c93e7edbca8a7840c945f4159c3059. FIXME: We should do all operations through the command stream.	2016-06-12 04:42:26 +02:00
Sebastian Lackner	c92ffa58c0	Rebase against 2a5b4fd884801a7f394ade49142fbfdba195243c.	2016-06-11 19:33:18 +02:00
Sebastian Lackner	e741b83080	Rebase against 9cc95e5a1d930d72892949a3ddf8fa00d471af88.	2016-06-06 22:38:52 +02:00
Sebastian Lackner	faf8d49216	winex11-_NET_ACTIVE_WINDOW: Update patchset and fix a regression (thanks Michael Müller).	2016-06-05 02:34:21 +02:00
Sebastian Lackner	08e221b30c	Added patch to send SC_KEYMENU on managed windows.	2016-06-05 01:32:42 +02:00
Sebastian Lackner	c2158ca405	Added patch to force conversion of 8 bpp grayscale PNG images to 32 bpp BGRA.	2016-06-04 03:04:10 +02:00
Sebastian Lackner	953ae16ca9	Added patch to scale a geometric pen for the mapping mode used by PATH_StrokePath.	2016-06-04 02:53:05 +02:00
Sebastian Lackner	066e207750	Rebase against d8641197c041763c2c9784f4b4a8b3dba2bbf0cb.	2016-06-03 18:05:36 +02:00
Sebastian Lackner	64e8ae3a61	Rebase against 5840ea47e6a0d761acbd45cd5a59fbcebfb86326.	2016-06-02 23:10:47 +02:00
Sebastian Lackner	3d1995983f	Rebase against 03fa4cfaffd4c10f56a2f8bfd383f4eaf67d364c. [ntdll-WinSqm] Removed patch to add WinSqm[Start\|End]Session implementation (accepted upstream).	2016-06-02 22:15:30 +02:00
Sebastian Lackner	4705d850ea	Rebase against 59ee884bdf4947f5939499456539fca7a5806939.	2016-05-31 23:09:34 +02:00
Sebastian Lackner	8bede16222	Rebase against c89dc58deb9ba74d8dcd7faf7012203cff0724a0.	2016-05-30 18:24:40 +02:00
Sebastian Lackner	5c3c83fef5	Added patch to check if menu text is a valid string in MENU_DrawMenuItem.	2016-05-30 15:40:30 +02:00
Sebastian Lackner	8c43c80df2	Release 1.9.11.	2016-05-29 20:16:54 +02:00
Sebastian Lackner	99ddea76c5	Temporarily disable ntdll-Thread_Stack patchset. The patchset was initially added for 64-bit MSYS2, however it seems to break various other applications. Disable it until a better solution is found.	2016-05-29 17:20:49 +02:00
Sebastian Lackner	6eb4b11c22	Added patch for ntoskrnl.IoStopTimer stub function.	2016-05-29 16:45:04 +02:00
Sebastian Lackner	5eb1d3c69b	Added patch to implement DrawDibProfileDisplay in msvideo.dll16.	2016-05-28 00:24:35 +02:00
Sebastian Lackner	70a46a2305	Added patch to provide DeviceID, Location and PortName for printers.	2016-05-28 00:18:19 +02:00
Sebastian Lackner	bd04bf9ac0	Added patch for setupapi.CM_Get_DevNode_Status stub implementation.	2016-05-28 00:13:07 +02:00
Sebastian Lackner	749dc37048	Rebase against 81c700e0f8f8670f9c3b05a4baab2b2cffaeff89.	2016-05-27 23:41:15 +02:00
Sebastian Lackner	a15b448623	Rebase against 0dcf255b51ef096d649a5b4daee7204409550376.	2016-05-27 23:01:46 +02:00
Sebastian Lackner	e460e59354	Rebase against a0c651cd7cf83c9fac6b8776de2d54a731fc4b29. [secur32-ANSI_NTLM_Credentials] Removed patch to fix handling of ANSI NTLM credentials (accepted upstream).	2016-05-26 23:38:44 +02:00
Sebastian Lackner	71bb1a35f5	Added patch to avoid sorting InMemoryOrderModuleList by memory address.	2016-05-26 15:55:53 +02:00
Sebastian Lackner	83d43970e8	wined3d-CSMT_Main: Use newly introduced wined3d_calloc function.	2016-05-26 01:38:25 +02:00
Sebastian Lackner	0f1aef64bf	Rebase against b5aeb661b9297a6ee6047335f42543936f593525.	2016-05-25 21:17:56 +02:00
Sebastian Lackner	a40017a010	Rebase against 351bd33f2cd1edd680176ef777d77a3d1256ab6d.	2016-05-25 20:34:59 +02:00
Sebastian Lackner	94419b1dad	Rebase against 698d4114677205c3e5a0df659d230fe982578757.	2016-05-25 03:43:00 +02:00
Sebastian Lackner	5d32e6fc71	Added patch with workaround for Windows 3.1 apps which call LoadImage(LR_LOADFROMFILE) with a resource id.	2016-05-21 15:07:54 +02:00
Sebastian Lackner	f10c1d3c42	Rebase against 9a80284e1a886ff7e01d33f68715c9bfdb773459.	2016-05-19 20:06:07 +02:00
Sebastian Lackner	9aefba7af5	wined3d-CSMT_Main: Make float constant updates consistent with the rest of the code.	2016-05-19 14:44:21 +02:00
Sebastian Lackner	16e6b1c3e3	Rebase against 58e95f72218fa018739c484f172bc236e685d5bb. [dbghelp-EnumerateLoadedModulesExW] Removed patch to implement dbghelp.EnumerateLoadedModulesExW (fixed upstream).	2016-05-19 13:19:02 +02:00
Sebastian Lackner	8a2c526e13	Rebase against aa475ce23fa295a8f5d0fa120d7b3dac1a5a41b5. [wininet-InternetReadFile] Removed patch to return synchronously from InternetReadFile if there is no more data to read (accepted upstream).	2016-05-19 13:18:45 +02:00
				`@@ -1 +0,0 @@`
				`Fixes: [40614] Implement dbghelp.EnumerateLoadedModulesExW`