wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 882980c17a9a033fa8e49a4c116af9583698d218.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-08-10 22:22:18 +02:00
parent b727968b45
commit a6c6b83eb7
12 changed files with 106 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,17 @@
From b9eb34a478b2f6824778c6e7b12fb2115c881ce6 Mon Sep 17 00:00:00 2001
From 3c4086e64e16a14b6164af7810c15e122f7ff537 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 | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
dlls/msvcirt/tests/msvcirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c
index 7b83cfb..dba01c0 100644
index 1b15949..8f2f8db 100644
--- a/dlls/msvcirt/tests/msvcirt.c
+++ b/dlls/msvcirt/tests/msvcirt.c
@@ -2960,7 +2960,9 @@ static void test_ostream(void) {
@@ -3122,7 +3122,9 @@ static void test_ostream(void) {
/* flush */
if (0) /* crashes on native */
@ -21,7 +21,7 @@ index 7b83cfb..dba01c0 100644
os1.base_ios.sb = &fb2.base;
call_func1(p_filebuf_ctor, &fb2);
pos = call_func1(p_ostream_flush, &os1);
@@ -3016,7 +3018,9 @@ if (0) /* crashes on native */
@@ -3178,7 +3180,9 @@ if (0) /* crashes on native */
os1.base_ios.tie = &os2;
os2.base_ios.sb = NULL;
if (0) /* crashes on native */
@ -31,7 +31,7 @@ index 7b83cfb..dba01c0 100644
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);
@@ -3043,7 +3047,9 @@ if (0) /* crashes on native */
@@ -3205,7 +3209,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 */
@ -41,7 +41,7 @@ index 7b83cfb..dba01c0 100644
os1.base_ios.sb = &fb1.base;
os1.base_ios.flags = FLAGS_unitbuf;
call_func1(p_ostream_osfx, &os1);
@@ -3083,7 +3089,9 @@ if (0) /* crashes on native */
@@ -3245,7 +3251,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 */
@ -51,7 +51,7 @@ index 7b83cfb..dba01c0 100644
os1.base_ios.sb = &fb1.base;
os1.base_ios.width = 5;
call_func1(p_filebuf_sync, &fb1);
@@ -3115,7 +3123,9 @@ if (0) /* crashes on native */
@@ -3277,7 +3285,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 */
@ -61,7 +61,7 @@ index 7b83cfb..dba01c0 100644
os1.base_ios.sb = &fb1.base;
os1.base_ios.width = 5;
call_func1(p_filebuf_sync, &fb1);
@@ -3231,7 +3241,9 @@ if (0) /* crashes on native */
@@ -3393,7 +3403,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 */
@ -71,7 +71,7 @@ index 7b83cfb..dba01c0 100644
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);
@@ -3696,7 +3708,9 @@ todo_wine
@@ -3856,7 +3868,9 @@ static void test_ostream_withassign(void)
osa1.unknown = 0xabababab;
osa1.base_ios.sb = (streambuf*) 0xabababab;
if (0) /* crashes on native */
@ -81,7 +81,7 @@ index 7b83cfb..dba01c0 100644
posa = call_func2(p_ostream_withassign_assign_sb, &osa1, &sb);
ok(posa == &osa1, "wrong return, expected %p got %p\n", &osa1, posa);
ok(osa1.unknown == 0xabababab, "expected %d got %d\n", 0xabababab, osa1.unknown);
@@ -3876,7 +3890,9 @@ static void test_istream(void)
@@ -4036,7 +4050,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 */
@ -91,7 +91,7 @@ index 7b83cfb..dba01c0 100644
is2.extract_delim = is2.count = 0xabababab;
is2.base_ios.sb = (streambuf*) 0xabababab;
is2.base_ios.state = 0xabababab;
@@ -3912,7 +3928,9 @@ if (0) /* crashes on native */
@@ -4072,7 +4088,9 @@ if (0) /* crashes on native */
/* eatwhite */
is1.extract_delim = is1.count = 0;
if (0) /* crashes on native */
@ -101,7 +101,7 @@ index 7b83cfb..dba01c0 100644
is1.base_ios.state = IOSTATE_badbit;
is1.base_ios.flags = 0;
call_func1(p_istream_eatwhite, &is1);
@@ -3980,7 +3998,9 @@ if (0) /* crashes on native */
@@ -4140,7 +4158,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 */
@ -111,7 +111,7 @@ index 7b83cfb..dba01c0 100644
is1.base_ios.state = IOSTATE_goodbit;
is1.base_ios.tie = &os;
pos = call_func3(p_ostream_sb_ctor, &os, &fb2.base, TRUE);
@@ -4247,7 +4267,9 @@ if (0) /* crashes on native */
@@ -4407,7 +4427,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 */
@ -121,7 +121,7 @@ index 7b83cfb..dba01c0 100644
/* get_str */
is1.extract_delim = is1.count = 0xabababab;
@@ -4385,7 +4407,9 @@ if (0) /* crashes on native */
@@ -4545,7 +4567,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 */
@ -131,7 +131,7 @@ index 7b83cfb..dba01c0 100644
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);
@@ -4497,7 +4521,9 @@ if (0) /* crashes on native */
@@ -4657,7 +4681,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 */
@ -141,7 +141,7 @@ index 7b83cfb..dba01c0 100644
*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);
@@ -4691,7 +4717,9 @@ if (0) /* crashes on native */
@@ -4851,7 +4877,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 */
@ -151,7 +151,7 @@ index 7b83cfb..dba01c0 100644
fb1.base.gptr = fb1.base.base + 14;
ret = (int) call_func1(p_istream_peek, &is1);
ok(ret == 206, "expected 206 got %d\n", ret);
@@ -4736,7 +4764,9 @@ if (0) /* crashes on native */
@@ -4896,7 +4924,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 */
@ -161,7 +161,7 @@ index 7b83cfb..dba01c0 100644
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);
@@ -4794,13 +4824,17 @@ if (0) /* crashes on native */
@@ -4954,13 +4984,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 */
@ -179,7 +179,7 @@ index 7b83cfb..dba01c0 100644
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);
@@ -4816,7 +4850,9 @@ if (0) /* crashes on native */
@@ -4976,7 +5010,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 */
@ -189,7 +189,7 @@ index 7b83cfb..dba01c0 100644
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);
@@ -4849,7 +4885,9 @@ if (0) /* crashes on native */
@@ -5009,7 +5045,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 */
@ -199,7 +199,7 @@ index 7b83cfb..dba01c0 100644
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);
@@ -4870,7 +4908,9 @@ if (0) /* crashes on native */
@@ -5030,7 +5068,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 */
@ -209,7 +209,7 @@ index 7b83cfb..dba01c0 100644
fb1.base.eback = fb1.base.gptr = fb1.base.base;
fb1.base.egptr = fb1.base.base + 30;
ret = (int) call_func1(p_istream_sync, &is1);
@@ -4903,7 +4943,9 @@ if (0) /* crashes on native */
@@ -5063,7 +5103,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 */
@ -219,6 +219,16 @@ index 7b83cfb..dba01c0 100644
fb1.base.eback = fb1.base.gptr = fb1.base.base;
fb1.base.egptr = fb1.base.base + 30;
ret = (int) call_func1(p_istream_tellg, &is1);
@@ -6015,7 +6057,9 @@ static void test_iostream(void)
memset(&ios2.base_ios, 0xcd, sizeof(ios));
ios2.base_ios.delbuf = 0;
if (0) /* crashes on native */
+{
pios = call_func2(p_iostream_assign, &ios2, NULL);
+}
pios = call_func2(p_iostream_assign, &ios2, &ios1);
ok(pios == &ios2, "wrong return, expected %p got %p\n", &ios2, pios);
ok(ios2.base1.extract_delim == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios2.base1.extract_delim);
--
2.9.0

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

