June 2021 - Wine-Commits - list.winehq.org

Zhiyi Zhang : write: Use correct wordpad.exe path.
by Alexandre Julliard June 9, 2021

June 9, 2021

Module: wine Branch: master Commit: 148d4048b466a81ba5ae1b4b018535a976a2f75f URL: https://source.winehq.org/git/wine.git/?a=commit;h=148d4048b466a81ba5ae1b4b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 9 22:01:37 2021 +0800 write: Use correct wordpad.exe path. Wordpad.exe is in C:\Program Files\Windows NT\Accessories\ now. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/write/Makefile.in | 2 +- programs/write/write.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index b0280b713da..5bde6efdf8d 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -1,5 +1,5 @@ MODULE = write.exe -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 shell32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/write/write.c b/programs/write/write.c index 1481e900f75..da9cba8ec51 100644 --- a/programs/write/write.c +++ b/programs/write/write.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <windows.h> +#include <shlobj.h> #include "resources.h" int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) @@ -31,9 +32,9 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar STARTUPINFOW stinf; PROCESS_INFORMATION info; - if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(L"\\wordpad.exe"))) + if (FAILED(SHGetFolderPathW(NULL, CSIDL_PROGRAM_FILES, NULL, 0, path))) goto failed; - lstrcatW(path, L"\\wordpad.exe"); + lstrcatW(path, L"\\Windows NT\\Accessories\\wordpad.exe"); stinf.cb = sizeof(STARTUPINFOW); GetStartupInfoW(&stinf);

1 0

Zhiyi Zhang : dxdiag: Enable visual styles.
by Alexandre Julliard June 9, 2021

June 9, 2021

Module: wine Branch: master Commit: 7af0ab05043d0d19e611c87b086b33ed43708ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7af0ab05043d0d19e611c87b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 9 21:57:17 2021 +0800 dxdiag: Enable visual styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dxdiag/Makefile.in | 2 +- programs/dxdiag/dxdiag.manifest | 16 ++++++++++++++++ programs/dxdiag/dxdiag.rc | 3 +++ programs/dxdiag/dxdiag_private.h | 1 + programs/dxdiag/main.c | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index aeab69ea306..f7420ee27df 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -1,5 +1,5 @@ MODULE = dxdiag.exe -IMPORTS = dxguid ole32 oleaut32 user32 +IMPORTS = dxguid ole32 oleaut32 user32 comctl32 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/dxdiag/dxdiag.manifest b/programs/dxdiag/dxdiag.manifest new file mode 100644 index 00000000000..57ba80c05db --- /dev/null +++ b/programs/dxdiag/dxdiag.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Dxdiag" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/dxdiag/dxdiag.rc b/programs/dxdiag/dxdiag.rc index a37b28d58d6..d7e45579706 100644 --- a/programs/dxdiag/dxdiag.rc +++ b/programs/dxdiag/dxdiag.rc @@ -29,3 +29,6 @@ STRINGTABLE STRING_DXDIAG_TOOL, "DirectX Diagnostic Tool" STRING_USAGE, "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" } + +/* @makedep: dxdiag.manifest */ +1 RT_MANIFEST dxdiag.manifest diff --git a/programs/dxdiag/dxdiag_private.h b/programs/dxdiag/dxdiag_private.h index 010bb941b27..8d76c0ef677 100644 --- a/programs/dxdiag/dxdiag_private.h +++ b/programs/dxdiag/dxdiag_private.h @@ -19,6 +19,7 @@ */ #include <windef.h> +#include <winuser.h> /* Resource definitions. */ #define MAX_STRING_LEN 1024 diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 968d84adea1..f57eec99292 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -21,6 +21,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <dxdiag.h> +#include <commctrl.h> #include "wine/debug.h" #include "dxdiag_private.h" @@ -180,6 +181,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm struct command_line_info info; struct dxdiag_information *dxdiag_info; + InitCommonControls(); + hInstance = hInst; if (!process_command_line(cmdline, &info))

1 0

Zebediah Figura : l3codeca.acm: Store the mpg123 handle directly as the ACM driver data.
by Alexandre Julliard June 9, 2021

