Update changelog for release 1.7.18-1.

debian/changelog

@@ -1,3 +1,9 @@
+wine-compholio (1.7.18-1) unstable; urgency=low
+  * Fix some issues on BSD systems.
+  * Add additional patches to silence a few FIXMEs.
+  * Rebase 02-ACL_Extended_Attributes patches.
+ -- Sebastian Lackner <sebastian@fds-team.de>  Tue, 13 May 2014 20:47:23 +0200
+
 wine-compholio (1.7.18) unstable; urgency=low
   * Updated SetTimer patch (10 ms accepted upstream).
  -- Erich E. Hoover <erich.e.hoover@gmail.com>  Fri, 02 May 2014 13:05:13 -0600

debian/tools/gitapply.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Setup parser variables
 nogit=0

patches/02-ACL_Extended_Attributes/0005-server-Retrieve-file-security-attributes-with-extend.patch

@@ -1,4 +1,4 @@
-From e031dc5069bebd63770a405d684ee75a14d1826b Mon Sep 17 00:00:00 2001
+From 4498c57f61bf85fca6eb17afd21c0c7051534f75 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Fri, 18 Apr 2014 14:01:35 -0600
 Subject: server: Retrieve file security attributes with extended file
@@ -11,7 +11,7 @@ Subject: server: Retrieve file security attributes with extended file
  3 files changed, 50 insertions(+), 29 deletions(-)
 
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index bd45189..e5ef7e6 100644
+index a0574c4..26cde37 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
 @@ -3105,24 +3105,24 @@ static void test_CreateDirectoryA(void)
@@ -49,9 +49,9 @@ index bd45189..e5ef7e6 100644
 +        todo_wine ok(ace->Mask == 0x1f01ff,
 +                     "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
      }
+     LocalFree(pSD);
  
- done:
-@@ -3294,23 +3294,22 @@ static void test_GetNamedSecurityInfoA(void)
+@@ -3297,23 +3297,22 @@ static void test_GetNamedSecurityInfoA(void)
          bret = pGetAce(pDacl, 0, (VOID **)&ace);
          ok(bret, "Failed to get Current User ACE.\n");
          bret = EqualSid(&ace->SidStart, user_sid);
@@ -81,7 +81,7 @@ index bd45189..e5ef7e6 100644
      }
      LocalFree(pSD);
      HeapFree(GetProcessHeap(), 0, user);
-@@ -3960,22 +3959,22 @@ static void test_GetSecurityInfo(void)
+@@ -3963,22 +3962,22 @@ static void test_GetSecurityInfo(void)
          bret = pGetAce(pDacl, 0, (VOID **)&ace);
          ok(bret, "Failed to get Current User ACE.\n");
          bret = EqualSid(&ace->SidStart, user_sid);
@@ -108,8 +108,8 @@ index bd45189..e5ef7e6 100644
 +        todo_wine ok(ace->Mask == 0x1f01ff,
 +                     "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask);
      }
+     LocalFree(pSD);
      CloseHandle(obj);
- }
 diff --git a/server/change.c b/server/change.c
 index c391180..77c01bb 100644
 --- a/server/change.c

patches/02-ACL_Extended_Attributes/0006-server-Convert-return-of-file-security-masks-with-ge.patch

@@ -1,4 +1,4 @@
-From 74d97eda7172d7eae8468c7a32d4e330382afca2 Mon Sep 17 00:00:00 2001
+From 689b660afba80654cde0a2dd6cf1d647a6e3705c Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Fri, 18 Apr 2014 14:05:32 -0600
 Subject: server: Convert return of file security masks with generic access
@@ -10,7 +10,7 @@ Subject: server: Convert return of file security masks with generic access
  2 files changed, 34 insertions(+), 12 deletions(-)
 
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index e5ef7e6..5b7e6a6 100644
+index 26cde37..48a3291 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
 @@ -3109,8 +3109,8 @@ static void test_CreateDirectoryA(void)
