wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddBezier().
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 8b170f0f59aab3dd0e775217a95227b1bfc4cf2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b170f0f59aab3dd0e775217a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:08 2015 +0200 d2d1: Implement d2d_geometry_sink_AddBezier(). --- dlls/d2d1/geometry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 0054a47..2f3a6cc 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -115,7 +115,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddLine(ID2D1GeometrySink *iface static void STDMETHODCALLTYPE d2d_geometry_sink_AddBezier(ID2D1GeometrySink *iface, const D2D1_BEZIER_SEGMENT *bezier) { - FIXME("iface %p, bezier %p stub!\n", iface, bezier); + TRACE("iface %p, bezier %p.\n", iface, bezier); + + d2d_geometry_sink_AddBeziers(iface, bezier, 1); } static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBezier(ID2D1GeometrySink *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddQuadraticBezier().
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 5d5fdbc63ba5d7fb913fe0d91b984f160824624d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5fdbc63ba5d7fb913fe0d91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:07 2015 +0200 d2d1: Implement d2d_geometry_sink_AddQuadraticBezier(). --- dlls/d2d1/geometry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 4ba851d..0054a47 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -121,7 +121,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBezier(ID2D1GeometrySink *ifa static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBezier(ID2D1GeometrySink *iface, const D2D1_QUADRATIC_BEZIER_SEGMENT *bezier) { - FIXME("iface %p, bezier %p stub!\n", iface, bezier); + TRACE("iface %p, bezier %p.\n", iface, bezier); + + ID2D1GeometrySink_AddQuadraticBeziers(iface, bezier, 1); } static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBeziers(ID2D1GeometrySink *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddLine().
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 95a12f246a6567a82852ff7f383266badfba7426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a12f246a6567a82852ff7f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:06 2015 +0200 d2d1: Implement d2d_geometry_sink_AddLine(). --- dlls/d2d1/geometry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 818a5d0..4ba851d 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -108,7 +108,9 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac static void STDMETHODCALLTYPE d2d_geometry_sink_AddLine(ID2D1GeometrySink *iface, D2D1_POINT_2F point) { - FIXME("iface %p, point {%.8e, %.8e} stub!\n", iface, point.x, point.y); + TRACE("iface %p, point {%.8e, %.8e}.\n", iface, point.x, point.y); + + d2d_geometry_sink_AddLines(iface, &point, 1); } static void STDMETHODCALLTYPE d2d_geometry_sink_AddBezier(ID2D1GeometrySink *iface, const D2D1_BEZIER_SEGMENT *bezier)

1 0

Hans Leidekker : winhttp: Keep the session open in the request object.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: b22ace7f7bceed769a7206755882cd3620f14200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22ace7f7bceed769a7206755… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 15 17:33:41 2015 +0200 winhttp: Keep the session open in the request object. Cookies have session scope in winhttp and they are not saved, so we need to keep the session open to ensure that cookies are passed along with subsequent requests. --- dlls/winhttp/request.c | 194 ++++++++++++++++++++++++++++--------------------- 1 file changed, 110 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b22ace7f7bceed769a720…

1 0

Hans Leidekker : winhttp: Correctly handle relative redirect paths.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 9736644ed50f996091afe16243c3fa4a373498a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9736644ed50f996091afe1624… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 15 17:32:50 2015 +0200 winhttp: Correctly handle relative redirect paths. --- dlls/winhttp/request.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2fee2c3..5aa90e4 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2296,13 +2296,21 @@ static BOOL handle_redirect( request_t *request, DWORD status ) { WCHAR *path, *p; - len = strlenW( location ) + 1; - if (location[0] != '/') len++; - if (!(p = path = heap_alloc( len * sizeof(WCHAR) ))) goto end; - - if (location[0] != '/') *p++ = '/'; - strcpyW( p, location ); - + if (location[0] == '/') + { + len = strlenW( location ); + if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + strcpyW( path, location ); + } + else + { + if ((p = strrchrW( request->path, '/' ))) *p = 0; + len = strlenW( request->path ) + 1 + strlenW( location ); + if (!(path = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto end; + strcpyW( path, request->path ); + strcatW( path, slashW ); + strcatW( path, location ); + } heap_free( request->path ); request->path = path;

1 0

Hans Leidekker : winhttp: Improve parsing of cookie values.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 41cf9a8372e698ecfa81254fd9ed67459607c3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41cf9a8372e698ecfa81254fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 15 17:32:25 2015 +0200 winhttp: Improve parsing of cookie values. --- dlls/winhttp/cookie.c | 53 ++++++++++---------- dlls/winhttp/tests/winhttp.c | 117 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 26 deletions(-) diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index 6e104b2..4bf0808 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -134,22 +134,14 @@ static cookie_t *parse_cookie( const WCHAR *string ) const WCHAR *p; int len; - if (!(p = strchrW( string, '=' ))) - { - WARN("no '=' in %s\n", debugstr_w(string)); - return NULL; - } - if (p == string) - { - WARN("empty cookie name in %s\n", debugstr_w(string)); - return NULL; - } + if (!(p = strchrW( string, '=' ))) p = string + strlenW( string ); + len = p - string; + while (len && string[len - 1] == ' ') len--; + if (!len) return NULL; if (!(cookie = heap_alloc_zero( sizeof(cookie_t) ))) return NULL; - list_init( &cookie->entry ); - len = p - string; if (!(cookie->name = heap_alloc( (len + 1) * sizeof(WCHAR) ))) { heap_free( cookie ); @@ -158,18 +150,20 @@ static cookie_t *parse_cookie( const WCHAR *string ) memcpy( cookie->name, string, len * sizeof(WCHAR) ); cookie->name[len] = 0; - p++; /* skip '=' */ - while (*p == ' ') p++; - - len = strlenW( p ); - if (!(cookie->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (*p++ == '=') { - free_cookie( cookie ); - return NULL; - } - memcpy( cookie->value, p, len * sizeof(WCHAR) ); - cookie->value[len] = 0; + while (*p && *p == ' ') p++; + len = strlenW( p ); + while (len && p[len - 1] == ' ') len--; + if (!(cookie->value = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + free_cookie( cookie ); + return NULL; + } + memcpy( cookie->value, p, len * sizeof(WCHAR) ); + cookie->value[len] = 0; + } return cookie; } @@ -259,14 +253,21 @@ BOOL add_cookie_headers( request_t *request ) if (strstrW( request->path, cookie->path ) == request->path) { - const WCHAR format[] = {'C','o','o','k','i','e',':',' ','%','s','=','%','s',0}; - int len; + const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; + int len, len_cookie = sizeof(cookieW) / sizeof(cookieW[0]), len_name = strlenW( cookie->name ); WCHAR *header; - len = strlenW( cookie->name ) + strlenW( format ) + strlenW( cookie->value ); + len = len_cookie + len_name; + if (cookie->value) len += strlenW( cookie->value ) + 1; if (!(header = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; - sprintfW( header, format, cookie->name, cookie->value ); + memcpy( header, cookieW, len_cookie * sizeof(WCHAR) ); + strcpyW( header + len_cookie, cookie->name ); + if (cookie->value) + { + header[len_cookie + len_name] = '='; + strcpyW( header + len_cookie + len_name + 1, cookie->value ); + } TRACE("%s\n", debugstr_w(header)); add_request_headers( request, header, len, WINHTTP_ADDREQ_FLAG_ADD ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3860461..10a3f06 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1799,6 +1799,15 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char notokmsg[] = +"HTTP/1.1 400 Bad Request\r\n" +"\r\n"; + +static const char cookiemsg[] = +"HTTP/1.1 200 OK\r\n" +"Set-Cookie: name = value \r\n" +"\r\n"; + static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\n" "Server: winetest\r\n" @@ -1917,6 +1926,16 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, headmsg, sizeof headmsg - 1, 0); continue; } + if (strstr(buffer, "GET /cookie2")) + { + if (strstr(buffer, "Cookie: name=value\r\n")) send(c, okmsg, sizeof(okmsg) - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } + else if (strstr(buffer, "GET /cookie")) + { + if (!strstr(buffer, "Cookie: name=value\r\n")) send(c, cookiemsg, sizeof(cookiemsg) - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -2503,6 +2522,103 @@ static void test_multiple_reads(int port) WinHttpCloseHandle(ses); } +static void test_cookies( int port ) +{ + static const WCHAR cookieW[] = {'/','c','o','o','k','i','e',0}; + static const WCHAR cookie2W[] = {'/','c','o','o','k','i','e','2',0}; + HINTERNET ses, con, req; + DWORD status, size; + BOOL ret; + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookieW, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 200, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, cookie2W, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL ); + ok( ret, "failed to query status code %u\n", GetLastError() ); + ok( status == 400, "request failed unexpectedly %u\n", status ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + static void test_connection_info( int port ) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -3478,6 +3594,7 @@ START_TEST (winhttp) test_basic_authentication(si.port); test_bad_header(si.port); test_multiple_reads(si.port); + test_cookies(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, NULL, quitW);

1 0

Huw Davies : user32/tests: Add some optional messages for Win XP.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 683ffd7ff163274ceb2e110d82b46063008928a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=683ffd7ff163274ceb2e110d8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 15 14:23:18 2015 +0100 user32/tests: Add some optional messages for Win XP. --- dlls/user32/tests/msg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5cbfec8..b5f9e6a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -793,6 +793,9 @@ static const struct message WmShowMaxPopupSeq[] = { { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCPAINT, sent|wparam|optional, 1 }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOMOVE|SWP_NOSIZE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 },

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.45
by Jeremy Newman 15 Jun '15

15 Jun '15

Module: website Branch: master Commit: 65f185d15d9bd1556d68e847e0e765bebe5e5b08 URL: http://source.winehq.org/git/website.git/?a=commit;h=65f185d15d9bd1556d68e8… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jun 12 20:29:26 2015 +0200 Polish translation for release 1.7.45 --- news/pl/2015061201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015061201.xml b/news/pl/2015061201.xml new file mode 100644 index 0000000..f6ad156 --- /dev/null +++ b/news/pl/2015061201.xml @@ -0,0 +1,16 @@ +<news> +<date>Czerwiec 12, 2015</date> +<title>Wydano Wine 1.7.45</title> +<body> + Wydanie rozwojowe Wine 1.7.45 jest już dostępne. + <a href="{$root}/announce/1.7.45">Co nowego</a> w tym wydaniu: +<ul> + <li>Lepsza wsparcie diagnostyki na 64-bitowym Mac OS X.</li> + <li>Postęo w implementacji DirectWrite.</li> + <li>Kilka poprawek do kontrolek RichEdit.</li> + <li>Początki implementacji starej biblioteki uruchomieniowej MSVCIRT C++.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.45.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.45
by Jeremy Newman 15 Jun '15

15 Jun '15

Module: website Branch: master Commit: fa76686423f20af15f8b3b8b28bf89c8ac65fba5 URL: http://source.winehq.org/git/website.git/?a=commit;h=fa76686423f20af15f8b3b… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Jun 14 15:56:19 2015 +0200 German translation for release 1.7.45 >From 8bde2c64ebcddddbea7adc50a44bfc7aac97f06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCger?= <jr98(a)gmx.net> Date: Sun, 14 Jun 2015 15:47:06 +0200 Subject: German translation for release 1.7.45 --- news/de/2015061201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015061201.xml b/news/de/2015061201.xml new file mode 100644 index 0000000..905cdfe --- /dev/null +++ b/news/de/2015061201.xml @@ -0,0 +1,16 @@ +<news> +<date>12. Juni 2015</date> +<title>Wine 1.7.45 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.45 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.45">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Bessere Debugging-Unterstützung unter 64-Bit Mac OS X.</li> + <li>Kleinere Fortschritte der DirectWrite-Implementierung.</li> + <li>Einige Korrekturen am RichEdit-Steuerelement.</li> + <li>Anfänge einer Implementierung der alten MSVCIRT C++-Laufzeit.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.45.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Huw Davies : oleaut32/tests: Add broken behaviour on Win 2003.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: 46bdb6e59a007b71aa6a0932228e30bf3ad8bc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bdb6e59a007b71aa6a09322… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 15 13:24:18 2015 +0100 oleaut32/tests: Add broken behaviour on Win 2003. --- dlls/oleaut32/tests/safearray.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index ae8b2a8..2a62977 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -456,11 +456,15 @@ static void test_safearray(void) bound.lLbound = 0; SafeArrayRedim(a, &bound); SafeArrayPtrOfIndex(a, indices, (void **)&ptr1); - ok(*(WORD *)ptr1 == 0, "Expanded area not zero-initialized\n"); + ok(*(WORD *)ptr1 == 0 || + broken(*(WORD *)ptr1 != 0), /* Win 2003 */ + "Expanded area not zero-initialized\n"); indices[1] = 1; SafeArrayPtrOfIndex(a, indices, (void **)&ptr1); - ok(*(WORD *)ptr1 == 0x55aa, "Data not preserved when resizing array\n"); + ok(*(WORD *)ptr1 == 0x55aa || + broken(*(WORD *)ptr1 != 0x55aa), /* Win 2003 */ + "Data not preserved when resizing array\n"); hres = SafeArrayDestroy(a); ok(hres == S_OK,"SAD failed with hres %x\n", hres);

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015