mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 84b3218ed6ad5975f537481edf2f61fb26bedb8b.
This commit is contained in:
Sebastian Lackner
parent
1b0da6367b
commit
929a758ef4
@ -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 */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 65d3fe2e1b64341598f8e427f2e331e430617aac Mon Sep 17 00:00:00 2001
|
||||
From 6a34fd5dad4f8cd722eb07f8e253525544705d0c Mon Sep 17 00:00:00 2001
|
||||
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
|
||||
Date: Thu, 17 Sep 2015 17:56:15 -0600
|
||||
Subject: msi: Add support for exporting the _SummaryInformation table.
|
||||
@ -54,7 +54,7 @@ index e28cf1c..13eac2a 100644
|
||||
if (r == ERROR_SUCCESS)
|
||||
{
|
||||
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
|
||||
index d457a54..71b620c 100644
|
||||
index 8e7b592..3aac2af 100644
|
||||
--- a/dlls/msi/msipriv.h
|
||||
+++ b/dlls/msi/msipriv.h
|
||||
@@ -954,6 +954,7 @@ extern LPWSTR msi_suminfo_dup_string( MSISUMMARYINFO *si, UINT uiProperty ) DECL
|
||||
@ -62,11 +62,11 @@ index d457a54..71b620c 100644
|
||||
extern LPWSTR msi_get_suminfo_product( IStorage *stg ) DECLSPEC_HIDDEN;
|
||||
extern UINT msi_add_suminfo( MSIDATABASE *db, LPWSTR **records, int num_records, int num_columns ) DECLSPEC_HIDDEN;
|
||||
+extern UINT msi_export_suminfo( MSIDATABASE *db, HANDLE handle ) DECLSPEC_HIDDEN;
|
||||
extern enum platform parse_platform( const WCHAR *str ) DECLSPEC_HIDDEN;
|
||||
extern UINT msi_load_suminfo_properties( MSIPACKAGE *package ) DECLSPEC_HIDDEN;
|
||||
|
||||
/* undocumented functions */
|
||||
diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c
|
||||
index 451fd16..c929fa5 100644
|
||||
index 451fd16b..c929fa5 100644
|
||||
--- a/dlls/msi/suminfo.c
|
||||
+++ b/dlls/msi/suminfo.c
|
||||
@@ -23,6 +23,7 @@
|
||||
@ -196,5 +196,5 @@ index 451fd16..c929fa5 100644
|
||||
{
|
||||
MSISUMMARYINFO *si;
|
||||
--
|
||||
2.5.1
|
||||
2.9.0
|
||||
|
||||
|
||||
@ -51,13 +51,13 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "3852d3357d087353d71d4d11359014a97dbf3e5a"
|
||||
echo "84b3218ed6ad5975f537481edf2f61fb26bedb8b"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
version()
|
||||
{
|
||||
echo "Wine Staging 1.9.16"
|
||||
echo "Wine Staging 1.9.17 (unreleased)"
|
||||
echo "Copyright (C) 2014-2016 the Wine Staging project authors."
|
||||
echo ""
|
||||
echo "Patchset to be applied on upstream Wine:"
|
||||
@ -7240,8 +7240,7 @@ fi
|
||||
# Patchset wined3d-Silence_FIXMEs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/wined3d/glsl_shader.c, dlls/wined3d/resource.c, dlls/wined3d/state.c, dlls/wined3d/surface.c,
|
||||
# | dlls/wined3d/swapchain.c, dlls/wined3d/texture.c
|
||||
# | * dlls/wined3d/resource.c, dlls/wined3d/state.c, dlls/wined3d/surface.c, dlls/wined3d/swapchain.c, dlls/wined3d/texture.c
|
||||
# |
|
||||
if test "$enable_wined3d_Silence_FIXMEs" -eq 1; then
|
||||
patch_apply wined3d-Silence_FIXMEs/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch
|
||||
@ -7251,7 +7250,6 @@ if test "$enable_wined3d_Silence_FIXMEs" -eq 1; then
|
||||
patch_apply wined3d-Silence_FIXMEs/0005-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch
|
||||
patch_apply wined3d-Silence_FIXMEs/0006-wined3d-Silence-extremely-noisy-FIXME-in-wined3d_tex.patch
|
||||
patch_apply wined3d-Silence_FIXMEs/0007-wined3d-Display-FIXME-only-once-when-blen-op-is-0.patch
|
||||
patch_apply wined3d-Silence_FIXMEs/0008-wined3d-Silence-false-FIXME-message.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },';
|
||||
echo '+ { "Christian Costa", "wined3d: Display FIXME for cmp function 0 only once.", 1 },';
|
||||
@ -7260,7 +7258,6 @@ if test "$enable_wined3d_Silence_FIXMEs" -eq 1; then
|
||||
echo '+ { "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "wined3d: Silence extremely noisy FIXME in wined3d_texture_add_dirty_region.", 1 },';
|
||||
echo '+ { "Christian Costa", "wined3d: Display FIXME only once when blen op is 0.", 1 },';
|
||||
echo '+ { "Józef Kucia", "wined3d: Silence false FIXME message.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
@ -7639,13 +7636,11 @@ fi
|
||||
# Patchset winhttp-System_Proxy_Autoconfig
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/winhttp/session.c, dlls/wininet/internet.c
|
||||
# | * dlls/wininet/internet.c
|
||||
# |
|
||||
if test "$enable_winhttp_System_Proxy_Autoconfig" -eq 1; then
|
||||
patch_apply winhttp-System_Proxy_Autoconfig/0001-winhttp-Silence-repeated-no-support-on-this-platform.patch
|
||||
patch_apply winhttp-System_Proxy_Autoconfig/0002-wininet-Silence-wininet-no-support-on-this-platform-.patch
|
||||
(
|
||||
echo '+ { "Jarkko Korpi", "winhttp: Silence repeated \"no support on this platform\" message.", 1 },';
|
||||
echo '+ { "Jarkko Korpi", "wininet: Silence wininet no support on this platform message.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From 3bbe012e2a27c6d2d59539b5e12bf92ab2180b77 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B3zef=20Kucia?= <jkucia@codeweavers.com>
|
||||
Date: Fri, 5 Aug 2016 19:41:41 +0200
|
||||
Subject: wined3d: Silence false FIXME message.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
|
||||
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
|
||||
---
|
||||
dlls/wined3d/glsl_shader.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
|
||||
index 2a03b9f..64c9cec 100644
|
||||
--- a/dlls/wined3d/glsl_shader.c
|
||||
+++ b/dlls/wined3d/glsl_shader.c
|
||||
@@ -1784,7 +1784,7 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b
|
||||
index);
|
||||
return;
|
||||
}
|
||||
- if (e->sysval_semantic)
|
||||
+ if (e->sysval_semantic && e->sysval_semantic != WINED3D_SV_POSITION)
|
||||
FIXME("Unhandled sysval semantic %#x.\n", e->sysval_semantic);
|
||||
|
||||
if (shader_glsl_use_explicit_attrib_location(gl_info))
|
||||
--
|
||||
2.9.0
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From e449ba207a501ae85ae23a1b0c84e91eea90caf6 Mon Sep 17 00:00:00 2001
|
||||
From: Jarkko Korpi <jarkko_korpi@hotmail.com>
|
||||
Date: Mon, 6 Jul 2015 21:07:26 +0300
|
||||
Subject: winhttp: Silence repeated "no support on this platform" message.
|
||||
|
||||
---
|
||||
dlls/winhttp/session.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
|
||||
index 1b54288..c84c69a 100644
|
||||
--- a/dlls/winhttp/session.c
|
||||
+++ b/dlls/winhttp/session.c
|
||||
@@ -1339,7 +1339,8 @@ static BOOL get_system_proxy_autoconfig_url( char *buf, DWORD buflen )
|
||||
CFRelease( settings );
|
||||
return ret;
|
||||
#else
|
||||
- FIXME( "no support on this platform\n" );
|
||||
+ static int once;
|
||||
+ if (!once++) FIXME( "no support on this platform\n" );
|
||||
return FALSE;
|
||||
#endif
|
||||
}
|
||||
--
|
||||
2.4.5
|
||||
|
||||
@ -1 +1 @@
|
||||
Wine Staging 1.9.16
|
||||
Wine Staging 1.9.17 (unreleased)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user