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

Nikolay Sivov : mf: Use CRT allocation functions.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: bab4f2939eea884c0774b386116b2b9756bb32c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bab4f2939eea884c0774b386… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 17 13:33:51 2021 +0300 mf: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/clock.c | 26 +++++++++------------ dlls/mf/copier.c | 6 ++--- dlls/mf/evr.c | 18 +++++++-------- dlls/mf/main.c | 57 ++++++++++++++------------------------------- dlls/mf/mf_private.h | 3 +-- dlls/mf/samplegrabber.c | 17 ++++++-------- dlls/mf/sar.c | 11 ++++----- dlls/mf/session.c | 61 +++++++++++++++++++++++-------------------------- dlls/mf/topology.c | 32 ++++++++++---------------- 9 files changed, 93 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bab4f2939eea884c0774…

1 0

Zebediah Figura : ws2_32: Check if the socket is bound in ConnectEx() in the server.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: 93d001fa813660cb162c276698a9f550d7d41b54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93d001fa813660cb162c2766… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 16 23:33:11 2021 -0500 ws2_32: Check if the socket is bound in ConnectEx() in the server. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 ------------ server/sock.c | 6 ++++++ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 845a0e68986..1a484da1527 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2014,22 +2014,10 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct WS_sockaddr *name, int struct afd_connect_params *params; void *cvalue = NULL; NTSTATUS status; - int fd, ret; TRACE( "socket %#lx, ptr %p %s, length %d, send_buffer %p, send_len %u, overlapped %p\n", s, name, debugstr_sockaddr(name), namelen, send_buffer, send_len, overlapped ); - if ((fd = get_sock_fd( s, FILE_READ_DATA, NULL )) == -1) - return FALSE; - - if ((ret = is_fd_bound( fd, NULL, NULL )) <= 0) - { - SetLastError( ret ? wsaErrno() : WSAEINVAL ); - release_sock_fd( s, fd ); - return FALSE; - } - release_sock_fd( s, fd ); - if (!overlapped) { SetLastError( WSA_INVALID_PARAMETER ); diff --git a/server/sock.c b/server/sock.c index 88f6e4ac9fd..bb0d13d9e6c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2126,6 +2126,12 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) send_len = get_req_data_size() - sizeof(*params) - params->addr_len; addr = (const struct WS_sockaddr *)(params + 1); + if (!params->synchronous && !sock->bound) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (sock->accept_recv_req) { set_error( STATUS_INVALID_PARAMETER );

1 0

Zebediah Figura : ntdll/tests: Relax tests for RtlWaitOnAddress() timeout.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: c82c5e96a9eb13bfa1fef95fb7467ce17624a341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c82c5e96a9eb13bfa1fef95f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 17 11:48:41 2021 -0500 ntdll/tests: Relax tests for RtlWaitOnAddress() timeout. RtlWaitOnAddress() shouldn't be waiting for less than 100 ms here, and it isn't, but using GetTickCount() to measure this can result in up to 15 ms of error, causing frequent test failures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a7f8eaa84e1..82f8188d176 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2304,7 +2304,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); @@ -2319,7 +2319,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, size, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); ok(!status, "got 0x%08x\n", status);

1 0

Andrew Eikum : shell32: Always create default known folder directories.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: 978e03ea942a7734dfb2d8c4b79e84fe8ac89f78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=978e03ea942a7734dfb2d8c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 17 10:43:01 2021 -0500 shell32: Always create default known folder directories. Some applications query for the default path, but this would fail on older prefixes where the new default path was never created. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index f71b660a7aa..005e905baaa 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4688,6 +4688,13 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, } } } + else + { + /* create the default dir, which may be different from the path + * stored in the registry. */ + SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE, + hToken, SHGFP_TYPE_DEFAULT, path); + } } if (hUserKey) RegCloseKey(hUserKey);

1 0