June 9, 2021

Module: wine Branch: master Commit: 1e047d786d71ed8d8e9f0f9442fd019c96080751 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e047d786d71ed8d8e9f0f94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 4 16:43:39 2021 -0500 l3codeca.acm: Store the mpg123 handle directly as the ACM driver data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/l3codeca.acm/mpegl3.c | 51 +++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index fb7c9cf386b..fa9f38258e5 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -111,11 +111,6 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) return 0xFFFFFFFF; } -typedef struct tagAcmMpeg3Data -{ - mpg123_handle *mh; -} AcmMpeg3Data; - /*********************************************************************** * MPEG3_drvOpen */ @@ -135,11 +130,9 @@ static LRESULT MPEG3_drvClose(DWORD_PTR dwDevID) } -static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, - const unsigned char* src, LPDWORD nsrc, - unsigned char* dst, LPDWORD ndst) +static void mp3_horse(mpg123_handle *handle, const unsigned char *src, + DWORD *nsrc, unsigned char *dst, DWORD *ndst) { - AcmMpeg3Data* amd = (AcmMpeg3Data*)adsi->dwDriver; int ret; size_t size; DWORD dpos = 0; @@ -147,7 +140,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, if (*nsrc > 0) { - ret = mpg123_feed(amd->mh, src, *nsrc); + ret = mpg123_feed(handle, src, *nsrc); if (ret != MPG123_OK) { ERR("Error feeding data\n"); @@ -158,7 +151,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, do { size = 0; - ret = mpg123_read(amd->mh, dst + dpos, *ndst - dpos, &size); + ret = mpg123_read(handle, dst + dpos, *ndst - dpos, &size); if (ret == MPG123_ERR) { FIXME("Error occurred during decoding!\n"); @@ -170,7 +163,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, { long rate; int channels, enc; - mpg123_getformat(amd->mh, &rate, &channels, &enc); + mpg123_getformat(handle, &rate, &channels, &enc); TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc); } dpos += size; @@ -185,7 +178,7 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi, */ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) { - AcmMpeg3Data* aad; + mpg123_handle *handle; int err; assert(!(instance->fdwOpen & ACM_STREAMOPENF_ASYNC)); @@ -215,12 +208,9 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) || instance->pwfxDst->wBitsPerSample != 16) return MMSYSERR_NOTSUPPORTED; - if (!(aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmMpeg3Data)))) - return MMSYSERR_NOMEM; - instance->dwDriver = (DWORD_PTR)aad; - - aad->mh = mpg123_new(NULL, &err); - mpg123_open_feed(aad->mh); + handle = mpg123_new(NULL, &err); + instance->dwDriver = (DWORD_PTR)handle; + mpg123_open_feed(handle); #if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ /* mpg123 may find a XING header in the mp3 and use that information @@ -228,7 +218,7 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) * We cannot allow that since the caller application is feeding us. * This fixes problems for mp3 files encoded with LAME (bug 42361) */ - mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); + mpg123_param(handle, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); #endif return MMSYSERR_NOERROR; @@ -238,11 +228,12 @@ static LRESULT MPEG3_StreamOpen(ACMDRVSTREAMINSTANCE *instance) * MPEG3_StreamClose * */ -static LRESULT MPEG3_StreamClose(PACMDRVSTREAMINSTANCE adsi) +static LRESULT MPEG3_StreamClose(ACMDRVSTREAMINSTANCE *instance) { - mpg123_close(((AcmMpeg3Data*)adsi->dwDriver)->mh); - mpg123_delete(((AcmMpeg3Data*)adsi->dwDriver)->mh); - HeapFree(GetProcessHeap(), 0, (void*)adsi->dwDriver); + mpg123_handle *handle = (mpg123_handle *)instance->dwDriver; + + mpg123_close(handle); + mpg123_delete(handle); return MMSYSERR_NOERROR; } @@ -513,9 +504,9 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad * MPEG3_StreamConvert * */ -static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER adsh) +static LRESULT MPEG3_StreamConvert(ACMDRVSTREAMINSTANCE *instance, ACMDRVSTREAMHEADER *adsh) { - AcmMpeg3Data* aad = (AcmMpeg3Data*)adsi->dwDriver; + mpg123_handle *handle = (mpg123_handle *)instance->dwDriver; DWORD nsrc = adsh->cbSrcLength; DWORD ndst = adsh->cbDstLength; @@ -533,12 +524,12 @@ static LRESULT MPEG3_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEAD */ if ((adsh->fdwConvert & ACM_STREAMCONVERTF_START)) { - mpg123_feedseek(aad->mh, 0, SEEK_SET, NULL); - mpg123_close(aad->mh); - mpg123_open_feed(aad->mh); + mpg123_feedseek(handle, 0, SEEK_SET, NULL); + mpg123_close(handle); + mpg123_open_feed(handle); } - mp3_horse(adsi, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst); + mp3_horse(handle, adsh->pbSrc, &nsrc, adsh->pbDst, &ndst); adsh->cbSrcLengthUsed = nsrc; adsh->cbDstLengthUsed = ndst;

