wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 84b3218ed6ad5975f537481edf2f61fb26bedb8b.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-08-08 21:43:18 +02:00
parent 1b0da6367b
commit 929a758ef4
6 changed files with 43 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +1,17 @@
From 5a398b6537c252196f0f3df6ea4dfbc3956e322b Mon Sep 17 00:00:00 2001
From b9eb34a478b2f6824778c6e7b12fb2115c881ce6 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(+)
dlls/msvcirt/tests/msvcirt.c | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c
index a921b27..11c8b4f 100644
index 7b83cfb..dba01c0 100644
--- a/dlls/msvcirt/tests/msvcirt.c
+++ b/dlls/msvcirt/tests/msvcirt.c
@@ -2896,7 +2896,9 @@ static void test_ostream(void) {
@@ -2960,7 +2960,9 @@ static void test_ostream(void) {
/* flush */
if (0) /* crashes on native */
@@ -21,7 +21,7 @@ index a921b27..11c8b4f 100644
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 */
@@ -3016,7 +3018,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 a921b27..11c8b4f 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);
@@ -2979,7 +2983,9 @@ if (0) /* crashes on native */
@@ -3043,7 +3047,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 a921b27..11c8b4f 100644
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 */
@@ -3083,7 +3089,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 a921b27..11c8b4f 100644
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 */
@@ -3115,7 +3123,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 a921b27..11c8b4f 100644
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 */
@@ -3231,7 +3241,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,17 @@ index a921b27..11c8b4f 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);
@@ -3580,7 +3592,9 @@ static void test_istream(void)
@@ -3696,7 +3708,9 @@ todo_wine
osa1.unknown = 0xabababab;
osa1.base_ios.sb = (streambuf*) 0xabababab;
if (0) /* crashes on native */
+{
osa1.base_ios.delbuf = 0xabababab;
+}
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)
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 */
@@ -81,7 +91,7 @@ index a921b27..11c8b4f 100644
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 */
@@ -3912,7 +3928,9 @@ if (0) /* crashes on native */
/* eatwhite */
is1.extract_delim = is1.count = 0;
if (0) /* crashes on native */
@@ -91,7 +101,7 @@ index a921b27..11c8b4f 100644
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 */
@@ -3980,7 +3998,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 */
@@ -101,7 +111,7 @@ index a921b27..11c8b4f 100644
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 */
@@ -4247,7 +4267,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 */
@@ -111,7 +121,7 @@ index a921b27..11c8b4f 100644
/* get_str */
is1.extract_delim = is1.count = 0xabababab;
@@ -4089,7 +4109,9 @@ if (0) /* crashes on native */
@@ -4385,7 +4407,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 */
@@ -121,7 +131,7 @@ index a921b27..11c8b4f 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);
@@ -4201,7 +4223,9 @@ if (0) /* crashes on native */
@@ -4497,7 +4521,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 */
@@ -131,7 +141,7 @@ index a921b27..11c8b4f 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);
@@ -4395,7 +4419,9 @@ if (0) /* crashes on native */
@@ -4691,7 +4717,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 */
@@ -141,7 +151,7 @@ index a921b27..11c8b4f 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);
@@ -4440,7 +4466,9 @@ if (0) /* crashes on native */
@@ -4736,7 +4764,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 */
@@ -151,7 +161,7 @@ index a921b27..11c8b4f 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);
@@ -4498,13 +4526,17 @@ if (0) /* crashes on native */
@@ -4794,13 +4824,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 */
@@ -169,7 +179,7 @@ index a921b27..11c8b4f 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);
@@ -4520,7 +4552,9 @@ if (0) /* crashes on native */
@@ -4816,7 +4850,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 */
@@ -179,7 +189,7 @@ index a921b27..11c8b4f 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);
@@ -4553,7 +4587,9 @@ if (0) /* crashes on native */
@@ -4849,7 +4885,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 */
@@ -189,7 +199,7 @@ index a921b27..11c8b4f 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);
@@ -4574,7 +4610,9 @@ if (0) /* crashes on native */
@@ -4870,7 +4908,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 */
@@ -199,7 +209,7 @@ index a921b27..11c8b4f 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);
@@ -4607,7 +4645,9 @@ if (0) /* crashes on native */
@@ -4903,7 +4943,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 */