@ -1,27 +1,12 @@
From dfefd1a7a793d0a6e4fcfb02438b7d9383f9ab97 Mon Sep 17 00:00:00 2001
From d93228af9587d69553082d48523a49e74a536704 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(+)
1 file changed, 2 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

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

@ -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

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

@ -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

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

@ -1,42 +1,12 @@
From f1fa74c00e8c42d4ffd17689532ade8663015c6e Mon Sep 17 00:00:00 2001
From 173e27263954c449c3657701e9d7489c603f1306 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(+)
dlls/shell32/tests/shellole.c | 2 ++
1 file changed, 2 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

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

@ -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

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

@ -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

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

@ -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

38
patches/ddraw-Device_Caps/0003-ddraw-Set-ddsOldCaps-correctly-in-ddraw7_GetCaps.patch
View File

@ -1,4 +1,4 @@
From be137f0fb6f21d40f3caaa4cce69c0e22d90d8da Mon Sep 17 00:00:00 2001
From 806018e4f6faf91ea74fd3bf287643e9e825b36b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 4 Mar 2016 22:22:42 +0100
Subject: ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
@ -12,10 +12,10 @@ Subject: ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
5 files changed, 106 insertions(+)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index e9ca114..59f19ff 100644
index e50edb4..bac9b8a 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1532,6 +1532,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
@@ -1533,6 +1533,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
caps.dwCaps |= DDCAPS_ALIGNSTRIDE;
caps.dwAlignStrideAlign = DDRAW_STRIDE_ALIGNMENT;
@ -25,10 +25,10 @@ index e9ca114..59f19ff 100644
if(DriverCaps)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 88d4f0c..07a8c10 100644
index bfc6bfe..76e2236 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -8977,6 +8977,31 @@ static void test_getdc(void)
@@ -9071,6 +9071,31 @@ static void test_getdc(void)
DestroyWindow(window);
}
@ -60,17 +60,17 @@ index 88d4f0c..07a8c10 100644
START_TEST(ddraw1)
{
IDirectDraw *ddraw;
@@ -9055,4 +9080,5 @@ START_TEST(ddraw1)
@@ -9153,4 +9178,5 @@ START_TEST(ddraw1)
test_overlay_rect();
test_blt();
test_getdc();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index fdba786..44d23ad 100644
index 171f669..79f4c97 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -10153,6 +10153,31 @@ static void test_draw_primitive(void)
@@ -10453,6 +10453,31 @@ static void test_edge_antialiasing_blending(void)
DestroyWindow(window);
}
@ -102,17 +102,17 @@ index fdba786..44d23ad 100644
START_TEST(ddraw2)
{
IDirectDraw2 *ddraw;
@@ -10239,4 +10264,5 @@ START_TEST(ddraw2)
test_blt();
@@ -10544,4 +10569,5 @@ START_TEST(ddraw2)
test_getdc();
test_draw_primitive();
test_edge_antialiasing_blending();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index cbcae06..67515a1 100644
index 988a82f..c1e0457 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -11477,6 +11477,31 @@ static void test_draw_primitive(void)
@@ -11785,6 +11785,31 @@ static void test_edge_antialiasing_blending(void)
DestroyWindow(window);
}
@ -144,17 +144,17 @@ index cbcae06..67515a1 100644
START_TEST(ddraw4)
{
IDirectDraw4 *ddraw;
@@ -11571,4 +11596,5 @@ START_TEST(ddraw4)
test_color_clamping();
@@ -11884,4 +11909,5 @@ START_TEST(ddraw4)
test_getdc();
test_draw_primitive();
test_edge_antialiasing_blending();
+ test_caps();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 5bfbe4d..23681f6 100644
index 56f8107..7c8467a 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -11762,6 +11762,31 @@ static void test_draw_primitive(void)
@@ -12104,6 +12104,31 @@ static void test_edge_antialiasing_blending(void)
DestroyWindow(window);
}
@ -186,12 +186,12 @@ index 5bfbe4d..23681f6 100644
START_TEST(ddraw7)
{
HMODULE module = GetModuleHandleA("ddraw.dll");
@@ -11867,4 +11892,5 @@ START_TEST(ddraw7)
test_color_clamping();
@@ -12214,4 +12239,5 @@ START_TEST(ddraw7)
test_getdc();
test_draw_primitive();
test_edge_antialiasing_blending();
+ test_caps();
}
--
2.7.1
2.9.0