1 0

Esme Povirk : advapi32: Fix typo.
by Alexandre Julliard June 9, 2021

June 9, 2021

Module: wine Branch: master Commit: 5a7d9fc26155ea40018ba4fb7d1b0ba2e7d61783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a7d9fc26155ea40018ba4fb… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Jun 9 12:46:03 2021 -0500 advapi32: Fix typo. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6246cd21a62..02787fc841c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -101,7 +101,7 @@ static const AccountSid ACCOUNT_SIDS[] = { { WinBuiltinPreWindows2000CompatibleAccessSid, L"Pre-Windows 2000 Compatible Access", L"BUILTIN", SidTypeAlias }, { WinBuiltinRemoteDesktopUsersSid, L"Remote Desktop Users", L"BUILTIN", SidTypeAlias }, { WinBuiltinNetworkConfigurationOperatorsSid, L"Network Configuration Operators", L"BUILTIN", SidTypeAlias }, - { WinNTLMAuthenticationSid, L"NTML Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, + { WinNTLMAuthenticationSid, L"NTLM Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, { WinDigestAuthenticationSid, L"Digest Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, { WinSChannelAuthenticationSid, L"SChannel Authentication", L"NT AUTHORITY", SidTypeWellKnownGroup }, { WinThisOrganizationSid, L"This Organization", L"NT AUTHORITY", SidTypeWellKnownGroup },

1 0

Zebediah Figura : ws2_32: Use IOCTL_WINE_AFD_COMPLETE_ASYNC in SIO_ROUTING_INTERFACE_QUERY.
by Alexandre Julliard June 9, 2021

June 9, 2021

Module: wine Branch: master Commit: dddd46624be3915cbb025092e12bd5483fbf6200 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dddd46624be3915cbb025092… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 9 00:04:46 2021 -0500 ws2_32: Use IOCTL_WINE_AFD_COMPLETE_ASYNC in SIO_ROUTING_INTERFACE_QUERY. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 27 ++++++++++++++++----------- dlls/ws2_32/tests/sock.c | 21 +++++++++------------ 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7493b9e9f87..6f111e263c2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3435,7 +3435,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID struct WS_sockaddr_in *saddr_in = out_buff; MIB_IPFORWARDROW row; PMIB_IPADDRTABLE ipAddrTable = NULL; - DWORD size, i, found_index; + DWORD size, i, found_index, ret = 0; + NTSTATUS status = STATUS_SUCCESS; TRACE( "-> WS_SIO_ROUTING_INTERFACE_QUERY request\n" ); @@ -3448,21 +3449,21 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (daddr->sa_family != WS_AF_INET) { FIXME("unsupported address family %d\n", daddr->sa_family); - status = WSAEAFNOSUPPORT; - break; + SetLastError( WSAEAFNOSUPPORT ); + return -1; } if (GetBestRoute( daddr_in->sin_addr.S_un.S_addr, 0, &row ) != NOERROR || GetIpAddrTable( NULL, &size, FALSE ) != ERROR_INSUFFICIENT_BUFFER) { - status = WSAEFAULT; - break; + SetLastError( WSAEFAULT ); + return -1; } ipAddrTable = HeapAlloc( GetProcessHeap(), 0, size ); if (GetIpAddrTable( ipAddrTable, &size, FALSE )) { HeapFree( GetProcessHeap(), 0, ipAddrTable ); - status = WSAEFAULT; - break; + SetLastError( WSAEFAULT ); + return -1; } for (i = 0, found_index = ipAddrTable->dwNumEntries; i < ipAddrTable->dwNumEntries; i++) @@ -3475,15 +3476,19 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID ERR("no matching IP address for interface %d\n", row.dwForwardIfIndex); HeapFree( GetProcessHeap(), 0, ipAddrTable ); - status = WSAEFAULT; - break; + SetLastError( WSAEFAULT ); + return -1; } saddr_in->sin_family = WS_AF_INET; saddr_in->sin_addr.S_un.S_addr = ipAddrTable->table[found_index].dwAddr; saddr_in->sin_port = 0; - total = sizeof(struct WS_sockaddr_in); HeapFree( GetProcessHeap(), 0, ipAddrTable ); - break; + + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), + NULL, 0, ret_size, overlapped, completion ); + if (!ret) *ret_size = sizeof(struct WS_sockaddr_in); + SetLastError( ret ); + return ret ? -1 : 0; } case WS_SIO_SET_COMPATIBILITY_MODE: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3648fa2a329..055fdf8feae 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7770,7 +7770,7 @@ static void test_sioRoutingInterfaceQuery(void) size = 0xdeadbeef; ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), &out, sizeof(out), &size, NULL, NULL); ok(!ret, "expected failure\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(size == sizeof(out), "got size %u\n", size); /* We expect the source address to be INADDR_LOOPBACK as well, but * there's no guarantee that a route to the loopback address exists, @@ -7801,15 +7801,15 @@ static void test_sioRoutingInterfaceQuery(void) overlapped.InternalHigh = 0xdeadbeef; ret = WSAIoctl(sock, SIO_ROUTING_INTERFACE_QUERY, &in, sizeof(in), &out, sizeof(out), &size, &overlapped, NULL); ok(!ret, "expected failure\n"); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(size == sizeof(out), "got size %u\n", size); ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); ok(ret, "got error %u\n", GetLastError()); - todo_wine ok(!size, "got size %u\n", size); + ok(!size, "got size %u\n", size); ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr); ok(!overlapped.Internal, "got status %#x\n", (NTSTATUS)overlapped.Internal); - todo_wine ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); + ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); CloseHandle(port); closesocket(sock); @@ -7829,14 +7829,11 @@ static void test_sioRoutingInterfaceQuery(void) ok(size == sizeof(out), "got size %u\n", size); ret = SleepEx(0, TRUE); - todo_wine ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); - if (ret == WAIT_IO_COMPLETION) - { - ok(apc_count == 1, "APC was called %u times\n", apc_count); - ok(!apc_error, "got APC error %u\n", apc_error); - ok(!apc_size, "got APC size %u\n", apc_size); - ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); - } + ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); + ok(apc_count == 1, "APC was called %u times\n", apc_count); + ok(!apc_error, "got APC error %u\n", apc_error); + ok(!apc_size, "got APC size %u\n", apc_size); + ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); closesocket(sock); }

1 0

Zebediah Figura : ws2_32: Return WSAEOPNOTSUPP in SIO_FLUSH.
by Alexandre Julliard June 9, 2021

June 9, 2021

Module: wine Branch: master Commit: b8bb6bae8f46a7ed3e33c6ddc56c6791662639e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8bb6bae8f46a7ed3e33c6dd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 9 00:04:48 2021 -0500 ws2_32: Return WSAEOPNOTSUPP in SIO_FLUSH. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ---- dlls/ws2_32/tests/sock.c | 28 +++++++++++----------------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3b68d2e6336..08ea427913b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3369,10 +3369,6 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } } - case WS_SIO_FLUSH: - FIXME("SIO_FLUSH: stub.\n"); - break; - case WS_SIO_GET_EXTENSION_FUNCTION_POINTER: { #define EXTENSION_FUNCTION(x, y) { x, y, #y }, diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5b833ca8ba7..c654e442364 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4135,9 +4135,8 @@ static void test_unsupported_ioctls(void) WSASetLastError(0xdeadbeef); size = 0xdeadbeef; ret = WSAIoctl(s, codes[i], NULL, 0, NULL, 0, &size, NULL, NULL); - todo_wine_if (codes[i] == SIO_FLUSH) - ok(ret == -1, "expected failure\n"); - todo_wine_if (codes[i] == FIOASYNC || codes[i] == SIO_FLUSH) + ok(ret == -1, "expected failure\n"); + todo_wine_if (codes[i] == FIOASYNC) ok(WSAGetLastError() == WSAEOPNOTSUPP, "got error %u\n", WSAGetLastError()); todo_wine_if (codes[i] == FIOASYNC) ok(!size, "got size %u\n", size); @@ -4147,24 +4146,21 @@ static void test_unsupported_ioctls(void) overlapped.Internal = 0xdeadbeef; overlapped.InternalHigh = 0xdeadbeef; ret = WSAIoctl(s, codes[i], NULL, 0, NULL, 0, &size, &overlapped, NULL); - todo_wine_if (codes[i] == SIO_FLUSH) ok(ret == -1, "expected failure\n"); - todo_wine_if (codes[i] == FIOASYNC || codes[i] == SIO_FLUSH) + todo_wine_if (codes[i] == FIOASYNC) ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - todo_wine_if (codes[i] == SIO_FLUSH) - ok(size == 0xdeadbeef, "got size %u\n", size); + ok(size == 0xdeadbeef, "got size %u\n", size); ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); - todo_wine_if (codes[i] == SIO_FLUSH) - ok(!ret, "expected failure\n"); - todo_wine_if (codes[i] == FIOASYNC || codes[i] == SIO_FLUSH) + ok(!ret, "expected failure\n"); + todo_wine_if (codes[i] == FIOASYNC) ok(GetLastError() == ERROR_NOT_SUPPORTED, "got error %u\n", GetLastError()); todo_wine_if (codes[i] == FIOASYNC) ok(!size, "got size %u\n", size); ok(key == 123, "got key %Iu\n", key); todo_wine_if (codes[i] == FIOASYNC) ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr); - todo_wine_if (codes[i] == FIOASYNC || codes[i] == SIO_FLUSH) + todo_wine_if (codes[i] == FIOASYNC) ok((NTSTATUS)overlapped.Internal == STATUS_NOT_SUPPORTED, "got status %#x\n", (NTSTATUS)overlapped.Internal); todo_wine_if (codes[i] == FIOASYNC) @@ -4182,15 +4178,13 @@ static void test_unsupported_ioctls(void) apc_count = 0; size = 0xdeadbeef; ret = WSAIoctl(s, codes[i], NULL, 0, NULL, 0, &size, &overlapped, socket_apc); - todo_wine_if (codes[i] == SIO_FLUSH) - ok(ret == -1, "expected failure\n"); - todo_wine_if (codes[i] == FIOASYNC || codes[i] == SIO_FLUSH) + ok(ret == -1, "expected failure\n"); + todo_wine_if (codes[i] == FIOASYNC) ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); - todo_wine_if (codes[i] == SIO_FLUSH) - ok(size == 0xdeadbeef, "got size %u\n", size); + ok(size == 0xdeadbeef, "got size %u\n", size); ret = SleepEx(0, TRUE); - todo_wine_if (codes[i] == FIOASYNC || codes[i] == SIO_FLUSH) + todo_wine_if (codes[i] == FIOASYNC) ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); if (ret == WAIT_IO_COMPLETION) {

1 0

Alistair Leslie-Hughes : msado15: Convert to Integer for field index.
by Alexandre Julliard June 9, 2021

June 9, 2021

Module: wine Branch: master Commit: f6fc0e2b7722e5fe3c6bdfb31101ac5ef1c39670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6fc0e2b7722e5fe3c6bdfb3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 9 16:41:32 2021 +1000 msado15: Convert to Integer for field index. Thanks Gabriel Ivăncescu. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 24 ++++++++++-------------- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 7cd943f55d5..92a0deb6959 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -740,28 +740,24 @@ static HRESULT map_index( struct fields *fields, VARIANT *index, ULONG *ret ) { ULONG i; - if (V_VT( index ) == VT_I4 || V_VT( index ) == VT_I2) + if (V_VT( index ) != VT_BSTR) { - if (V_VT( index ) == VT_I4) - i = V_I4 ( index ); - else - i = V_I2 ( index ); + VARIANT idx; - if (i < fields->count) + VariantInit(&idx); + if (VariantChangeType(&idx, index, 0, VT_UI4) == S_OK) { - *ret = i; - return S_OK; + i = V_UI4 ( &idx ); + if (i < fields->count) + { + *ret = i; + return S_OK; + } } return MAKE_ADO_HRESULT(adErrItemNotFound); } - if (V_VT( index ) != VT_BSTR) - { - FIXME( "variant type %u not supported\n", V_VT( index ) ); - return E_INVALIDARG; - } - for (i = 0; i < fields->count; i++) { BSTR name; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 860144338c0..25c9c6f8356 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -150,6 +150,23 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); Field_Release(field); + V_VT( &index ) = VT_I1; + V_I1( &index ) = 0; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + Field_Release(field); + + V_VT( &index ) = VT_R8; + V_R8( &index ) = 0.1; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == S_OK, "got %08x\n", hr ); + Field_Release(field); + + V_VT( &index ) = VT_UNKNOWN; + V_UNKNOWN( &index ) = NULL; + hr = Fields_get_Item( fields, index, &field ); + ok( hr == MAKE_ADO_HRESULT(adErrItemNotFound), "got %08x\n", hr ); + V_VT( &index ) = VT_BSTR; V_BSTR( &index ) = name; hr = Fields_get_Item( fields, index, &field );

1 0

Zebediah Figura : ws2_32: Return WSAEOPNOTSUPP in FIOASYNC.
by Alexandre Julliard June 9, 2021

June 9, 2021

Module: wine Branch: master Commit: 0a4a7c434500ccba883a05ca062550e41384ce7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a4a7c434500ccba883a05ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 9 00:04:49 2021 -0500 ws2_32: Return WSAEOPNOTSUPP in FIOASYNC. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 5 ----- dlls/ws2_32/tests/sock.c | 45 ++++++++++++++++----------------------------- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 08ea427913b..a4d0e932eae 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3276,11 +3276,6 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } - case WS_FIOASYNC: - WARN("Warning: WS1.1 shouldn't be using async I/O\n"); - SetLastError(WSAEINVAL); - return SOCKET_ERROR; - case WS_SIO_GET_INTERFACE_LIST: { DWORD ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c654e442364..d9cb629caa4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4136,35 +4136,27 @@ static void test_unsupported_ioctls(void) size = 0xdeadbeef; ret = WSAIoctl(s, codes[i], NULL, 0, NULL, 0, &size, NULL, NULL); ok(ret == -1, "expected failure\n"); - todo_wine_if (codes[i] == FIOASYNC) - ok(WSAGetLastError() == WSAEOPNOTSUPP, "got error %u\n", WSAGetLastError()); - todo_wine_if (codes[i] == FIOASYNC) - ok(!size, "got size %u\n", size); + ok(WSAGetLastError() == WSAEOPNOTSUPP, "got error %u\n", WSAGetLastError()); + ok(!size, "got size %u\n", size); WSASetLastError(0xdeadbeef); size = 0xdeadbeef; overlapped.Internal = 0xdeadbeef; overlapped.InternalHigh = 0xdeadbeef; ret = WSAIoctl(s, codes[i], NULL, 0, NULL, 0, &size, &overlapped, NULL); - ok(ret == -1, "expected failure\n"); - todo_wine_if (codes[i] == FIOASYNC) - ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); ok(size == 0xdeadbeef, "got size %u\n", size); ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); ok(!ret, "expected failure\n"); - todo_wine_if (codes[i] == FIOASYNC) - ok(GetLastError() == ERROR_NOT_SUPPORTED, "got error %u\n", GetLastError()); - todo_wine_if (codes[i] == FIOASYNC) - ok(!size, "got size %u\n", size); + ok(GetLastError() == ERROR_NOT_SUPPORTED, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); ok(key == 123, "got key %Iu\n", key); - todo_wine_if (codes[i] == FIOASYNC) - ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr); - todo_wine_if (codes[i] == FIOASYNC) - ok((NTSTATUS)overlapped.Internal == STATUS_NOT_SUPPORTED, - "got status %#x\n", (NTSTATUS)overlapped.Internal); - todo_wine_if (codes[i] == FIOASYNC) - ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); + ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr); + ok((NTSTATUS)overlapped.Internal == STATUS_NOT_SUPPORTED, + "got status %#x\n", (NTSTATUS)overlapped.Internal); + ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); CloseHandle(port); closesocket(s); @@ -4179,20 +4171,15 @@ static void test_unsupported_ioctls(void) size = 0xdeadbeef; ret = WSAIoctl(s, codes[i], NULL, 0, NULL, 0, &size, &overlapped, socket_apc); ok(ret == -1, "expected failure\n"); - todo_wine_if (codes[i] == FIOASYNC) - ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); ok(size == 0xdeadbeef, "got size %u\n", size); ret = SleepEx(0, TRUE); - todo_wine_if (codes[i] == FIOASYNC) - ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); - if (ret == WAIT_IO_COMPLETION) - { - ok(apc_count == 1, "APC was called %u times\n", apc_count); - ok(apc_error == WSAEOPNOTSUPP, "got APC error %u\n", apc_error); - ok(!apc_size, "got APC size %u\n", apc_size); - ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); - } + ok(ret == WAIT_IO_COMPLETION, "got %d\n", ret); + ok(apc_count == 1, "APC was called %u times\n", apc_count); + ok(apc_error == WSAEOPNOTSUPP, "got APC error %u\n", apc_error); + ok(!apc_size, "got APC size %u\n", apc_size); + ok(apc_overlapped == &overlapped, "got APC overlapped %p\n", apc_overlapped); closesocket(s); winetest_pop_context();

