July 2022 - Wine-Commits - list.winehq.org

Jeff Smith : d3drm/tests: Clean up some magic values.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: wine Branch: master Commit: 77189a341fb2e1b71a033b6f579c8b85330a1895 URL: https://gitlab.winehq.org/wine/wine/-/commit/77189a341fb2e1b71a033b6f579c8b… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jul 19 10:09:27 2022 -0500 d3drm/tests: Clean up some magic values. In BMP files with 24-bit depth, color components are stored in BGR order. Due to magic values being used several places in tests to reduce the components, some logical errors are hard to spot. Give names to the magic values to make logical errors more apparent. --- dlls/d3drm/tests/d3drm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5745fea4b09..87986547a4d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6145,6 +6145,10 @@ static void test_create_device_3(void) IDirect3DRM_Release(d3drm); } +#define MOD_R 247 +#define MOD_G 239 +#define MOD_B 251 + static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) { unsigned int bpp = palettized ? 8 : 24; @@ -6205,9 +6209,9 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) } else { - buffer[i++] = j % 251; - buffer[i++] = j % 239; - buffer[i++] = j++ % 247; + buffer[i++] = j % MOD_B; + buffer[i++] = j % MOD_G; + buffer[i++] = j++ % MOD_R; } } ret = WriteFile(file, buffer, size, &written, NULL); @@ -6253,11 +6257,11 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img, const unsigned char *ptr = &data[i * img->bytes_per_line + j * 4]; unsigned int idx = upside_down ? (h - 1 - i) * w + j : i * w + j; - if (ptr[0] != idx % 251 || ptr[1] != idx % 239 || ptr[2] != idx % 247 || ptr[3] != 0xff) + if (ptr[0] != idx % MOD_B || ptr[1] != idx % MOD_G || ptr[2] != idx % MOD_R || ptr[3] != 0xff) { ok(0, "Test %u: Got unexpected color 0x%02x%02x%02x%02x at position %u, %u, " "expected 0x%02x%02x%02x%02x.\n", test_idx, ptr[0], ptr[1], ptr[2], ptr[3], - j, i, idx % 251, idx % 239, idx % 247, 0xff); + j, i, idx % MOD_B, idx % MOD_G, idx % MOD_R, 0xff); return; } } @@ -6283,8 +6287,8 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img, for (i = 0; i < img->palette_size; ++i) { unsigned int idx = upside_down ? (h - 1) * w - i + (i % w) * 2 : i; - ok(img->palette[i].red == idx % 251 - && img->palette[i].green == idx % 239 && img->palette[i].blue == idx % 247, + ok(img->palette[i].red == idx % MOD_B + && img->palette[i].green == idx % MOD_G && img->palette[i].blue == idx % MOD_R, "Test %u: Got unexpected palette entry (%u) color 0x%02x%02x%02x.\n", test_idx, i, img->palette[i].red, img->palette[i].green, img->palette[i].blue); ok(img->palette[i].flags == D3DRMPALETTE_READONLY,

1 0

cjsilver : WWN 422 announcement.
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: website Branch: master Commit: 303a11a5bcf9c83f99b15bec03f6f0709704413f URL: https://gitlab.winehq.org/winehq/winehq/-/commit/303a11a5bcf9c83f99b15bec03… Author: cjsilver <cjsilver(a)codeweavers.com> Date: Thu Jul 21 13:33:26 2022 +0000 WWN 422 announcement. --- news/en/2022072202.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2022072202.xml b/news/en/2022072202.xml new file mode 100644 index 00000000..4d8556f3 --- /dev/null +++ b/news/en/2022072202.xml @@ -0,0 +1,14 @@ +<news> + <date>July 22, 2022</date> + <title>World Wine News Issue 422</title> + <body> + <a href="{$root}/wwn/422">WWN Issue 422</a> was released today. + <p> + <ul> + <li><a href="{$root}/wwn/422#2-for-1" class="">2-for-1</a></li> + <li><a href="{$root}/wwn/422#Bugs Closed July 1st, 2022" class="">Bugs Closed July 1st, 2022</a></li> + <li><a href="{$root}/wwn/422#Bugs Closed July 15th, 2022" class="">Bugs Closed July 15th, 2022</a></li> + </ul> + </p> + </body> +</news>

1 0

cjsilver : WWN 422
by Alexandre Julliard July 21, 2022

July 21, 2022

