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

Jacek Caban : winepulse: Move pulse stream initialization to unix lib.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: ebd344f2922f4044117904e024a0a87576a3eff1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebd344f2922f4044117904e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 18:31:45 2021 +0200 winepulse: Move pulse stream initialization to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 339 +-------------------------------------- dlls/winepulse.drv/pulse.c | 363 +++++++++++++++++++++++++++++++++++++++++- dlls/winepulse.drv/unixlib.h | 13 +- 3 files changed, 377 insertions(+), 338 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebd344f2922f40441179…

1 0

Ziqing Hui : windowscodecs: Implement IWICDdsEncoder_GetParameters.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: 8e8b70b9d3892d952ca5be879e663504af825168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e8b70b9d3892d952ca5be87… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 12 13:07:49 2021 +0800 windowscodecs: Implement IWICDdsEncoder_GetParameters. 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/ddsformat.c | 50 ++++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 2 -- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index a102d4883cd..8f505aed993 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -168,6 +168,7 @@ typedef struct DdsEncoder { UINT frame_count; BOOL uncommitted_frame; BOOL committed; + dds_info info; } DdsEncoder; typedef struct DdsFrameEncode { @@ -1740,8 +1741,39 @@ static HRESULT WINAPI DdsEncoder_Dds_SetParameters(IWICDdsEncoder *iface, static HRESULT WINAPI DdsEncoder_Dds_GetParameters(IWICDdsEncoder *iface, WICDdsParameters *parameters) { - FIXME("(%p,%p): stub.\n", iface, parameters); - return E_NOTIMPL; + DdsEncoder *This = impl_from_IWICDdsEncoder(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, parameters); + + if (!parameters) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (!This->stream) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + parameters->Width = This->info.width; + parameters->Height = This->info.height; + parameters->Depth = This->info.depth; + parameters->MipLevels = This->info.mip_levels; + parameters->ArraySize = This->info.array_size; + parameters->DxgiFormat = This->info.format; + parameters->Dimension = This->info.dimension; + parameters->AlphaMode = This->info.alpha_mode; + + TRACE("(%p,%p) -> (%dx%d depth=%u mipLevels=%u arraySize=%u dxgiFormat=%#x dimension=%#x alphaMode=%#x)\n", + iface, parameters, parameters->Width, parameters->Height, parameters->Depth, parameters->MipLevels, + parameters->ArraySize, parameters->DxgiFormat, parameters->Dimension, parameters->AlphaMode); + + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI DdsEncoder_Dds_CreateNewFrame(IWICDdsEncoder *iface, @@ -1835,6 +1867,20 @@ static HRESULT WINAPI DdsEncoder_Initialize(IWICBitmapEncoder *iface, This->stream = stream; IStream_AddRef(stream); + This->info.width = 1; + This->info.height = 1; + This->info.depth = 1; + This->info.mip_levels = 1; + This->info.array_size = 1; + This->info.frame_count = 1; + This->info.data_offset = 0; + This->info.bytes_per_block = get_bytes_per_block_from_format(DXGI_FORMAT_BC3_UNORM); + This->info.format = DXGI_FORMAT_BC3_UNORM; + This->info.dimension = WICDdsTexture2D; + This->info.alpha_mode = WICDdsAlphaModeUnknown; + This->info.pixel_format = &GUID_WICPixelFormatUndefined; + This->info.pixel_format_bpp = 0; + hr = S_OK; end: diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 681a73cf6de..dc8333a433f 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1317,11 +1317,9 @@ static void test_dds_encoder_params(IWICBitmapEncoder *encoder, IWICDdsEncoder * HRESULT hr; hr = IWICDdsEncoder_GetParameters(dds_encoder, NULL); - todo_wine ok(hr == E_INVALIDARG, "GetParameters got unexpected hr %#x\n", hr); hr = IWICDdsEncoder_GetParameters(dds_encoder, &params); - todo_wine ok(hr == S_OK, "GetParameters failed, hr %#x\n", hr); if (hr != S_OK) return;

1 0

Jacek Caban : winepulse: Move synchronization functions to unix lib.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: d3673fcb034348b708a5d8b8c65a746faaeec19d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3673fcb034348b708a5d8b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 11 18:29:38 2021 +0200 winepulse: Move synchronization functions to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/Makefile.in | 3 +- dlls/winepulse.drv/mmdevdrv.c | 199 ++++++++++++++++++++--------------------- dlls/winepulse.drv/pulse.c | 83 +++++++++++++++++ dlls/winepulse.drv/unixlib.h | 25 ++++++ 4 files changed, 207 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3673fcb034348b708a5…

1 0

Hugh McMaster : reg: Update the STRING_VALUEALL_FAILED resource string.
by Alexandre Julliard May 12, 2021

May 12, 2021

1 0

Zebediah Figura : server: Rename "hmask" to "reported_events".
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: 0214c73d4629f40d176bf1508e79bbdec2c0929b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0214c73d4629f40d176bf150… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 21:19:49 2021 -0500 server: Rename "hmask" to "reported_events". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/server/sock.c b/server/sock.c index 8b0b56f4070..bd65cfc68c3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -112,8 +112,19 @@ struct sock struct fd *fd; /* socket file descriptor */ unsigned int state; /* status bits */ unsigned int mask; /* event mask */ - unsigned int pending_events; /* pending FD_* events which have not yet been reported to the application */ - unsigned int hmask; /* held (blocked) events */ + /* pending FD_* events which have not yet been reported to the application */ + unsigned int pending_events; + /* FD_* events which have already been reported and should not be selected + * for again until reset by a relevant call. + * + * For example, if FD_READ is set here and not in pending_events, it has + * already been reported and consumed, and we should not report it again, + * even if POLLIN is signaled, until it is reset by e.g recv(). + * + * If an event has been signaled and not consumed yet, it will be set in + * both pending_events and reported_events (as we should only ever report + * any event once until it is reset.) */ + unsigned int reported_events; unsigned int flags; /* socket flags */ int polling; /* is socket being polled? */ unsigned short proto; /* socket protocol */ @@ -617,7 +628,7 @@ static void post_socket_event( struct sock *sock, unsigned int event_bit, unsign unsigned int event = (1 << event_bit); sock->pending_events |= event; - sock->hmask |= event; + sock->reported_events |= event; sock->errors[event_bit] = error; } @@ -743,15 +754,15 @@ static void sock_dump( struct object *obj, int verbose ) { struct sock *sock = (struct sock *)obj; assert( obj->ops == &sock_ops ); - fprintf( stderr, "Socket fd=%p, state=%x, mask=%x, pending=%x, held=%x\n", + fprintf( stderr, "Socket fd=%p, state=%x, mask=%x, pending=%x, reported=%x\n", sock->fd, sock->state, - sock->mask, sock->pending_events, sock->hmask ); + sock->mask, sock->pending_events, sock->reported_events ); } static int sock_get_poll_events( struct fd *fd ) { struct sock *sock = get_fd_user( fd ); - unsigned int mask = sock->mask & ~sock->hmask; + unsigned int mask = sock->mask & ~sock->reported_events; unsigned int smask = sock->state & mask; int ev = 0; @@ -773,7 +784,7 @@ static int sock_get_poll_events( struct fd *fd ) ev |= POLLIN | POLLPRI; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ else if (sock->type == WS_SOCK_STREAM && (sock->state & FD_READ) && (mask & FD_CLOSE) && - !(sock->hmask & FD_READ)) + !(sock->reported_events & FD_READ)) ev |= POLLIN; if (async_queued( &sock->write_q )) @@ -892,8 +903,8 @@ static struct sock *create_socket(void) sock->fd = NULL; sock->state = 0; sock->mask = 0; - sock->hmask = 0; sock->pending_events = 0; + sock->reported_events = 0; sock->polling = 0; sock->flags = 0; sock->proto = 0; @@ -1144,7 +1155,7 @@ static struct sock *accept_socket( struct sock *sock ) } clear_error(); sock->pending_events &= ~FD_ACCEPT; - sock->hmask &= ~FD_ACCEPT; + sock->reported_events &= ~FD_ACCEPT; sock_reselect( sock ); return acceptsock; } @@ -1179,8 +1190,8 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) } acceptsock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; - acceptsock->hmask = 0; acceptsock->pending_events = 0; + acceptsock->reported_events = 0; acceptsock->polling = 0; acceptsock->proto = sock->proto; acceptsock->type = sock->type; @@ -1194,7 +1205,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) clear_error(); sock->pending_events &= ~FD_ACCEPT; - sock->hmask &= ~FD_ACCEPT; + sock->reported_events &= ~FD_ACCEPT; sock_reselect( sock ); return TRUE; @@ -1769,7 +1780,7 @@ DECL_HANDLER(set_socket_event) if (get_unix_fd( sock->fd ) == -1) return; old_event = sock->event; sock->mask = req->mask; - sock->hmask &= ~req->mask; /* re-enable held events */ + sock->reported_events &= ~req->mask; /* re-enable held events */ sock->event = NULL; sock->window = req->window; sock->message = req->msg; @@ -1837,7 +1848,7 @@ DECL_HANDLER(enable_socket_event) /* for event-based notification, windows erases stale events */ sock->pending_events &= ~req->mask; - sock->hmask &= ~req->mask; + sock->reported_events &= ~req->mask; sock->state |= req->sstate; sock->state &= ~req->cstate; if (sock->type != WS_SOCK_STREAM) sock->state &= ~STREAM_FLAG_MASK;

1 0

Alexandre Julliard : include: Define all the context structures on all platforms.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: 7a25671c38de0287aee45b4248a6fd916040b388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a25671c38de0287aee45b42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 12 15:30:03 2021 +0200 include: Define all the context structures on all platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 536 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 266 insertions(+), 270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a25671c38de0287aee4…

1 0

Alexandre Julliard : ntdll: Implement RtlWow64GetCpuAreaInfo().
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: e97a2c4c0f330ac1a523ca42573ba93bcc295710 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e97a2c4c0f330ac1a523ca42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 12 15:30:41 2021 +0200 ntdll: Implement RtlWow64GetCpuAreaInfo(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 36 +++++++++++++++++++++++++++++++++ dlls/ntdll/tests/info.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 29 +++++++++++++++++++++++---- 4 files changed, 114 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 05712d842c4..06ca3d3957c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1070,6 +1070,7 @@ @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr) +@ stdcall -arch=win64 RtlWow64GetCpuAreaInfo(ptr long ptr) @ stdcall RtlWow64GetCurrentMachine() @ stdcall RtlWow64GetProcessMachines(long ptr ptr) @ stdcall -arch=x86_64 RtlWow64GetThreadContext(long ptr) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index dbb94cfb8b7..82b1b69c4ea 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -108,6 +108,42 @@ NTSTATUS WINAPI RtlWow64IsWowGuestMachineSupported( USHORT machine, BOOLEAN *sup } +#ifdef _WIN64 + +/********************************************************************** + * RtlWow64GetCpuAreaInfo (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64GetCpuAreaInfo( WOW64_CPURESERVED *cpu, ULONG reserved, WOW64_CPU_AREA_INFO *info ) +{ + static const struct { ULONG machine, align, size, offset, flag; } data[] = + { +#define ENTRY(machine,type,flag) { machine, TYPE_ALIGNMENT(type), sizeof(type), offsetof(type,ContextFlags), flag }, + ENTRY( IMAGE_FILE_MACHINE_I386, I386_CONTEXT, CONTEXT_i386 ) + ENTRY( IMAGE_FILE_MACHINE_AMD64, AMD64_CONTEXT, CONTEXT_AMD64 ) + ENTRY( IMAGE_FILE_MACHINE_ARMNT, ARM_CONTEXT, CONTEXT_ARM ) + ENTRY( IMAGE_FILE_MACHINE_ARM64, ARM64_NT_CONTEXT, CONTEXT_ARM64 ) +#undef ENTRY + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(data); i++) + { +#define ALIGN(ptr,align) ((void *)(((ULONG_PTR)(ptr) + (align) - 1) & ~((align) - 1))) + if (data[i].machine != cpu->Machine) continue; + info->Context = ALIGN( cpu + 1, data[i].align ); + info->ContextEx = ALIGN( (char *)info->Context + data[i].size, sizeof(void *) ); + info->ContextFlagsLocation = (char *)info->Context + data[i].offset; + info->ContextFlag = data[i].flag; + info->CpuReserved = cpu; + info->Machine = data[i].machine; + return STATUS_SUCCESS; +#undef ALIGN + } + return STATUS_INVALID_PARAMETER; +} + +#endif + /********************************************************************** * RtlCreateUserProcess (NTDLL.@) */ diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 1c1722ee392..bca2086fee9 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -25,6 +25,7 @@ static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pRtlWow64GetCpuAreaInfo)( WOW64_CPURESERVED *cpu, ULONG reserved, WOW64_CPU_AREA_INFO *info ); static USHORT (WINAPI * pRtlWow64GetCurrentMachine)(void); static NTSTATUS (WINAPI * pRtlWow64GetProcessMachines)(HANDLE,WORD*,WORD*); static NTSTATUS (WINAPI * pRtlWow64IsWowGuestMachineSupported)(USHORT,BOOLEAN*); @@ -85,6 +86,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtQuerySystemInformation); NTDLL_GET_PROC(NtSetSystemInformation); NTDLL_GET_PROC(RtlGetNativeSystemInformation); + NTDLL_GET_PROC(RtlWow64GetCpuAreaInfo); NTDLL_GET_PROC(RtlWow64GetCurrentMachine); NTDLL_GET_PROC(RtlWow64GetProcessMachines); NTDLL_GET_PROC(RtlWow64IsWowGuestMachineSupported); @@ -3133,7 +3135,56 @@ static void test_thread_info(void) static void test_wow64(void) { -#ifndef _WIN64 +#ifdef _WIN64 + if (pRtlWow64GetCpuAreaInfo) + { + static const struct + { + USHORT machine; + NTSTATUS expect; + ULONG align, size, offset, flag; + } tests[] = + { + { IMAGE_FILE_MACHINE_I386, 0, 4, 0x2cc, 0x00, 0x00010000 }, + { IMAGE_FILE_MACHINE_AMD64, 0, 16, 0x4d0, 0x30, 0x00100000 }, + { IMAGE_FILE_MACHINE_ARMNT, 0, 8, 0x1a0, 0x00, 0x00200000 }, + { IMAGE_FILE_MACHINE_ARM64, 0, 16, 0x390, 0x00, 0x00400000 }, + { IMAGE_FILE_MACHINE_ARM, STATUS_INVALID_PARAMETER }, + { IMAGE_FILE_MACHINE_THUMB, STATUS_INVALID_PARAMETER }, + }; + USHORT buffer[2048]; + WOW64_CPURESERVED *cpu; + WOW64_CPU_AREA_INFO info; + ULONG i, j; + NTSTATUS status; +#define ALIGN(ptr,align) ((void *)(((ULONG_PTR)(ptr) + (align) - 1) & ~((align) - 1))) + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + for (j = 0; j < 8; j++) + { + cpu = (WOW64_CPURESERVED *)(buffer + j); + cpu->Flags = 0; + cpu->Machine = tests[i].machine; + status = pRtlWow64GetCpuAreaInfo( cpu, 0, &info ); + ok( status == tests[i].expect, "%u:%u: failed %x\n", i, j, status ); + if (status) continue; + ok( info.Context == ALIGN( cpu + 1, tests[i].align ), "%u:%u: wrong offset %u\n", + i, j, (ULONG)((char *)info.Context - (char *)cpu) ); + ok( info.ContextEx == ALIGN( (char *)info.Context + tests[i].size, sizeof(void*) ), + "%u:%u: wrong ex offset %u\n", i, j, (ULONG)((char *)info.ContextEx - (char *)cpu) ); + ok( info.ContextFlagsLocation == (char *)info.Context + tests[i].offset, + "%u:%u: wrong flags offset %u\n", + i, j, (ULONG)((char *)info.ContextFlagsLocation - (char *)info.Context) ); + ok( info.CpuReserved == cpu, "%u:%u: wrong cpu %p / %p\n", info.CpuReserved, cpu ); + ok( info.ContextFlag == tests[i].flag, "%u:%u: wrong flag %08x\n", i, j, info.ContextFlag ); + ok( info.Machine == tests[i].machine, "%u:%u: wrong machine %x\n", i, j, info.Machine ); + } + } +#undef ALIGN + } + else win_skip( "RtlWow64GetCpuAreaInfo not supported\n" ); +#else if (is_wow64) { PEB64 *peb64; diff --git a/include/winternl.h b/include/winternl.h index 1839f4a0151..c9868fb5e39 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3588,6 +3588,25 @@ typedef enum _DEBUGOBJECTINFOCLASS MaxDebugObjectInfoClass } DEBUGOBJECTINFOCLASS, *PDEBUGOBJECTINFOCLASS; + +typedef struct _WOW64_CPURESERVED +{ + USHORT Flags; + USHORT Machine; + /* CONTEXT context */ + /* CONTEXT_EX *context_ex */ +} WOW64_CPURESERVED, *PWOW64_CPURESERVED; + +typedef struct _WOW64_CPU_AREA_INFO +{ + void *Context; + void *ContextEx; + void *ContextFlagsLocation; + WOW64_CPURESERVED *CpuReserved; + ULONG ContextFlag; + USHORT Machine; +} WOW64_CPU_AREA_INFO, *PWOW64_CPU_AREA_INFO; + /*********************************************************************** * Function declarations */ @@ -4249,10 +4268,6 @@ NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); NTSYSAPI USHORT WINAPI RtlWow64GetCurrentMachine(void); NTSYSAPI NTSTATUS WINAPI RtlWow64GetProcessMachines(HANDLE,USHORT*,USHORT*); -#ifdef __x86_64__ -NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE, WOW64_CONTEXT *); -NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE, const WOW64_CONTEXT *); -#endif NTSYSAPI NTSTATUS WINAPI RtlWow64IsWowGuestMachineSupported(USHORT,BOOLEAN*); NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI RtlZombifyActivationContext(HANDLE); @@ -4263,6 +4278,12 @@ NTSYSAPI NTSTATUS WINAPI RtlpUnWaitCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,__ms_va_list); NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_va_list); +#ifdef _WIN64 +NTSYSAPI NTSTATUS WINAPI RtlWow64GetCpuAreaInfo(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); +NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE,WOW64_CONTEXT*); +NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE,const WOW64_CONTEXT*); +#endif + #if defined(__x86_64__) || defined(__i386__) NTSYSAPI NTSTATUS WINAPI RtlCopyExtendedContext(CONTEXT_EX*,ULONG,CONTEXT_EX*); NTSYSAPI NTSTATUS WINAPI RtlInitializeExtendedContext(void*,ULONG,CONTEXT_EX**);

1 0

Hugh McMaster : reg: Fail if access is denied when deleting registry data.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: ab64b0e33972b31b648ee92922b1df78cb6b5a70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab64b0e33972b31b648ee929… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 12 22:24:23 2021 +1000 reg: Fail if access is denied when deleting registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/delete.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/programs/reg/delete.c b/programs/reg/delete.c index f8e62e490b9..8804e16e52f 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -18,9 +18,27 @@ #include "reg.h" +static BOOL op_delete_key = TRUE; + +static void output_error(LONG rc) +{ + if (rc == ERROR_FILE_NOT_FOUND) + { + if (op_delete_key) + output_message(STRING_KEY_NONEXIST); + else + output_message(STRING_VALUE_NONEXIST); + } + else + { + output_message(STRING_ACCESS_DENIED); + } +} + static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL value_all, BOOL force) { + LONG rc; HKEY hkey; if (!force) @@ -44,26 +62,28 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name /* Delete registry key if no /v* option is given */ if (!value_name && !value_empty && !value_all) { - if (RegDeleteTreeW(root, path) != ERROR_SUCCESS) + if ((rc = RegDeleteTreeW(root, path))) { - output_message(STRING_KEY_NONEXIST); + output_error(rc); return 1; } + output_message(STRING_SUCCESS); return 0; } - if (RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey)) + if ((rc = RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &hkey))) { - output_message(STRING_KEY_NONEXIST); + output_error(rc); return 1; } + op_delete_key = FALSE; + if (value_all) { DWORD max_value_len = 256, value_len; WCHAR *value_name; - LONG rc; value_name = malloc(max_value_len * sizeof(WCHAR)); @@ -79,6 +99,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name free(value_name); RegCloseKey(hkey); output_message(STRING_VALUEALL_FAILED, key_name); + output_error(rc); return 1; } } @@ -93,10 +114,10 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name } else if (value_name || value_empty) { - if (RegDeleteValueW(hkey, value_name)) + if ((rc = RegDeleteValueW(hkey, value_name))) { RegCloseKey(hkey); - output_message(STRING_VALUE_NONEXIST); + output_error(rc); return 1; } }

1 0

Zebediah Figura : server: Add a helper to post socket events.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: ccbc17c9f69a79c59303ac6e2d54261de0239653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccbc17c9f69a79c59303ac6e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 21:19:47 2021 -0500 server: Add a helper to post socket events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/server/sock.c b/server/sock.c index 6891b5cbc57..791e4912c89 100644 --- a/server/sock.c +++ b/server/sock.c @@ -612,50 +612,40 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) return event; } +static void post_socket_event( struct sock *sock, unsigned int event_bit, unsigned int error ) +{ + unsigned int event = (1 << event_bit); + + sock->pmask |= event; + sock->hmask |= event; + sock->errors[event_bit] = error; +} + static void sock_dispatch_events( struct sock *sock, int prevstate, int event, int error ) { if (prevstate & FD_CONNECT) { - sock->pmask |= FD_CONNECT; - sock->hmask |= FD_CONNECT; - sock->errors[FD_CONNECT_BIT] = sock_get_error( error ); + post_socket_event( sock, FD_CONNECT_BIT, sock_get_error( error ) ); goto end; } if (prevstate & FD_WINE_LISTENING) { - sock->pmask |= FD_ACCEPT; - sock->hmask |= FD_ACCEPT; - sock->errors[FD_ACCEPT_BIT] = sock_get_error( error ); + post_socket_event( sock, FD_ACCEPT_BIT, sock_get_error( error ) ); goto end; } if (event & POLLIN) - { - sock->pmask |= FD_READ; - sock->hmask |= FD_READ; - sock->errors[FD_READ_BIT] = 0; - } + post_socket_event( sock, FD_READ_BIT, 0 ); if (event & POLLOUT) - { - sock->pmask |= FD_WRITE; - sock->hmask |= FD_WRITE; - sock->errors[FD_WRITE_BIT] = 0; - } + post_socket_event( sock, FD_WRITE_BIT, 0 ); if (event & POLLPRI) - { - sock->pmask |= FD_OOB; - sock->hmask |= FD_OOB; - sock->errors[FD_OOB_BIT] = 0; - } + post_socket_event( sock, FD_OOB_BIT, 0 ); if (event & (POLLERR|POLLHUP)) - { - sock->pmask |= FD_CLOSE; - sock->hmask |= FD_CLOSE; - sock->errors[FD_CLOSE_BIT] = sock_get_error( error ); - } + post_socket_event( sock, FD_CLOSE_BIT, sock_get_error( error ) ); + end: sock_wake_up( sock ); }

