- Wine-Devel - list.winehq.org

[PATCH 1/2] windowscodecs/tests: Add test for big PNG chunks.
by Torge Matthies Dec. 3, 2021

Dec. 3, 2021

Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/windowscodecs/tests/pngformat.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 8c33d3b9645..79d8a6fbe7f 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -922,6 +922,25 @@ todo_wine_if(td[i].todo) #undef PNG_COLOR_TYPE_GRAY_ALPHA #undef PNG_COLOR_TYPE_RGB_ALPHA +/* 1 bpp 1x1 pixel PNG image with 8 MiB comment */ +static const char png_8M_tEXt[] = { + 0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a, + 0x00,0x00,0x00,0x0d,'I','H','D','R',0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x37,0x6e,0xf9,0x24, + 0x00,0x80,0x00,0x08,'t','E','X','t','C','o','m','m','e','n','t',0x00,[0x800030]=0x00,0x1e,0x13,0xe2,0xc7, + 0x00,0x00,0x00,0x0c,'I','D','A','T',0x78,0x9c,0x63,0x68,0x00,0x00,0x00,0x82,0x00,0x81,0x77,0xcd,0x72,0xb6, + 0x00,0x00,0x00,0x00,'I','E','N','D',0xae,0x42,0x60,0x82 +}; + +static void test_chunk_size(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + + hr = create_decoder(png_8M_tEXt, sizeof(png_8M_tEXt), &decoder); + todo_wine ok(hr == S_OK, "Failed to load PNG image data %#x\n", hr); + if (hr != S_OK) return; +} + START_TEST(pngformat) { HRESULT hr; @@ -935,6 +954,7 @@ START_TEST(pngformat) test_color_contexts(); test_png_palette(); test_color_formats(); + test_chunk_size(); IWICImagingFactory_Release(factory); CoUninitialize(); -- 2.34.1

2 4

[PATCH v3] server: support inotify file change notifications on FreeBSD
by Damjan Jovanovic Dec. 3, 2021

Dec. 3, 2021

The inotify code uses the Linux-specific /proc/self/fd/<FD> symlinks to translate file descriptors to filesystem paths. On FreeBSD, do this translation using its own sysctl instead. Try 3 makes the mib variable in fd_path() non-static, and moves the fd_path() functions into the HAVE_SYS_INOTIFY_H block where they should be invisible on MacOS. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- server/change.c | 132 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 111 insertions(+), 21 deletions(-)

1 0

[PATCH v2] server: support inotify file change notifications on FreeBSD
by Damjan Jovanovic Dec. 3, 2021

Dec. 3, 2021

The inotify code uses the Linux-specific /proc/self/fd/<FD> symlinks to translate file descriptors to filesystem paths. On FreeBSD, do this translation using its own sysctl instead. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- server/change.c | 132 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 111 insertions(+), 21 deletions(-)

2 2

[PATCH 2/2] wineoss: Don't acquire the sessions lock after the client lock.
by Huw Davies Dec. 3, 2021

Dec. 3, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 19a59cd9ba1..b340db00c3c 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1085,22 +1085,26 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } + EnterCriticalSection(&g_sessions_lock); EnterCriticalSection(&This->lock); if(This->initted){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; } hr = setup_oss_device(mode, This->fd, fmt, NULL); if(FAILED(hr)){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return hr; } This->fmt = clone_format(fmt); if(!This->fmt){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1116,6 +1120,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->fmt); This->fmt = NULL; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1124,6 +1129,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->fmt); This->fmt = NULL; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1134,27 +1140,24 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->flags = flags; This->oss_bufsize_bytes = 0; - EnterCriticalSection(&g_sessions_lock); - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); if(FAILED(hr)){ - LeaveCriticalSection(&g_sessions_lock); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; CoTaskMemFree(This->fmt); This->fmt = NULL; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return hr; } list_add_tail(&This->session->clients, &This->entry); - LeaveCriticalSection(&g_sessions_lock); - This->initted = TRUE; LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } -- 2.23.0

2 1

[PATCH 1/2] winealsa: Don't acquire the sessions lock after the client lock.
by Huw Davies Dec. 3, 2021

Dec. 3, 2021

