wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Esme Povirk : diasymreader: Add stub dll.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: ee6bee6a452647a2629c1d1f82dd2389fac4e441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee6bee6a452647a2629c1d1f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jan 28 13:00:51 2022 -0600 diasymreader: Add stub dll. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/diasymreader/Makefile.in | 3 +++ dlls/diasymreader/diasymreader.spec | 8 ++++++++ loader/wine.inf.in | 2 ++ 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 8578764ed5e..f5afadafd39 100755 --- a/configure +++ b/configure @@ -1294,6 +1294,7 @@ enable_devenum enable_dhcpcsvc enable_dhcpcsvc6 enable_dhtmled_ocx +enable_diasymreader enable_difxapi enable_dinput enable_dinput8 @@ -21842,6 +21843,7 @@ wine_fn_config_makefile dlls/dhcpcsvc enable_dhcpcsvc wine_fn_config_makefile dlls/dhcpcsvc/tests enable_tests wine_fn_config_makefile dlls/dhcpcsvc6 enable_dhcpcsvc6 wine_fn_config_makefile dlls/dhtmled.ocx enable_dhtmled_ocx +wine_fn_config_makefile dlls/diasymreader enable_diasymreader wine_fn_config_makefile dlls/difxapi enable_difxapi wine_fn_config_makefile dlls/dinput enable_dinput wine_fn_config_makefile dlls/dinput/tests enable_tests diff --git a/configure.ac b/configure.ac index 54ef47f767c..039beaf98ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2738,6 +2738,7 @@ WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc6) WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx) +WINE_CONFIG_MAKEFILE(dlls/diasymreader) WINE_CONFIG_MAKEFILE(dlls/difxapi) WINE_CONFIG_MAKEFILE(dlls/dinput) WINE_CONFIG_MAKEFILE(dlls/dinput/tests) diff --git a/dlls/diasymreader/Makefile.in b/dlls/diasymreader/Makefile.in new file mode 100644 index 00000000000..6cc5541adff --- /dev/null +++ b/dlls/diasymreader/Makefile.in @@ -0,0 +1,3 @@ +MODULE = diasymreader.dll + +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/diasymreader/diasymreader.spec b/dlls/diasymreader/diasymreader.spec new file mode 100644 index 00000000000..9277fb1bcd9 --- /dev/null +++ b/dlls/diasymreader/diasymreader.spec @@ -0,0 +1,8 @@ +@ stub CreateNGenPdbWriter +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllGetClassObjectInternal +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub VSDllRegisterServer +@ stub VSDllUnregisterServer diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1dce3468db0..0e488d87dcb 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2635,6 +2635,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,aspnet_regiis.exe,- 11,,ngen.exe,- 11,,fusion.dll,- +11,,diasymreader.dll,- 11,,mscorwks.dll,- 11,,regsvcs.exe,- 11,,regasm.exe,- @@ -2689,6 +2690,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,aspnet_regiis.exe,- 11,,ngen.exe,- 11,,fusion.dll,- +11,,diasymreader.dll,- 11,,mscorwks.dll,- 11,,regsvcs.exe,- 11,,regasm.exe,-

1 0

