May 2021 - Wine-Devel - list.winehq.org

[website] German translation for release 6.7
by Julian Rüger May 28, 2021

May 28, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.0.5
by Julian Rüger May 28, 2021

May 28, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.6
by Julian Rüger May 28, 2021

May 28, 2021

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH v2] shell32: Avoid crashes caused by very long URLs.
by Haoyang Chen May 28, 2021

May 28, 2021

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/shell32/shlexec.c | 90 +++++++++++++++++++++--------------- dlls/shell32/tests/shlexec.c | 24 +++++++--- 2 files changed, 72 insertions(+), 42 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ce0b8f6d2be..1a1948b55a7 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -448,12 +448,17 @@ static BOOL SHELL_TryAppPathW( LPCWSTR szName, LPWSTR lpResult, WCHAR **env) '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','A','p','p',' ','P','a','t','h','s','\\',0}; static const WCHAR wPath[] = {'P','a','t','h',0}; HKEY hkApp = 0; - WCHAR buffer[1024]; + WCHAR *buffer; LONG len; LONG res; BOOL found = FALSE; + LONG bufferlen = lstrlenW(szName) + ARRAYSIZE(wszKeyAppPaths) + 1; if (env) *env = NULL; + if (!(buffer = heap_alloc(bufferlen * sizeof(WCHAR)))) + { + return FALSE; + } strcpyW(buffer, wszKeyAppPaths); strcatW(buffer, szName); res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buffer, 0, KEY_READ, &hkApp); @@ -466,13 +471,14 @@ static BOOL SHELL_TryAppPathW( LPCWSTR szName, LPWSTR lpResult, WCHAR **env) if (env) { - DWORD count = sizeof(buffer); + DWORD count = bufferlen * sizeof(WCHAR); if (!RegQueryValueExW(hkApp, wPath, NULL, NULL, (LPBYTE)buffer, &count) && buffer[0]) *env = SHELL_BuildEnvW( buffer ); } end: if (hkApp) RegCloseKey(hkApp); + if (buffer) heap_free(buffer); return found; } @@ -991,16 +997,23 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWST { static const WCHAR wCommand[] = {'c','o','m','m','a','n','d',0}; static const WCHAR wDdeexec[] = {'d','d','e','e','x','e','c',0}; - WCHAR cmd[256], param[1024], ddeexec[256]; + WCHAR cmd[256], ddeexec[256]; + WCHAR *param; LONG cmdlen = sizeof(cmd), ddeexeclen = sizeof(ddeexec); UINT_PTR retval = SE_ERR_NOASSOC; DWORD resultLen; LPWSTR tmp; + LONG paramlen = cmdlen + lstrlenW(lpFile) + 1; TRACE("%s %s %s %s %s\n", debugstr_w(key), debugstr_w(lpFile), debugstr_w(env), debugstr_w(szCommandline), debugstr_w(executable_name)); cmd[0] = '\0'; + if (!(param = heap_alloc(paramlen * sizeof(WCHAR)))) + { + return (UINT_PTR)NULL; + } + param[0] = '\0'; /* Get the application from the registry */ @@ -1013,8 +1026,8 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWST if (cmdlen >= ARRAY_SIZE(cmd)) cmdlen = ARRAY_SIZE(cmd) - 1; cmd[cmdlen] = '\0'; - SHELL_ArgifyW(param, ARRAY_SIZE(param), cmd, lpFile, psei->lpIDList, szCommandline, &resultLen); - if (resultLen > ARRAY_SIZE(param)) + SHELL_ArgifyW(param, paramlen, cmd, lpFile, psei->lpIDList, szCommandline, &resultLen); + if (resultLen > paramlen) ERR("Argify buffer not large enough, truncating\n"); } @@ -1038,6 +1051,7 @@ static UINT_PTR execute_from_key(LPCWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWST else WARN("Nothing appropriate found for %s\n", debugstr_w(key)); + heap_free(param); return retval; } @@ -1588,11 +1602,11 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; - WCHAR parametersBuffer[1024], dirBuffer[MAX_PATH], wcmdBuffer[1024]; - WCHAR *wszApplicationName, *wszParameters, *wszDir, *wcmd = NULL; + WCHAR dirBuffer[MAX_PATH]; + WCHAR *wcmdBuffer = NULL, *wszApplicationName, *wszParameters, *wszDir, *wcmd = NULL; DWORD dwApplicationNameLen = MAX_PATH+2; - DWORD parametersLen = ARRAY_SIZE(parametersBuffer); - DWORD wcmdLen = ARRAY_SIZE(wcmdBuffer); + DWORD parametersLen = 1024; + DWORD wcmdLen = 1024; DWORD len; SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */ WCHAR *env; @@ -1633,19 +1647,21 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) memcpy(wszApplicationName, sei_tmp.lpFile, l*sizeof(WCHAR)); } - wszParameters = parametersBuffer; if (sei_tmp.lpParameters) { len = lstrlenW(sei_tmp.lpParameters) + 1; if (len > parametersLen) - { - wszParameters = heap_alloc(len * sizeof(WCHAR)); parametersLen = len; - } - strcpyW(wszParameters, sei_tmp.lpParameters); + wszParameters = heap_alloc(parametersLen * sizeof(WCHAR)); + strcpyW(wszParameters, sei_tmp.lpParameters); } else - *wszParameters = '\0'; + { + wszParameters = heap_alloc(parametersLen * sizeof(WCHAR)); + if (!wszParameters) + return FALSE; + *wszParameters = '\0'; + } wszDir = dirBuffer; if (sei_tmp.lpDirectory) @@ -1653,10 +1669,10 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) len = lstrlenW(sei_tmp.lpDirectory) + 1; if (len > ARRAY_SIZE(dirBuffer)) wszDir = heap_alloc(len * sizeof(WCHAR)); - strcpyW(wszDir, sei_tmp.lpDirectory); + strcpyW(wszDir, sei_tmp.lpDirectory); } else - *wszDir = '\0'; + *wszDir = '\0'; /* adjust string pointers to point to the new buffers */ sei_tmp.lpFile = wszApplicationName; @@ -1671,25 +1687,24 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* process the IDList */ if (sei_tmp.fMask & SEE_MASK_IDLIST) { - IShellExecuteHookW* pSEH; + IShellExecuteHookW* pSEH; - HRESULT hr = SHBindToParent(sei_tmp.lpIDList, &IID_IShellExecuteHookW, (LPVOID*)&pSEH, NULL); + HRESULT hr = SHBindToParent(sei_tmp.lpIDList, &IID_IShellExecuteHookW, (LPVOID*)&pSEH, NULL); - if (SUCCEEDED(hr)) - { - hr = IShellExecuteHookW_Execute(pSEH, &sei_tmp); + if (SUCCEEDED(hr)) + { + hr = IShellExecuteHookW_Execute(pSEH, &sei_tmp); - IShellExecuteHookW_Release(pSEH); + IShellExecuteHookW_Release(pSEH); - if (hr == S_OK) { + if (hr == S_OK) { heap_free(wszApplicationName); - if (wszParameters != parametersBuffer) - heap_free(wszParameters); + heap_free(wszParameters); if (wszDir != dirBuffer) heap_free(wszDir); - return TRUE; + return TRUE; } - } + } SHGetPathFromIDListW(sei_tmp.lpIDList, wszApplicationName); TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); @@ -1723,8 +1738,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) { sei->hInstApp = (HINSTANCE) 33; heap_free(wszApplicationName); - if (wszParameters != parametersBuffer) - heap_free(wszParameters); + heap_free(wszParameters); if (wszDir != dirBuffer) heap_free(wszDir); return TRUE; @@ -1737,8 +1751,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) if (retval <= 32 && !(sei_tmp.fMask & SEE_MASK_FLAG_NO_UI)) do_error_dialog(retval, sei_tmp.hwnd); heap_free(wszApplicationName); - if (wszParameters != parametersBuffer) - heap_free(wszParameters); + heap_free(wszParameters); if (wszDir != dirBuffer) heap_free(wszDir); return retval > 32; @@ -1805,6 +1818,11 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* Else, try to execute the filename */ TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); lpFile = sei_tmp.lpFile; + wcmdLen = (strlenW(wszApplicationName) > wcmdLen ? strlenW(wszApplicationName): wcmdLen) + 1; + wcmdBuffer = heap_alloc(wcmdLen * sizeof(WCHAR)); + if (!wcmdBuffer) + return FALSE; + wcmd = wcmdBuffer; strcpyW(wcmd, wszApplicationName); if (sei_tmp.lpDirectory) @@ -1820,12 +1838,12 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) sei, execfunc ); if (retval > 32) { heap_free(wszApplicationName); - if (wszParameters != parametersBuffer) - heap_free(wszParameters); + heap_free(wszParameters); if (wszDir != dirBuffer) heap_free(wszDir); if (wcmd != wcmdBuffer) heap_free(wcmd); + heap_free(wcmdBuffer); return TRUE; } @@ -1885,8 +1903,8 @@ end: TRACE("retval %lu\n", retval); heap_free(wszApplicationName); - if (wszParameters != parametersBuffer) - heap_free(wszParameters); + heap_free(wcmdBuffer); + heap_free(wszParameters); if (wszDir != dirBuffer) heap_free(wszDir); if (wcmd != wcmdBuffer) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 2481fb6faa2..d4f687bb0ad 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -66,7 +66,7 @@ static HANDLE dde_ready_event; static const char* encodeA(const char* str) { - static char encoded[2*1024+1]; + static char encoded[8*1024+1]; char* ptr; size_t len,i; @@ -94,7 +94,7 @@ static unsigned decode_char(char c) static char* decodeA(const char* str) { - static char decoded[1024]; + static char decoded[4096]; char* ptr; size_t len,i; @@ -115,7 +115,7 @@ static char* decodeA(const char* str) static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) { __ms_va_list valist; - char buffer[1024]; + char buffer[8192]; DWORD w; __ms_va_start(valist, fmt); @@ -126,7 +126,7 @@ static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fm static char* getChildString(const char* sect, const char* key) { - char buf[1024]; + char buf[8192]; char* ret; GetPrivateProfileStringA(sect, key, "-", buf, sizeof(buf), child_file); @@ -345,11 +345,11 @@ static void dump_child_(const char* file, int line) * ***/ -static char shell_call[2048]; +static char shell_call[4096]; static void WINAPIV __WINE_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...) { __ms_va_list valist; - char buffer[2048]; + char buffer[12288]; strcpy(buffer, shell_call); strcat(buffer, " "); @@ -1869,6 +1869,7 @@ static void test_fileurls(void) static void test_urls(void) { char url[MAX_PATH + 15]; + char long_url[2048]; INT_PTR rc; if (!create_test_class("fakeproto", FALSE)) @@ -1941,6 +1942,17 @@ static void test_urls(void) okChildString("argvA3", "URL"); okChildString("argvA4", "shlproto://foo/bar"); + memset(long_url, 0, sizeof(long_url)); + strcpy(long_url, "shlproto://foo/bar"); + memset(long_url + strlen(long_url), 'r', sizeof(long_url) - strlen(long_url) - 5); + strcat(long_url, ".exe"); + + rc = shell_execute(NULL, long_url, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); + okChildInt("argcA", 5); + okChildString("argvA3", "URL"); + okChildString("argvA4", long_url); + /* Environment variables are expanded in URLs (but not in file URLs!) */ rc = shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, "shlproto://%TMPDIR%/bar", NULL, NULL, NULL); -- 2.20.1

2 1

[PATCH] winex11.drv: Fix window state error when WS_MAXIMIZE style.
by Jiajin Cui May 28, 2021

May 28, 2021

1 0

[PATCH 1/5] ntdll: Introduce IOCTL_AFD_WINE_TRANSMIT.
by Zebediah Figura May 28, 2021

May 28, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/unix/socket.c | 212 +++++++++++++++++++++++++++++++++++++++ include/wine/afd.h | 12 +++ 2 files changed, 224 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 3d4b98e5871..6112a1260cb 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -71,6 +71,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); +#define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) + static async_data_t server_async( HANDLE handle, struct async_fileio *user, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, IO_STATUS_BLOCK *io ) { @@ -126,6 +128,23 @@ struct async_send_ioctl struct iovec iov[1]; }; +struct async_transmit_ioctl +{ + struct async_fileio io; + HANDLE file; + char *buffer; + unsigned int buffer_size; /* allocated size of buffer */ + unsigned int read_len; /* amount of valid data currently in the buffer */ + unsigned int head_cursor; /* amount of header data already sent */ + unsigned int file_cursor; /* amount of file data already sent */ + unsigned int buffer_cursor; /* amount of data currently in the buffer already sent */ + unsigned int tail_cursor; /* amount of tail data already sent */ + unsigned int file_len; /* total file length to send */ + DWORD flags; + TRANSMIT_FILE_BUFFERS buffers; + LARGE_INTEGER offset; +}; + static NTSTATUS sock_errno_to_status( int err ) { switch (err) @@ -921,6 +940,182 @@ static NTSTATUS sock_send( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi return status; } +static ssize_t do_send( int fd, const void *buffer, size_t len, int flags ) +{ + ssize_t ret; + while ((ret = send( fd, buffer, len, flags )) < 0 && errno == EINTR); + if (ret < 0 && errno != EWOULDBLOCK) WARN( "send: %s\n", strerror( errno ) ); + return ret; +} + +static NTSTATUS try_transmit( int sock_fd, int file_fd, struct async_transmit_ioctl *async ) +{ + ssize_t ret; + + while (async->head_cursor < async->buffers.HeadLength) + { + TRACE( "sending %u bytes of header data\n", async->buffers.HeadLength - async->head_cursor ); + ret = do_send( sock_fd, (char *)async->buffers.Head + async->head_cursor, + async->buffers.HeadLength - async->head_cursor, 0 ); + if (ret < 0) return sock_errno_to_status( errno ); + TRACE( "send returned %zd\n", ret ); + async->head_cursor += ret; + } + + while (async->buffer_cursor < async->read_len) + { + TRACE( "sending %u bytes of file data\n", async->read_len - async->buffer_cursor ); + ret = do_send( sock_fd, async->buffer + async->buffer_cursor, + async->read_len - async->buffer_cursor, 0 ); + if (ret < 0) return sock_errno_to_status( errno ); + TRACE( "send returned %zd\n", ret ); + async->buffer_cursor += ret; + async->file_cursor += ret; + } + + if (async->file && async->buffer_cursor == async->read_len) + { + unsigned int read_size = async->buffer_size; + + if (async->file_len) + read_size = min( read_size, async->file_len - async->file_cursor ); + + TRACE( "reading %u bytes of file data\n", read_size ); + do + { + if (async->offset.QuadPart == FILE_USE_FILE_POINTER_POSITION) + ret = read( file_fd, async->buffer, read_size ); + else + ret = pread( file_fd, async->buffer, read_size, async->offset.QuadPart ); + } while (ret < 0 && errno == EINTR); + if (ret < 0) return errno_to_status( errno ); + TRACE( "read returned %zd\n", ret ); + + async->read_len = ret; + async->buffer_cursor = 0; + if (async->offset.QuadPart != FILE_USE_FILE_POINTER_POSITION) + async->offset.QuadPart += ret; + + if (ret < read_size || (async->file_len && async->file_cursor == async->file_len)) + async->file = NULL; + return STATUS_PENDING; /* still more data to send */ + } + + while (async->tail_cursor < async->buffers.TailLength) + { + TRACE( "sending %u bytes of tail data\n", async->buffers.TailLength - async->tail_cursor ); + ret = do_send( sock_fd, (char *)async->buffers.Tail + async->tail_cursor, + async->buffers.TailLength - async->tail_cursor, 0 ); + if (ret < 0) return sock_errno_to_status( errno ); + TRACE( "send returned %zd\n", ret ); + async->tail_cursor += ret; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS async_transmit_proc( void *user, IO_STATUS_BLOCK *io, NTSTATUS status ) +{ + int sock_fd, file_fd = -1, sock_needs_close = FALSE, file_needs_close = FALSE; + struct async_transmit_ioctl *async = user; + + TRACE( "%#x\n", status ); + + if (status == STATUS_ALERTED) + { + if ((status = server_get_unix_fd( async->io.handle, 0, &sock_fd, &sock_needs_close, NULL, NULL ))) + return status; + + if (async->file && (status = server_get_unix_fd( async->file, 0, &file_fd, &file_needs_close, NULL, NULL ))) + { + if (sock_needs_close) close( sock_fd ); + return status; + } + + status = try_transmit( sock_fd, file_fd, async ); + TRACE( "got status %#x\n", status ); + + if (status == STATUS_DEVICE_NOT_READY) + status = STATUS_PENDING; + + if (sock_needs_close) close( sock_fd ); + if (file_needs_close) close( file_fd ); + } + if (status != STATUS_PENDING) + { + io->Status = status; + io->Information = async->head_cursor + async->file_cursor + async->tail_cursor; + release_fileio( &async->io ); + } + return status; +} + +static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *io, int fd, const struct afd_transmit_params *params ) +{ + int file_fd, file_needs_close = FALSE; + struct async_transmit_ioctl *async; + enum server_fd_type file_type; + union unix_sockaddr addr; + socklen_t addr_len; + HANDLE wait_handle; + NTSTATUS status; + ULONG options; + + addr_len = sizeof(addr); + if (getpeername( fd, &addr.addr, &addr_len ) != 0) + return STATUS_INVALID_CONNECTION; + + if (params->file) + { + if ((status = server_get_unix_fd( params->file, 0, &file_fd, &file_needs_close, &file_type, NULL ))) + return status; + if (file_needs_close) close( file_fd ); + + if (file_type != FD_TYPE_FILE) + { + FIXME( "unsupported file type %#x\n", file_type ); + return STATUS_NOT_IMPLEMENTED; + } + } + + if (!(async = (struct async_transmit_ioctl *)alloc_fileio( sizeof(*async), async_transmit_proc, handle ))) + return STATUS_NO_MEMORY; + + async->file = params->file; + async->buffer_size = params->buffer_size ? params->buffer_size : 65536; + if (!(async->buffer = malloc( async->buffer_size ))) + { + release_fileio( &async->io ); + return STATUS_NO_MEMORY; + } + async->read_len = 0; + async->head_cursor = 0; + async->file_cursor = 0; + async->buffer_cursor = 0; + async->tail_cursor = 0; + async->file_len = params->file_len; + async->flags = params->flags; + async->buffers = params->buffers; + async->offset = params->offset; + + SERVER_START_REQ( send_socket ) + { + req->status = STATUS_PENDING; + req->total = 0; + req->async = server_async( handle, &async->io, event, apc, apc_user, io ); + status = wine_server_call( req ); + wait_handle = wine_server_ptr_handle( reply->wait ); + options = reply->options; + } + SERVER_END_REQ; + + if (status != STATUS_PENDING) release_fileio( &async->io ); + + if (wait_handle) status = wait_async( wait_handle, options & FILE_SYNCHRONOUS_IO_ALERT ); + return status; +} + NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) { @@ -1037,6 +1232,23 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_WINE_TRANSMIT: + { + const struct afd_transmit_params *params = in_buffer; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + if (in_size < sizeof(*params)) + { + return STATUS_BUFFER_TOO_SMALL; + break; + } + + status = sock_transmit( handle, event, apc, apc_user, io, fd, params ); + break; + } + case IOCTL_AFD_POLL: status = sock_poll( handle, event, apc, apc_user, io, in_buffer, in_size, out_buffer, out_size ); break; diff --git a/include/wine/afd.h b/include/wine/afd.h index f003263bfc8..8199e0e2dbe 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -23,6 +23,7 @@ #include <winternl.h> #include <winioctl.h> +#include <mswsock.h> #include "wine/server_protocol.h" #ifdef USE_WS_PREFIX @@ -93,6 +94,7 @@ struct afd_poll_params #define IOCTL_AFD_WINE_SHUTDOWN CTL_CODE(FILE_DEVICE_NETWORK, 204, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_RECVMSG CTL_CODE(FILE_DEVICE_NETWORK, 205, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SENDMSG CTL_CODE(FILE_DEVICE_NETWORK, 206, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_TRANSMIT CTL_CODE(FILE_DEVICE_NETWORK, 207, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -137,4 +139,14 @@ struct afd_sendmsg_params const WSABUF *buffers; }; +struct afd_transmit_params +{ + HANDLE file; + DWORD file_len; + DWORD buffer_size; + LARGE_INTEGER offset; + TRANSMIT_FILE_BUFFERS buffers; + DWORD flags; +}; + #endif -- 2.30.2

2 8

wine-6.0.1-rc2 Available
by Michael Stefaniuc May 27, 2021

May 27, 2021

Hello guys, I have pushed wine-6.0.1-rc2 (98f4bf3b3889a547c2f9b78500e8948a6f23df94) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ Changes to -rc1: - Pulled in 3 patches for Apple Silicon requested by Dean. - A regression fix for one of the above patches (bug #50790) With this patches 6.0.1 should be able to run on Apple Silicon. But I can't test it myself so I haven't added it to the release notes. bye michael

2 3

[PATCH] ntdll: Quiet some noisy ETW FIXMEs.
by Zebediah Figura May 27, 2021

May 27, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/misc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 9c7708a24a5..4b590b76ce5 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -330,7 +330,7 @@ ULONG WINAPI EtwEventActivityIdControl(ULONG code, GUID *guid) */ BOOLEAN WINAPI EtwEventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG keyword ) { - FIXME("%s, %u, %s: stub\n", wine_dbgstr_longlong(handle), level, wine_dbgstr_longlong(keyword)); + WARN("%s, %u, %s: stub\n", wine_dbgstr_longlong(handle), level, wine_dbgstr_longlong(keyword)); return FALSE; } @@ -340,7 +340,7 @@ BOOLEAN WINAPI EtwEventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) { - FIXME("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle); + WARN("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle); if (!handle) return ERROR_INVALID_PARAMETER; @@ -353,7 +353,7 @@ ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID */ ULONG WINAPI EtwEventUnregister( REGHANDLE handle ) { - FIXME("(%s) stub.\n", wine_dbgstr_longlong(handle)); + WARN("(%s) stub.\n", wine_dbgstr_longlong(handle)); return ERROR_SUCCESS; } @@ -413,7 +413,7 @@ ULONG WINAPI EtwRegisterTraceGuidsW( WMIDPREQUEST RequestAddress, TRACE_GUID_REGISTRATION *TraceGuidReg, const WCHAR *MofImagePath, const WCHAR *MofResourceName, TRACEHANDLE *RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + WARN("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), debugstr_w(MofResourceName), RegistrationHandle); @@ -438,7 +438,7 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, TRACE_GUID_REGISTRATION *TraceGuidReg, const char *MofImagePath, const char *MofResourceName, TRACEHANDLE *RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, + WARN("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), debugstr_a(MofResourceName), RegistrationHandle); return ERROR_SUCCESS; @@ -452,7 +452,7 @@ ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) if (!RegistrationHandle) return ERROR_INVALID_PARAMETER; - FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); + WARN("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); return ERROR_SUCCESS; } @@ -461,7 +461,7 @@ ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) */ BOOLEAN WINAPI EtwEventEnabled( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor ) { - FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); + WARN("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); return FALSE; } -- 2.30.2

1 0

[PATCH 5/5] winepulse: Use NtAllocateVirtualMemory for local_buffer.
by Jacek Caban May 27, 2021

May 27, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)

2 1

[PATCH 4/5] winepulse: Use NtAllocateVirtualMemory for tmp_buffer.
by Jacek Caban May 27, 2021

May 27, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-)

2 1