This could lead to a deadlock with AudioSessionControl_GetState() which acquires the locks in the other order. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7f25cdcce1b..5aa1b4aab63 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1344,10 +1344,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } + EnterCriticalSection(&g_sessions_lock); EnterCriticalSection(&This->lock); if(This->initted){ LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; } @@ -1537,19 +1539,13 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->share = mode; This->flags = flags; - EnterCriticalSection(&g_sessions_lock); - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); - if(FAILED(hr)){ - LeaveCriticalSection(&g_sessions_lock); + if(FAILED(hr)) goto exit; - } list_add_tail(&This->session->clients, &This->entry); - LeaveCriticalSection(&g_sessions_lock); - This->initted = TRUE; TRACE("ALSA period: %lu frames\n", This->alsa_period_frames); @@ -1569,6 +1565,7 @@ exit: } LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); return hr; } -- 2.23.0

2 1

[PATCH v3 1/2] ntdll/tests: Add more tests for \Device\NamedPipe\ root directory.
by Jinoh Kang Dec. 3, 2021

Dec. 3, 2021

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v2 -> v3: move some tests from om.c to pipe.c dlls/ntdll/tests/om.c | 9 ++++ dlls/ntdll/tests/pipe.c | 93 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c32136763a1..23b4ff617c2 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1871,6 +1871,15 @@ static void test_query_object(void) pNtClose( handle ); + handle = CreateFileA( "\\\\.\\pipe\\", 0, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); + + test_object_name( handle, L"\\Device\\NamedPipe\\", TRUE ); + test_object_type( handle, L"File" ); + test_file_info( handle ); + + pNtClose( handle ); + RtlInitUnicodeString( &path, L"\\REGISTRY\\Machine" ); status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed status %x\n", status ); diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 1118f41f81f..d774645ee08 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -51,6 +51,13 @@ typedef struct { ULONG NamedPipeEnd; } FILE_PIPE_LOCAL_INFORMATION; +typedef struct _FILE_PIPE_WAIT_FOR_BUFFER { + LARGE_INTEGER Timeout; + ULONG NameLength; + BOOLEAN TimeoutSpecified; + WCHAR Name[1]; +} FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER; + #ifndef FILE_SYNCHRONOUS_IO_ALERT #define FILE_SYNCHRONOUS_IO_ALERT 0x10 #endif @@ -62,6 +69,10 @@ typedef struct { #ifndef FSCTL_PIPE_LISTEN #define FSCTL_PIPE_LISTEN CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) #endif + +#ifndef FSCTL_PIPE_WAIT +#define FSCTL_PIPE_WAIT CTL_CODE(FILE_DEVICE_NAMED_PIPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) +#endif #endif static NTSTATUS (WINAPI *pNtFsControlFile) (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, PVOID apc_context, PIO_STATUS_BLOCK io, ULONG code, PVOID in_buffer, ULONG in_size, PVOID out_buffer, ULONG out_size); @@ -177,6 +188,51 @@ static NTSTATUS listen_pipe(HANDLE hPipe, HANDLE hEvent, PIO_STATUS_BLOCK iosb, return pNtFsControlFile(hPipe, hEvent, use_apc ? &ioapc: NULL, use_apc ? &dummy: NULL, iosb, FSCTL_PIPE_LISTEN, 0, 0, 0, 0); } +static NTSTATUS wait_pipe(HANDLE handle, PUNICODE_STRING name, const LARGE_INTEGER* timeout) +{ + HANDLE event; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + FILE_PIPE_WAIT_FOR_BUFFER *pipe_wait; + ULONG pipe_wait_size; + + pipe_wait_size = offsetof(FILE_PIPE_WAIT_FOR_BUFFER, Name[0]) + name->Length; + pipe_wait = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pipe_wait_size); + if (!pipe_wait) return STATUS_NO_MEMORY; + + pipe_wait->TimeoutSpecified = !!timeout; + pipe_wait->NameLength = name->Length; + if (timeout) pipe_wait->Timeout = *timeout; + memcpy(pipe_wait->Name, name->Buffer, name->Length); + + InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); + status = NtCreateEvent(&event, GENERIC_ALL, &attr, NotificationEvent, FALSE); + if (status != STATUS_SUCCESS) + { + ok(0, "NtCreateEvent failure: %08x\n", status); + HeapFree(GetProcessHeap(), 0, pipe_wait); + return status; + } + + memset(&iosb, 0, sizeof(iosb)); + iosb.Status = STATUS_PENDING; + status = pNtFsControlFile(handle, event, NULL, NULL, &iosb, FSCTL_PIPE_WAIT, + pipe_wait, pipe_wait_size, NULL, 0); + if (status == STATUS_PENDING && iosb.Status == STATUS_PENDING) + { + WaitForSingleObject(event, INFINITE); + } + if (SUCCEEDED(status) && iosb.Status != STATUS_PENDING) + { + status = iosb.Status; + } + + NtClose(event); + HeapFree(GetProcessHeap(), 0, pipe_wait); + return status; +} + static void test_create_invalid(void) { IO_STATUS_BLOCK iosb; @@ -2412,6 +2468,7 @@ static void test_security_info(void) static void test_empty_name(void) { + static const LARGE_INTEGER zero_timeout = {{ 0 }}; HANDLE hdirectory, hpipe, hpipe2, hwrite, hwrite2, handle; OBJECT_TYPE_INFORMATION *type_info; OBJECT_NAME_INFORMATION *name_info; @@ -2442,6 +2499,10 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#x.\n", status); + pRtlInitUnicodeString(&name, L"nonexistent_pipe"); + status = wait_pipe(hdirectory, &name, &zero_timeout); + todo_wine ok(status == STATUS_ILLEGAL_FUNCTION, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe: %08x\n", status); + name.Buffer = NULL; name.Length = 0; name.MaximumLength = 0; @@ -2454,6 +2515,17 @@ static void test_empty_name(void) todo_wine ok(status == STATUS_OBJECT_NAME_INVALID, "Got unexpected status %#x.\n", status); if (!status) CloseHandle(hpipe); + + pRtlInitUnicodeString(&name, L"test3\\pipe"); + attr.RootDirectory = hdirectory; + attr.ObjectName = &name; + timeout.QuadPart = -(LONG64)10000000; + status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ|GENERIC_WRITE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + ok(status == STATUS_OBJECT_NAME_INVALID, "unexpected status from NtCreateNamedPipeFile: %08x\n", status); + if (!status) + CloseHandle(hpipe); + CloseHandle(hdirectory); pRtlInitUnicodeString(&name, L"\\Device\\NamedPipe\\"); @@ -2467,6 +2539,10 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, NULL, 0 ); ok(!status, "Got unexpected status %#x.\n", status); + pRtlInitUnicodeString(&name, L"nonexistent_pipe"); + status = wait_pipe(hdirectory, &name, &zero_timeout); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "unexpected status for FSCTL_PIPE_WAIT on \\Device\\NamedPipe\\: %08x\n", status); + name.Buffer = NULL; name.Length = 0; name.MaximumLength = 0; @@ -2557,9 +2633,24 @@ static void test_empty_name(void) CloseHandle(hwrite); CloseHandle(hpipe); - CloseHandle(hdirectory); CloseHandle(hpipe2); CloseHandle(hwrite2); + + pRtlInitUnicodeString(&name, L"test3\\pipe"); + attr.RootDirectory = hdirectory; + attr.ObjectName = &name; + timeout.QuadPart = -(LONG64)10000000; + status = pNtCreateNamedPipeFile(&hpipe, GENERIC_READ|GENERIC_WRITE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_CREATE, FILE_PIPE_FULL_DUPLEX, 0, 0, 0, 1, 256, 256, &timeout); + todo_wine ok(!status, "unexpected failure from NtCreateNamedPipeFile: %08x\n", status); + + handle = CreateFileA("\\\\.\\pipe\\test3\\pipe", GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + todo_wine ok(handle != INVALID_HANDLE_VALUE, "Failed to open NamedPipe (%u)\n", GetLastError()); + + CloseHandle(handle); + CloseHandle(hpipe); + CloseHandle(hdirectory); } START_TEST(pipe) -- 2.31.1

1 1

[PATCH 1/4] bcrypt: Return export size from export_gnutls_datum().
by Hans Leidekker Dec. 3, 2021

Dec. 3, 2021

And make zero padding explicit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 77 ++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index c94577f8acd..3a1eff1e7bd 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -585,32 +585,31 @@ static NTSTATUS key_symmetric_destroy( void *args ) return STATUS_SUCCESS; } -static void export_gnutls_datum( UCHAR *buffer, ULONG length, gnutls_datum_t *d, ULONG *actual_length ) +static ULONG export_gnutls_datum( UCHAR *buffer, ULONG buflen, gnutls_datum_t *d, BOOL zero_pad ) { ULONG size = d->size; UCHAR *src = d->data; - ULONG offset; + ULONG offset = 0; - assert( size <= length + 1 ); - if (size == length + 1) + assert( size <= buflen + 1 ); + if (size == buflen + 1) { - assert(!src[0]); - ++src; - --size; + assert( !src[0] ); + src++; + size--; } - if (actual_length) + if (zero_pad) { - offset = 0; - *actual_length = size; + offset = buflen - size; + if (buffer) memset( buffer, 0, offset ); + size = buflen; } - else - { - offset = length - size; - memset( buffer, 0, offset ); - } - memcpy( buffer + offset, src, size ); + + if (buffer) memcpy( buffer + offset, src, size ); + return size; } +#define EXPORT_SIZE(d,f,p) export_gnutls_datum( NULL, bitlen / f, &d, p ) static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, void *pubkey, ULONG *pubkey_len ) { BCRYPT_RSAKEY_BLOB *rsa_blob = pubkey; @@ -624,19 +623,19 @@ static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bit return STATUS_INTERNAL_ERROR; } - if (*pubkey_len < sizeof(*rsa_blob) + e.size + m.size) + if (*pubkey_len < sizeof(*rsa_blob) + EXPORT_SIZE(e,8,0) + EXPORT_SIZE(m,8,1)) { - FIXME( "wrong pubkey len %u / %u\n", *pubkey_len, (ULONG)sizeof(*rsa_blob) + e.size + m.size ); + FIXME( "wrong pubkey len %u\n", *pubkey_len ); pgnutls_perror( ret ); free( e.data ); free( m.data ); return STATUS_BUFFER_TOO_SMALL; } dst = (UCHAR *)(rsa_blob + 1); - export_gnutls_datum( dst, bitlen / 8, &e, &rsa_blob->cbPublicExp ); + rsa_blob->cbPublicExp = export_gnutls_datum( dst, bitlen / 8, &e, 0 ); dst += rsa_blob->cbPublicExp; - export_gnutls_datum( dst, bitlen / 8, &m, &rsa_blob->cbModulus ); + rsa_blob->cbModulus = export_gnutls_datum( dst, bitlen / 8, &m, 1 ); rsa_blob->Magic = BCRYPT_RSAPUBLIC_MAGIC; rsa_blob->BitLength = bitlen; @@ -699,10 +698,10 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, enum alg_ ecc_blob->cbKey = size; dst = (UCHAR *)(ecc_blob + 1); - export_gnutls_datum( dst, size, &x, NULL ); + export_gnutls_datum( dst, size, &x, 1 ); dst += size; - export_gnutls_datum( dst, size, &y, NULL ); + export_gnutls_datum( dst, size, &y, 1 ); *pubkey_len = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; @@ -738,16 +737,16 @@ static NTSTATUS export_gnutls_pubkey_dsa( gnutls_privkey_t gnutls_key, ULONG bit } dst = (UCHAR *)(dsa_blob + 1); - export_gnutls_datum( dst, bitlen / 8, &p, NULL ); + export_gnutls_datum( dst, bitlen / 8, &p, 1 ); dst += bitlen / 8; - export_gnutls_datum( dst, bitlen / 8, &g, NULL ); + export_gnutls_datum( dst, bitlen / 8, &g, 1 ); dst += bitlen / 8; - export_gnutls_datum( dst, bitlen / 8, &y, NULL ); + export_gnutls_datum( dst, bitlen / 8, &y, 1 ); dst = dsa_blob->q; - export_gnutls_datum( dst, sizeof(dsa_blob->q), &q, NULL ); + export_gnutls_datum( dst, sizeof(dsa_blob->q), &q, 1 ); dsa_blob->dwMagic = BCRYPT_DSA_PUBLIC_MAGIC; dsa_blob->cbKey = bitlen / 8; @@ -813,19 +812,19 @@ static NTSTATUS export_gnutls_pubkey_dsa_capi( gnutls_privkey_t gnutls_key, cons dsskey->bitlen = bitlen; dst = (UCHAR *)(dsskey + 1); - export_gnutls_datum( dst, bitlen / 8, &p, NULL ); + export_gnutls_datum( dst, bitlen / 8, &p, 1 ); reverse_bytes( dst, bitlen / 8 ); dst += bitlen / 8; - export_gnutls_datum( dst, Q_SIZE, &q, NULL ); + export_gnutls_datum( dst, Q_SIZE, &q, 1 ); reverse_bytes( dst, Q_SIZE ); dst += Q_SIZE; - export_gnutls_datum( dst, bitlen / 8, &g, NULL ); + export_gnutls_datum( dst, bitlen / 8, &g, 1 ); reverse_bytes( dst, bitlen / 8 ); dst += bitlen / 8; - export_gnutls_datum( dst, bitlen / 8, &y, NULL ); + export_gnutls_datum( dst, bitlen / 8, &y, 1 ); reverse_bytes( dst, bitlen / 8 ); dst += bitlen / 8; @@ -962,13 +961,13 @@ static NTSTATUS key_export_ecc( void *args ) ecc_blob->cbKey = size; dst = (UCHAR *)(ecc_blob + 1); - export_gnutls_datum( dst, size, &x, NULL ); + export_gnutls_datum( dst, size, &x, 1 ); dst += size; - export_gnutls_datum( dst, size, &y, NULL ); + export_gnutls_datum( dst, size, &y, 1 ); dst += size; - export_gnutls_datum( dst, size, &d, NULL ); + export_gnutls_datum( dst, size, &d, 1 ); } free( x.data ); free( y.data ); free( d.data ); @@ -1101,19 +1100,19 @@ static NTSTATUS key_export_dsa_capi( void *args ) pubkey->bitlen = key->u.a.bitlen; dst = (UCHAR *)(pubkey + 1); - export_gnutls_datum( dst, size, &p, NULL ); + export_gnutls_datum( dst, size, &p, 1 ); reverse_bytes( dst, size ); dst += size; - export_gnutls_datum( dst, 20, &q, NULL ); + export_gnutls_datum( dst, 20, &q, 1 ); reverse_bytes( dst, 20 ); dst += 20; - export_gnutls_datum( dst, size, &g, NULL ); + export_gnutls_datum( dst, size, &g, 1 ); reverse_bytes( dst, size ); dst += size; - export_gnutls_datum( dst, 20, &x, NULL ); + export_gnutls_datum( dst, 20, &x, 1 ); reverse_bytes( dst, 20 ); dst += 20; @@ -1571,8 +1570,8 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat if (output) { - export_gnutls_datum( output, sig_len / 2, &r, NULL ); - export_gnutls_datum( output + sig_len / 2, sig_len / 2, &s, NULL ); + export_gnutls_datum( output, sig_len / 2, &r, 1 ); + export_gnutls_datum( output + sig_len / 2, sig_len / 2, &s, 1 ); } free( r.data ); free( s.data ); -- 2.30.2