22
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "ba858c28fd489a812ea0f55a11680a8edaf99ce5"
echo "882980c17a9a033fa8e49a4c116af9583698d218"
}
# Show version information
@ -2330,25 +2330,18 @@ fi
# | * dlls/amstream/mediastreamfilter.c, dlls/comctl32/listview.c, dlls/d2d1/brush.c, dlls/d2d1/geometry.c, dlls/d3d11/view.c,
# | dlls/d3d8/texture.c, dlls/d3d9/tests/visual.c, dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dsound/primary.c,
# | dlls/dwrite/layout.c, dlls/mshtml/script.c, dlls/msvcirt/tests/msvcirt.c, dlls/msxml3/schema.c,
# | dlls/netapi32/netapi32.c, dlls/ole32/tests/compobj.c, dlls/oleaut32/oleaut.c, dlls/oleaut32/tests/safearray.c,
# | dlls/rpcrt4/cstub.c, dlls/rpcrt4/tests/ndr_marshall.c, dlls/scrrun/tests/dictionary.c, dlls/shell32/tests/appbar.c,
# | dlls/shell32/tests/shelldispatch.c, dlls/shell32/tests/shellole.c, dlls/shlwapi/tests/ordinal.c,
# | dlls/user32/tests/input.c, dlls/user32/tests/menu.c, dlls/vbscript/vbdisp.c, dlls/winealsa.drv/mmdevdrv.c,
# | dlls/wined3d/glsl_shader.c, dlls/winhttp/tests/winhttp.c, dlls/wshom.ocx/tests/wshom.c, include/d3dtypes.h,
# | include/wine/list.h, include/wine/rbtree.h, include/winnt.h, server/request.c, server/sock.c, tools/makedep.c
# | dlls/netapi32/netapi32.c, dlls/oleaut32/oleaut.c, dlls/oleaut32/tests/safearray.c, dlls/rpcrt4/cstub.c,
# | dlls/shell32/tests/shellole.c, dlls/shlwapi/tests/ordinal.c, dlls/vbscript/vbdisp.c, dlls/winealsa.drv/mmdevdrv.c,
# | dlls/wined3d/glsl_shader.c, include/d3dtypes.h, include/wine/list.h, include/wine/rbtree.h, include/winnt.h,
# | server/request.c, server/sock.c, tools/makedep.c
# |
if test "$enable_Compiler_Warnings" -eq 1; then
patch_apply Compiler_Warnings/0001-comctl32-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0004-mshtml-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0005-msvcirt-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0006-oleaut32-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0007-rpcrt4-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0008-scrrun-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0009-shell32-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0010-shlwapi-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0011-user32-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0012-winhttp-tests-Avoid-misleading-indentation-warnings.patch
patch_apply Compiler_Warnings/0013-wshom.ocx-tests-Avoid-misleading-indentation-warning.patch
patch_apply Compiler_Warnings/0015-include-Avoid-shift-overflow-warning.patch
patch_apply Compiler_Warnings/0017-server-Workaround-duplicate-condition-warning-of-GCC.patch
patch_apply Compiler_Warnings/0018-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch
@ -2370,13 +2363,8 @@ if test "$enable_Compiler_Warnings" -eq 1; then
echo '+ { "Sebastian Lackner", "mshtml: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "msvcirt/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "oleaut32/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "rpcrt4/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "scrrun/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "shell32/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "shlwapi/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "user32/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "winhttp/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "wshom.ocx/tests: Avoid misleading indentation warnings.", 1 },';
echo '+ { "Sebastian Lackner", "include: Avoid shift overflow warning.", 1 },';
echo '+ { "Sebastian Lackner", "server: Workaround duplicate condition warning of GCC 6.", 1 },';
echo '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },';