Esme Povirk : include: Add ISymUnmanagedWriter definition.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: c396a784d0285a3663d205075dbf6e034e2391f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c396a784d0285a3663d20507… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jan 28 13:00:50 2022 -0600 include: Add ISymUnmanagedWriter definition. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/corsym.idl | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7fcf5f0ba7b..2f1e4767848 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -89,6 +89,7 @@ SOURCES = \ cordebug.idl \ corerror.h \ corhdr.h \ + corsym.idl \ cpl.h \ crtrow.idl \ cryptdlg.h \ diff --git a/include/corsym.idl b/include/corsym.idl new file mode 100644 index 00000000000..f46b1f5a78a --- /dev/null +++ b/include/corsym.idl @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2022 Esme Povirk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +cpp_quote("#if 0") +/* defined in corhdr.h */ +typedef UINT32 mdToken; +typedef mdToken mdMethodDef; +typedef mdToken mdTypeDef; +/* defined in winnt.h */ +typedef SIZE_T IMAGE_DEBUG_DIRECTORY; +cpp_quote("#endif") + +[ + object, + uuid(b01fafeb-c450-3a4d-beec-b4ceec01e006), + pointer_default(unique) +] +interface ISymUnmanagedDocumentWriter : IUnknown +{ + HRESULT SetSource([in] ULONG32 sourceSize, [in, size_is(sourceSize)] BYTE source[]); + HRESULT SetCheckSum([in] GUID algorithmId, + [in] ULONG32 checkSumSize, [in, size_is(checkSumSize)] BYTE checkSum[]); +} + +[ + object, + uuid(ed14aa72-78e2-4884-84e2-334293ae5214), + pointer_default(unique) +] +interface ISymUnmanagedWriter : IUnknown +{ + HRESULT DefineDocument([in] const WCHAR *url, [in] const GUID *language, [in] const GUID *languageVendor, + [in] const GUID *documentType, [out, retval] ISymUnmanagedDocumentWriter** pRetVal); + HRESULT SetUserEntryPoint([in] mdMethodDef entryMethod); + HRESULT OpenMethod([in] mdMethodDef method); + HRESULT CloseMethod(); + HRESULT OpenScope([in] ULONG32 startOffset, [out, retval] ULONG32 *pRetVal); + HRESULT CloseScope([in] ULONG32 endOffset); + HRESULT SetScopeRange([in] ULONG32 scopeID, [in] ULONG32 startOffset, [in] ULONG32 endOffset); + HRESULT DefineLocalVariable([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3, + [in] ULONG32 startOffset, [in] ULONG32 endOffset); + HRESULT DefineParameter([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 sequence, + [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT DefineField([in] mdTypeDef parent, [in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT DefineGlobalVariable([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT Close(); + HRESULT SetSymAttributes([in] mdToken parent, [in] const WCHAR *name, + [in] ULONG32 cData, [in, size_is(cData)] unsigned char data[]); + HRESULT OpenNamespace([in] const WCHAR *name); + HRESULT CloseNamespace(); + HRESULT UsingNamespace([in] const WCHAR *fullName); + HRESULT SetMethodSourceRange([in] ISymUnmanagedDocumentWriter *startDoc, ULONG32 startLine, ULONG32 startColumn, + [in] ISymUnmanagedDocumentWriter *endDoc, ULONG32 endLine, ULONG32 endColumn); + HRESULT Initialize([in] IUnknown *emitter, [in] const WCHAR *filename, [in] IStream *pIStream, + [in] BOOL fFullBuild); + HRESULT GetDebugInfo([in, out] IMAGE_DEBUG_DIRECTORY *pIDD, [in] DWORD cData, [out] DWORD *pcData, + [out, size_is(cData), length_is(*pcData)] BYTE data[]); + HRESULT DefineSequencePoints([in] ISymUnmanagedDocumentWriter *document, [in] ULONG32 spCount, + [in, size_is(spCount)] ULONG32 offsets[], [in, size_is(spCount)] ULONG32 lines[], + [in, size_is(spCount)] ULONG32 columns[], [in, size_is(spCount)] ULONG32 endLines[], + [in, size_is(spCount)] ULONG32 endColumns[]); + HRESULT RemapToken([in] mdToken oldToken, [in] mdToken newToken); + HRESULT Initialize2([in] IUnknown *emitter, [in] const WCHAR *tempFilename, [in] IStream *pIStream, + [in] BOOL fFullBuild, [in] const WCHAR *finalFilename); + HRESULT DefineConstant([in] const WCHAR *name, [in] VARIANT value, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[]); + HRESULT Abort(); +} + +cpp_quote("DEFINE_GUID(CLSID_CorSymWriter_SxS, 0x0ae2deb0,0xf901,0x478b,0xbb,0x9f,0x88,0x1e,0xe8,0x06,0x67,0x88);")

1 0

Zebediah Figura : kernelbase: Use ntdll ctype functions.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: d0ed0b676c78702b48db2cb62866a6f09ef45feb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0ed0b676c78702b48db2cb6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 29 20:39:57 2022 -0600 kernelbase: Use ntdll ctype functions. These were open-coded in 5933c2a6901218bc6ef7b6e808b0571fa96b542e, but there's no reason not to use the ASCII versions from ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 18 ++++-------------- dlls/kernelbase/string.c | 4 ---- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 3503286a82a..5f983895576 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -36,13 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(path); -#define isalnum(ch) (((ch) >= '0' && (ch) <= '9') || \ - ((ch) >= 'A' && (ch) <= 'Z') || \ - ((ch) >= 'a' && (ch) <= 'z')) -#define isxdigit(ch) (((ch) >= '0' && (ch) <= '9') || \ - ((ch) >= 'A' && (ch) <= 'F') || \ - ((ch) >= 'a' && (ch) <= 'f')) - static const char hexDigits[] = "0123456789ABCDEF"; static const unsigned char hashdata_lookup[256] = @@ -107,13 +100,12 @@ static WCHAR *heap_strdupAtoW(const char *str) static BOOL is_drive_spec( const WCHAR *str ) { - return ((str[0] >= 'A' && str[0] <= 'Z') || (str[0] >= 'a' && str[0] <= 'z')) && str[1] == ':'; + return isalpha( str[0] ) && str[1] == ':'; } static BOOL is_escaped_drive_spec( const WCHAR *str ) { - return ((str[0] >= 'A' && str[0] <= 'Z') || (str[0] >= 'a' && str[0] <= 'z')) && - (str[1] == ':' || str[1] == '|'); + return isalpha( str[0] ) && (str[1] == ':' || str[1] == '|'); } static BOOL is_prefixed_unc(const WCHAR *string) @@ -2794,8 +2786,7 @@ HRESULT WINAPI ParseURLA(const char *url, PARSEDURLA *result) if (result->cbSize != sizeof(*result)) return E_INVALIDARG; - while (*ptr && ((*ptr >= 'a' && *ptr <= 'z') || (*ptr >= 'A' && *ptr <= 'Z') || - (*ptr >= '0' && *ptr <= '9') || *ptr == '-' || *ptr == '+' || *ptr == '.')) + while (*ptr && (isalnum( *ptr ) || *ptr == '-' || *ptr == '+' || *ptr == '.')) ptr++; if (*ptr != ':' || ptr <= url + 1) @@ -4177,8 +4168,7 @@ static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_typ switch (type) { case SCHEME: - while ((*start >= 'a' && *start <= 'z') || (*start >= '0' && *start <= '9') || - *start == '+' || *start == '-' || *start == '.') + while ((isalnum( *start ) && !isupper( *start )) || *start == '+' || *start == '-' || *start == '.') { start++; (*size)++; diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 29cc158202f..f5d4468ae6c 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -30,10 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(string); -#define isxdigit(ch) (((ch) >= '0' && (ch) <= '9') || \ - ((ch) >= 'A' && (ch) <= 'F') || \ - ((ch) >= 'a' && (ch) <= 'f')) - static BOOL char_compare(WORD ch1, WORD ch2, DWORD flags) { char str1[3], str2[3];

1 0

Zebediah Figura : kernelbase: Use wcsnlen().
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 628f2a1e565ea1d539f8ec37a029c66d0f54bacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=628f2a1e565ea1d539f8ec37… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 29 20:39:56 2022 -0600 kernelbase: Use wcsnlen(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b4b31410a3a..3503286a82a 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -105,15 +105,6 @@ static WCHAR *heap_strdupAtoW(const char *str) return ret; } -static SIZE_T strnlenW(const WCHAR *string, SIZE_T maxlen) -{ - SIZE_T i; - - for (i = 0; i < maxlen; i++) - if (!string[i]) break; - return i; -} - static BOOL is_drive_spec( const WCHAR *str ) { return ((str[0] >= 'A' && str[0] <= 'Z') || (str[0] >= 'a' && str[0] <= 'z')) && str[1] == ':'; @@ -517,7 +508,7 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens if (FAILED(hr)) return hr; if (*existing_extension) return S_FALSE; - path_length = strnlenW(path, size); + path_length = wcsnlen(path, size); dot_length = has_dot ? 0 : 1; extension_length = lstrlenW(extension); @@ -752,7 +743,7 @@ HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **p return E_INVALIDARG; } - path_length = strnlenW(path, path_size); + path_length = wcsnlen(path, path_size); if (path_length == path_size && !path[path_length]) return E_INVALIDARG; root_end = get_root_end(path);

1 0

Zebediah Figura : ntdll: Implement wcsnlen().
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: a524ab500434df3b9c4c5b10010b0f6fe571e859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a524ab500434df3b9c4c5b10… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 29 20:39:55 2022 -0600 ntdll: Implement wcsnlen(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/wcstring.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bd8e1f5efe6..afb945d4665 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1609,6 +1609,7 @@ @ cdecl wcsncat(wstr wstr long) @ cdecl wcsncmp(wstr wstr long) @ cdecl wcsncpy(ptr wstr long) +@ cdecl wcsnlen(ptr long) @ cdecl wcspbrk(wstr wstr) @ cdecl wcsrchr(wstr long) @ cdecl wcsspn(wstr wstr) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index a727e4defac..9422e4f676c 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -251,6 +251,17 @@ LPWSTR __cdecl wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n ) } +/********************************************************************* + * wcsnlen (NTDLL.@) + */ +size_t __cdecl wcsnlen( const WCHAR *str, size_t len ) +{ + const WCHAR *s = str; + for (s = str; len && *s; s++, len--) ; + return s - str; +} + + /********************************************************************* * wcspbrk (NTDLL.@) */

1 0

Zebediah Figura : tiff: Explictly link to zlib.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: ad5b6be1a9679b37ba5c3701f830648028727c8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5b6be1a9679b37ba5c3701… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jan 29 18:53:50 2022 -0600 tiff: Explictly link to zlib. This normally works because the only module linking to tiff (windowscodecs) also pulls in static zlib via PNG_PE_LIBS. However, if using shared libpng, windowscodecs will currently fail to link. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 425d267ec50..8578764ed5e 100755 --- a/configure +++ b/configure @@ -13359,7 +13359,7 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: png libs: $PNG_PE_LIBS" >&5 if ${TIFF_PE_LIBS:+false} : then : - TIFF_PE_LIBS=tiff + TIFF_PE_LIBS="tiff \$(ZLIB_PE_LIBS)" if ${TIFF_PE_CFLAGS:+false} : then : TIFF_PE_CFLAGS="-I\$(top_srcdir)/libs/tiff/libtiff" diff --git a/configure.ac b/configure.ac index fed12f61036..54ef47f767c 100644 --- a/configure.ac +++ b/configure.ac @@ -1102,7 +1102,7 @@ WINE_EXTLIB_FLAGS(JXR, jxr, jxr, "-I\$(top_srcdir)/libs/jxr/jxrgluelib -I\$(top_ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I\$(top_srcdir)/libs/mpg123/src/libmpg123") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") -WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") +WINE_EXTLIB_FLAGS(TIFF, tiff, "tiff \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/tiff/libtiff") WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO")

1 0

Fabian Maurer : ws2_32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 0959b2acc7e1ea2a5cc7e3364bfc5fe2e04bc9b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0959b2acc7e1ea2a5cc7e336… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:05 2022 +0100 ws2_32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 48 ++++++++++++++++++++++---------------------- dlls/ws2_32/tests/sock.c | 26 ++++++++++++------------ 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 881e3a388fd..5597e3df854 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -393,13 +393,13 @@ static void test_WSALookupService(void) ret = WSALookupServiceBeginW(NULL, 0, &handle); error = WSAGetLastError(); ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); -todo_wine + todo_wine ok(error == WSAEFAULT, "expected 10014, got %d\n", error); ret = WSALookupServiceBeginW(qs, 0, NULL); error = WSAGetLastError(); ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); -todo_wine + todo_wine ok(error == WSAEFAULT, "expected 10014, got %d\n", error); ret = WSALookupServiceBeginW(qs, 0, &handle); @@ -410,9 +410,9 @@ todo_wine ret = WSALookupServiceEnd(NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "WSALookupServiceEnd should have failed\n"); -todo_wine + todo_wine ok(error == ERROR_INVALID_HANDLE, "expected 6, got %d\n", error); /* standard network list query */ @@ -426,9 +426,9 @@ todo_wine return; } -todo_wine + todo_wine ok(!ret, "WSALookupServiceBeginW failed unexpectedly with error %d\n", error); -todo_wine + todo_wine ok(handle != (HANDLE)0xdeadbeef, "Handle was not filled\n"); offset = 0; @@ -2610,40 +2610,40 @@ static void test_WSAEnumNameSpaceProvidersA(void) SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(&len, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); /* Invalid parameter tests */ SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(NULL, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(NULL, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersA(&len, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); name = HeapAlloc(GetProcessHeap(), 0, len); ret = WSAEnumNameSpaceProvidersA(&len, name); -todo_wine + todo_wine ok(ret > 0, "Expected more than zero name space providers\n"); HeapFree(GetProcessHeap(), 0, name); @@ -2657,40 +2657,40 @@ static void test_WSAEnumNameSpaceProvidersW(void) SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(&len, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); /* Invalid parameter tests */ SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(NULL, name); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(NULL, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); SetLastError(0xdeadbeef); ret = WSAEnumNameSpaceProvidersW(&len, NULL); error = WSAGetLastError(); -todo_wine + todo_wine ok(ret == SOCKET_ERROR, "Expected failure, got %u\n", ret); -todo_wine + todo_wine ok(error == WSAEFAULT, "Expected 10014, got %u\n", error); name = HeapAlloc(GetProcessHeap(), 0, len); ret = WSAEnumNameSpaceProvidersW(&len, name); -todo_wine + todo_wine ok(ret > 0, "Expected more than zero name space providers\n"); if (winetest_debug > 1) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 054e597b719..b38357954b7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1289,7 +1289,7 @@ static void test_set_getsockopt(void) SetLastError(0xdeadbeef); i = 1234; err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); -todo_wine + todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); @@ -1300,7 +1300,7 @@ todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); -todo_wine + todo_wine ok (i == 1234, "got %d (expected 1234)\n", i); /* Test invalid optlen */ @@ -6054,7 +6054,7 @@ todo_wine { ret = pWSASendMsg(sock, &msg, 0, &bytesSent, NULL, NULL); ok(ret == SOCKET_ERROR, "WSASendMsg should have failed\n"); err = WSAGetLastError(); -todo_wine + todo_wine ok(err == WSAEINVAL, "expected 10014, got %d instead\n", err); closesocket(sock); } @@ -7184,7 +7184,7 @@ static void test_AcceptEx(void) 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); -todo_wine + todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on a non-listening socket " "returned %d + errno %d\n", bret, WSAGetLastError()); ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); @@ -8768,7 +8768,7 @@ static void test_sioAddressListChange(void) ok(ret == WAIT_OBJECT_0, "failed to get overlapped event %u\n", ret); ret = WaitForSingleObject(event2, 500); -todo_wine + todo_wine ok(ret == WAIT_OBJECT_0, "failed to get change event %u\n", ret); ret = WaitForSingleObject(event3, 500); @@ -10329,7 +10329,7 @@ todo_wine SetLastError(0xdeadbeef); ret = GetQueuedCompletionStatus(port, &bytes, &key, &ovl_iocp, 100); ok(!ret, "got %d\n", ret); -todo_wine + todo_wine ok(GetLastError() == ERROR_CONNECTION_ABORTED || GetLastError() == ERROR_NETNAME_DELETED /* XP */, "got %u\n", GetLastError()); ok(!bytes, "got bytes %u\n", bytes); ok(key == 0x12345678, "got key %#lx\n", key); @@ -10337,7 +10337,7 @@ todo_wine if (ovl_iocp) { ok(!ovl_iocp->InternalHigh, "got %#lx\n", ovl_iocp->InternalHigh); -todo_wine + todo_wine ok(ovl_iocp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || ovl_iocp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT /* XP */, "got %#lx\n", ovl_iocp->Internal); } @@ -10568,7 +10568,7 @@ static void iocp_async_read_thread_closesocket(SOCKET src) SetLastError(0xdeadbeef); ret = GetQueuedCompletionStatus(port, &bytes, &key, &ovl_iocp, 100); ok(!ret, "got %d\n", ret); -todo_wine + todo_wine ok(GetLastError() == ERROR_CONNECTION_ABORTED || GetLastError() == ERROR_NETNAME_DELETED /* XP */, "got %u\n", GetLastError()); ok(!bytes, "got bytes %u\n", bytes); ok(key == 0x12345678, "got key %#lx\n", key); @@ -10576,7 +10576,7 @@ todo_wine if (ovl_iocp) { ok(!ovl_iocp->InternalHigh, "got %#lx\n", ovl_iocp->InternalHigh); -todo_wine + todo_wine ok(ovl_iocp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || ovl_iocp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT /* XP */, "got %#lx\n", ovl_iocp->Internal); } @@ -11724,10 +11724,10 @@ static void do_sockopt_validity_tests(const char *type, SOCKET sock, int level, WSASetLastError(0); rc = getsockopt(sock, level, tests[i].opt, value, &count); expected_rc = tests[i].get_error ? SOCKET_ERROR : 0; -todo_wine_if(!tests[i].get_error && tests[i].todo) + todo_wine_if(!tests[i].get_error && tests[i].todo) ok(rc == expected_rc || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected getsockopt to return %i, got %i\n", expected_rc, rc); -todo_wine_if(tests[i].todo) + todo_wine_if(tests[i].todo) ok(WSAGetLastError() == tests[i].get_error || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected getsockopt to set error %i, got %i\n", tests[i].get_error, WSAGetLastError()); @@ -11740,10 +11740,10 @@ todo_wine_if(tests[i].todo) WSASetLastError(0); rc = setsockopt(sock, level, tests[i].opt, value, count); expected_rc = tests[i].set_error ? SOCKET_ERROR : 0; -todo_wine_if(!tests[i].set_error && tests[i].todo) + todo_wine_if(!tests[i].set_error && tests[i].todo) ok(rc == expected_rc || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected setsockopt to return %i, got %i\n", expected_rc, rc); -todo_wine_if(tests[i].todo) + todo_wine_if(tests[i].todo) ok(WSAGetLastError() == tests[i].set_error || broken(rc == SOCKET_ERROR && WSAGetLastError() == WSAENOPROTOOPT), "expected setsockopt to set error %i, got %i\n", tests[i].set_error, WSAGetLastError());

1 0

Fabian Maurer : wininet/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 874473c50337a124d72fcb301095b4df76457293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=874473c50337a124d72fcb30… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:04 2022 +0100 wininet/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 4c2facb635a..8fc72be8431 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1632,7 +1632,7 @@ static void test_InternetGetConnectedStateExA(void) buffer[0] = 0; res = pInternetGetConnectedStateExA(&flags, buffer, sizeof(buffer), 0); trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, buffer); -todo_wine + todo_wine ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExA tests require a valid connection\n"); @@ -1734,7 +1734,7 @@ static void test_InternetGetConnectedStateExW(void) buffer[0] = 0; res = pInternetGetConnectedStateExW(&flags, buffer, ARRAY_SIZE(buffer), 0); trace("Internet Connection: Flags 0x%02x - Name '%s'\n", flags, wine_dbgstr_w(buffer)); -todo_wine + todo_wine ok (flags & INTERNET_RAS_INSTALLED, "Missing RAS flag\n"); if(!res) { win_skip("InternetGetConnectedStateExW tests require a valid connection\n");

