September 2013 - Wine-Commits

Akihiro Sagawa : gdi32: Fix empty glyph handling.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 31a6fce46b13c09584209ac07b280399b438cff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a6fce46b13c09584209ac07… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 20 00:57:53 2013 +0900 gdi32: Fix empty glyph handling. --- dlls/gdi32/font.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7fd5bd3..a025d17 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1812,7 +1812,11 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, image->ptr = NULL; image->free = NULL; - if (!ret) return ERROR_SUCCESS; /* empty glyph */ + if (!ret) /* empty glyph */ + { + metrics->gmBlackBoxX = metrics->gmBlackBoxY = 0; + return ERROR_SUCCESS; + } stride = get_dib_stride( metrics->gmBlackBoxX, 1 ); size = metrics->gmBlackBoxY * stride;

1 0

Dmitry Timoshkov : ntdll: Perform the offset checks also for a serial device.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 084f4b643cd4cd98bdedbd89dc1e5ccc239cc83b URL: http://source.winehq.org/git/wine.git/?a=commit;h=084f4b643cd4cd98bdedbd89d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 19 16:10:09 2013 +0900 ntdll: Perform the offset checks also for a serial device. --- dlls/kernel32/tests/comm.c | 9 --------- dlls/ntdll/file.c | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index dfd148c..242b599 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -2153,20 +2153,14 @@ todo_wine SetLastError(0xdeadbeef); ret = ReadFile(hcom, buf, 0, &bytes, NULL); ok(!ret, "ReadFile should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); iob.Status = -1; iob.Information = -1; status = pNtReadFile(hcom, 0, NULL, NULL, &iob, buf, 0, NULL, NULL); -todo_wine ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); - /* FIXME: Remove once Wine is fixed */ - if (status == STATUS_PENDING) WaitForSingleObject(hcom, TIMEOUT); -todo_wine ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); -todo_wine ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); for (i = -20; i < 20; i++) @@ -2187,11 +2181,8 @@ todo_wine } else { -todo_wine ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status); -todo_wine ok(iob.Status == -1, "%d: expected -1, got %#x\n", i, iob.Status); -todo_wine ok(iob.Information == -1, "%d: expected -1, got %ld\n", i, iob.Information); } } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 15e8829..75ce35c 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -632,6 +632,14 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } } + else if (type == FD_TYPE_SERIAL) + { + if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) + { + status = STATUS_INVALID_PARAMETER; + goto done; + } + } for (;;) {

1 0

