Release 2.8.

The issue is mentioned in bug 32515, but Steam cache
validation still fails with this patch applied.

LICENSE.md

@@ -7,7 +7,7 @@ are part of **Wine Staging** and are licensed under the terms of the
 [LGPLv2.1](#gnu-lgpl-version-21), to stay compatible with Wine:
 
 ```
-Copyright (C) 2014-2016 the Wine Staging project authors.
+Copyright (C) 2014-2017 the Wine Staging project authors.
 
 Wine Staging is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

README.md

@@ -13,7 +13,7 @@ Installation
 
 Ready-to-use packages for Wine Staging are available for a variety of Linux
 distributions and for Mac OS X. Just follow the
-[installation instructions](https://github.com/wine-compholio/wine-staging/wiki/Installation)
+[installation instructions](https://wine-staging.com/installation.html)
 for your operating system.
 
 On most distributions the `wine-staging` package is installed to
@@ -66,7 +66,8 @@ Configuration:
 
 Backends:
   --backend=patch      Use regular 'patch' utility to apply patches (default)
-  --backend=epatch     Use 'epatch' to apply patches (Gentoo only)
+  --backend=eapply     Use 'eapply' to apply patches (Gentoo only)
+  --backend=epatch     Use 'epatch' to apply patches (Gentoo only, deprecated)
   --backend=git-am     Use 'git am' to apply patches
   --backend=git-apply  Use 'git apply' to apply patches
   --backend=stg        Import the patches using stacked git

patches/Compiler_Warnings/0001-comctl32-Avoid-misleading-indentation-warnings.patch

@@ -1,136 +0,0 @@
-From 99d742d6850f82d5106a7402ea0fbc680e929202 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:53:32 +0200
-Subject: comctl32: Avoid misleading indentation warnings.
-
----
- dlls/comctl32/listview.c | 54 ++++++++++++++++++++++++++++++++----------------
- 1 file changed, 36 insertions(+), 18 deletions(-)
-
-diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
-index cfdb7de..0298b12 100644
---- a/dlls/comctl32/listview.c
-+++ b/dlls/comctl32/listview.c
-@@ -588,23 +588,28 @@ static const char* debugscrollinfo(const SCROLLINFO *pScrollInfo)
- 
-     if (pScrollInfo == NULL) return "(null)";
-     len = snprintf(buf, size, "{cbSize=%u, ", pScrollInfo->cbSize);
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (pScrollInfo->fMask & SIF_RANGE)
- 	len = snprintf(buf, size, "nMin=%d, nMax=%d, ", pScrollInfo->nMin, pScrollInfo->nMax);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (pScrollInfo->fMask & SIF_PAGE)
- 	len = snprintf(buf, size, "nPage=%u, ", pScrollInfo->nPage);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (pScrollInfo->fMask & SIF_POS)
- 	len = snprintf(buf, size, "nPos=%d, ", pScrollInfo->nPos);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (pScrollInfo->fMask & SIF_TRACKPOS)
- 	len = snprintf(buf, size, "nTrackPos=%d, ", pScrollInfo->nTrackPos);
-     else len = 0;
--    if (len == -1) goto end; buf += len;
-+    if (len == -1) goto end;
-+    buf += len;
-     goto undo;
- end:
-     buf = text + strlen(text);
-@@ -629,27 +634,33 @@ static const char* debuglvitem_t(const LVITEMW *lpLVItem, BOOL isW)
-     
-     if (lpLVItem == NULL) return "(null)";
-     len = snprintf(buf, size, "{iItem=%d, iSubItem=%d, ", lpLVItem->iItem, lpLVItem->iSubItem);
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (lpLVItem->mask & LVIF_STATE)
- 	len = snprintf(buf, size, "state=%x, stateMask=%x, ", lpLVItem->state, lpLVItem->stateMask);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (lpLVItem->mask & LVIF_TEXT)
- 	len = snprintf(buf, size, "pszText=%s, cchTextMax=%d, ", debugtext_tn(lpLVItem->pszText, isW, 80), lpLVItem->cchTextMax);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (lpLVItem->mask & LVIF_IMAGE)
- 	len = snprintf(buf, size, "iImage=%d, ", lpLVItem->iImage);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (lpLVItem->mask & LVIF_PARAM)
- 	len = snprintf(buf, size, "lParam=%lx, ", lpLVItem->lParam);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (lpLVItem->mask & LVIF_INDENT)
- 	len = snprintf(buf, size, "iIndent=%d, ", lpLVItem->iIndent);
-     else len = 0;
--    if (len == -1) goto end; buf += len;
-+    if (len == -1) goto end;
-+    buf += len;
-     goto undo;
- end:
-     buf = text + strlen(text);
-@@ -665,31 +676,38 @@ static const char* debuglvcolumn_t(const LVCOLUMNW *lpColumn, BOOL isW)
-     
-     if (lpColumn == NULL) return "(null)";
-     len = snprintf(buf, size, "{");
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (lpColumn->mask & LVCF_SUBITEM)
- 	len = snprintf(buf, size, "iSubItem=%d, ",  lpColumn->iSubItem);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (lpColumn->mask & LVCF_FMT)
- 	len = snprintf(buf, size, "fmt=%x, ", lpColumn->fmt);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (lpColumn->mask & LVCF_WIDTH)
- 	len = snprintf(buf, size, "cx=%d, ", lpColumn->cx);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (lpColumn->mask & LVCF_TEXT)
- 	len = snprintf(buf, size, "pszText=%s, cchTextMax=%d, ", debugtext_tn(lpColumn->pszText, isW, 80), lpColumn->cchTextMax);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (lpColumn->mask & LVCF_IMAGE)
- 	len = snprintf(buf, size, "iImage=%d, ", lpColumn->iImage);
-     else len = 0;
--    if (len == -1) goto end; buf += len; size -= len;
-+    if (len == -1) goto end;
-+    buf += len; size -= len;
-     if (lpColumn->mask & LVCF_ORDER)
- 	len = snprintf(buf, size, "iOrder=%d, ", lpColumn->iOrder);
-     else len = 0;
--    if (len == -1) goto end; buf += len;
-+    if (len == -1) goto end;
-+    buf += len;
-     goto undo;
- end:
-     buf = text + strlen(text);
--- 
-2.9.0
-

patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch

@@ -0,0 +1,26 @@
+From 43628d9b1905396ff6442e4f1e07c9dd48739b19 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 14 Apr 2017 15:57:18 +0200
+Subject: ole32: Fix compilation with recent versions of gcc.
+
+---
+ dlls/ole32/storage32.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
+index 4fcfd9c362..2b23ab8eb8 100644
+--- a/dlls/ole32/storage32.h
++++ b/dlls/ole32/storage32.h
+@@ -526,6 +526,9 @@ StgStreamImpl* StgStreamImpl_Construct(
+ /******************************************************************************
+  * Endian conversion macros
+  */
++#undef htole32
++#undef htole16
++
+ #ifdef WORDS_BIGENDIAN
+ 
+ #define htole32(x) RtlUlongByteSwap(x)
+-- 
+2.12.2
+

patches/Compiler_Warnings/0002-dwrite-tests-Avoid-misleading-indentation-warnings.patch

@@ -1,248 +0,0 @@
-From 41ec9334edb0453cbc979d7655b430061af02dbb Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:54:51 +0200
-Subject: dwrite/tests: Avoid misleading indentation warnings.
-
----
- dlls/dwrite/tests/analyzer.c |  2 ++
- dlls/dwrite/tests/font.c     | 28 ++++++++++++++++++++++++++++
- dlls/dwrite/tests/layout.c   | 14 ++++++++++++++
- 3 files changed, 44 insertions(+)
-
-diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c
-index 1e3b318..ddd3584 100644
---- a/dlls/dwrite/tests/analyzer.c
-+++ b/dlls/dwrite/tests/analyzer.c
-@@ -1167,7 +1167,9 @@ static void test_GetScriptProperties(void)
-     ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
- 
- if (0) /* crashes on native */
-+{
-     hr = IDWriteTextAnalyzer1_GetScriptProperties(analyzer1, sa, NULL);
-+}
- 
-     sa.script = 0;
-     hr = IDWriteTextAnalyzer1_GetScriptProperties(analyzer1, sa, &props);
-diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
-index 3b402b8..5691388 100644
---- a/dlls/dwrite/tests/font.c
-+++ b/dlls/dwrite/tests/font.c
-@@ -842,8 +842,10 @@ static void test_CreateFontFromLOGFONT(void)
-     EXPECT_HR(hr, S_OK);
- 
- if (0)
-+{
-     /* null out parameter crashes this call */
-     hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, NULL);
-+}
- 
-     font = (void*)0xdeadbeef;
-     hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, &font);
-@@ -1013,7 +1015,9 @@ static void test_CreateBitmapRenderTarget(void)
-     EXPECT_HR(hr, S_OK);
- 
- if (0) /* crashes on native */
-+{
-     hr = IDWriteBitmapRenderTarget_GetSize(target, NULL);
-+}
- 
-     size.cx = size.cy = -1;
-     hr = IDWriteBitmapRenderTarget_GetSize(target, &size);
-@@ -1159,7 +1163,9 @@ if (0) /* crashes on native */
- 
-     /* transform tests, current hdc transform is not immediately affected */
- if (0) /* crashes on native */
-+{
-     hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, NULL);
-+}
- 
-     memset(&m, 0xcc, sizeof(m));
-     hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, &m);
-@@ -1406,7 +1412,9 @@ static void test_GetFamilyNames(void)
-     EXPECT_HR(hr, S_OK);
- 
- if (0) /* crashes on native */
-+{
-     hr = IDWriteFontFamily_GetFamilyNames(family, NULL);
-+}
- 
-     hr = IDWriteFontFamily_GetFamilyNames(family, &names);
-     ok(hr == S_OK, "got 0x%08x\n", hr);
-@@ -1421,7 +1429,9 @@ if (0) /* crashes on native */
- 
-     /* GetStringLength */
- if (0) /* crashes on native */
-+{
-     hr = IDWriteLocalizedStrings_GetStringLength(names, 0, NULL);
-+}
- 
-     len = 100;
-     hr = IDWriteLocalizedStrings_GetStringLength(names, 10, &len);
-@@ -1441,7 +1451,9 @@ if (0) /* crashes on native */
-     ok(hr == E_FAIL, "got 0x%08x\n", hr);
- 
- if (0)
-+{
-     hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 100);
-+}
- 
-     buffer[0] = 1;
-     hr = IDWriteLocalizedStrings_GetString(names, 10, buffer, 100);
-@@ -1513,7 +1525,9 @@ static void test_CreateFontFace(void)
-     ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);
- 
- if (0) /* crashes on native */
-+{
-     hr = IDWriteFont_CreateFontFace(font, NULL);
-+}
- 
-     fontface = NULL;
-     hr = IDWriteFont_CreateFontFace(font, &fontface);
-@@ -1846,7 +1860,9 @@ static void test_GetMetrics(void)
-     DeleteObject(hfont);
- 
- if (0) /* crashes on native */
-+{
-     IDWriteFont_GetMetrics(font, NULL);
-+}
- 
-     memset(&metrics, 0, sizeof(metrics));
-     IDWriteFont_GetMetrics(font, &metrics);
-@@ -2649,7 +2665,9 @@ if (0) { /* crashes on win10 */
- todo_wine
-     ok(hr == S_OK, "got 0x%08x\n", hr);
- if (face2)
-+{
-     IDWriteFontFace_Release(face2);
-+}
- 
-     file2 = NULL;
-     hr = IDWriteFactory_CreateCustomFontFileReference(factory, &fontrsrc, sizeof(HRSRC), &rloader, &file2);
-@@ -2682,7 +2700,9 @@ if (face2)
-     ok(indices[1] == 11, "got index %i\n", indices[1]);
- 
- if (0) /* crashes on native */
-+{
-     hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 1, NULL);
-+}
- 
-     hr = IDWriteFontFace_GetGlyphIndices(face, codePoints, 1, indices);
-     ok(hr == S_OK, "got 0x%08x\n", hr);
-@@ -4130,7 +4150,9 @@ static void test_GetKerningPairAdjustments(void)
-         ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr);
- 
-     if (0) /* crashes on native */
-+    {
-         hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, NULL);
-+    }
- 
-         adjustments[0] = 1;
-         hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, adjustments);
-@@ -4837,7 +4859,9 @@ static void test_GetGdiCompatibleMetrics_face(IDWriteFontFace *face)
-             expected.subscriptSizeY = round(round(design_metrics1.subscriptSizeY * scale) / scale);
-             expected.superscriptPositionX = round(round(design_metrics1.superscriptPositionX * scale) / scale);
-         if (0) /* this fails for 3 emsizes, Tahoma from [5, 2048] range */
-+        {
-             expected.superscriptPositionY = round(round(design_metrics1.superscriptPositionY * scale) / scale);
-+        }
-             expected.superscriptSizeX = round(round(design_metrics1.superscriptSizeX * scale) / scale);
-             expected.superscriptSizeY = round(round(design_metrics1.superscriptSizeY * scale) / scale);
-             expected.hasTypographicMetrics = design_metrics1.hasTypographicMetrics;
-@@ -4904,7 +4928,9 @@ static void test_GetPanose(void)
-         DWRITE_PANOSE panose;
- 
-     if (0) /* crashes on native */
-+    {
-         IDWriteFont1_GetPanose(font1, NULL);
-+    }
- 
-         memset(&panose, 0, sizeof(panose));
-         IDWriteFont1_GetPanose(font1, &panose);
-@@ -5211,8 +5237,10 @@ static void test_GetRecommendedRenderingMode(void)
-         win_skip("IDWriteFontFace3::GetRecommendedRenderingMode() is not supported.\n");
- 
- if (0) /* crashes on native */
-+{
-     hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, 3.0, 1.0,
-         DWRITE_MEASURING_MODE_GDI_CLASSIC, NULL, NULL);
-+}
- 
-     mode = 10;
-     hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, 3.0, 1.0,
-diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
-index 03038d8..d92d419 100644
---- a/dlls/dwrite/tests/layout.c
-+++ b/dlls/dwrite/tests/layout.c
-@@ -983,7 +983,9 @@ static void test_CreateTextFormat(void)
-     ok(hr == S_OK, "got 0x%08x\n", hr);
- 
- if (0) /* crashes on native */
-+{
-     hr = IDWriteTextFormat_GetFontCollection(format, NULL);
-+}
- 
-     collection = NULL;
-     hr = IDWriteTextFormat_GetFontCollection(format, &collection);
-@@ -2235,7 +2237,9 @@ static void test_SetLocaleName(void)
-     ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
- 
- if (0) /* crashes on native */
-+{
-     hr = IDWriteTextLayout_GetLocaleName(layout, 0, NULL, 1, NULL);
-+}
- 
-     buffW[0] = 0;
-     range.length = 0;
-@@ -2447,7 +2451,9 @@ static void test_fallback(void)
-     }
- 
- if (0) /* crashes on native */
-+{
-     hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL);
-+}
- 
-     fallback = (void*)0xdeadbeef;
-     hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback);
-@@ -4371,7 +4377,9 @@ todo_wine {
- todo_wine
-     ok(font != NULL, "got %p\n", font);
- if (font)
-+{
-     IDWriteFont_Release(font);
-+}
- 
-     /* same latin text, full length */
-     g_source = strW;
-@@ -4388,7 +4396,9 @@ todo_wine {
- todo_wine
-     ok(font != NULL, "got %p\n", font);
- if (font)
-+{
-     IDWriteFont_Release(font);
-+}
- 
-     /* string 'a\x3058b' */
-     g_source = str2W;
-@@ -4405,7 +4415,9 @@ todo_wine {
- todo_wine
-     ok(font != NULL, "got %p\n", font);
- if (font)
-+{
-     IDWriteFont_Release(font);
-+}
- 
-     g_source = str2W;
-     mappedlength = 0;
-@@ -4545,7 +4557,9 @@ static void test_FontFallbackBuilder(void)
-     ok(hr == S_OK, "got 0x%08x\n", hr);
- 
- if (0) /* crashes on native */
-+{
-     hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, NULL);
-+}
- 
-     hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback);
-     ok(hr == S_OK, "got 0x%08x\n", hr);
--- 
-2.9.0
-

patches/Compiler_Warnings/0004-mshtml-Avoid-misleading-indentation-warnings.patch

@@ -1,27 +0,0 @@
-From e733682785c0f2001a972090693c4b49bb8e1090 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:55:40 +0200
-Subject: mshtml: Avoid misleading indentation warnings.
-
----
- dlls/mshtml/script.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c
-index 40deda4..19f3541 100644
---- a/dlls/mshtml/script.c
-+++ b/dlls/mshtml/script.c
-@@ -991,8 +991,8 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream)
-         if(This->bsc.readed >= This->size) {
- 	  void *new_buf;
- 	  new_buf = heap_realloc(This->buf, This->size << 1);
--	  if(!new_buf)
--	    return E_OUTOFMEMORY;
-+            if(!new_buf)
-+                return E_OUTOFMEMORY;
-             This->size <<= 1;
-             This->buf = new_buf;
-         }
--- 
-2.9.0
-

patches/Compiler_Warnings/0005-msvcirt-tests-Avoid-misleading-indentation-warnings.patch

@@ -1,214 +0,0 @@
-From 5a398b6537c252196f0f3df6ea4dfbc3956e322b Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:56:41 +0200
-Subject: msvcirt/tests: Avoid misleading indentation warnings.
-
----
- dlls/msvcirt/tests/msvcirt.c | 40 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
-
-diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c
-index a921b27..11c8b4f 100644
---- a/dlls/msvcirt/tests/msvcirt.c
-+++ b/dlls/msvcirt/tests/msvcirt.c
-@@ -2896,7 +2896,9 @@ static void test_ostream(void) {
- 
-     /* flush */
- if (0) /* crashes on native */
-+{
-     pos = call_func1(p_ostream_flush, &os1);
-+}
-     os1.base_ios.sb = &fb2.base;
-     call_func1(p_filebuf_ctor, &fb2);
-     pos = call_func1(p_ostream_flush, &os1);
-@@ -2952,7 +2954,9 @@ if (0) /* crashes on native */
-     os1.base_ios.tie = &os2;
-     os2.base_ios.sb = NULL;
- if (0) /* crashes on native */
-+{
-     ret = (int) call_func1(p_ostream_opfx, &os1);
-+}
-     os2.base_ios.sb = &fb2.base;
-     os2.base_ios.state = IOSTATE_badbit;
-     ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "We've known each other", 22);
-@@ -2979,7 +2983,9 @@ if (0) /* crashes on native */
-     ok(ret == 1, "expected 1 got %d\n", ret);
-     os1.base_ios.sb = NULL;
- if (0) /* crashes on native */
-+{
-     call_func1(p_ostream_osfx, &os1);
-+}
-     os1.base_ios.sb = &fb1.base;
-     os1.base_ios.flags = FLAGS_unitbuf;
-     call_func1(p_ostream_osfx, &os1);
-@@ -3019,7 +3025,9 @@ if (0) /* crashes on native */
-     ok(fb1.base.pptr == fb1.base.base + 1, "wrong put pointer, expected %p got %p\n", fb1.base.base + 1, fb1.base.pptr);
-     os1.base_ios.sb = NULL;
- if (0) /* crashes on native */
-+{
-     pos = call_func2(p_ostream_put_char, &os1, 'c');
-+}
-     os1.base_ios.sb = &fb1.base;
-     os1.base_ios.width = 5;
-     call_func1(p_filebuf_sync, &fb1);
-@@ -3051,7 +3059,9 @@ if (0) /* crashes on native */
-     ok(fb1.base.pptr == fb1.base.base + 7, "wrong put pointer, expected %p got %p\n", fb1.base.base + 7, fb1.base.pptr);
-     os1.base_ios.sb = NULL;
- if (0) /* crashes on native */
-+{
-     pos = call_func3(p_ostream_write_char, &os1, "been", 4);
-+}
-     os1.base_ios.sb = &fb1.base;
-     os1.base_ios.width = 5;
-     call_func1(p_filebuf_sync, &fb1);
-@@ -3167,7 +3177,9 @@ if (0) /* crashes on native */
-     ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos);
-     ok(!strncmp(fb1.base.pptr - 6, "abzzzz", 6), "expected 'abzzzz' got '%s'\n", fb1.base.pptr - 6);
- if (0) /* crashes on native */
-+{
-     pos = call_func3(p_ostream_writepad, &os1, NULL, "o");
-+}
-     pos = call_func3(p_ostream_writepad, &os1, "", "hello");
-     ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos);
-     ok(!strncmp(fb1.base.pptr - 6, "helloz", 6), "expected 'helloz' got '%s'\n", fb1.base.pptr - 6);
-@@ -3580,7 +3592,9 @@ static void test_istream(void)
-     ok(is2.base_ios.precision == 6, "expected 6 got %d\n", is2.base_ios.precision);
-     ok(is2.base_ios.width == 0, "expected 0 got %d\n", is2.base_ios.width);
- if (0) /* crashes on native */
-+{
-     pis = call_func2(p_istream_assign, &is2, NULL);
-+}
-     is2.extract_delim = is2.count = 0xabababab;
-     is2.base_ios.sb = (streambuf*) 0xabababab;
-     is2.base_ios.state = 0xabababab;
-@@ -3616,7 +3630,9 @@ if (0) /* crashes on native */
-     /* eatwhite */
-     is1.extract_delim = is1.count = 0;
- if (0) /* crashes on native */
-+{
-     is1.base_ios.sb = NULL;
-+}
-     is1.base_ios.state = IOSTATE_badbit;
-     is1.base_ios.flags = 0;
-     call_func1(p_istream_eatwhite, &is1);
-@@ -3684,7 +3700,9 @@ if (0) /* crashes on native */
-     ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n",
-         IOSTATE_badbit|IOSTATE_failbit, is1.base_ios.state);
- if (0) /* crashes on native */
-+{
-     is1.base_ios.sb = NULL;
-+}
-     is1.base_ios.state = IOSTATE_goodbit;
-     is1.base_ios.tie = &os;
-     pos = call_func3(p_ostream_sb_ctor, &os, &fb2.base, TRUE);
-@@ -3951,7 +3969,9 @@ if (0) /* crashes on native */
-     ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr);
-     ok(buffer[0] == 0, "expected 0 got %d\n", buffer[0]);
- if (0) /* crashes on native */
-+{
-     pis = call_func4(p_istream_get_str_delim, &is1, (char*) 0x1, 5, 0);
-+}
- 
-     /* get_str */
-     is1.extract_delim = is1.count = 0xabababab;
-@@ -4089,7 +4109,9 @@ if (0) /* crashes on native */
-     ok(fb1.base.gptr == fb1.base.base + 3, "wrong get pointer, expected %p got %p\n", fb1.base.base + 3, fb1.base.gptr);
-     ok(c == -50, "expected %d got %d\n", -50, c);
- if (0) /* crashes on native */
-+{
-     pis = call_func2(p_istream_get_char, &is1, NULL);
-+}
-     fb1.base.gptr = fb1.base.base + 30;
-     pis = call_func2(p_istream_get_char, &is1, &c);
-     ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
-@@ -4201,7 +4223,9 @@ if (0) /* crashes on native */
-     ok(fb2.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb2.base.epptr);
-     is1.base_ios.state = IOSTATE_goodbit;
- if (0) /* crashes on native */
-+{
-     pis = call_func3(p_istream_get_sb, &is1, NULL, '?');
-+}
-     *fb1.base.gptr = -50;
-     pis = call_func3(p_istream_get_sb, &is1, &fb2.base, -50);
-     ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
-@@ -4395,7 +4419,9 @@ if (0) /* crashes on native */
-     ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
-     ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr);
- if (0) /* crashes on native */
-+{
-     is1.base_ios.sb = NULL;
-+}
-     fb1.base.gptr = fb1.base.base + 14;
-     ret = (int) call_func1(p_istream_peek, &is1);
-     ok(ret == 206, "expected 206 got %d\n", ret);
-@@ -4440,7 +4466,9 @@ if (0) /* crashes on native */
-     ok(fb1.base.gptr == fb1.base.base + 15, "wrong get pointer, expected %p got %p\n", fb1.base.base + 15, fb1.base.gptr);
-     is1.base_ios.state = IOSTATE_goodbit;
- if (0) /* crashes on native */
-+{
-     is1.base_ios.sb = NULL;
-+}
-     pis = call_func2(p_istream_putback, &is1, -40);
-     ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
-     ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
-@@ -4498,13 +4526,17 @@ if (0) /* crashes on native */
-     ok(!strncmp(buffer, fb1.base.base, 30), "unexpected buffer content, got '%s'\n", buffer);
-     ok(buffer[30] == 'A', "expected 'A' got %d\n", buffer[30]);
- if (0) /* crashes on native */
-+{
-     is1.base_ios.sb = NULL;
-+}
-     is1.base_ios.state = IOSTATE_goodbit;
-     fb1.base.eback = fb1.base.gptr = fb1.base.base;
-     fb1.base.egptr = fb1.base.base + 30;
-     memset(buffer, 'A', sizeof(buffer));
- if (0) /* crashes on native */
-+{
-     pis = call_func3(p_istream_read, &is1, buffer, -1);
-+}
-     pis = call_func3(p_istream_read, &is1, buffer, 0);
-     ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
-     ok(is1.count == 0, "expected 0 got %d\n", is1.count);
-@@ -4520,7 +4552,9 @@ if (0) /* crashes on native */
-     ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr);
-     ok(_tell(fb1.fd) == 0, "expected 0 got %d\n", _tell(fb1.fd));
- if (0) /* crashes on native */
-+{
-     is1.base_ios.sb = NULL;
-+}
-     pis = call_func2(p_istream_seekg, &is1, -5);
-     ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
-     ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state);
-@@ -4553,7 +4587,9 @@ if (0) /* crashes on native */
-     ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state);
-     ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr);
- if (0) /* crashes on native */
-+{
-     is1.base_ios.sb = NULL;
-+}
-     fb1.base.gptr = fb1.base.egptr;
-     pis = call_func3(p_istream_seekg_offset, &is1, 0, SEEKDIR_end);
-     ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
-@@ -4574,7 +4610,9 @@ if (0) /* crashes on native */
-     ok(ret == 0, "expected 0 got %d\n", ret);
-     ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
- if (0) /* crashes on native */
-+{
-     is1.base_ios.sb = NULL;
-+}
-     fb1.base.eback = fb1.base.gptr = fb1.base.base;
-     fb1.base.egptr = fb1.base.base + 30;
-     ret = (int) call_func1(p_istream_sync, &is1);
-@@ -4607,7 +4645,9 @@ if (0) /* crashes on native */
-     ok(ret == 24, "expected 24 got %d\n", ret);
-     ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
- if (0) /* crashes on native */
-+{
-     is1.base_ios.sb = NULL;
-+}
-     fb1.base.eback = fb1.base.gptr = fb1.base.base;
-     fb1.base.egptr = fb1.base.base + 30;
-     ret = (int) call_func1(p_istream_tellg, &is1);
--- 
-2.9.0
-

patches/Compiler_Warnings/0006-oleaut32-tests-Avoid-misleading-indentation-warnings.patch

@@ -1,41 +0,0 @@
-From dfefd1a7a793d0a6e4fcfb02438b7d9383f9ab97 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:57:11 +0200
-Subject: oleaut32/tests: Avoid misleading indentation warnings.
-
----
- dlls/ole32/tests/compobj.c      | 2 ++
- dlls/oleaut32/tests/safearray.c | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
-index 3b523d1..627f9a4 100644
---- a/dlls/ole32/tests/compobj.c
-+++ b/dlls/ole32/tests/compobj.c
-@@ -2880,7 +2880,9 @@ static void test_CoGetMalloc(void)
-     HRESULT hr;
- 
- if (0) /* crashes on native */
-+{
-     hr = CoGetMalloc(0, NULL);
-+}
- 
-     imalloc = (void*)0xdeadbeef;
-     hr = CoGetMalloc(0, &imalloc);
-diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c
-index f57b886..787891c 100644
---- a/dlls/oleaut32/tests/safearray.c
-+++ b/dlls/oleaut32/tests/safearray.c
-@@ -706,7 +706,9 @@ static void test_safearray(void)
-     }
- 
-     if (!pSafeArrayAllocDescriptorEx)
-+    {
-         return;
-+    }
- 
- 	for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) {
- 		a = NULL;
--- 
-2.9.0
-

patches/Compiler_Warnings/0007-rpcrt4-tests-Avoid-misleading-indentation-warnings.patch

@@ -1,26 +0,0 @@
-From 9bda354ab7636fb357f29f777892de3c39ff06ae Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:57:37 +0200
-Subject: rpcrt4/tests: Avoid misleading indentation warnings.
-
----
- dlls/rpcrt4/tests/ndr_marshall.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
-index aeecf8c..b71f07b 100644
---- a/dlls/rpcrt4/tests/ndr_marshall.c
-+++ b/dlls/rpcrt4/tests/ndr_marshall.c
-@@ -2434,7 +2434,9 @@ static void test_MesEncodeFixedBufferHandleCreate(void)
- todo_wine
-     ok(status == RPC_S_INVALID_ARG, "got %d\n", status);
- if (status == RPC_S_OK)
-+{
-     MesHandleFree(handle);
-+}
- 
-     status = MesEncodeFixedBufferHandleCreate(buffer, 32, NULL, &handle);
-     ok(status == RPC_S_INVALID_ARG, "got %d\n", status);
--- 
-2.9.0
-

patches/Compiler_Warnings/0008-scrrun-tests-Avoid-misleading-indentation-warnings.patch

@@ -1,36 +0,0 @@
-From b79a3f64ec023a17955620362c748320c17a9ed0 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:57:59 +0200
-Subject: scrrun/tests: Avoid misleading indentation warnings.
-
----
- dlls/scrrun/tests/dictionary.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c
-index a1b7d06..1880c20 100644
---- a/dlls/scrrun/tests/dictionary.c
-+++ b/dlls/scrrun/tests/dictionary.c
-@@ -102,7 +102,9 @@ static void test_comparemode(void)
-     ok(hr == S_OK, "got 0x%08x\n", hr);
- 
- if (0) /* crashes on native */
-+{
-     hr = IDictionary_get_CompareMode(dict, NULL);
-+}
- 
-     method = 10;
-     hr = IDictionary_get_CompareMode(dict, &method);
-@@ -934,7 +936,9 @@ static void test_IEnumVARIANT(void)
-     ok(hr == S_OK, "got 0x%08x\n", hr);
- 
- if (0) /* crashes on native */
-+{
-     hr = IDictionary__NewEnum(dict, NULL);
-+}
- 
-     hr = IDictionary__NewEnum(dict, &enum1);
-     ok(hr == S_OK, "got 0x%08x\n", hr);
--- 
-2.9.0
-

patches/Compiler_Warnings/0009-shell32-tests-Avoid-misleading-indentation-warnings.patch

@@ -1,56 +0,0 @@
-From f1fa74c00e8c42d4ffd17689532ade8663015c6e Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:58:37 +0200
-Subject: shell32/tests: Avoid misleading indentation warnings.
-
----
- dlls/shell32/tests/appbar.c        | 2 ++
- dlls/shell32/tests/shelldispatch.c | 2 ++
- dlls/shell32/tests/shellole.c      | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c
-index dbac4e6..7ec3c34 100644
---- a/dlls/shell32/tests/appbar.c
-+++ b/dlls/shell32/tests/appbar.c
-@@ -424,7 +424,9 @@ static void test_GetCurrentProcessExplicitAppUserModelID(void)
-     }
- 
- if (0) /* crashes on native */
-+{
-     hr = pGetCurrentProcessExplicitAppUserModelID(NULL);
-+}
- 
-     appid = (void*)0xdeadbeef;
-     hr = pGetCurrentProcessExplicitAppUserModelID(&appid);
-diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c
-index 70b6c36..f42504e 100644
---- a/dlls/shell32/tests/shelldispatch.c
-+++ b/dlls/shell32/tests/shelldispatch.c
-@@ -729,7 +729,9 @@ todo_wine
- todo_wine
-         ok(hr == S_OK, "got 0x%08x\n", hr);
- if (hr == S_OK)
-+{
-         test_dispatch_typeinfo(doc, viewdual_riids);
-+}
- 
-         IWebBrowser2_Release(wb);
- 
-diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c
-index e8cf744..99f0ccb 100644
---- a/dlls/shell32/tests/shellole.c
-+++ b/dlls/shell32/tests/shellole.c
-@@ -872,7 +872,9 @@ static void test_SHCreateSessionKey(void)
-     }
- 
- if (0) /* crashes on native */
-+{
-     hr = pSHCreateSessionKey(KEY_READ, NULL);
-+}
- 
-     hkey = (HKEY)0xdeadbeef;
-     hr = pSHCreateSessionKey(0, &hkey);
--- 
-2.9.0
-

patches/Compiler_Warnings/0010-shlwapi-tests-Avoid-misleading-indentation-warnings.patch

@@ -1,26 +0,0 @@
-From f590ced17854c6830cd15b63e757ef5798095cb1 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:58:52 +0200
-Subject: shlwapi/tests: Avoid misleading indentation warnings.
-
----
- dlls/shlwapi/tests/ordinal.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
-index 74cad7d..b26fd4f 100644
---- a/dlls/shlwapi/tests/ordinal.c
-+++ b/dlls/shlwapi/tests/ordinal.c
-@@ -3225,7 +3225,9 @@ static void test_IUnknown_GetClassID(void)
-     HRESULT hr;
- 
- if (0) /* crashes on native systems */
-+{
-     hr = pIUnknown_GetClassID(NULL, NULL);
-+}
- 
-     memset(&clsid, 0xcc, sizeof(clsid));
-     memset(&clsid3, 0xcc, sizeof(clsid3));
--- 
-2.9.0
-

patches/Compiler_Warnings/0011-user32-tests-Avoid-misleading-indentation-warnings.patch

@@ -1,57 +0,0 @@
-From 49be4c98c9f543d23bb3e9f7dfc4c93ddc0a7d68 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:59:11 +0200
-Subject: user32/tests: Avoid misleading indentation warnings.
-
----
- dlls/user32/tests/input.c | 4 +++-
- dlls/user32/tests/menu.c  | 4 ++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
-index 0d7c6d6..66325e1 100644
---- a/dlls/user32/tests/input.c
-+++ b/dlls/user32/tests/input.c
-@@ -184,7 +184,7 @@ static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam )
-             if(  TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */
-                     (VKey != VK_MENU)) /* <ALT>-down...<something else>-up */
-                 message = WM_SYSKEYUP;
--                TrackSysKey = 0;
-+            TrackSysKey = 0; /* FIXME */
-         }
-         InputKeyStateTable[VKey] &= ~0x80;
-         flags |= KF_REPEAT | KF_UP;
-@@ -1768,7 +1768,9 @@ static void test_keyboard_layout_name(void)
-     char klid[KL_NAMELENGTH];
- 
- if (0) /* crashes on native system */
-+{
-     ret = GetKeyboardLayoutNameA(NULL);
-+}
- 
-     SetLastError(0xdeadbeef);
-     ret = GetKeyboardLayoutNameW(NULL);
-diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c
-index ae7b957..f057613 100644
---- a/dlls/user32/tests/menu.c
-+++ b/dlls/user32/tests/menu.c
-@@ -3973,12 +3973,16 @@ static void test_AppendMenu(void)
-     ret = InsertMenuItemA(hmenu, 0, TRUE, &mii);
-     ok(ret, "InsertMenuItem failed\n");
- if (0) /* FIXME: uncomment once Wine is fixed */
-+{
-     check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED);
-+}
-     mii.wID = 207;
-     ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii);
-     ok(ret, "SetMenuItemInfo failed\n");
- if (0) /* FIXME: uncomment once Wine is fixed */
-+{
-     check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED);
-+}
-     DestroyMenu(hmenu);
- 
-     hbmp = CreateBitmap(1, 1, 1, 1, NULL);
--- 
-2.9.0
-

patches/Compiler_Warnings/0012-winhttp-tests-Avoid-misleading-indentation-warnings.patch

@@ -1,26 +0,0 @@
-From 74a5d7a75aaae754ad64fd24947ba3f17d92a00a Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:59:27 +0200
-Subject: winhttp/tests: Avoid misleading indentation warnings.
-
----
- dlls/winhttp/tests/winhttp.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c
-index 6be7598..d29457a 100644
---- a/dlls/winhttp/tests/winhttp.c
-+++ b/dlls/winhttp/tests/winhttp.c
-@@ -3823,7 +3823,9 @@ static void test_IWinHttpRequest_Invoke(void)
- 
-     VariantInit(&ret);
- if (0) /* crashes */
-+{
-     hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, NULL, &ret, NULL, &err);
-+}
- 
-     params.cArgs = 1;
-     hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err);
--- 
-2.9.0
-

patches/Compiler_Warnings/0013-wshom.ocx-tests-Avoid-misleading-indentation-warning.patch

@@ -1,26 +0,0 @@
-From ec626b0fe26ec342091e9db61e78d77acf16f00a Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 30 Jul 2016 23:59:41 +0200
-Subject: wshom.ocx/tests: Avoid misleading indentation warnings.
-
----
- dlls/wshom.ocx/tests/wshom.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c
-index a3d398e..5b6ffd0 100644
---- a/dlls/wshom.ocx/tests/wshom.c
-+++ b/dlls/wshom.ocx/tests/wshom.c
-@@ -214,7 +214,9 @@ static void test_wshshell(void)
- 
-     /* current directory */
- if (0) /* crashes on native */
-+{
-     hr = IWshShell3_get_CurrentDirectory(sh3, NULL);
-+}
- 
-     str = NULL;
-     hr = IWshShell3_get_CurrentDirectory(sh3, &str);
--- 
-2.9.0
-

patches/Compiler_Warnings/0015-include-Avoid-shift-overflow-warning.patch

@@ -1,25 +0,0 @@
-From 1d2744df97beb00c40ae4c9d307334f4fe0c253d Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 31 Jul 2016 00:01:52 +0200
-Subject: include: Avoid shift overflow warning.
-
----
- include/d3dtypes.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/d3dtypes.h b/include/d3dtypes.h
-index 75aee55..8a884a8 100644
---- a/include/d3dtypes.h
-+++ b/include/d3dtypes.h
-@@ -53,7 +53,7 @@ typedef LONG D3DFIXED;
- #define RGBA_GETRED(rgb)        (((rgb) >> 16) & 0xff)
- #define RGBA_GETGREEN(rgb)      (((rgb) >> 8) & 0xff)
- #define RGBA_GETBLUE(rgb)       ((rgb) & 0xff)
--#define RGBA_MAKE(r, g, b, a)   ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
-+#define RGBA_MAKE(r, g, b, a)   ((D3DCOLOR) (((DWORD)(a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
- 
- #define D3DRGB(r, g, b) \
-     (0xff000000 | ( ((LONG)((r) * 255)) << 16) | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255))
--- 
-2.9.0
-

patches/Compiler_Warnings/0017-server-Workaround-duplicate-condition-warning-of-GCC.patch

@@ -1,85 +0,0 @@
-From c3170561ea6c0de42ae71925e31e08941e1b96dc Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 31 Jul 2016 00:03:02 +0200
-Subject: server: Workaround duplicate condition warning of GCC 6.
-
----
- server/request.c | 13 ++++++++++---
- server/sock.c    |  9 ++++++++-
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/server/request.c b/server/request.c
-index 597bf88..483884b 100644
---- a/server/request.c
-+++ b/server/request.c
-@@ -220,6 +220,13 @@ const void *get_req_data_after_objattr( const struct object_attributes *attr, da
-     return ptr;
- }
- 
-+static inline int should_retry( int err )
-+{
-+    if (err == EWOULDBLOCK) return 1;
-+    if (err == EAGAIN) return 1;
-+    return 0;
-+}
-+
- /* write the remaining part of the reply */
- void write_reply( struct thread *thread )
- {
-@@ -241,7 +248,7 @@ void write_reply( struct thread *thread )
-     }
-     if (errno == EPIPE)
-         kill_thread( thread, 0 );  /* normal death */
--    else if (errno != EWOULDBLOCK && errno != EAGAIN)
-+    else if (!should_retry( errno ))
-         fatal_protocol_error( thread, "reply write: %s\n", strerror( errno ));
- }
- 
-@@ -368,7 +375,7 @@ error:
-         kill_thread( thread, 0 );
-     else if (ret > 0)
-         fatal_protocol_error( thread, "partial read %d\n", ret );
--    else if (errno != EWOULDBLOCK && errno != EAGAIN)
-+    else if (!should_retry( errno ))
-         fatal_protocol_error( thread, "read: %s\n", strerror( errno ));
- }
- 
-@@ -449,7 +456,7 @@ int receive_fd( struct process *process )
-     }
-     else
-     {
--        if (errno != EWOULDBLOCK && errno != EAGAIN)
-+        if (!should_retry( errno ))
-         {
-             fprintf( stderr, "Protocol error: process %04x: ", process->id );
-             perror( "recvmsg" );
-diff --git a/server/sock.c b/server/sock.c
-index dc10d2a..4f76163 100644
---- a/server/sock.c
-+++ b/server/sock.c
-@@ -1065,6 +1065,13 @@ static void ifchange_wake_up( struct object *obj, unsigned int status )
-     }
- }
- 
-+static inline int should_retry( int err )
-+{
-+    if (err == EWOULDBLOCK) return 1;
-+    if (err == EAGAIN) return 1;
-+    return 0;
-+}
-+
- static void ifchange_poll_event( struct fd *fd, int event )
- {
-     struct object *ifchange = get_fd_user( fd );
-@@ -1075,7 +1082,7 @@ static void ifchange_poll_event( struct fd *fd, int event )
-     r = recv( get_unix_fd(fd), buffer, sizeof(buffer), MSG_DONTWAIT );
-     if (r < 0)
-     {
--        if (errno == EWOULDBLOCK || errno == EAGAIN)
-+        if (should_retry( errno ))
-             return; /* retry when poll() says the socket is ready */
-         status = sock_get_ntstatus( errno );
-     }
--- 
-2.9.0
-

patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,17 +1,40 @@
-From 869fbc7190eb77e027be4bcd98d938198189c3dd Mon Sep 17 00:00:00 2001
+From 744549e1ecc76c3764079d337c09445d01a3527e Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:58:40 +0100
 Subject: dwrite: Avoid implicit cast of interface pointer.
 
 ---
+ dlls/dwrite/font.c   | 4 ++--
  dlls/dwrite/layout.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
+diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
+index d9ddce0..0a90c20 100644
+--- a/dlls/dwrite/font.c
++++ b/dlls/dwrite/font.c
+@@ -1684,7 +1684,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
+     if (!iface)
+         return NULL;
+     assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
+-    return CONTAINING_RECORD(iface, struct dwrite_font, IDWriteFont3_iface);
++    return CONTAINING_RECORD((IDWriteFont3 *)iface, struct dwrite_font, IDWriteFont3_iface);
+ }
+ 
+ static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -1692,7 +1692,7 @@ static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace
+     if (!iface)
+         return NULL;
+     assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
+-    return CONTAINING_RECORD(iface, struct dwrite_fontface, IDWriteFontFace4_iface);
++    return CONTAINING_RECORD((IDWriteFontFace4 *)iface, struct dwrite_fontface, IDWriteFontFace4_iface);
+ }
+ 
+ void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf)
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index 38b5e32..24f4abc 100644
+index 706ed4e..c76a909 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
-@@ -5115,7 +5115,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
+@@ -5196,7 +5196,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
  static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
  {
      return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
@@ -21,5 +44,5 @@ index 38b5e32..24f4abc 100644
  
  HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
 -- 
-2.7.1
+2.9.0
 

patches/Compiler_Warnings/definition

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

patches/Exagear/0001-ntdll-Implement-emulation-of-SIDT-instruction-when-u.patch

@@ -1,287 +0,0 @@
-From 472184e5801de5d1fb92d275d9c0c7e840c9a0bf Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 11 Nov 2014 03:11:33 +0100
-Subject: ntdll: Implement emulation of SIDT instruction when using Exagear.
-
----
- configure.ac             |   8 ++
- dlls/ntdll/signal_i386.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 231 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 1e6bba3..43bf0db 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,6 +32,7 @@ AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 supp
- AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
- AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests]))
- AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]))
-+AC_ARG_ENABLE(exagear-compat, AS_HELP_STRING([--enable-exagear-compat],[use workarounds for known problems in the Exagear emulator]))
- 
- AC_ARG_WITH(alsa,      AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
-             [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
-@@ -364,6 +365,13 @@ WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false],
-                   [gettext tools not found (or too old), translations won't be built.],
-                   [enable_po])
- 
-+dnl **** Enable Exagear workarounds ****
-+
-+if test "x$enable_exagear_compat" = "xyes"
-+then
-+  AC_DEFINE(EXAGEAR_COMPAT, 1, [Define if you want to enable Exagear emulator workarounds])
-+fi
-+
- dnl **** Check for some libraries ****
- 
- dnl Check for -li386 for NetBSD and OpenBSD
-diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
-index ee8855a..4269329 100644
---- a/dlls/ntdll/signal_i386.c
-+++ b/dlls/ntdll/signal_i386.c
-@@ -96,6 +96,14 @@ typedef struct
-     BYTE Reserved4[96];
- } XMM_SAVE_AREA32;
- 
-+#include "pshpack1.h"
-+struct idtr
-+{
-+    WORD  limit;
-+    BYTE *base;
-+};
-+#include "poppack.h"
-+
- /***********************************************************************
-  * signal context platform-specific definitions
-  */
-@@ -1898,6 +1906,213 @@ static inline DWORD get_fpu_code( const CONTEXT *context )
- }
- 
- 
-+#ifdef EXAGEAR_COMPAT
-+
-+/***********************************************************************
-+ *           INSTR_GetOperandAddr
-+ *
-+ * Return the address of an instruction operand (from the mod/rm byte).
-+ */
-+static BYTE *INSTR_GetOperandAddr( CONTEXT *context, const BYTE *instr,
-+                                   int long_addr, int segprefix, int *len )
-+{
-+    int mod, rm, base = 0, index = 0, ss = 0, off;
-+
-+#define GET_VAL(val,type) \
-+    { *val = *(type *)instr; instr += sizeof(type); *len += sizeof(type); }
-+
-+    *len = 0;
-+    GET_VAL( &mod, BYTE );
-+    rm = mod & 7;
-+    mod >>= 6;
-+
-+    if (mod == 3)
-+    {
-+        switch(rm)
-+        {
-+        case 0: return (BYTE *)&context->Eax;
-+        case 1: return (BYTE *)&context->Ecx;
-+        case 2: return (BYTE *)&context->Edx;
-+        case 3: return (BYTE *)&context->Ebx;
-+        case 4: return (BYTE *)&context->Esp;
-+        case 5: return (BYTE *)&context->Ebp;
-+        case 6: return (BYTE *)&context->Esi;
-+        case 7: return (BYTE *)&context->Edi;
-+        }
-+    }
-+
-+    if (long_addr)
-+    {
-+        if (rm == 4)
-+        {
-+            BYTE sib;
-+            GET_VAL( &sib, BYTE );
-+            rm = sib & 7;
-+            ss = sib >> 6;
-+            switch((sib >> 3) & 7)
-+            {
-+            case 0: index = context->Eax; break;
-+            case 1: index = context->Ecx; break;
-+            case 2: index = context->Edx; break;
-+            case 3: index = context->Ebx; break;
-+            case 4: index = 0; break;
-+            case 5: index = context->Ebp; break;
-+            case 6: index = context->Esi; break;
-+            case 7: index = context->Edi; break;
-+            }
-+        }
-+
-+        switch(rm)
-+        {
-+        case 0: base = context->Eax; break;
-+        case 1: base = context->Ecx; break;
-+        case 2: base = context->Edx; break;
-+        case 3: base = context->Ebx; break;
-+        case 4: base = context->Esp; break;
-+        case 5: base = context->Ebp; break;
-+        case 6: base = context->Esi; break;
-+        case 7: base = context->Edi; break;
-+        }
-+        switch (mod)
-+        {
-+        case 0:
-+            if (rm == 5)  /* special case: ds:(disp32) */
-+            {
-+                GET_VAL( &base, DWORD );
-+            }
-+            break;
-+
-+        case 1:  /* 8-bit disp */
-+            GET_VAL( &off, BYTE );
-+            base += (signed char)off;
-+            break;
-+
-+        case 2:  /* 32-bit disp */
-+            GET_VAL( &off, DWORD );
-+            base += (signed long)off;
-+            break;
-+        }
-+    }
-+    else  /* short address */
-+    {
-+        switch(rm)
-+        {
-+        case 0:  /* ds:(bx,si) */
-+            base = LOWORD(context->Ebx) + LOWORD(context->Esi);
-+            break;
-+        case 1:  /* ds:(bx,di) */
-+            base = LOWORD(context->Ebx) + LOWORD(context->Edi);
-+            break;
-+        case 2:  /* ss:(bp,si) */
-+            base = LOWORD(context->Ebp) + LOWORD(context->Esi);
-+            break;
-+        case 3:  /* ss:(bp,di) */
-+            base = LOWORD(context->Ebp) + LOWORD(context->Edi);
-+            break;
-+        case 4:  /* ds:(si) */
-+            base = LOWORD(context->Esi);
-+            break;
-+        case 5:  /* ds:(di) */
-+            base = LOWORD(context->Edi);
-+            break;
-+        case 6:  /* ss:(bp) */
-+            base = LOWORD(context->Ebp);
-+            break;
-+        case 7:  /* ds:(bx) */
-+            base = LOWORD(context->Ebx);
-+            break;
-+        }
-+
-+        switch(mod)
-+        {
-+        case 0:
-+            if (rm == 6)  /* special case: ds:(disp16) */
-+            {
-+                GET_VAL( &base, WORD );
-+            }
-+            break;
-+
-+        case 1:  /* 8-bit disp */
-+            GET_VAL( &off, BYTE );
-+            base += (signed char)off;
-+            break;
-+
-+        case 2:  /* 16-bit disp */
-+            GET_VAL( &off, WORD );
-+            base += (signed short)off;
-+            break;
-+        }
-+        base &= 0xffff;
-+    }
-+    /* FIXME: we assume that all segments have a base of 0 */
-+    return (BYTE *)(base + (index << ss));
-+#undef GET_VAL
-+}
-+
-+
-+/***********************************************************************
-+ *           check_invalid_instr
-+ *
-+ * Support for instructions not implemented by Exagear.
-+ */
-+static inline BOOL check_invalid_instr( CONTEXT *context )
-+{
-+    const BYTE *instr;
-+    unsigned int prefix_count = 0;
-+    int len, long_addr = 1;
-+
-+    if (!wine_ldt_is_system( context->SegCs )) return FALSE;
-+    instr = (BYTE *)context->Eip;
-+
-+    for (;;) switch (*instr)
-+    {
-+    /* instruction prefixes */
-+    case 0x2e:  /* %cs: */
-+    case 0x36:  /* %ss: */
-+    case 0x3e:  /* %ds: */
-+    case 0x26:  /* %es: */
-+    case 0x64:  /* %fs: */
-+    case 0x65:  /* %gs: */
-+    case 0x66:  /* opcode size */
-+    case 0x67:  /* addr size */
-+    case 0xf0:  /* lock */
-+    case 0xf2:  /* repne */
-+    case 0xf3:  /* repe */
-+        if (++prefix_count >= 15) return FALSE;
-+        if (*instr == 0x67) long_addr = !long_addr; /* addr size */
-+        instr++;
-+        continue;
-+    case 0x0f: /* extended instruction */
-+        switch (instr[1])
-+        {
-+        case 0x01:
-+            if (((instr[2] >> 3) & 7) == 1) /* sidt m */
-+            {
-+                struct idtr ret;
-+                BYTE *addr;
-+
-+                if ((instr[2] >> 6) == 3) return FALSE; /* loading to register not allowed */
-+                addr = INSTR_GetOperandAddr( context, instr + 2, long_addr, 0, &len );
-+
-+                /* fake IDT structure */
-+                ret.limit = 0xfff;
-+                ret.base  = (void *)0xff000000;
-+                memcpy(addr, &ret, sizeof(ret));
-+
-+                context->Eip += prefix_count + len + 2;
-+                return TRUE;
-+            }
-+            break;
-+        }
-+        return FALSE;
-+    default:
-+        return FALSE;
-+    }
-+}
-+
-+#endif /* EXAGEAR_COMPAT */
-+
-+
- /**********************************************************************
-  *		raise_segv_exception
-  */
-@@ -1907,6 +2122,14 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
- 
-     switch(rec->ExceptionCode)
-     {
-+#ifdef EXAGEAR_COMPAT
-+    case EXCEPTION_ILLEGAL_INSTRUCTION:
-+        {
-+            if (check_invalid_instr( context ))
-+                goto done;
-+        }
-+        break;
-+#endif
-     case EXCEPTION_ACCESS_VIOLATION:
-         if (rec->NumberParameters == 2)
-         {
--- 
-2.7.1
-