@@ -33,9 +33,9 @@ index e5ef7e6..5b7e6a6 100644
 +        ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n",
 +                                  ace->Mask);
      }
+     LocalFree(pSD);
  
- done:
-@@ -3297,8 +3297,8 @@ static void test_GetNamedSecurityInfoA(void)
+@@ -3300,8 +3300,8 @@ static void test_GetNamedSecurityInfoA(void)
          ok(bret, "Current User ACE != Current User SID.\n");
          ok(((ACE_HEADER *)ace)->AceFlags == 0,
             "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
@@ -46,7 +46,7 @@ index e5ef7e6..5b7e6a6 100644
      }
      if (acl_size.AceCount > 1)
      {
-@@ -3308,8 +3308,8 @@ static void test_GetNamedSecurityInfoA(void)
+@@ -3311,8 +3311,8 @@ static void test_GetNamedSecurityInfoA(void)
          ok(bret || broken(!bret) /* win2k */, "Administators Group ACE != Administators Group SID.\n");
          ok(((ACE_HEADER *)ace)->AceFlags == 0,
             "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
@@ -57,7 +57,7 @@ index e5ef7e6..5b7e6a6 100644
      }
      LocalFree(pSD);
      HeapFree(GetProcessHeap(), 0, user);
-@@ -3962,8 +3962,8 @@ static void test_GetSecurityInfo(void)
+@@ -3965,8 +3965,8 @@ static void test_GetSecurityInfo(void)
          ok(bret, "Current User ACE != Current User SID.\n");
          ok(((ACE_HEADER *)ace)->AceFlags == 0,
             "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
@@ -68,7 +68,7 @@ index e5ef7e6..5b7e6a6 100644
      }
      if (acl_size.AceCount > 1)
      {
-@@ -3973,8 +3973,8 @@ static void test_GetSecurityInfo(void)
+@@ -3976,8 +3976,8 @@ static void test_GetSecurityInfo(void)
          ok(bret, "Administators Group ACE != Administators Group SID.\n");
          ok(((ACE_HEADER *)ace)->AceFlags == 0,
             "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags);
@@ -77,8 +77,8 @@ index e5ef7e6..5b7e6a6 100644
 +        ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n",
 +                                  ace->Mask);
      }
+     LocalFree(pSD);
      CloseHandle(obj);
- }
 diff --git a/server/file.c b/server/file.c
 index c4706b6..75f015b 100644
 --- a/server/file.c

patches/02-ACL_Extended_Attributes/0007-server-Inherit-security-attributes-from-parent-direc.patch

@@ -1,4 +1,4 @@
-From fba93c12801c694d0e1248cd582c9d679e3a246a Mon Sep 17 00:00:00 2001
+From c6052d785f4419a80ca091d978ee1ff3e7400ca9 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Fri, 18 Apr 2014 14:08:36 -0600
 Subject: server: Inherit security attributes from parent directories on
@@ -12,7 +12,7 @@ Subject: server: Inherit security attributes from parent directories on
  4 files changed, 179 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 5b7e6a6..68b63a0 100644
+index 48a3291..f3a3c09 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
 @@ -3030,10 +3030,11 @@ static void test_CreateDirectoryA(void)
@@ -28,9 +28,9 @@ index 5b7e6a6..68b63a0 100644
      DWORD error;
      PACL pDacl;
  
-@@ -3125,6 +3126,43 @@ static void test_CreateDirectoryA(void)
-                                   ace->Mask);
+@@ -3126,6 +3127,43 @@ static void test_CreateDirectoryA(void)
      }
+     LocalFree(pSD);
  
 +    /* Test inheritance of ACLs */
 +    strcpy(tmpfile, tmpdir);

patches/98-Miscellaneous/0002-wined3d-Silence-repeated-resource_check_usage-FIXME.patch