Zebediah Figura : ws2_32: Pass a Win32 socket address to IOCTL_AFD_WINE_CONNECT.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: 5295cc273e6d963d0abaa0412cdd5b9e75f04687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5295cc273e6d963d0abaa041… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 16 23:33:10 2021 -0500 ws2_32: Pass a Win32 socket address to IOCTL_AFD_WINE_CONNECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 54 +++++++++------------------------------------------- include/wine/afd.h | 2 +- server/sock.c | 19 +++++++++++++----- 3 files changed, 24 insertions(+), 51 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c8403808d8f..845a0e68986 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1959,8 +1959,6 @@ int WINAPI WS_closesocket(SOCKET s) */ int WINAPI WS_connect( SOCKET s, const struct WS_sockaddr *addr, int len ) { - union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = ws_sockaddr_ws2u( addr, len, &uaddr ); struct afd_connect_params *params; IO_STATUS_BLOCK io; HANDLE sync_event; @@ -1968,35 +1966,19 @@ int WINAPI WS_connect( SOCKET s, const struct WS_sockaddr *addr, int len ) TRACE( "socket %#lx, addr %s, len %d\n", s, debugstr_sockaddr(addr), len ); - if (!uaddrlen) - { - SetLastError( WSAEFAULT ); - return -1; - } - - if (addr->sa_family == WS_AF_INET) - { - struct sockaddr_in *in4 = (struct sockaddr_in *)&uaddr; - if (!memcmp(&in4->sin_addr, magic_loopback_addr, sizeof(magic_loopback_addr))) - { - TRACE("Replacing magic address 127.12.34.56 with INADDR_LOOPBACK.\n"); - in4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); - } - } - if (!(sync_event = get_sync_event())) return -1; - if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + uaddrlen ))) + if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + len ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return -1; } - params->addr_len = uaddrlen; + params->addr_len = len; params->synchronous = TRUE; - memcpy(params + 1, &uaddr, uaddrlen); + memcpy( params + 1, addr, len ); status = NtDeviceIoControlFile( (HANDLE)s, sync_event, NULL, NULL, &io, IOCTL_AFD_WINE_CONNECT, - params, sizeof(*params) + uaddrlen, NULL, 0); + params, sizeof(*params) + len, NULL, 0 ); HeapFree( GetProcessHeap(), 0, params ); if (status == STATUS_PENDING) { @@ -2029,8 +2011,6 @@ int WINAPI WSAConnect( SOCKET s, const struct WS_sockaddr* name, int namelen, static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct WS_sockaddr *name, int namelen, void *send_buffer, DWORD send_len, DWORD *ret_len, OVERLAPPED *overlapped ) { - union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = ws_sockaddr_ws2u(name, namelen, &uaddr); struct afd_connect_params *params; void *cvalue = NULL; NTSTATUS status; @@ -2060,35 +2040,19 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct WS_sockaddr *name, int overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; - if (!uaddrlen) - { - SetLastError( WSAEFAULT ); - return SOCKET_ERROR; - } - - if (name->sa_family == WS_AF_INET) - { - struct sockaddr_in *in4 = (struct sockaddr_in *)&uaddr; - if (!memcmp( &in4->sin_addr, magic_loopback_addr, sizeof(magic_loopback_addr) )) - { - TRACE("Replacing magic address 127.12.34.56 with INADDR_LOOPBACK.\n"); - in4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); - } - } - - if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + uaddrlen + send_len ))) + if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + namelen + send_len ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return SOCKET_ERROR; } - params->addr_len = uaddrlen; + params->addr_len = namelen; params->synchronous = FALSE; - memcpy( params + 1, &uaddr, uaddrlen ); - memcpy( (char *)(params + 1) + uaddrlen, send_buffer, send_len ); + memcpy( params + 1, name, namelen ); + memcpy( (char *)(params + 1) + namelen, send_buffer, send_len ); status = NtDeviceIoControlFile( SOCKET2HANDLE(s), overlapped->hEvent, NULL, cvalue, (IO_STATUS_BLOCK *)overlapped, IOCTL_AFD_WINE_CONNECT, - params, sizeof(*params) + uaddrlen + send_len, NULL, 0 ); + params, sizeof(*params) + namelen + send_len, NULL, 0 ); HeapFree( GetProcessHeap(), 0, params ); if (ret_len) *ret_len = overlapped->InternalHigh; SetLastError( NtStatusToWSAError( status ) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index 04468363673..19c1e064aaf 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -173,7 +173,7 @@ struct afd_connect_params { int addr_len; int synchronous; - /* VARARG(addr, struct sockaddr, addr_len); */ + /* VARARG(addr, struct WS(sockaddr), addr_len); */ /* VARARG(data, bytes); */ }; diff --git a/server/sock.c b/server/sock.c index 39575b22f76..88f6e4ac9fd 100644 --- a/server/sock.c +++ b/server/sock.c @@ -109,6 +109,8 @@ #define IP_UNICAST_IF 50 #endif +static const char magic_loopback_addr[] = {127, 12, 34, 56}; + union win_sockaddr { struct WS_sockaddr addr; @@ -2109,8 +2111,8 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) case IOCTL_AFD_WINE_CONNECT: { const struct afd_connect_params *params = get_req_data(); + const struct WS_sockaddr *addr; union unix_sockaddr unix_addr; - const struct sockaddr *addr; struct connect_req *req; socklen_t unix_len; int send_len, ret; @@ -2122,7 +2124,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } send_len = get_req_data_size() - sizeof(*params) - params->addr_len; - addr = (const struct sockaddr *)(params + 1); + addr = (const struct WS_sockaddr *)(params + 1); if (sock->accept_recv_req) { @@ -2144,7 +2146,16 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - ret = connect( unix_fd, addr, params->addr_len ); + unix_len = sockaddr_to_unix( addr, params->addr_len, &unix_addr ); + if (!unix_len) + { + set_error( STATUS_INVALID_ADDRESS ); + return 0; + } + if (unix_addr.addr.sa_family == AF_INET && !memcmp( &unix_addr.in.sin_addr, magic_loopback_addr, 4 )) + unix_addr.in.sin_addr.s_addr = htonl( INADDR_LOOPBACK ); + + ret = connect( unix_fd, &unix_addr.addr, unix_len ); if (ret < 0 && errno != EINPROGRESS) { set_error( sock_get_ntstatus( errno ) ); @@ -2427,8 +2438,6 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (unix_addr.addr.sa_family == WS_AF_INET) { - static const char magic_loopback_addr[] = {127, 12, 34, 56}; - if (!memcmp( &unix_addr.in.sin_addr, magic_loopback_addr, 4 ) || bind_to_interface( sock, &unix_addr.in )) bind_addr.in.sin_addr.s_addr = htonl( INADDR_ANY );

1 0

Yeshun Ye : iphlpapi: Fix the field 'AdapterName' of IP_ADAPTER_INFO returned by GetAdaptersInfo.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: fb648144e33d7afd27bda84ffd793bfcac96441d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb648144e33d7afd27bda84f… Author: Yeshun Ye <yeyeshun(a)uniontech.com> Date: Thu Jun 17 08:56:30 2021 +0800 iphlpapi: Fix the field 'AdapterName' of IP_ADAPTER_INFO returned by GetAdaptersInfo. Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 9 ++++++++- dlls/iphlpapi/tests/iphlpapi.c | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 09414d26dde..21edd9ee128 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -706,9 +706,16 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) DWORD i; PIP_ADDR_STRING currentIPAddr = &ptr->IpAddressList; BOOL firstIPAddr = TRUE; + NET_LUID luid; + GUID guid; /* on Win98 this is left empty, but whatever */ - getInterfaceNameByIndex(table->indexes[ndx], ptr->AdapterName); + ConvertInterfaceIndexToLuid(table->indexes[ndx], &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(ptr->AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); getInterfaceNameByIndex(table->indexes[ndx], ptr->Description); ptr->AddressLength = sizeof(ptr->Address); getInterfacePhysicalByIndex(table->indexes[ndx], diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..b6e62138256 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1115,6 +1115,9 @@ static void testGetAdaptersInfo(void) ; /* no adapter's, that's okay */ else if (apiReturn == ERROR_BUFFER_OVERFLOW) { PIP_ADAPTER_INFO ptr, buf = HeapAlloc(GetProcessHeap(), 0, len); + NET_LUID luid; + GUID guid; + char AdapterName[ARRAY_SIZE(ptr->AdapterName)]; apiReturn = GetAdaptersInfo(buf, &len); ok(apiReturn == NO_ERROR, @@ -1122,6 +1125,13 @@ static void testGetAdaptersInfo(void) apiReturn); ptr = buf; while (ptr) { + ConvertInterfaceIndexToLuid(ptr->Index, &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); + ok(!strcmp(ptr->AdapterName, AdapterName), "expected '%s' got '%s'\n", ptr->AdapterName, AdapterName); ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP address must be present\n"); ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); ok(ptr->GatewayList.IpAddress.String[0], "A valid IP address must be present\n");

1 0

Zebediah Figura : ws2_32: Check if the socket is bound in listen() in the server.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: f0b42b2ffa4a0eafedce69211b5d2259163a29dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0b42b2ffa4a0eafedce6921… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 16 23:33:09 2021 -0500 ws2_32: Check if the socket is bound in listen() in the server. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 ----------- server/sock.c | 6 ++++++ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 63c26a9c769..c8403808d8f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3282,20 +3282,9 @@ int WINAPI WS_listen( SOCKET s, int backlog ) struct afd_listen_params params = {.backlog = backlog}; IO_STATUS_BLOCK io; NTSTATUS status; - int fd, bound; TRACE( "socket %#lx, backlog %d\n", s, backlog ); - if ((fd = get_sock_fd( s, FILE_READ_DATA, NULL )) == -1) - return -1; - bound = is_fd_bound( fd, NULL, NULL ); - release_sock_fd( s, fd ); - if (bound <= 0) - { - SetLastError( bound ? wsaErrno() : WSAEINVAL ); - return -1; - } - status = NtDeviceIoControlFile( SOCKET2HANDLE(s), NULL, NULL, NULL, &io, IOCTL_AFD_LISTEN, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); diff --git a/server/sock.c b/server/sock.c index 23c750243a6..39575b22f76 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2084,6 +2084,12 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + if (!sock->bound) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (listen( unix_fd, params->backlog ) < 0) { set_error( sock_get_ntstatus( errno ) );

1 0

Zebediah Figura : server: Correctly access the sir_lsap_sel field.
by Alexandre Julliard June 17, 2021

June 17, 2021

Module: wine Branch: master Commit: 43a1a248c3227d7d7623f6b4ded8adc8e2e16cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a1a248c3227d7d7623f6b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 16 23:33:08 2021 -0500 server: Correctly access the sir_lsap_sel field. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 6b0c4af6b11..23c750243a6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -427,10 +427,10 @@ static socklen_t sockaddr_to_unix( const struct WS_sockaddr *wsaddr, int wsaddrl memcpy( &win, wsaddr, sizeof(win) ); uaddr->irda.sir_family = AF_IRDA; if (sscanf( win.irdaServiceName, "LSAP-SEL%u", &lsap_sel ) == 1) - uaddr->sir_lsap_sel = lsap_sel; + uaddr->irda.sir_lsap_sel = lsap_sel; else { - uaddr->sir_lsap_sel = LSAP_ANY; + uaddr->irda.sir_lsap_sel = LSAP_ANY; memcpy( uaddr->irda.sir_name, win.irdaServiceName, sizeof(win.irdaServiceName) ); } memcpy( &uaddr->irda.sir_addr, win.irdaDeviceID, sizeof(win.irdaDeviceID) );

1 0

Hugh McMaster : reg/tests: Modify delete_key() to support use of RegDeleteKeyEx().
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: f06869199571466c989b0e75a8edfb55ad6e541a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f06869199571466c989b0e75… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 16 22:43:05 2021 +1000 reg/tests: Modify delete_key() to support use of RegDeleteKeyEx(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 35 +++++++++++++++++++++-------------- programs/reg/tests/copy.c | 32 ++++++++++++++++---------------- programs/reg/tests/export.c | 14 +++++++------- programs/reg/tests/import.c | 38 +++++++++++++++++++------------------- programs/reg/tests/reg_test.h | 4 ++-- 5 files changed, 65 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f06869199571466c989b…

1 0

Ziqing Hui : windowscodecs/tests: Use winetest_push_context for DDS tests.
by Alexandre Julliard June 16, 2021

June 16, 2021

Module: wine Branch: master Commit: 6f57297c4acf52f3cf053b7155f592f402d33e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f57297c4acf52f3cf053b71… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 15 09:59:50 2021 +0800 windowscodecs/tests: Use winetest_push_context for DDS tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 291 ++++++++++++++++++----------------- 1 file changed, 151 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f57297c4acf52f3cf05…

1 0