Alexandre Julliard : makefiles: Generate dependencies for symlinks that are needed at build time.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 83eb4fd9b3cff08ad7483bcc876a0cf8e95175c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83eb4fd9b3cff08ad7483bcc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 23 12:52:14 2013 +0200 makefiles: Generate dependencies for symlinks that are needed at build time. --- Makefile.in | 2 -- aclocal.m4 | 29 ++++++++++++++++++++--------- configure | 29 ++++++++++++++--------------- configure.ac | 17 +++++++---------- 4 files changed, 41 insertions(+), 36 deletions(-) diff --git a/Makefile.in b/Makefile.in index 72161fc..a07abd2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,8 +77,6 @@ tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine tools/widl tools/wmc tools/wrc: libs/wpp -dlls/shell32/Makefile dlls/shell32/__depend__: dlls/shell32/AUTHORS - $(MAKEDEP): include/config.h @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT) diff --git a/aclocal.m4 b/aclocal.m4 index 08ba797..1e1bece 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -599,12 +599,20 @@ distclean:: wine_fn_config_symlink () { - ac_link=$[1] + ac_linkdir= + if test "x$[1]" = "x-d" + then + ac_linkdir=$[2] + shift; shift + fi + ac_links=$[@] wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_link: - @./config.status $ac_link +"$ac_links: + @./config.status \$[@] distclean:: - \$(RM) $ac_link" + \$(RM) $ac_links" + test -n "$ac_linkdir" || return + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_linkdir/Makefile $ac_linkdir/__depend__: $ac_links" } if test "x$CROSSTEST_DISABLE" != x @@ -635,13 +643,16 @@ AC_DEFUN([WINE_CONFIG_EXTRA_DIR], dnl **** Create symlinks from config.status **** dnl -dnl Usage: WINE_CONFIG_SYMLINK(name,target,enable) +dnl Usage: WINE_CONFIG_SYMLINK(target,src,files,enable,srcfile) dnl AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl -m4_ifval([$3],[if test "x$[$3]" != xno; then -])AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl -m4_if([$2],,[test "$srcdir" = "." || ])wine_fn_config_symlink $1[]m4_ifval([$3],[ -fi])]) +m4_ifval([$4],[if test "x$[$4]" != xno; then +])m4_foreach([f],[$3], +[AC_CONFIG_LINKS(m4_ifval([$1],[$1/])f[:]m4_ifval([$2],[$2/])m4_ifval([$5],[$5],f))])dnl +m4_if([$1],[$2],[test "$srcdir" = "." || ])dnl +wine_fn_config_symlink[]m4_if([$1],[$2],,m4_ifval([$1],[ -d $1]))[]m4_foreach([f],[$3],[ ]m4_ifval([$1],[$1/])f)m4_ifval([$4],[ +fi])[]dnl +])]) dnl **** Create a make rules file from config.status **** dnl diff --git a/configure b/configure index a2f8e22..7cbe217 100755 --- a/configure +++ b/configure @@ -15830,12 +15830,20 @@ distclean:: wine_fn_config_symlink () { - ac_link=$1 + ac_linkdir= + if test "x$1" = "x-d" + then + ac_linkdir=$2 + shift; shift + fi + ac_links=$@ wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_link: - @./config.status $ac_link +"$ac_links: + @./config.status \$@ distclean:: - \$(RM) $ac_link" + \$(RM) $ac_links" + test -n "$ac_linkdir" || return + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_linkdir/Makefile $ac_linkdir/__depend__: $ac_links" } if test "x$CROSSTEST_DISABLE" != x @@ -15845,24 +15853,15 @@ then @echo \"crosstest is not supported (mingw not installed?)\" && false" fi ac_config_links="$ac_config_links dlls/shell32/AUTHORS:AUTHORS" -wine_fn_config_symlink dlls/shell32/AUTHORS +wine_fn_config_symlink -d dlls/shell32 dlls/shell32/AUTHORS ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" -test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf -fi -if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" -test "$srcdir" = "." || wine_fn_config_symlink fonts/symbol.ttf -fi -if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" -test "$srcdir" = "." || wine_fn_config_symlink fonts/tahoma.ttf -fi -if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" -test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf +test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf fonts/symbol.ttf fonts/tahoma.ttf fonts/tahomabd.ttf fi ac_config_links="$ac_config_links po/LINGUAS:po/LINGUAS" test "$srcdir" = "." || wine_fn_config_symlink po/LINGUAS diff --git a/configure.ac b/configure.ac index b687119..8b78cfe 100644 --- a/configure.ac +++ b/configure.ac @@ -2554,16 +2554,13 @@ AH_BOTTOM([#endif /* WINE_CROSSTEST */ AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) -WINE_CONFIG_SYMLINK(dlls/shell32/AUTHORS,AUTHORS) -WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd) -WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts) -WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts) -WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts) -WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts) -WINE_CONFIG_SYMLINK(po/LINGUAS) -WINE_CONFIG_SYMLINK(tools/l_intl.nls,,enable_tools) -WINE_CONFIG_SYMLINK(wine,tools/winewrapper) -WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,enable_win64) +WINE_CONFIG_SYMLINK(dlls/shell32,,[AUTHORS]) +WINE_CONFIG_SYMLINK(dlls/wineps.drv,dlls/wineps.drv,[generic.ppd]) +WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) +WINE_CONFIG_SYMLINK(po,po,[LINGUAS]) +WINE_CONFIG_SYMLINK(tools,tools,[l_intl.nls],enable_tools) +WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) +WINE_CONFIG_SYMLINK(,tools,[wine64],enable_win64,winewrapper) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/dibdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)

1 0

Bruno Jesus : ws2_32: Fix some parameters checking in AcceptEx.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: d0009573eea2e5bad3ce810ddfb22fef99fe969c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0009573eea2e5bad3ce810dd… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 21 16:45:20 2013 -0300 ws2_32: Fix some parameters checking in AcceptEx. --- dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fac090d..c606659 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2319,6 +2319,13 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW return FALSE; } + if ((local_addr_len < sizeof(struct sockaddr_in) + 16) + || (rem_addr_len < sizeof(struct sockaddr_in) + 16)) + { + SetLastError(WSAEINVAL); + return FALSE; + } + fd = get_sock_fd( listener, FILE_READ_DATA, NULL ); if (fd == -1) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c1d6956..343fd94 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5348,12 +5348,22 @@ static void test_AcceptEx(void) bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 15, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, 0, &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, + sizeof(struct sockaddr_in) + 15, &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, 0, @@ -5362,6 +5372,10 @@ static void test_AcceptEx(void) ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, 0, &bytesReturned, NULL); + ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " + "returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped);