@@ -1,29 +1,32 @@
-From 0c70b7b664bc3a1b997cd8ff72f08deae099a879 Mon Sep 17 00:00:00 2001
+From 13d5795515836c4b8674bf96643333d68cd3d3a0 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 3 Apr 2014 21:36:33 -0600
 Subject: wined3d: Silence repeated resource_check_usage FIXME.
 
 ---
- dlls/wined3d/resource.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ dlls/wined3d/resource.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
-index 999dc5c..5a06346 100644
+index 999dc5c..3558440 100644
 --- a/dlls/wined3d/resource.c
 +++ b/dlls/wined3d/resource.c
-@@ -56,9 +56,14 @@ static void resource_check_usage(DWORD usage)
-             | WINED3DUSAGE_STATICDECL
-             | WINED3DUSAGE_OVERLAY
-             | WINED3DUSAGE_TEXTURE;
-+    static DWORD notified = 0;
-+    DWORD unhandled = usage & ~handled;
+@@ -49,7 +49,7 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool)
  
--    if (usage & ~handled)
--        FIXME("Unhandled usage flags %#x.\n", usage & ~handled);
-+    if (unhandled && (unhandled & ~notified))
+ static void resource_check_usage(DWORD usage)
+ {
+-    static const DWORD handled = WINED3DUSAGE_RENDERTARGET
++    static DWORD handled = WINED3DUSAGE_RENDERTARGET
+             | WINED3DUSAGE_DEPTHSTENCIL
+             | WINED3DUSAGE_DYNAMIC
+             | WINED3DUSAGE_AUTOGENMIPMAP
+@@ -58,7 +58,10 @@ static void resource_check_usage(DWORD usage)
+             | WINED3DUSAGE_TEXTURE;
+ 
+     if (usage & ~handled)
 +    {
-+        FIXME("Unhandled usage flags %#x.\n", unhandled);
-+        notified |= unhandled;
+         FIXME("Unhandled usage flags %#x.\n", usage & ~handled);
++        handled |= usage;
 +    }
  }
  

patches/98-Miscellaneous/0003-kernel32-Silence-repeated-CompareStringEx-FIXME.patch

@@ -0,0 +1,50 @@
+From 33fa174b6404cfea673d510457d21d784a23efbd Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 4 May 2014 00:18:11 +0200
+Subject: kernel32: Silence repeated CompareStringEx FIXME.
+
+---
+ dlls/kernel32/locale.c |   14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
+index eca0e39..55ef3d6 100644
+--- a/dlls/kernel32/locale.c
++++ b/dlls/kernel32/locale.c
+@@ -2985,9 +2985,10 @@ INT WINAPI CompareStringW(LCID lcid, DWORD flags,
+ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1,
+                            LPCWSTR str2, INT len2, LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lParam)
+ {
+-    DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT
+-                           |NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP;
+-    DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000;
++    static const DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT
++                                        |NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP
++                                        |NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000;
++    static DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000;
+     /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */
+     INT ret;
+ 
+@@ -3001,14 +3002,17 @@ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1,
+         return 0;
+     }
+ 
+-    if (flags & ~(supported_flags|semistub_flags))
++    if (flags & ~supported_flags)
+     {
+         SetLastError(ERROR_INVALID_FLAGS);
+         return 0;
+     }
+ 
+     if (flags & semistub_flags)
+-        FIXME("semi-stub behavor for flag(s) 0x%x\n", flags & semistub_flags);
++    {
++        FIXME("semi-stub behavior for flag(s) 0x%x\n", flags & semistub_flags);
++        semistub_flags &= ~flags;
++    }
+ 
+     if (len1 < 0) len1 = strlenW(str1);
+     if (len2 < 0) len2 = strlenW(str2);
+-- 
+1.7.9.5
+

patches/98-Miscellaneous/0004-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch

@@ -0,0 +1,36 @@
+From a347c9baa86ec4503d51b03c1659d08a7062839a Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 4 May 2014 00:53:51 +0200
+Subject: wined3d: Silence repeated wined3d_swapchain_present FIXME.
+
+---
+ dlls/wined3d/swapchain.c |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
+index 75e6628..10c3911 100644
+--- a/dlls/wined3d/swapchain.c
++++ b/dlls/wined3d/swapchain.c
+@@ -136,12 +136,17 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain,
+         const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override,
+         const RGNDATA *dirty_region, DWORD flags)
+ {
++    static DWORD notified_flags = 0;
++
+     TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n",
+             swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect),
+             dst_window_override, dirty_region, flags);
+ 
+-    if (flags)
+-        FIXME("Ignoring flags %#x.\n", flags);
++    if (flags & ~notified_flags)
++    {
++        FIXME("Ignoring flags %#x.\n", flags & ~notified_flags);
++        notified_flags |= flags;
++    }
+ 
+     if (!swapchain->back_buffers)
+     {
+-- 
+1.7.9.5
+

patches/98-Miscellaneous/325645ba-d39d-4de4-9c94-3fe694eedaab.def

@@ -0,0 +1,3 @@
+Revision: 1
+Author: Sebastian Lackner
+Title: kernel32: Silence repeated CompareStringEx FIXME.

patches/98-Miscellaneous/acff3012-0f75-4710-9941-08b5ce4c61f3.def

@@ -1,4 +1,4 @@
-Revision: 1
+Revision: 2
 Author: Erich E. Hoover
 Title: wined3d: Silence repeated resource_check_usage FIXME.
 

patches/98-Miscellaneous/c7263660-be78-439b-979f-e745a8d87120.def

@@ -0,0 +1,3 @@
+Revision: 1
+Author: Sebastian Lackner
+Title: wined3d: Silence repeated wined3d_swapchain_present FIXME.

patches/Makefile

@@ -2,6 +2,7 @@ SUBDIRS=10-Missing_Fonts
 
 #PATCH:=patch -N -p0 --strip=1
 #PATCH:=git apply
+CURDIR ?= ${.CURDIR}
 PATCH:=$(CURDIR)/../debian/tools/gitapply.sh
 
 install:

patches/patch-list.patch

@@ -37,7 +37,7 @@ diff --git a/libs/wine/config.c b/libs/wine/config.c
 index a273502..5fa0cd5 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -478,6 +478,36 @@ const char *wine_get_version(void)
+@@ -478,6 +478,38 @@ const char *wine_get_version(void)
      return PACKAGE_VERSION;
  }
  
@@ -59,7 +59,9 @@ index a273502..5fa0cd5 100644
 +    { "0b21d7ac-0387-4493-aa38-fbafe3e749f5:2", "Michael Müller", "Decrease minimum SetTimer interval to 5 ms." },
 +    { "19835498-8d90-4673-867e-2376af4d7c76:1", "Sebastian Lackner", "Allow to set wined3d strictDrawOrdering via environment variable." },
 +    { "59bd38b7-bbdc-4cfd-9ccd-1c72c4ed84c0:1", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." },
-+    { "acff3012-0f75-4710-9941-08b5ce4c61f3:1", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME." },
++    { "325645ba-d39d-4de4-9c94-3fe694eedaab:1", "Sebastian Lackner", "kernel32: Silence repeated CompareStringEx FIXME." },
++    { "acff3012-0f75-4710-9941-08b5ce4c61f3:2", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME." },
++    { "c7263660-be78-439b-979f-e745a8d87120:1", "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME." },
 +    { "eec5dea8-879d-417b-9f97-364deaae6576:1", "Sebastian Lackner", "Add tests for IVMRMonitorConfig." },
 +    { "e46b26df-3c1b-419c-9579-f0d1e1c50bea:1", "Sebastian Lackner", "Workaround for broken implementation of shlwapi url functions." },
 +    { NULL, NULL, NULL }