1 0

Fabian Maurer : winhttp/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 19c758dc56d3171854111908aacb70afe78eeda1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c758dc56d3171854111908… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:03 2022 +0100 winhttp/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 7e46a43aa05..053f8315fec 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4816,7 +4816,7 @@ static void test_IWinHttpRequest_Invoke(void) VariantInit(&arg[2]); params.cArgs = 3; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err); -todo_wine + todo_wine ok(hr == S_OK, "error %#x\n", hr); VariantInit(&arg[0]); @@ -4861,7 +4861,7 @@ todo_wine params.cArgs = 2; hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYGET, &params, NULL, NULL, NULL); -todo_wine + todo_wine ok(hr == S_OK, "error %#x\n", hr); params.cArgs = 0;

1 0

Fabian Maurer : windowscodecs/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: c79cd9993b91edf3d38ab3ed9ae0e12e2860bbe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c79cd9993b91edf3d38ab3ed… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:37:02 2022 +0100 windowscodecs/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/bitmap.c | 4 ++-- dlls/windowscodecs/tests/converter.c | 2 +- dlls/windowscodecs/tests/icoformat.c | 2 +- dlls/windowscodecs/tests/info.c | 22 +++++++++++----------- dlls/windowscodecs/tests/pngformat.c | 4 ++-- dlls/windowscodecs/tests/stream.c | 2 +- dlls/windowscodecs/tests/tiffformat.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index dd31bf88f3f..2dfe3f93f6b 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -867,7 +867,7 @@ static void test_CreateBitmapFromHBITMAP(void) ok(hr == S_OK, "CreateBitmapFromHBITMAP error %#x\n", hr); IWICBitmap_GetPixelFormat(bitmap, &format); -todo_wine + todo_wine ok(IsEqualGUID(&format, &GUID_WICPixelFormat4bppIndexed), "unexpected pixel format %s\n", wine_dbgstr_guid(&format)); @@ -887,7 +887,7 @@ todo_wine hr = IWICPalette_GetColorCount(palette, &count); ok(hr == S_OK, "GetColorCount error %#x\n", hr); -todo_wine + todo_wine ok(count == 16, "expected 16, got %u\n", count); IWICPalette_Release(palette); diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 0429b7a3af6..f0672fceaf8 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1223,7 +1223,7 @@ static void test_set_frame_palette(IWICBitmapFrameEncode *frameencode) ok(hr == S_OK, "CreatePalette failed, hr=%x\n", hr); hr = IWICBitmapFrameEncode_SetPalette(frameencode, palette); -todo_wine + todo_wine ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr=%x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedHalftone256, FALSE); diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c index 38db51c3764..36cc970bf3c 100644 --- a/dlls/windowscodecs/tests/icoformat.c +++ b/dlls/windowscodecs/tests/icoformat.c @@ -164,7 +164,7 @@ static void test_ico_data_(void *data, DWORD data_size, HRESULT init_hr, int tod { hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)icostream, WICDecodeMetadataCacheOnDemand); - todo_wine_if(todo) + todo_wine_if(todo) ok_(__FILE__, line)(hr == init_hr, "Initialize failed, hr=%x\n", hr); if (SUCCEEDED(hr)) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index bb8d3310bc9..339555f23fe 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -177,7 +177,7 @@ static void test_decoder_info(void) len = 0; hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, NULL, &len); ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, NULL); @@ -186,7 +186,7 @@ static void test_decoder_info(void) len = 0; hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, &len); ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); value[0] = 0; @@ -198,7 +198,7 @@ static void test_decoder_info(void) } hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, value, &len); ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetMimeType failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(len == lstrlenW(mimetypeW) + 1, "GetMimeType returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); @@ -250,7 +250,7 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, NULL, &len); ok(hr == E_INVALIDARG, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "%u: GetFileExtensions returned wrong len %i\n", i, len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, NULL); @@ -258,27 +258,27 @@ static void test_decoder_info(void) hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 0, NULL, &len); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); value[0] = 0; hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, len, value, &len); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 1, value, &len); ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); hr = IWICBitmapDecoderInfo_GetFileExtensions(decoder_info, 256, value, &len); ok(hr == S_OK, "GetFileExtensions failed, hr=%x\n", hr); - todo_wine_if(test->todo) + todo_wine_if(test->todo) ok(lstrcmpW(value, extensionsW) == 0, "GetFileExtensions returned wrong value %s\n", wine_dbgstr_w(value)); - todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) + todo_wine_if(test->todo && !IsEqualCLSID(test->clsid, &CLSID_WICTiffDecoder)) ok(len == lstrlenW(extensionsW) + 1, "GetFileExtensions returned wrong len %i\n", len); IWICBitmapDecoderInfo_Release(decoder_info); @@ -559,7 +559,7 @@ static void test_reader_info(void) IWICComponentInfo_Release(info); hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICXMPStructMetadataReader, &info); -todo_wine + todo_wine ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); if (FAILED(hr)) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 32afc989c2b..50cb7a68a87 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -824,7 +824,7 @@ todo_wine_if(td[i].todo_load) hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); -todo_wine_if(td[i].todo) + todo_wine_if(td[i].todo) ok(IsEqualGUID(&format, td[i].format_PLTE_tRNS), "PLTE+tRNS: expected %s, got %s (type %d, bpp %d)\n", wine_dbgstr_guid(td[i].format_PLTE_tRNS), wine_dbgstr_guid(&format), td[i].color_type, td[i].bit_depth); @@ -907,7 +907,7 @@ todo_wine_if(td[i].todo_load) hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); -todo_wine_if(td[i].todo) + todo_wine_if(td[i].todo) ok(IsEqualGUID(&format, td[i].format_PLTE_tRNS), "tRNS: expected %s, got %s (type %d, bpp %d)\n", wine_dbgstr_guid(td[i].format_PLTE_tRNS), wine_dbgstr_guid(&format), td[i].color_type, td[i].bit_depth); diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index d3f712c38b0..247606ebf58 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -32,7 +32,7 @@ static void _check_cur_pos(IStream *stream, ULONGLONG expected_pos, BOOL todo, u offset.QuadPart = 0; hr = IStream_Seek(stream, offset, STREAM_SEEK_CUR, &pos); ok_(__FILE__, line)(hr == S_OK, "Failed to get current position, hr %#x.\n", hr); -todo_wine_if(todo) + todo_wine_if(todo) ok_(__FILE__, line)(pos.QuadPart == expected_pos, "Unexpected stream position %s.\n", wine_dbgstr_longlong(pos.QuadPart)); } diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index e0d70929585..4c3dea2288f 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -551,7 +551,7 @@ static void test_QueryCapability(void) /* CreateDecoderFromStream fails if seeked past the start */ hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); -todo_wine + todo_wine ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr); if (SUCCEEDED(hr))

1 0

← Newer
1
2
3
4
5
6
7
8
...
73
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 January 2022