1 0

Nikolay Sivov : dxva2/tests: Remove a test failing on system with hw dxva devices support.
by Alexandre Julliard June 9, 2021

June 9, 2021

Module: wine Branch: master Commit: 37c6790fb75ea5de61a83bd5441c2a7a2d624184 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37c6790fb75ea5de61a83bd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 9 08:59:52 2021 +0300 dxva2/tests: Remove a test failing on system with hw dxva devices support. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/tests/dxva2.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 80749b81f12..4b09e93e87a 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -378,9 +378,6 @@ static void test_device_manager(void) hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats); ok(hr == E_FAIL, "Unexpected hr %#x, format %d.\n", hr, rt_unsupported_formats[i]); - - hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); } IDirectXVideoProcessorService_Release(proc_service);

1 0

Rémi Bernon : ntoskrnl.exe/tests: Silent a todo_wine failing test after a while.
by Alexandre Julliard June 9, 2021

June 9, 2021

Module: wine Branch: master Commit: 4c81c50f449a5ead6cfebd8f1e284da407a2795b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c81c50f449a5ead6cfebd8f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:12:15 2021 +0200 ntoskrnl.exe/tests: Silent a todo_wine failing test after a while. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 44ec1b09526..0f626e6866c 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -103,6 +103,7 @@ static const unsigned char report_descriptor[] = static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { + static BOOL test_failed; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); const ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength; const ULONG out_size = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -175,11 +176,15 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) } case IOCTL_HID_READ_REPORT: + { + ULONG expected_size = 2; ok(!in_size, "got input size %u\n", in_size); - todo_wine ok(out_size == 2, "got output size %u\n", out_size); + if (!test_failed) todo_wine ok(out_size == expected_size, "got output size %u\n", out_size); + if (out_size != expected_size) test_failed = TRUE; ret = STATUS_NOT_IMPLEMENTED; break; + } case IOCTL_HID_GET_STRING: ok(!in_size, "got input size %u\n", in_size);

1 0