Module: website Branch: master Commit: 55552a8d4ad6f355b737e8c10c80731af71e2fbd URL: https://gitlab.winehq.org/winehq/winehq/-/commit/55552a8d4ad6f355b737e8c10c… Author: cjsilver <cjsilver(a)codeweavers.com> Date: Thu Jul 21 13:25:05 2022 +0000 WWN 422 --- wwn/en/wn20220722_422.xml | 414 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 414 insertions(+)

1 0

Santino Mazza : jscript: Return ParseProcedureText when compile fails.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: d93712feee25bfe989b5dabcd25759e713a8580a URL: https://gitlab.winehq.org/wine/wine/-/commit/d93712feee25bfe989b5dabcd25759… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Jul 19 20:49:00 2022 -0300 jscript: Return ParseProcedureText when compile fails. This prevents crashes when there is an invalid script inside a tag property. Because ParseProcedureText calls release_bytecode without checking if compile_script failed, "code" is not set, and this leads to a crash when release_bytecode tries to access it. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/jscript/jscript.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8a54f32f234..190a2876900 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -1197,9 +1197,12 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars enter_script(This->ctx, &ei); hres = compile_script(This->ctx, pstrCode, dwSourceContextCookie, ulStartingLineNumber, pstrFormalParams, pstrDelimiter, FALSE, This->is_encode, item, &code); - if(SUCCEEDED(hres)) - hres = create_source_function(This->ctx, code, &code->global_code, NULL, &dispex); + if(FAILED(hres)) + return leave_script(This->ctx, hres); + + hres = create_source_function(This->ctx, code, &code->global_code, NULL, &dispex); release_bytecode(code); + hres = leave_script(This->ctx, hres); if(FAILED(hres)) return hres;

1 0

