Release 1.7.42.

Based on the discussion in bug 202, this patch adds support for categories
to patchupdate.py.

README.md

@@ -39,7 +39,7 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features in Wine Staging 1.7.41 [218]:**
+**Bug fixes and features in Wine Staging 1.7.42 [221]:**
 
 *Note: The following list only contains features and bug fixes which are not
 yet available in vanilla Wine. They are removed from the list as soon as they
@@ -48,7 +48,6 @@ releases, take a look at the
 [changelog](https://github.com/wine-compholio/wine-staging/blob/master/debian/changelog)
 for more details.*
 
-* Add Dynamic DST exceptions for Israel Standard Time ([Wine Bug #36374](https://bugs.winehq.org/show_bug.cgi?id=36374))
 * Add a ProfileList\<UserSID> registry subkey ([Wine Bug #15670](https://bugs.winehq.org/show_bug.cgi?id=15670))
 * Add default ACLs for user shell folders
 * Add implementation for CreateThreadpool ([Wine Bug #35192](https://bugs.winehq.org/show_bug.cgi?id=35192))
@@ -60,9 +59,11 @@ for more details.*
 * Add stub fltmgr.sys (filter manager driver) ([Wine Bug #23583](https://bugs.winehq.org/show_bug.cgi?id=23583))
 * Add stub for D3DXComputeNormalMap
 * Add stub for D3DXComputeTangentFrameEx ([Wine Bug #31984](https://bugs.winehq.org/show_bug.cgi?id=31984))
+* Add stub for D3DXFrameFind ([Wine Bug #38334](https://bugs.winehq.org/show_bug.cgi?id=38334))
 * Add stub for D3DXIntersect
 * Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
-* Add stub for WinSqmIsOptedIn ([Wine Bug #38388](https://bugs.winehq.org/show_bug.cgi?id=38388))
+* Add stub for advapi32.ImpersonateAnonymousToken
+* Add stub for d3d11.D3D11CreateDeviceAndSwapChain ([Wine Bug #33153](https://bugs.winehq.org/show_bug.cgi?id=33153))
 * Add stub for gdiplus.GdipCreateEffect ([Wine Bug #32163](https://bugs.winehq.org/show_bug.cgi?id=32163))
 * Add stub for ntoskrnl.ExAcquireResourceExclusiveLite
 * Add stub for ntoskrnl.ExDeleteResourceLite
@@ -86,7 +87,6 @@ for more details.*
 * Allow to override number of quality levels for D3DMULTISAMPLE_NONMASKABLE. ([Wine Bug #12652](https://bugs.winehq.org/show_bug.cgi?id=12652))
 * Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW ([Wine Bug #37916](https://bugs.winehq.org/show_bug.cgi?id=37916))
 * Audio stuttering and performance drops in multiple applications ([Wine Bug #30639](https://bugs.winehq.org/show_bug.cgi?id=30639))
-* Avoid crash when trying to bind mshtml event scripts to window ([Wine Bug #38419](https://bugs.winehq.org/show_bug.cgi?id=38419))
 * Avoid crashing when broken app tries to release surface although refcount is zero ([Wine Bug #18477](https://bugs.winehq.org/show_bug.cgi?id=18477))
 * Avoid race-conditions in NtReadFile() operations with write watches.
 * Avoid race-conditions of async WSARecv() operations with write watches.
@@ -97,10 +97,12 @@ for more details.*
 * Black & White needs DXTn software decoding support ([Wine Bug #14939](https://bugs.winehq.org/show_bug.cgi?id=14939))
 * CPU-Z fails to start because GetLogicalProcessorInformationEx returns FALSE
 * Calculate msvcrt exponential math operations with higher precision ([Wine Bug #37149](https://bugs.winehq.org/show_bug.cgi?id=37149))
+* Create HKLM\Software\Microsoft\Cryptography\MachineGuid registry key ([Wine Bug #38508](https://bugs.winehq.org/show_bug.cgi?id=38508))
 * CreateProcess does not prioritize the working directory over the system search path ([Wine Bug #23934](https://bugs.winehq.org/show_bug.cgi?id=23934))
 * D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770))
 * Do not append duplicate NULL characters when importing keys with regedit ([Wine Bug #37575](https://bugs.winehq.org/show_bug.cgi?id=37575))
 * Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](https://bugs.winehq.org/show_bug.cgi?id=11436))
+* Emulate \Device\Null using /dev/null ([Wine Bug #38107](https://bugs.winehq.org/show_bug.cgi?id=38107))
 * Emulate access to KI_USER_SHARED_DATA kernel page on x86_64 ([Wine Bug #33849](https://bugs.winehq.org/show_bug.cgi?id=33849))
 * Enforce that surfaces are flushed after ReleaseDC
 * Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](https://bugs.winehq.org/show_bug.cgi?id=33162))
@@ -136,7 +138,7 @@ for more details.*
 * Fix multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087))
 * Fix possible segfault in pulse_rd_loop of PulseAudio backend
 * Fix race-condition when threads are killed during shutdown
-* Fix regression caused by blacklisting supported OpenGL extensions ([Wine Bug #38264](https://bugs.winehq.org/show_bug.cgi?id=38264))
+* Fix regression caused by blacklisting supported OpenGL extensions ([Wine Bug #38480](https://bugs.winehq.org/show_bug.cgi?id=38480))
 * Fix return value of ScrollWindowEx for invisible windows ([Wine Bug #37706](https://bugs.winehq.org/show_bug.cgi?id=37706))
 * Fix texture corruption in CSI: Fatal Conspiracy ([Wine Bug #33768](https://bugs.winehq.org/show_bug.cgi?id=33768))
 * Fix unintentional leaks with ntdll internals
@@ -150,8 +152,8 @@ for more details.*
 * GetMonitorInfo returns the same name for all monitors ([Wine Bug #37709](https://bugs.winehq.org/show_bug.cgi?id=37709))
 * GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](https://bugs.winehq.org/show_bug.cgi?id=15980))
 * Graphical issues in Inquisitor ([Wine Bug #32490](https://bugs.winehq.org/show_bug.cgi?id=32490))
-* Hearthstone fails to start ([Wine Bug #36216](https://bugs.winehq.org/show_bug.cgi?id=36216))
 * IOCTL_DVD_READ_STRUCTURE expects the wrong size of output buffer for some requests ([Wine Bug #37767](https://bugs.winehq.org/show_bug.cgi?id=37767))
+* Ignore garbage after decoding gif lines ([Wine Bug #32227](https://bugs.winehq.org/show_bug.cgi?id=32227))
 * Ignore unsupported flags for CoInternetSetFeatureEnabled ([Wine Bug #35197](https://bugs.winehq.org/show_bug.cgi?id=35197))
 * Implement D3DXGetShaderOutputSemantics
 * Implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces ([Wine Bug #17233](https://bugs.winehq.org/show_bug.cgi?id=17233))
@@ -191,6 +193,7 @@ for more details.*
 * Multiple applications need EnumDisplayDevicesW implementation ([Wine Bug #34978](https://bugs.winehq.org/show_bug.cgi?id=34978))
 * Multiple applications start wrong executable if whitespace present in name ([Wine Bug #19666](https://bugs.winehq.org/show_bug.cgi?id=19666))
 * Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115))
+* OpenClipboard with current owner shouldn't fail ([Wine Bug #2805](https://bugs.winehq.org/show_bug.cgi?id=2805))
 * Other Pipelight-specific enhancements
 * Port Royale doesn't display ocean correctly ([Wine Bug #17913](https://bugs.winehq.org/show_bug.cgi?id=17913))
 * Prevent window managers from grouping all wine programs together ([Wine Bug #32699](https://bugs.winehq.org/show_bug.cgi?id=32699))
@@ -198,13 +201,13 @@ for more details.*
 * Process Hacker 2.x needs ntoskrnl.ProbeForRead ([Wine Bug #38103](https://bugs.winehq.org/show_bug.cgi?id=38103))
 * Properly handle closing sockets during a select call ([Wine Bug #38399](https://bugs.winehq.org/show_bug.cgi?id=38399))
 * Python PIP needs better NtQueryInformationJobObject stub
-* Recognize localhost as local machine in wbemprox
 * Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates)
 * Reset device state in SysKeyboard*Impl_Acquire ([Wine Bug #11607](https://bugs.winehq.org/show_bug.cgi?id=11607))
 * Return an error when trying to open a terminated process ([Wine Bug #37087](https://bugs.winehq.org/show_bug.cgi?id=37087))
 * Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](https://bugs.winehq.org/show_bug.cgi?id=23174))
 * Return correct device type for cd devices without medium
 * Return correct values for GetThreadTimes function ([Wine Bug #20230](https://bugs.winehq.org/show_bug.cgi?id=20230))
+* Return failure in NtProtectVirtualMemory when last argument is omitted ([Wine Bug #38495](https://bugs.winehq.org/show_bug.cgi?id=38495))
 * SO_CONNECT_TIME returns the appropriate time
 * Scrolling causes mouse and screen to lock in Call to Power II ([Wine Bug #34559](https://bugs.winehq.org/show_bug.cgi?id=34559))
 * Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652))
@@ -221,7 +224,7 @@ for more details.*
 * Support for D3DXGetShaderInputSemantics ([Wine Bug #22682](https://bugs.winehq.org/show_bug.cgi?id=22682))
 * Support for DDS file format in D3DXSaveTextureToFileInMemory ([Wine Bug #26898](https://bugs.winehq.org/show_bug.cgi?id=26898))
 * Support for DOS hidden/system file attributes ([Wine Bug #9158](https://bugs.winehq.org/show_bug.cgi?id=9158))
-* Support for Dynamic DST (daylight saving time) information in registry
+* Support for FileFsFullSizeInformation information class
 * Support for GdipCreateRegionRgnData ([Wine Bug #34843](https://bugs.winehq.org/show_bug.cgi?id=34843))
 * Support for GetFinalPathNameByHandle ([Wine Bug #34851](https://bugs.winehq.org/show_bug.cgi?id=34851))
 * Support for GetSystemTimes ([Wine Bug #19813](https://bugs.winehq.org/show_bug.cgi?id=19813))

debian/changelog

@@ -1,3 +1,24 @@
+wine-staging (1.7.42) unstable; urgency=low
+  * Added patch with stub for advapi32.ImpersonateAnonymousToken (fixes Wine Staging Bug #254).
+  * Added patch to implement FileFsFullSizeInformation information class.
+  * Added patch to update timezone information in wine.inf.
+  * Added patch to fix check for texture levels in wined3d_device_update_texture.
+  * Added patch to ignore garbage after decoding gif lines.
+  * Added patch to fix various issues related to advapi32.LookupAccountSidA.
+  * Added patch with stub for d3d11.D3D11CreateDeviceAndSwapChain.
+  * Added patch with stub for D3DXFrameFind.
+  * Added patch to return failure in NtProtectVirtualMemory when last argument is omitted.
+  * Added patch to emulate \Device\Null using /dev/null.
+  * Added patch to make sure OpenClipboard with current owner doesn't fail.
+  * Added patch to create HKLM\Software\Microsoft\Cryptography\MachineGuid registry key.
+  * Removed patch to avoid crash when trying to bind mshtml event scripts to window (fixed upstream).
+  * Removed patch for stub of ntdll.WinSqmIsOptedIn (fixed upstream).
+  * Removed patch to fix issues with invalid console handles for new processes (accepted upstream). 
+  * Removed patches to fix timezone information (accepted upstream).
+  * Removed patch to recognize localhost as local machine in wbemprox (accepted upstream).
+  * Partially removed patches to fix handling of opening read-only files for FILE_DELETE_ON_CLOSE (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 03 May 2015 22:01:51 +0200
+
 wine-staging (1.7.41) unstable; urgency=low
   * Updated server-PeekMessage patchset to reset message filter in accept_hardware_message call (fixes Wine Staging Bug #211).
   * Updated ntdll-FileDispositionInformation patchset to block deleting mapped files (by Qian Hong, fixes Wine Staging Bug #228).

debian/tools/patchupdate.py

@@ -230,6 +230,7 @@ def read_patchset(revision = None):
     all_patches = {}
     name_to_id  = {}
     all_bugids  = set()
+    categories  = {}
 
     # Read in sorted order (to ensure created Makefile doesn't change too much)
     for name, directory in sorted(enum_directories(revision, config.path_patches)):
@@ -294,6 +295,14 @@ def read_patchset(revision = None):
                     if i != j and any([fnmatch.fnmatch(f, val) for f in other_patch.modified_files]):
                         patch.auto_depends.add(j)
 
+            elif key == "category":
+                val = "category-%s" % val
+                if name_to_id.has_key(val):
+                    raise PatchUpdaterError("Category name in definition file %s collides with patchset %s" % (filename, val))
+                if not categories.has_key(val):
+                    categories[val] = set()
+                categories[val].add(i)
+
             elif key == "fixes":
                 r = re.match("^[0-9]+$", val)
                 if r:
@@ -318,6 +327,15 @@ def read_patchset(revision = None):
             elif revision is None:
                 print "WARNING: Ignoring unknown command in definition file %s: %s" % (filename, line)
 
+    # Add virtual targets for all the categories
+    for category, indices in categories.iteritems():
+        patch = PatchSet(category, directory)
+        patch.depends = indices
+
+        i = next(unique_id)
+        all_patches[i] = patch
+        name_to_id[name] = i
+
     # To simplify the task of keeping the bug list up-to-date, list all bugs
     # which might require attention.
     if revision is None:
@@ -628,6 +646,11 @@ def generate_script(all_patches):
     # Generate code for applying all patchsets
     lines = []
     for i, patch in [(i, all_patches[i]) for i in resolved]:
+
+        # Categories do not have any files associated, so just skip over
+        if len(patch.files) == 0:
+            continue
+
         lines.append("# Patchset %s\n" % patch.name)
         lines.append("# |\n")
 

patches/Staging/definition

@@ -0,0 +1 @@
+Category: stable

patches/advapi32-ImpersonateAnonymousToken/0001-advapi32-Add-stub-for-ImpersonateAnonymousToken.patch

@@ -0,0 +1,47 @@
+From 77f0cb1855bc3886516214aee76799da10458871 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Thu, 30 Apr 2015 01:37:44 +0200
+Subject: advapi32: Add stub for ImpersonateAnonymousToken.
+
+---
+ dlls/advapi32/advapi32.spec |  2 +-
+ dlls/advapi32/security.c    | 10 ++++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
+index e7b7cf7..9fdd266 100644
+--- a/dlls/advapi32/advapi32.spec
++++ b/dlls/advapi32/advapi32.spec
+@@ -375,7 +375,7 @@
+ @ stub I_ScSetServiceBitsA
+ # @ stub I_ScSetServiceBitsW
+ # @ stub IdentifyCodeAuthzLevelW
+-# @ stub ImpersonateAnonymousToken
++@ stdcall ImpersonateAnonymousToken(long)
+ @ stdcall ImpersonateLoggedOnUser(long)
+ @ stdcall ImpersonateNamedPipeClient(long)
+ @ stdcall ImpersonateSelf(long)
+diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
+index 2362dd5..5bd835c 100644
+--- a/dlls/advapi32/security.c
++++ b/dlls/advapi32/security.c
+@@ -2504,6 +2504,16 @@ BOOL WINAPI ImpersonateLoggedOnUser(HANDLE hToken)
+ }
+ 
+ /******************************************************************************
++ * ImpersonateAnonymousToken [ADVAPI32.@]
++ */
++BOOL WINAPI ImpersonateAnonymousToken(HANDLE hThread)
++{
++    FIXME("(%p)\n", hThread);
++    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
++    return FALSE;
++}
++
++/******************************************************************************
+  * AccessCheck [ADVAPI32.@]
+  */
+ BOOL WINAPI
+-- 
+2.3.5
+

patches/advapi32-ImpersonateAnonymousToken/definition

@@ -0,0 +1 @@
+Fixes: Add stub for advapi32.ImpersonateAnonymousToken

patches/advapi32-LsaLookupSids/0004-advapi32-Fallback-to-Sid-string-when-LookupAccountSi.patch

@@ -1,14 +1,14 @@
-From 9a19e77a0334f91e370e73099066484f20b24321 Mon Sep 17 00:00:00 2001
+From 616c17cc58a4943d3a367704943e737d5713740d Mon Sep 17 00:00:00 2001
 From: Qian Hong <qhong@codeweavers.com>
 Date: Tue, 7 Apr 2015 11:23:34 +0800
 Subject: advapi32: Fallback to Sid string when LookupAccountSid fails.
 
 ---
- dlls/advapi32/lsa.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
+ dlls/advapi32/lsa.c | 31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
 
 diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index 258b8ca..2b2c6b6 100644
+index 258b8ca..93afa20 100644
 --- a/dlls/advapi32/lsa.c
 +++ b/dlls/advapi32/lsa.c
 @@ -29,6 +29,7 @@
@@ -41,7 +41,7 @@ index 258b8ca..2b2c6b6 100644
      }
  
      /* now we have full length needed for both */
-@@ -593,6 +609,20 @@ NTSTATUS WINAPI LsaLookupSids(
+@@ -593,6 +609,21 @@ NTSTATUS WINAPI LsaLookupSids(
                  heap_free(domain.Buffer);
              }
          }
@@ -52,6 +52,7 @@ index 258b8ca..2b2c6b6 100644
 +            if (ConvertSidToStringSidW(Sids[i], &strsid))
 +            {
 +                name_size = strlenW(strsid) + 1;
++                mapped++;
 +
 +                (*Names)[i].Name.Buffer = name_buffer;
 +                memcpy((*Names)[i].Name.Buffer, strsid, name_size * sizeof(WCHAR));

patches/advapi32-LsaLookupSids/0005-advapi32-tests-Test-prefix-and-use-of-TokenPrimaryGr.patch

@@ -0,0 +1,95 @@
+From f0290aad953e988b1a15e214ecfc57f21dc136af Mon Sep 17 00:00:00 2001
+From: Qian Hong <qhong@codeweavers.com>
+Date: Tue, 28 Apr 2015 23:28:50 +0800
+Subject: advapi32/tests: Test prefix and use of TokenPrimaryGroup Sid.
+
+---
+ dlls/advapi32/tests/security.c | 35 ++++++++++++++++++++++++++++++-----
+ 1 file changed, 30 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index f3fc682..6a716d6 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -2514,19 +2514,21 @@ static void test_granted_access(HANDLE handle, ACCESS_MASK access,
+ static void test_process_security(void)
+ {
+     BOOL res;
++    PTOKEN_USER user;
+     PTOKEN_OWNER owner;
+     PTOKEN_PRIMARY_GROUP group;
+-    PSID AdminSid = NULL, UsersSid = NULL;
++    PSID AdminSid = NULL, UsersSid = NULL, UserSid = NULL;
+     PACL Acl = NULL, ThreadAcl = NULL;
+     SECURITY_DESCRIPTOR *SecurityDescriptor = NULL, *ThreadSecurityDescriptor = NULL;
+-    char buffer[MAX_PATH];
++    char buffer[MAX_PATH], account[MAX_PATH], domain[MAX_PATH];
+     PROCESS_INFORMATION info;
+     STARTUPINFOA startup;
+     SECURITY_ATTRIBUTES psa, tsa;
+     HANDLE token, event;
+-    DWORD size;
++    DWORD size, acc_size, dom_size, ret;
+     SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY };
+     PSID EveryoneSid = NULL;
++    SID_NAME_USE use;
+ 
+     Acl = HeapAlloc(GetProcessHeap(), 0, 256);
+     res = InitializeAcl(Acl, 256, ACL_REVISION);
+@@ -2558,7 +2560,8 @@ static void test_process_security(void)
+     owner = HeapAlloc(GetProcessHeap(), 0, size);
+     res = GetTokenInformation( token, TokenOwner, owner, size, &size );
+     ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
+-    AdminSid = ((TOKEN_OWNER*)owner)->Owner;
++    AdminSid = owner->Owner;
++    test_sid_str(AdminSid);
+ 
+     res = GetTokenInformation( token, TokenPrimaryGroup, NULL, 0, &size );
+     ok(!res, "Expected failure, got %d\n", res);
+@@ -2568,13 +2571,34 @@ static void test_process_security(void)
+     group = HeapAlloc(GetProcessHeap(), 0, size);
+     res = GetTokenInformation( token, TokenPrimaryGroup, group, size, &size );
+     ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
+-    UsersSid = ((TOKEN_PRIMARY_GROUP*)group)->PrimaryGroup;
++    UsersSid = group->PrimaryGroup;
++    test_sid_str(UsersSid);
++
++    acc_size = sizeof(account);
++    dom_size = sizeof(domain);
++    ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use );
++    ok(ret, "LookupAccountSid failed with %d\n", ret);
++    todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
++    todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
++
++    res = GetTokenInformation( token, TokenUser, NULL, 0, &size );
++    ok(!res, "Expected failure, got %d\n", res);
++    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER,
++       "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());
++
++    user = HeapAlloc(GetProcessHeap(), 0, size);
++    res = GetTokenInformation( token, TokenUser, user, size, &size );
++    ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
++    UserSid = user->User.Sid;
++    test_sid_str(UserSid);
++    todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n");
+ 
+     CloseHandle( token );
+     if (!res)
+     {
+         HeapFree(GetProcessHeap(), 0, group);
+         HeapFree(GetProcessHeap(), 0, owner);
++        HeapFree(GetProcessHeap(), 0, user);
+         HeapFree(GetProcessHeap(), 0, Acl);
+         return;
+     }
+@@ -2681,6 +2705,7 @@ static void test_process_security(void)
+     CloseHandle( event );
+     HeapFree(GetProcessHeap(), 0, group);
+     HeapFree(GetProcessHeap(), 0, owner);
++    HeapFree(GetProcessHeap(), 0, user);
+     HeapFree(GetProcessHeap(), 0, Acl);
+     HeapFree(GetProcessHeap(), 0, SecurityDescriptor);
+     HeapFree(GetProcessHeap(), 0, ThreadAcl);
+-- 
+2.3.5
+

patches/advapi32-LsaLookupSids/0006-server-Create-primary-group-using-DOMAIN_GROUP_RID_U.patch

@@ -0,0 +1,38 @@
+From 5487b4720e24aaa7a10719fc36bc23c851a48a9b Mon Sep 17 00:00:00 2001
+From: Qian Hong <qhong@codeweavers.com>
+Date: Tue, 28 Apr 2015 22:35:26 +0800
+Subject: server: Create primary group using DOMAIN_GROUP_RID_USERS.
+
+---
+ dlls/advapi32/tests/security.c | 2 +-
+ server/token.c                 | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index 25b34ba4..573119f 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -2591,7 +2591,7 @@ static void test_process_security(void)
+     ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
+     UserSid = user->User.Sid;
+     test_sid_str(UserSid);
+-    todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n");
++    ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n");
+ 
+     CloseHandle( token );
+     if (!res)
+diff --git a/server/token.c b/server/token.c
+index e57cbc6..be8c53b 100644
+--- a/server/token.c
++++ b/server/token.c
+@@ -695,6 +695,7 @@ struct token *token_create_admin( void )
+             { security_local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
+             { security_interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
+             { security_authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
++            { security_domain_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER },
+             { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER },
+             { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
+             { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID },
+-- 
+2.3.5
+

patches/advapi32-LsaLookupSids/0007-advapi32-Fix-name-and-use-of-DOMAIN_GROUP_RID_USERS.patch

@@ -0,0 +1,53 @@
+From 83517396c266c2de290670128d678770f5d79cc9 Mon Sep 17 00:00:00 2001
+From: Qian Hong <qhong@codeweavers.com>
+Date: Tue, 28 Apr 2015 23:00:08 +0800
+Subject: advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS.
+
+---
+ dlls/advapi32/security.c       | 7 +++++--
+ dlls/advapi32/tests/security.c | 4 ++--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
+index d27b2e7..2362dd5 100644
+--- a/dlls/advapi32/security.c
++++ b/dlls/advapi32/security.c
+@@ -191,7 +191,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','
+ static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 };
+ static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 };
+ static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 };
+-static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 };
++static const WCHAR None[] = { 'N','o','n','e',0 };
+ static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 };
+ static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 };
+ static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 };
+@@ -2206,7 +2206,10 @@ LookupAccountSidW(
+                             ac = Domain_Admins;
+                             break;
+                         case DOMAIN_GROUP_RID_USERS:
+-                            ac = Domain_Users;
++                            /* MSDN says the name of DOMAIN_GROUP_RID_USERS is Domain Users,
++                             * tests show that MSDN seems to be wrong. */
++                            ac = None;
++                            use = 2;
+                             break;
+                         case DOMAIN_GROUP_RID_GUESTS:
+                             ac = Domain_Guests;
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index 573119f..490ce26 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -2578,8 +2578,8 @@ static void test_process_security(void)
+     dom_size = sizeof(domain);
+     ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use );
+     ok(ret, "LookupAccountSid failed with %d\n", ret);
+-    todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
+-    todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
++    ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
++    ok(!strcmp(account, "None"), "expect None, got %s\n", account);
+ 
+     res = GetTokenInformation( token, TokenUser, NULL, 0, &size );
+     ok(!res, "Expected failure, got %d\n", res);
+-- 
+2.3.5
+

patches/advapi32-LsaLookupSids/definition

@@ -0,0 +1,2 @@
+Depends: server-Misc_ACL
+Depends: server-CreateProcess_ACLs

patches/configure-Absolute_RPATH/definition

@@ -1 +1,2 @@
 Fixes: [26256] Support for setcap on wine-preloader
+Category: stable

patches/d3d11-D3D11CreateDeviceAndSwapChain/0001-d3d11-add-a-stub-for-D3D11CreateDeviceAndSwapChain.patch

@@ -0,0 +1,46 @@
+From 84ef0e10eed439613ce503470eb000f79628fe6c Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Tue, 23 Dec 2014 18:30:51 -0600
+Subject: d3d11: add a stub for D3D11CreateDeviceAndSwapChain
+
+---
+ dlls/d3d11/d3d11.spec   |  2 +-
+ dlls/d3d11/d3d11_main.c | 12 ++++++++++++
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec
+index 52d7bcb..2d6c877 100644
+--- a/dlls/d3d11/d3d11.spec
++++ b/dlls/d3d11/d3d11.spec
+@@ -3,7 +3,7 @@
+ @ stub D3D11CoreGetLayeredDeviceSize
+ @ stub D3D11CoreRegisterLayers
+ @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr)
+-@ stub D3D11CreateDeviceAndSwapChain
++@ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr)
+ @ stub D3DKMTCloseAdapter
+ @ stub D3DKMTCreateAllocation
+ @ stub D3DKMTCreateContext
+diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c
+index ec8236f..bf8f42f 100644
+--- a/dlls/d3d11/d3d11_main.c
++++ b/dlls/d3d11/d3d11_main.c
+@@ -54,3 +54,15 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t
+             flags, feature_levels, levels, sdk_version, device, feature_level, context);
+     return E_OUTOFMEMORY;
+ }
++
++HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type,
++        HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels,
++        UINT sdk_version, const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain,
++        ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **immediate_context)
++{
++    FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %d, "
++            "swapchain_desc %p, swapchain %p, device %p, feature_level %p, immediate_context %p stub!\n",
++            adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version,
++            swapchain_desc, swapchain, device, feature_level, immediate_context);
++    return E_INVALIDARG;
++}
+-- 
+2.3.5
+

patches/d3d11-D3D11CreateDeviceAndSwapChain/definition

@@ -0,0 +1 @@
+Fixes: [33153] Add stub for d3d11.D3D11CreateDeviceAndSwapChain

patches/d3d9-Surface_Refcount/definition

@@ -1 +1,2 @@
 Fixes: [18477] Avoid crashing when broken app tries to release surface although refcount is zero
+Category: stable

patches/d3dx9_36-D3DXStubs/0004-d3dx9_36-Add-stub-for-D3DXComputeNormalMap.patch

@@ -1,15 +1,190 @@
-From 704432d4e84d6ed8da895bce0012b9afb8dc3fdc Mon Sep 17 00:00:00 2001
+From c2fd16d732f2e94b02a53966ab2a0704466438a3 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 ++++++++++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
+ 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(-)
 
+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 4a473e6..8a66668 100644
+index 0c24882b..e3bb568 100644
 --- a/dlls/d3dx9_36/d3dx9_36.spec
 +++ b/dlls/d3dx9_36/d3dx9_36.spec
 @@ -22,7 +22,7 @@
@@ -22,7 +197,7 @@ index 4a473e6..8a66668 100644
  @ 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 7c9d0e1..842abc8 100644
+index c42b7d5..d643b15 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)
@@ -44,6 +219,97 @@ index 7c9d0e1..842abc8 100644
   * D3DXIntersect    (D3DX9_36.@)
   */
  HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *Mesh, const D3DXVECTOR3 *RayPos, const D3DXVECTOR3 *RayDir, BOOL *Hit,
+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.2.1
+2.3.5
 

patches/d3dx9_36-D3DXStubs/0005-d3dx9_36-Add-D3DXFrameFind-stub.patch

@@ -0,0 +1,309 @@
+From 6befe7a7b9230a78055fd539d3016c335b6d10ac 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(-)
+
+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
+--- 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)
++@ 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 d643b15..e09c240 100644
+--- a/dlls/d3dx9_36/mesh.c
++++ b/dlls/d3dx9_36/mesh.c
+@@ -4044,6 +4044,12 @@ HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame, ID3DXAllocateHierarchy *alloc_
+     return D3D_OK;
+ }
+ 
++D3DXFRAME* WINAPI D3DXFrameFind(const D3DXFRAME *frame_root, const char *name)
++{
++    FIXME("frame_root %p, name %s stub.\n", frame_root, debugstr_a(name));
++    return NULL;
++}
++
+ 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.3.5
+

patches/d3dx9_36-D3DXStubs/definition

@@ -2,3 +2,5 @@ Fixes: [31984] Add stub for D3DXComputeTangentFrameEx
 Fixes: Add stub for D3DXIntersect
 Fixes: [26379] Support for D3DXComputeNormals
 Fixes: Add stub for D3DXComputeNormalMap
+Fixes: [38334] Add stub for D3DXFrameFind
+Category: stable

patches/dbghelp-Debug_Symbols/definition

@@ -0,0 +1 @@
+Category: stable

patches/dinput-Events/definition

@@ -1,2 +1,3 @@
 Fixes: [8854] Ensure X11 input events are handled even without explicit message loop
 Fixes: [34559] Scrolling causes mouse and screen to lock in Call to Power II
+Category: stable