45
patches/wined3d-CSMT_Main/0008-wined3d-Move-the-framebuffer-into-wined3d_state.patch
View File

@ -1,4 +1,4 @@
From 70827802a1fc98a6a804538508e6b35d618810cc Mon Sep 17 00:00:00 2001
From fd4c139df920eac1a3f8268d29316de8777f57c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Thu, 20 Dec 2012 13:09:17 +0100
Subject: wined3d: Move the framebuffer into wined3d_state
@ -633,7 +633,7 @@ index 28d5972..37594b2 100644
static unsigned int warned = 0;
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 572dda2..156e8a5 100644
index 4e3243c..15be52e 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -152,7 +152,7 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_
@ -645,25 +645,22 @@ index 572dda2..156e8a5 100644
{
TRACE("No Z buffer - disabling depth test\n");
zenable = WINED3D_ZB_FALSE;
@@ -452,14 +452,14 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st
GLenum src_blend, dst_blend;
unsigned int rt_fmt_flags;
- if (!state->fb->render_targets[0])
+ if (!state->fb.render_targets[0])
{
gl_info->gl_ops.gl.p_glDisable(GL_BLEND);
return;
@@ -466,11 +466,11 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st
checkGLcall("glDisable(GL_LINE_SMOOTH)");
}
- rt_format = state->fb->render_targets[0]->format;
- rt_fmt_flags = state->fb->render_targets[0]->format_flags;
+ rt_format = state->fb.render_targets[0]->format;
+ rt_fmt_flags = state->fb.render_targets[0]->format_flags;
- enable_blend = state->fb->render_targets[0] && state->render_states[WINED3D_RS_ALPHABLENDENABLE];
+ enable_blend = state->fb.render_targets[0] && state->render_states[WINED3D_RS_ALPHABLENDENABLE];
if (enable_blend)
{
- rt_format = state->fb->render_targets[0]->format;
- rt_fmt_flags = state->fb->render_targets[0]->format_flags;
+ rt_format = state->fb.render_targets[0]->format;
+ rt_fmt_flags = state->fb.render_targets[0]->format_flags;
/* According to the red book, GL_LINE_SMOOTH needs GL_BLEND with specific
* blending parameters to work. */
@@ -861,7 +861,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_
/* Disable blending in all cases even without pixelshaders.
* With blending on we could face a big performance penalty.
@@ -858,7 +858,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_
GLint depthFail_ccw;
/* No stencil test without a stencil buffer. */
@ -672,7 +669,7 @@ index 572dda2..156e8a5 100644
{
gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST);
checkGLcall("glDisable GL_STENCIL_TEST");
@@ -957,7 +957,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_
@@ -954,7 +954,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_
static void state_stencilwrite2s(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
@ -681,7 +678,7 @@ index 572dda2..156e8a5 100644
const struct wined3d_gl_info *gl_info = context->gl_info;
GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK));
@@ -971,7 +971,7 @@ static void state_stencilwrite2s(struct wined3d_context *context, const struct w
@@ -968,7 +968,7 @@ static void state_stencilwrite2s(struct wined3d_context *context, const struct w
static void state_stencilwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
@ -690,7 +687,7 @@ index 572dda2..156e8a5 100644
const struct wined3d_gl_info *gl_info = context->gl_info;
gl_info->gl_ops.gl.p_glStencilMask(mask);
@@ -1709,7 +1709,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3
@@ -1706,7 +1706,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3
if (state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS]
|| state->render_states[WINED3D_RS_DEPTHBIAS])
{
@ -699,7 +696,7 @@ index 572dda2..156e8a5 100644
float scale;
union
@@ -4623,8 +4623,8 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine
@@ -4620,8 +4620,8 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine
static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
@ -710,7 +707,7 @@ index 572dda2..156e8a5 100644
const struct wined3d_gl_info *gl_info = context->gl_info;
struct wined3d_viewport vp = state->viewport;
unsigned int width, height;
@@ -4810,7 +4810,7 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st
@@ -4807,7 +4807,7 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st
}
else
{
@ -719,7 +716,7 @@ index 572dda2..156e8a5 100644
UINT height;
UINT width;
@@ -4875,7 +4875,7 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state
@@ -4872,7 +4872,7 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state
TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id);

48
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@ -5384,31 +5384,27 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
{
TRACE("No Z buffer - disabling depth test\n");
zenable = WINED3D_ZB_FALSE;
@@ -452,14 +456,23 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st
GLenum src_blend, dst_blend;
unsigned int rt_fmt_flags;
+#if !defined(STAGING_CSMT)
if (!state->fb->render_targets[0])
+#else /* STAGING_CSMT */
+ if (!state->fb.render_targets[0])
+#endif /* STAGING_CSMT */
{
gl_info->gl_ops.gl.p_glDisable(GL_BLEND);
return;
@@ -466,11 +470,19 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st
checkGLcall("glDisable(GL_LINE_SMOOTH)");
}
+#if !defined(STAGING_CSMT)
rt_format = state->fb->render_targets[0]->format;
rt_fmt_flags = state->fb->render_targets[0]->format_flags;
enable_blend = state->fb->render_targets[0] && state->render_states[WINED3D_RS_ALPHABLENDENABLE];
if (enable_blend)
{
rt_format = state->fb->render_targets[0]->format;
rt_fmt_flags = state->fb->render_targets[0]->format_flags;
+#else /* STAGING_CSMT */
+ rt_format = state->fb.render_targets[0]->format;
+ rt_fmt_flags = state->fb.render_targets[0]->format_flags;
+ enable_blend = state->fb.render_targets[0] && state->render_states[WINED3D_RS_ALPHABLENDENABLE];
+ if (enable_blend)
+ {
+ rt_format = state->fb.render_targets[0]->format;
+ rt_fmt_flags = state->fb.render_targets[0]->format_flags;
+#endif /* STAGING_CSMT */
/* According to the red book, GL_LINE_SMOOTH needs GL_BLEND with specific
* blending parameters to work. */
@@ -861,7 +874,11 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_
/* Disable blending in all cases even without pixelshaders.
* With blending on we could face a big performance penalty.
@@ -858,7 +870,11 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_
GLint depthFail_ccw;
/* No stencil test without a stencil buffer. */
@ -5420,7 +5416,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
{
gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST);
checkGLcall("glDisable GL_STENCIL_TEST");
@@ -957,7 +974,11 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_
@@ -954,7 +970,11 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_
static void state_stencilwrite2s(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
@ -5432,7 +5428,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
const struct wined3d_gl_info *gl_info = context->gl_info;
GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK));
@@ -971,7 +992,11 @@ static void state_stencilwrite2s(struct wined3d_context *context, const struct w
@@ -968,7 +988,11 @@ static void state_stencilwrite2s(struct wined3d_context *context, const struct w
static void state_stencilwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
@ -5444,7 +5440,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
const struct wined3d_gl_info *gl_info = context->gl_info;
gl_info->gl_ops.gl.p_glStencilMask(mask);
@@ -1709,7 +1734,11 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3
@@ -1706,7 +1730,11 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3
if (state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS]
|| state->render_states[WINED3D_RS_DEPTHBIAS])
{
@ -5456,7 +5452,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
float scale;
union
@@ -3642,7 +3671,11 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state
@@ -3639,7 +3667,11 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state
}
else
{
@ -5468,7 +5464,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
{
ERR("Failed to create sampler.\n");
sampler = NULL;
@@ -4623,8 +4656,13 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine
@@ -4620,8 +4652,13 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine
static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
@ -5482,7 +5478,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
const struct wined3d_gl_info *gl_info = context->gl_info;
struct wined3d_viewport vp = state->viewport;
unsigned int width, height;
@@ -4810,7 +4848,11 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st
@@ -4807,7 +4844,11 @@ static void scissorrect(struct wined3d_context *context, const struct wined3d_st
}
else
{
@ -5494,7 +5490,7 @@ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
UINT height;
UINT width;
@@ -4875,7 +4917,11 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state
@@ -4872,7 +4913,11 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state
TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id);