1 0

Michael Stefaniuc : rsaenh: Avoid using CONST.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 1a3137fa1ba4cf126604357a5ec1f547050e13c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3137fa1ba4cf126604357a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 23 00:29:19 2013 +0200 rsaenh: Avoid using CONST. --- dlls/rsaenh/implglue.c | 14 ++-- dlls/rsaenh/implglue.h | 14 ++-- dlls/rsaenh/rsaenh.c | 146 ++++++++++++++++++++++++------------------------ 3 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a3137fa1ba4cf1266043…

1 0

Michael Stefaniuc : gdiplus: Avoid using CONST.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 9fefae61dafcfb6b7a583050b6fd741170a3894c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fefae61dafcfb6b7a583050b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 23 00:36:04 2013 +0200 gdiplus: Avoid using CONST. --- dlls/gdiplus/gdiplus.c | 6 +++--- dlls/gdiplus/gdiplus_private.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index bfa3279..a76143e 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -374,7 +374,7 @@ REAL units_scale(GpUnit from, GpUnit to, REAL dpi) } /* Calculates Bezier points from cardinal spline points. */ -void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, +void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) { REAL xdiff, ydiff; @@ -473,13 +473,13 @@ void delete_element(region_element* element) } } -const char *debugstr_rectf(CONST RectF* rc) +const char *debugstr_rectf(const RectF* rc) { if (!rc) return "(null)"; return wine_dbg_sprintf("(%0.2f,%0.2f,%0.2f,%0.2f)", rc->X, rc->Y, rc->Width, rc->Height); } -const char *debugstr_pointf(CONST PointF* pt) +const char *debugstr_pointf(const PointF* pt) { if (!pt) return "(null)"; return wine_dbg_sprintf("(%0.2f,%0.2f)", pt->X, pt->Y); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 00be810..19b2130 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -60,7 +60,7 @@ extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDE extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; extern MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) DECLSPEC_HIDDEN; -extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, +extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, REAL tension, REAL *x, REAL *y) DECLSPEC_HIDDEN; @@ -114,9 +114,9 @@ static inline ARGB color_over(ARGB bg, ARGB fg) return (a<<24)|(r<<16)|(g<<8)|b; } -extern const char *debugstr_rectf(CONST RectF* rc) DECLSPEC_HIDDEN; +extern const char *debugstr_rectf(const RectF* rc) DECLSPEC_HIDDEN; -extern const char *debugstr_pointf(CONST PointF* pt) DECLSPEC_HIDDEN; +extern const char *debugstr_pointf(const PointF* pt) DECLSPEC_HIDDEN; extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride) DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : shlwapi/tests: Skip some of IStream invalid parameter tests under Windows 2000 + IE5.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 50c4723aec7610e7cd6c7ff918f0a1fd5aa2994e URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c4723aec7610e7cd6c7ff91… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 23 16:54:34 2013 +0900 shlwapi/tests: Skip some of IStream invalid parameter tests under Windows 2000 + IE5. --- dlls/shlwapi/tests/istream.c | 40 +++++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 48f417f..a61e293 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -35,6 +35,7 @@ static HRESULT (WINAPI *pSHCreateStreamOnFileA)(LPCSTR file, DWORD mode, IStream static HRESULT (WINAPI *pSHCreateStreamOnFileW)(LPCWSTR file, DWORD mode, IStream **stream); static HRESULT (WINAPI *pSHCreateStreamOnFileEx)(LPCWSTR file, DWORD mode, DWORD attributes, BOOL create, IStream *template, IStream **stream); +static BOOL is_win2000_IE5 = FALSE; static void test_IStream_invalid_operations(IStream * stream, DWORD mode) { @@ -76,40 +77,53 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) ret = stream->lpVtbl->Write(stream, NULL, 0, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, - "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); + { + ok(ret == STG_E_ACCESSDENIED /* XP */ || broken(ret == S_OK) /* Win2000 + IE5 */, + "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); + if (ret == S_OK) + is_win2000_IE5 = TRUE; + } else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); + /* IStream::Write calls below hang under Win2000 + IE5, Win2000 + IE6 SP1 + * and newer Windows versions pass these tests. + */ + if (is_win2000_IE5) + { + win_skip("broken IStream::Write implementation (win2000)\n"); + return; + } + strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 5, NULL); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, - "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED, + "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 0, NULL); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, - "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED, + "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 0, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, - "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED, + "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); strcpy(data, "Hello"); ret = stream->lpVtbl->Write(stream, data, 3, &count); if (mode == STGM_READ) - ok(ret == STG_E_ACCESSDENIED /* XP */ || ret == S_OK /* 2000 */, - "expected STG_E_ACCESSDENIED or S_OK, got 0x%08x\n", ret); + ok(ret == STG_E_ACCESSDENIED, + "expected STG_E_ACCESSDENIED, got 0x%08x\n", ret); else ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); @@ -119,8 +133,8 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) ok(ret == S_OK, "expected S_OK, got 0x%08x\n", ret); ret = IStream_Seek(stream, zero, 20, NULL); - ok(ret == E_INVALIDARG /* XP */ || ret == S_OK /* 2000 */, - "expected E_INVALIDARG or S_OK, got 0x%08x\n", ret); + ok(ret == E_INVALIDARG, + "expected E_INVALIDARG, got 0x%08x\n", ret); /* IStream::CopyTo */ @@ -172,7 +186,7 @@ static void test_IStream_invalid_operations(IStream * stream, DWORD mode) /* IStream::Stat */ ret = IStream_Stat(stream, NULL, 0); - ok(ret == STG_E_INVALIDPOINTER /* XP */ || ret == E_NOTIMPL /* 2000 */, + ok(ret == STG_E_INVALIDPOINTER, "expected STG_E_INVALIDPOINTER or E_NOTIMPL, got 0x%08x\n", ret); /* IStream::Clone */

1 0

André Hentschel : ws2_32/tests: Don' t test function directly when reporting WSAGetLastError().
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: b605553e28fd51cd39cc3d2a503477c44ab9bd43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b605553e28fd51cd39cc3d2a5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 22 21:35:38 2013 +0200 ws2_32/tests: Don't test function directly when reporting WSAGetLastError(). --- dlls/ws2_32/tests/sock.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 343fd94..b085f0b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2094,7 +2094,7 @@ static void test_WSADuplicateSocket(void) WSAPROTOCOL_INFOA info; DWORD err; struct sockaddr_in addr; - int socktype, size, addrsize; + int socktype, size, addrsize, ret; char teststr[] = "TEST", buffer[16]; source = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0); @@ -2181,8 +2181,8 @@ static void test_WSADuplicateSocket(void) ok(dupsock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); size = sizeof(int); - ok(!getsockopt(dupsock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), - "getsockopt failed with %d\n", WSAGetLastError()); + ret = getsockopt(dupsock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", SOCK_DGRAM, socktype);

1 0

André Hentschel : wininet/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 7e65578b7cb00c74433fc6801c83d6753f2ec878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e65578b7cb00c74433fc6801… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 22 21:35:34 2013 +0200 wininet/tests: Don't test function directly when reporting GetLastError(). --- dlls/wininet/tests/http.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2526681..12eab57 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1468,6 +1468,7 @@ static void HttpHeaders_test(void) DWORD len = 256; DWORD oldlen; DWORD index = 0; + BOOL ret; hSession = InternetOpen("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG,NULL,NULL,0); @@ -1759,19 +1760,19 @@ static void HttpHeaders_test(void) ok(index == 1, "Index was not incremented\n"); ok(strcmp(buffer,"value3")==0, "incorrect string was returned(%s)\n",buffer); - ok(HttpAddRequestHeaders(hRequest, "Authorization: Basic\r\n", -1, HTTP_ADDREQ_FLAG_ADD), - "unable to add header %u\n", GetLastError()); + ret = HttpAddRequestHeaders(hRequest, "Authorization: Basic\r\n", -1, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "unable to add header %u\n", GetLastError()); index = 0; buffer[0] = 0; len = sizeof(buffer); - ok(HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index), - "unable to query header %u\n", GetLastError()); + ret = HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index); + ok(ret, "unable to query header %u\n", GetLastError()); ok(index == 1, "index was not incremented\n"); ok(!strcmp(buffer, "Basic"), "incorrect string was returned (%s)\n", buffer); - ok(HttpAddRequestHeaders(hRequest, "Authorization:\r\n", -1, HTTP_ADDREQ_FLAG_REPLACE), - "unable to remove header %u\n", GetLastError()); + ret = HttpAddRequestHeaders(hRequest, "Authorization:\r\n", -1, HTTP_ADDREQ_FLAG_REPLACE); + ok(ret, "unable to remove header %u\n", GetLastError()); index = 0; len = sizeof(buffer);

1 0

Hans Leidekker : advapi32/tests: Mark a test result as broken.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 51acdc6b271f499bdfad06bd06b917638be22660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51acdc6b271f499bdfad06bd0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 23 10:05:02 2013 +0200 advapi32/tests: Mark a test result as broken. --- dlls/advapi32/tests/crypt.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index dc10cce..89a0e27 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -1144,7 +1144,7 @@ static void test_container_sd(void) { HCRYPTPROV prov; SECURITY_DESCRIPTOR *sd; - DWORD len; + DWORD len, err; BOOL ret; ret = CryptAcquireContextA(&prov, "winetest", "Microsoft Enhanced Cryptographic Provider v1.0", @@ -1154,8 +1154,9 @@ static void test_container_sd(void) len = 0; SetLastError(0xdeadbeef); ret = CryptGetProvParam(prov, PP_KEYSET_SEC_DESCR, NULL, &len, OWNER_SECURITY_INFORMATION); - ok(ret, "got %u\n", GetLastError()); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + err = GetLastError(); + ok(ret, "got %u\n", err); + ok(err == ERROR_INSUFFICIENT_BUFFER || broken(err == ERROR_INVALID_PARAMETER), "got %u\n", err); ok(len, "expected len > 0\n"); sd = HeapAlloc(GetProcessHeap(), 0, len);

1 0