1 0

[PATCH v6 1/6] include: Move WIN32_MEMORY_RANGE_ENTRY from winnt.h to winbase.h.
by Jinoh Kang Dec. 3, 2021

Dec. 3, 2021

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winbase.h | 6 ++++++ include/winnt.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 8e8a185b4ff..a1efec3db4b 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1757,6 +1757,12 @@ typedef struct _WIN32_FIND_STREAM_DATA { WCHAR cStreamName[MAX_PATH + 36]; } WIN32_FIND_STREAM_DATA,*PWIN32_FIND_STREAM_DATA; +typedef struct _WIN32_MEMORY_RANGE_ENTRY +{ + PVOID VirtualAddress; + SIZE_T NumberOfBytes; +} WIN32_MEMORY_RANGE_ENTRY, *PWIN32_MEMORY_RANGE_ENTRY; + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); diff --git a/include/winnt.h b/include/winnt.h index 2ab74ab123c..3e8a92fc063 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -776,12 +776,6 @@ typedef struct DECLSPEC_ALIGN(8) MEM_EXTENDED_PARAMETER { } DUMMYUNIONNAME; } MEM_EXTENDED_PARAMETER, *PMEM_EXTENDED_PARAMETER; -typedef struct _WIN32_MEMORY_RANGE_ENTRY -{ - PVOID VirtualAddress; - SIZE_T NumberOfBytes; -} WIN32_MEMORY_RANGE_ENTRY, *PWIN32_MEMORY_RANGE_ENTRY; - #define PAGE_NOACCESS 0x01 #define PAGE_READONLY 0x02 #define PAGE_READWRITE 0x04 -- 2.31.1

1 5

[PATCH v2 5/5] win32u: Use NtUserSelectPalette instead of GDISelectPalette.
by Jacek Caban Dec. 3, 2021

Dec. 3, 2021

2 1

[PATCH v2 4/5] win32u: Use NtUserCallOneParam instead of GDIRealizePalette.
by Jacek Caban Dec. 3, 2021

Dec. 3, 2021

2 1