Zhiyi Zhang : include: Add IMediaParamInfo definition.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: 4e23e412ea55029410bcae9849d0a31502419d89 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e23e412ea55029410bcae9849d0a3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 19 20:49:19 2022 +0800 include: Add IMediaParamInfo definition. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/Makefile.in | 1 + include/medparam.idl | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d5f389b506a..4ea66b37f33 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -414,6 +414,7 @@ SOURCES = \ mcx.h \ mediaerr.h \ mediaobj.idl \ + medparam.idl \ metahost.idl \ mfapi.h \ mfd3d12.idl \ diff --git a/include/medparam.idl b/include/medparam.idl new file mode 100644 index 00000000000..f3b7f2f463e --- /dev/null +++ b/include/medparam.idl @@ -0,0 +1,58 @@ +/* + * Copyright 2022 Zhiyi Zhang for CodeWeavers + * + * 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"; + +typedef float MP_DATA; +typedef DWORD MP_CAPS; +typedef DWORD MP_TIMEDATA; + +typedef enum _MP_Type +{ + MPT_INT, + MPT_FLOAT, + MPT_BOOL, + MPT_ENUM, + MPT_MAX, +} MP_TYPE; + +typedef struct _MP_PARAMINFO +{ + MP_TYPE mpType; + MP_CAPS mopCaps; + MP_DATA mpdMinValue; + MP_DATA mpdMaxValue; + MP_DATA mpdNeutralValue; + WCHAR szUnitText[32]; + WCHAR szLabel[32]; +} MP_PARAMINFO; + +[ +object, +uuid(6D6CBB60-A223-44AA-842F-A2F06750BE6D), +version(1.0) +] +interface IMediaParamInfo : IUnknown +{ + HRESULT GetParamCount([out] DWORD *count); + HRESULT GetParamInfo([in] DWORD index, [out] MP_PARAMINFO *info); + HRESULT GetParamText([in] DWORD index, [out] WCHAR **text); + HRESULT GetNumTimeFormats([out] DWORD *count); + HRESULT GetSupportedTimeFormat([in] DWORD index, [out] GUID *guid); + HRESULT GetCurrentTimeFormat([out] GUID *guid, [out] MP_TIMEDATA *time_data); +}

1 0

Jinoh Kang : server: Use the token owner instead of the token user for default object owner.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: 9090229e6789f8ba3c24047134c47c7964b1d73b URL: https://gitlab.winehq.org/wine/wine/-/commit/9090229e6789f8ba3c24047134c47c… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jul 19 23:58:21 2022 +0900 server: Use the token owner instead of the token user for default object owner. Also, replace the token user with the token owner for the default DACL as well. Wine currently selects domain_users_sid as the token owner, so use that. This is required to pass the advapi32:security test which expects the security descriptor owner SID to be referenced in the DACL as well. --- dlls/advapi32/tests/security.c | 2 -- server/change.c | 2 +- server/file.c | 4 ++-- server/object.c | 2 +- server/security.h | 2 +- server/token.c | 6 +++--- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 99e68c9a1e5..51bf60d0f36 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6420,7 +6420,6 @@ static void test_default_dacl_owner_group_sid(void) ok( ret, "error %lu\n", GetLastError() ); ok( owner != (void *)0xdeadbeef, "owner not set\n" ); ok( !defaulted, "owner defaulted\n" ); - todo_wine ok( EqualSid( owner, token_owner->Owner ), "owner shall equal token owner\n" ); group = (void *)0xdeadbeef; @@ -6460,7 +6459,6 @@ static void test_default_dacl_owner_group_sid(void) "expected ACCESS_ALLOWED_ACE_TYPE, got %d\n", ace->Header.AceType ); if (EqualSid( &ace->SidStart, token_user->User.Sid )) found = TRUE; } - todo_wine ok( !found, "DACL shall not reference token user if it is different from token owner\n" ); } diff --git a/server/change.c b/server/change.c index 6477b457f74..7a806abc017 100644 --- a/server/change.c +++ b/server/change.c @@ -391,7 +391,7 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, else if (obj->sd) owner = sd_get_owner( obj->sd ); else - owner = token_get_user( current->process->token ); + owner = token_get_owner( current->process->token ); if (set_info & DACL_SECURITY_INFORMATION) { diff --git a/server/file.c b/server/file.c index eb2dc5696ed..76c687833c9 100644 --- a/server/file.c +++ b/server/file.c @@ -245,7 +245,7 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si { const struct sid *owner = sd_get_owner( sd ); if (!owner) - owner = token_get_user( current->process->token ); + owner = token_get_owner( current->process->token ); mode = sd_to_mode( sd, owner ); } else if (options & FILE_DIRECTORY_FILE) @@ -528,7 +528,7 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd else if (obj->sd) owner = sd_get_owner( obj->sd ); else - owner = token_get_user( current->process->token ); + owner = token_get_owner( current->process->token ); /* group and sacl not supported */ diff --git a/server/object.c b/server/object.c index 333f9e7b5d6..89e541ffb6b 100644 --- a/server/object.c +++ b/server/object.c @@ -574,7 +574,7 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri } else if (token) { - owner = token_get_user( token ); + owner = token_get_owner( token ); new_sd.owner_len = sid_len( owner ); } else new_sd.owner_len = 0; diff --git a/server/security.h b/server/security.h index fa91b81b77c..58ab1594eae 100644 --- a/server/security.h +++ b/server/security.h @@ -73,7 +73,7 @@ extern int token_check_privileges( struct token *token, int all_required, const struct luid_attr *reqprivs, unsigned int count, struct luid_attr *usedprivs ); extern const struct acl *token_get_default_dacl( struct token *token ); -extern const struct sid *token_get_user( struct token *token ); +extern const struct sid *token_get_owner( struct token *token ); extern const struct sid *token_get_primary_group( struct token *token ); extern unsigned int token_get_session_id( struct token *token ); extern int token_sid_present( struct token *token, const struct sid *sid, int deny ); diff --git a/server/token.c b/server/token.c index f817c1114f8..99f5e36e279 100644 --- a/server/token.c +++ b/server/token.c @@ -732,7 +732,7 @@ struct token *token_create_admin( unsigned primary, int impersonation_level, int /* on Windows, this value changes every time the user logs on */ struct sid logon_sid = { SID_REVISION, 3, SECURITY_NT_AUTHORITY, { SECURITY_LOGON_IDS_RID, 0, 0 /* FIXME: should be randomly generated when tokens are inherited by new processes */ }}; const struct sid *user_sid = security_unix_uid_to_sid( getuid() ); - struct acl *default_dacl = create_default_dacl( user_sid ); + struct acl *default_dacl = create_default_dacl( &domain_users_sid ); const struct luid_attr admin_privs[] = { { SeChangeNotifyPrivilege, SE_PRIVILEGE_ENABLED }, @@ -1044,9 +1044,9 @@ const struct acl *token_get_default_dacl( struct token *token ) return token->default_dacl; } -const struct sid *token_get_user( struct token *token ) +const struct sid *token_get_owner( struct token *token ) { - return token->user; + return token->owner; } const struct sid *token_get_primary_group( struct token *token )

1 0

Zebediah Figura : server: Use sock_poll_event() in poll_socket().
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: 236476417ac6777951d1cfc26c0393bff2a64c23 URL: https://gitlab.winehq.org/wine/wine/-/commit/236476417ac6777951d1cfc26c0393… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 27 19:25:20 2022 -0500 server: Use sock_poll_event() in poll_socket(). In multiple cases errors may be reported only once by the host socket implementation, but should persist for Windows sockets. These cases are currently not handled by poll_socket(). poll_socket() also does not include logic for filtering out events when asyncs are queued or alerted on the relevant socket. Hence, instead of duplicating more logic, remove the logic already duplicated, and just call sock_poll_event(), so that there is one central place where events are translated. Mark the currently active poll async with a special "pending" field so that poll_socket() does not attempt to complete it before all sockets are checked. --- server/sock.c | 53 +++++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/server/sock.c b/server/sock.c index 95335df8fd3..b96f81a0ea8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -124,6 +124,7 @@ struct poll_req struct timeout_user *timeout; timeout_t orig_timeout; int exclusive; + int pending; unsigned int count; struct { @@ -981,8 +982,11 @@ static void complete_async_polls( struct sock *sock, int event, int error ) req->sockets[i].flags = req->sockets[i].mask & flags; req->sockets[i].status = sock_get_ntstatus( error ); - complete_async_poll( req, STATUS_SUCCESS ); - break; + if (req->pending) + { + complete_async_poll( req, STATUS_SUCCESS ); + break; + } } } } @@ -3002,32 +3006,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } } -static int poll_single_socket( struct sock *sock, int mask ) -{ - struct pollfd pollfd; - - pollfd.fd = get_unix_fd( sock->fd ); - pollfd.events = poll_flags_from_afd( sock, mask ); - if (pollfd.events < 0 || poll( &pollfd, 1, 0 ) < 0) - return 0; - - if (sock->state == SOCK_CONNECTING && (pollfd.revents & (POLLERR | POLLHUP))) - pollfd.revents &= ~POLLOUT; - - if ((mask & AFD_POLL_HUP) && (pollfd.revents & POLLIN) && sock->type == WS_SOCK_STREAM) - { - char dummy; - - if (!recv( get_unix_fd( sock->fd ), &dummy, 1, MSG_PEEK )) - { - pollfd.revents &= ~POLLIN; - pollfd.revents |= POLLHUP; - } - } - - return get_poll_flags( sock, pollfd.revents ) & mask; -} - static void handle_exclusive_poll(struct poll_req *req) { unsigned int i; @@ -3065,6 +3043,7 @@ static void poll_socket( struct sock *poll_sock, struct async *async, int exclus return; req->timeout = NULL; + req->pending = 0; if (timeout && timeout != TIMEOUT_INFINITE && !(req->timeout = add_timeout_user( timeout, async_poll_timeout, req ))) { @@ -3103,26 +3082,28 @@ static void poll_socket( struct sock *poll_sock, struct async *async, int exclus { struct sock *sock = req->sockets[i].sock; int mask = req->sockets[i].mask; - int flags = poll_single_socket( sock, mask ); + struct pollfd pollfd; - if (flags) - { - signaled = TRUE; - req->sockets[i].flags = flags; - req->sockets[i].status = sock_get_ntstatus( sock_error( sock ) ); - } + pollfd.fd = get_unix_fd( sock->fd ); + pollfd.events = poll_flags_from_afd( sock, mask ); + if (pollfd.events >= 0 && poll( &pollfd, 1, 0 ) >= 0) + sock_poll_event( sock->fd, pollfd.revents ); /* FIXME: do other error conditions deserve a similar treatment? */ if (sock->state != SOCK_CONNECTING && sock->errors[AFD_POLL_BIT_CONNECT_ERR] && (mask & AFD_POLL_CONNECT_ERR)) { - signaled = TRUE; req->sockets[i].flags |= AFD_POLL_CONNECT_ERR; req->sockets[i].status = sock_get_ntstatus( sock->errors[AFD_POLL_BIT_CONNECT_ERR] ); } + + if (req->sockets[i].flags) + signaled = TRUE; } if (!timeout || signaled) complete_async_poll( req, STATUS_SUCCESS ); + else + req->pending = 1; for (i = 0; i < req->count; ++i) sock_reselect( req->sockets[i].sock );

1 0

Zebediah Figura : server: Always wake up pending read or write asyncs on POLLHUP or POLLERR.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: f234341ca1170a799d03179061914b772d4166cd URL: https://gitlab.winehq.org/wine/wine/-/commit/f234341ca1170a799d03179061914b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 28 21:40:46 2022 -0500 server: Always wake up pending read or write asyncs on POLLHUP or POLLERR. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52815 --- dlls/ws2_32/tests/sock.c | 32 ++++++++++++++++---------------- server/sock.c | 6 ++---- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 490b3b96e51..b0f07b9ab58 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7018,12 +7018,12 @@ static void test_WSARecv(void) close_with_rst(src); dwret = WaitForSingleObject(ov.hEvent, 1000); - todo_wine ok(dwret == WAIT_OBJECT_0, "Waiting for disconnect event failed with %ld + errno %ld\n", dwret, GetLastError()); + ok(dwret == WAIT_OBJECT_0, "Waiting for disconnect event failed with %ld + errno %ld\n", dwret, GetLastError()); bret = GetOverlappedResult((HANDLE)dest, &ov, &bytesReturned, FALSE); ok(!bret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "got error %lu\n", GetLastError()); - todo_wine ok(bytesReturned == 0, "Bytes received is %ld\n", bytesReturned); + ok(GetLastError() == ERROR_NETNAME_DELETED, "got error %lu\n", GetLastError()); + ok(bytesReturned == 0, "Bytes received is %ld\n", bytesReturned); closesocket(dest); dest = INVALID_SOCKET; @@ -9669,10 +9669,10 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); ok(bret == FALSE, "GetQueuedCompletionStatus returned %d\n", bret); - todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "Last error was %ld\n", GetLastError()); - todo_wine ok(key == 125, "Key is %Iu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes received is %lu\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); + ok(GetLastError() == ERROR_NETNAME_DELETED, "Last error was %ld\n", GetLastError()); + ok(key == 125, "Key is %Iu\n", key); + ok(num_bytes == 0, "Number of bytes received is %lu\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -9721,10 +9721,10 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); ok(bret == FALSE, "GetQueuedCompletionStatus returned %u\n", bret ); - todo_wine ok(GetLastError() == WAIT_TIMEOUT, "Last error was %ld\n", GetLastError()); - todo_wine ok(key == 0xdeadbeef, "Key is %Iu\n", key); - todo_wine ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %lu\n", num_bytes); - todo_wine ok(!olp, "Overlapped structure is at %p\n", olp); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %ld\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %Iu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %lu\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); if (dest != INVALID_SOCKET) closesocket(dest); @@ -12851,12 +12851,12 @@ static void test_tcp_reset(void) close_with_rst(server); ret = WaitForSingleObject(overlapped.hEvent, 1000); - todo_wine ok(!ret, "wait failed\n"); + ok(!ret, "wait failed\n"); ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "got error %lu\n", GetLastError()); - todo_wine ok(!size, "got size %lu\n", size); - todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_CONNECTION_RESET, "got status %#lx\n", (NTSTATUS)overlapped.Internal); + ok(GetLastError() == ERROR_NETNAME_DELETED, "got error %lu\n", GetLastError()); + ok(!size, "got size %lu\n", size); + ok((NTSTATUS)overlapped.Internal == STATUS_CONNECTION_RESET, "got status %#lx\n", (NTSTATUS)overlapped.Internal); len = sizeof(error); ret = getsockopt(client, SOL_SOCKET, SO_ERROR, (char *)&error, &len); @@ -12868,7 +12868,7 @@ static void test_tcp_reset(void) WSASetLastError(0xdeadbeef); size = 0xdeadbeef; ret = WSARecv(client, &wsabuf, 1, &size, &flags, &overlapped, NULL); - ok(ret == -1, "got %d\n", ret); + todo_wine ok(ret == -1, "got %d\n", ret); todo_wine ok(WSAGetLastError() == WSAECONNRESET, "got error %u\n", WSAGetLastError()); check_poll_todo(client, POLLERR | POLLHUP | POLLWRNORM); diff --git a/server/sock.c b/server/sock.c index 31a04579fce..95335df8fd3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1046,10 +1046,8 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) int status = sock_get_ntstatus( error ); struct accept_req *req, *next; - if (sock->rd_shutdown || sock->hangup) - async_wake_up( &sock->read_q, status ); - if (sock->wr_shutdown) - async_wake_up( &sock->write_q, status ); + async_wake_up( &sock->read_q, status ); + async_wake_up( &sock->write_q, status ); LIST_FOR_EACH_ENTRY_SAFE( req, next, &sock->accept_list, struct accept_req, entry ) {

1 0

Zebediah Figura : Revert "server: Explicitly shutdown destroyed sockets to force pending poll() calls to return.".
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: 07b66768b101c3bf8152c5db09c2bfa432e0eba6 URL: https://gitlab.winehq.org/wine/wine/-/commit/07b66768b101c3bf8152c5db09c2bf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 28 21:11:02 2022 -0500 Revert "server: Explicitly shutdown destroyed sockets to force pending poll() calls to return.". This reverts commit 24b64534e592e47e5cac70e497a98c0ddbc3941b. We no longer perform any blocking waits on the client side, so shutdown() is no longer necessary. Moreover, shutting down is not always correct. Under some conditions, closing a TCP socket should trigger RST without FIN (namely, when SO_LINGER is on but has a zero timeout). By reverting this commit we match Windows behaviour in this respect. --- dlls/ws2_32/tests/afd.c | 9 ++++----- dlls/ws2_32/tests/sock.c | 30 +++++++++++++++--------------- server/sock.c | 7 +------ 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index f2dccd465a3..9852d54ecb9 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -162,8 +162,7 @@ static void check_poll_(int line, SOCKET s, HANDLE event, int mask, int expect, ok_(__FILE__, line)(out_params.count == 1, "got count %u\n", out_params.count); ok_(__FILE__, line)(out_params.sockets[0].socket == s, "got socket %#Ix\n", out_params.sockets[0].socket); todo_wine_if (todo) ok_(__FILE__, line)(out_params.sockets[0].flags == expect, "got flags %#x\n", out_params.sockets[0].flags); - todo_wine_if (expect & AFD_POLL_RESET) - ok_(__FILE__, line)(!out_params.sockets[0].status, "got status %#x\n", out_params.sockets[0].status); + ok_(__FILE__, line)(!out_params.sockets[0].status, "got status %#x\n", out_params.sockets[0].status); } static void test_poll(void) @@ -1408,7 +1407,7 @@ static void test_poll_reset(void) ok(out_params->count == 1, "got count %u\n", out_params->count); ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); todo_wine ok(out_params->sockets[0].flags == AFD_POLL_RESET, "got flags %#x\n", out_params->sockets[0].flags); - ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + todo_wine ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); check_poll_todo(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_RESET); @@ -2044,7 +2043,7 @@ static void test_get_events_reset(void) ok(!ret, "got %#x\n", ret); todo_wine ok(params.flags == (AFD_POLL_RESET | AFD_POLL_CONNECT | AFD_POLL_WRITE), "got flags %#x\n", params.flags); for (i = 0; i < ARRAY_SIZE(params.status); ++i) - ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + todo_wine_if (i == AFD_POLL_BIT_HUP) ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); closesocket(client); @@ -2062,7 +2061,7 @@ static void test_get_events_reset(void) ok(!ret, "got %#x\n", ret); todo_wine ok(params.flags == (AFD_POLL_RESET | AFD_POLL_WRITE), "got flags %#x\n", params.flags); for (i = 0; i < ARRAY_SIZE(params.status); ++i) - ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + todo_wine_if (i == AFD_POLL_BIT_HUP) ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); closesocket(server); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c89f48879aa..490b3b96e51 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7018,12 +7018,12 @@ static void test_WSARecv(void) close_with_rst(src); dwret = WaitForSingleObject(ov.hEvent, 1000); - ok(dwret == WAIT_OBJECT_0, "Waiting for disconnect event failed with %ld + errno %ld\n", dwret, GetLastError()); + todo_wine ok(dwret == WAIT_OBJECT_0, "Waiting for disconnect event failed with %ld + errno %ld\n", dwret, GetLastError()); bret = GetOverlappedResult((HANDLE)dest, &ov, &bytesReturned, FALSE); - todo_wine ok(!bret, "expected failure\n"); + ok(!bret, "expected failure\n"); todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "got error %lu\n", GetLastError()); - ok(bytesReturned == 0, "Bytes received is %ld\n", bytesReturned); + todo_wine ok(bytesReturned == 0, "Bytes received is %ld\n", bytesReturned); closesocket(dest); dest = INVALID_SOCKET; @@ -9668,11 +9668,11 @@ static void test_completion_port(void) olp = (WSAOVERLAPPED *)0xdeadbeef; bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); - todo_wine ok(bret == FALSE, "GetQueuedCompletionStatus returned %d\n", bret); + ok(bret == FALSE, "GetQueuedCompletionStatus returned %d\n", bret); todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "Last error was %ld\n", GetLastError()); - ok(key == 125, "Key is %Iu\n", key); - ok(num_bytes == 0, "Number of bytes received is %lu\n", num_bytes); - ok(olp == &ov, "Overlapped structure is at %p\n", olp); + todo_wine ok(key == 125, "Key is %Iu\n", key); + todo_wine ok(num_bytes == 0, "Number of bytes received is %lu\n", num_bytes); + todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -9721,10 +9721,10 @@ static void test_completion_port(void) bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); ok(bret == FALSE, "GetQueuedCompletionStatus returned %u\n", bret ); - ok(GetLastError() == WAIT_TIMEOUT, "Last error was %ld\n", GetLastError()); - ok(key == 0xdeadbeef, "Key is %Iu\n", key); - ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %lu\n", num_bytes); - ok(!olp, "Overlapped structure is at %p\n", olp); + todo_wine ok(GetLastError() == WAIT_TIMEOUT, "Last error was %ld\n", GetLastError()); + todo_wine ok(key == 0xdeadbeef, "Key is %Iu\n", key); + todo_wine ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %lu\n", num_bytes); + todo_wine ok(!olp, "Overlapped structure is at %p\n", olp); if (dest != INVALID_SOCKET) closesocket(dest); @@ -12851,11 +12851,11 @@ static void test_tcp_reset(void) close_with_rst(server); ret = WaitForSingleObject(overlapped.hEvent, 1000); - ok(!ret, "wait failed\n"); + todo_wine ok(!ret, "wait failed\n"); ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); - todo_wine ok(!ret, "expected failure\n"); + ok(!ret, "expected failure\n"); todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "got error %lu\n", GetLastError()); - ok(!size, "got size %lu\n", size); + todo_wine ok(!size, "got size %lu\n", size); todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_CONNECTION_RESET, "got status %#lx\n", (NTSTATUS)overlapped.Internal); len = sizeof(error); @@ -12868,7 +12868,7 @@ static void test_tcp_reset(void) WSASetLastError(0xdeadbeef); size = 0xdeadbeef; ret = WSARecv(client, &wsabuf, 1, &size, &flags, &overlapped, NULL); - todo_wine ok(ret == -1, "got %d\n", ret); + ok(ret == -1, "got %d\n", ret); todo_wine ok(WSAGetLastError() == WSAECONNRESET, "got error %u\n", WSAGetLastError()); check_poll_todo(client, POLLERR | POLLHUP | POLLWRNORM); diff --git a/server/sock.c b/server/sock.c index 4eef5c1ddb7..31a04579fce 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1467,12 +1467,7 @@ static void sock_destroy( struct object *obj ) free_async_queue( &sock->connect_q ); free_async_queue( &sock->poll_q ); if (sock->event) release_object( sock->event ); - if (sock->fd) - { - /* shut the socket down to force pending poll() calls in the client to return */ - shutdown( get_unix_fd(sock->fd), SHUT_RDWR ); - release_object( sock->fd ); - } + if (sock->fd) release_object( sock->fd ); } static struct sock *create_socket(void)

1 0

Zhiyi Zhang : dsdmo: Add IMediaParamInfo stub interface.
by Alexandre Julliard July 20, 2022

July 20, 2022

Module: wine Branch: master Commit: a0cac2e0d83828a13ea2fcc3860d9ff628cce586 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0cac2e0d83828a13ea2fcc3860d9f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 19 21:04:25 2022 +0800 dsdmo: Add IMediaParamInfo stub interface. Fix Chuzzle Deluxe crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dsdmo/main.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 7 ----- 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index fe7cf1115a7..720d37350fe 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -22,6 +22,7 @@ #include "mmsystem.h" #include "uuids.h" #include "initguid.h" +#include "medparam.h" #include "dsound.h" #include "rpcproxy.h" @@ -33,6 +34,7 @@ struct effect { IMediaObject IMediaObject_iface; IMediaObjectInPlace IMediaObjectInPlace_iface; + IMediaParamInfo IMediaParamInfo_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -66,6 +68,8 @@ static HRESULT WINAPI effect_inner_QueryInterface(IUnknown *iface, REFIID iid, v *out = &effect->IMediaObject_iface; else if (IsEqualGUID(iid, &IID_IMediaObjectInPlace)) *out = &effect->IMediaObjectInPlace_iface; + else if (IsEqualGUID(iid, &IID_IMediaParamInfo)) + *out = &effect->IMediaParamInfo_iface; else if (!(*out = effect->ops->query_interface(effect, iid))) { WARN("%s not implemented; returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -418,6 +422,78 @@ static const IMediaObjectInPlaceVtbl effect_inplace_vtbl = effect_inplace_GetLatency, }; +static struct effect *impl_from_IMediaParamInfo(IMediaParamInfo *iface) +{ + return CONTAINING_RECORD(iface, struct effect, IMediaParamInfo_iface); +} + +static HRESULT WINAPI effect_media_param_info_QueryInterface(IMediaParamInfo *iface, REFIID iid, void **out) +{ + struct effect *effect = impl_from_IMediaParamInfo(iface); + return IUnknown_QueryInterface(effect->outer_unk, iid, out); +} + +static ULONG WINAPI effect_media_param_info_AddRef(IMediaParamInfo *iface) +{ + struct effect *effect = impl_from_IMediaParamInfo(iface); + return IUnknown_AddRef(effect->outer_unk); +} + +static ULONG WINAPI effect_media_param_info_Release(IMediaParamInfo *iface) +{ + struct effect *effect = impl_from_IMediaParamInfo(iface); + return IUnknown_Release(effect->outer_unk); +} + +static HRESULT WINAPI effect_media_param_info_GetParamCount(IMediaParamInfo *iface, DWORD *count) +{ + FIXME("iface %p, count %p, stub!\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_media_param_info_GetParamInfo(IMediaParamInfo *iface, DWORD index, MP_PARAMINFO *info) +{ + FIXME("iface %p, index %lu, info %p, stub!\n", iface, index, info); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_media_param_info_GetParamText(IMediaParamInfo *iface, DWORD index, WCHAR **text) +{ + FIXME("iface %p, index %lu, text %p, stub!\n", iface, index, text); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_media_param_info_GetNumTimeFormats(IMediaParamInfo *iface, DWORD *count) +{ + FIXME("iface %p, count %p, stub!\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_media_param_info_GetSupportedTimeFormat(IMediaParamInfo *iface, DWORD index, GUID *guid) +{ + FIXME("iface %p, index %lu, guid %p, stub!\n", iface, index, guid); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_media_param_info_GetCurrentTimeFormat(IMediaParamInfo *iface, GUID *guid, MP_TIMEDATA *time_data) +{ + FIXME("iface %p, guid %p, time_data %p, stub!\n", iface, guid, time_data); + return E_NOTIMPL; +} + +static const IMediaParamInfoVtbl effect_media_param_info_vtbl = +{ + effect_media_param_info_QueryInterface, + effect_media_param_info_AddRef, + effect_media_param_info_Release, + effect_media_param_info_GetParamCount, + effect_media_param_info_GetParamInfo, + effect_media_param_info_GetParamText, + effect_media_param_info_GetNumTimeFormats, + effect_media_param_info_GetSupportedTimeFormat, + effect_media_param_info_GetCurrentTimeFormat, +}; + static void effect_init(struct effect *effect, IUnknown *outer, const struct effect_ops *ops) { effect->outer_unk = outer ? outer : &effect->IUnknown_inner; @@ -425,6 +501,7 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff effect->IUnknown_inner.lpVtbl = &effect_inner_vtbl; effect->IMediaObject_iface.lpVtbl = &effect_vtbl; effect->IMediaObjectInPlace_iface.lpVtbl = &effect_inplace_vtbl; + effect->IMediaParamInfo_iface.lpVtbl = &effect_media_param_info_vtbl; InitializeCriticalSection(&effect->cs); effect->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": effect.cs"); diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 4947b67c751..90b8e61f5e7 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -151,14 +151,7 @@ static void test_interfaces(const GUID *clsid, const GUID *iid) winetest_push_context("GUID %s", debugstr_guid(guids[i])); hr = IUnknown_QueryInterface(unk, guids[i], (void **)&unk2); - todo_wine_if(guids[i] == &IID_IMediaParamInfo) ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr != S_OK) - { - winetest_pop_context(); - continue; - } - hr = IUnknown_QueryInterface(unk2, iid, (void **)&unk3); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(unk3 == unk, "Interface pointers didn't match.\n");

1 0