1 0

Zebediah Figura : sechost: Allow hexadecimal and string rights flags to be interleaved.
by Alexandre Julliard May 12, 2021

May 12, 2021

Module: wine Branch: master Commit: bb3d74c2e1e65b77686d7fab7762de3d9c635e43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb3d74c2e1e65b77686d7fab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 11 16:51:37 2021 -0500 sechost: Allow hexadecimal and string rights flags to be interleaved. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++++ dlls/sechost/security.c | 36 ++++++++++++------------------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 299a340dcf3..b3361795761 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4212,6 +4212,10 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, { "S:(AU;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xDeAdBeEf;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;GR0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xFFFFFFFFGR;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xFFFFFGR;;;WD)", SDDL_REVISION_1, TRUE }, /* test ACE string access right error case */ { "D:(A;;ROB;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL }, /* test behaviour with empty strings */ diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 47ffba9ed52..b6731b1fe1c 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -868,14 +868,21 @@ static DWORD parse_ace_flag( const WCHAR *string ) return 0; } -static DWORD parse_ace_right( const WCHAR *string ) +static DWORD parse_ace_right( const WCHAR **string_ptr ) { + const WCHAR *string = *string_ptr; unsigned int i; + if (string[0] == '0' && string[1] == 'x') + return wcstoul( string, (WCHAR **)string_ptr, 16 ); + for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) { if (!wcsncmp( string, ace_rights[i].str, 2 )) + { + *string_ptr += 2; return ace_rights[i].value; + } } return 0; } @@ -908,30 +915,11 @@ static DWORD parse_ace_rights( const WCHAR **string_ptr ) while (*string == ' ') string++; - if (string[0] == '0' && string[1] == 'x') - { - const WCHAR *p = string; - - while (*p && *p != ';') - p++; - - if (p - string <= 10 /* 8 hex digits + "0x" */ ) - { - rights = wcstoul( string, NULL, 16 ); - string = p; - } - else - WARN("Invalid rights string format: %s\n", debugstr_wn(string, p - string)); - } - else + while (*string != ';') { - while (*string != ';') - { - DWORD right = parse_ace_right( string ); - if (!right) return 0; - rights |= right; - string += 2; - } + DWORD right = parse_ace_right( &string ); + if (!right) return 0; + rights |= right; } *string_ptr = string;

1 0