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

[tools] testbot/WineTest: Don't run the tests for test=build missions.
by Francois Gouget June 13, 2021

June 13, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineTest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index ffd665faa..73cd660c6 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -116,7 +116,7 @@ sub TestPatch($$) { push @TestList, "-m", "do.not.submit"; } - else + elsif ($Mission->{test} ne "build") { foreach my $ModuleName (sort keys %{$Impacts->{Modules}}) { -- 2.20.1

1 0

[PATCH] ntdll: Export ZwFilterToken().
by Kalen Alwardt June 13, 2021

June 13, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39142 Signed-off-by: Kalen Alwardt <kalenalwardt(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6bd6579d432..8cba4fa164a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1224,7 +1224,7 @@ # @ stub ZwEnumerateSystemEnvironmentValuesEx @ stdcall -private -syscall ZwEnumerateValueKey(long long long ptr long ptr) NtEnumerateValueKey @ stub ZwExtendSection -# @ stub ZwFilterToken +@ stdcall -private -syscall ZwFilterToken(long long ptr ptr ptr ptr) NtFilterToken @ stdcall -private -syscall ZwFindAtom(ptr long ptr) NtFindAtom @ stdcall -private -syscall ZwFlushBuffersFile(long ptr) NtFlushBuffersFile @ stdcall -private -syscall ZwFlushInstructionCache(long ptr long) NtFlushInstructionCache -- 2.18.0.windows.1

2 1

[PATCH] server: Free the old process image name if a second process image is mapped (Valgrind).
by Zebediah Figura June 12, 2021

June 12, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/mapping.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/mapping.c b/server/mapping.c index 9cb24a4213f..cd918224caa 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -376,6 +376,9 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) /* main exe */ set_process_machine( process, view ); list_add_head( &process->views, &view->entry ); + + free( process->image ); + process->image = NULL; if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) process->imagelen = name.len; return; -- 2.30.2

1 0

[PATCH] ntdll: Reserve space for the whole 64-bit YMM context in struct x86_thread_data.
by Zebediah Figura June 12, 2021

June 12, 2021

Fixes a regression introduced by 308a5e7c4d01525184b057058949c68c0ee77dba. This was previously broken, but happened to work until the aforementioned commit put the YMM state right at the end of a page. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- I don't know how accurate "some" is; both of my development machines suffer from this. It manifests as a stack overflow trying to execute any 32-bit program. The processors in question are AMD cores manufactured in 2012 and 2018. dlls/ntdll/unix/signal_i386.c | 53 +++++++++++------------------------ 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 0b2b269505f..446fed25eb8 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -461,24 +461,6 @@ enum i386_trap_code #endif }; -struct syscall_xsave -{ - union - { - XSAVE_FORMAT xsave; - FLOATING_SAVE_AREA fsave; - } u; - struct - { - ULONG64 mask; - ULONG64 compaction_mask; - ULONG64 reserved[6]; - M128A ymm_high[8]; - } xstate; -}; - -C_ASSERT( sizeof(struct syscall_xsave) == 0x2c0 ); - struct syscall_frame { DWORD restore_flags; /* 000 */ @@ -504,16 +486,13 @@ struct syscall_frame XSAVE_FORMAT xsave; FLOATING_SAVE_AREA fsave; } u; - struct /* 240 */ - { - ULONG64 mask; - ULONG64 compaction_mask; - ULONG64 reserved[6]; - M128A ymm_high[8]; - } xstate; + /* Leave space for the whole set of YMM registers. They're not used in + * 32-bit mode, but some processors fault if they're not in writable memory. + */ + XSTATE xstate; /* 240 */ }; -C_ASSERT( sizeof(struct syscall_frame) == 0x300 ); +C_ASSERT( sizeof(struct syscall_frame) == 0x380 ); struct x86_thread_data { @@ -1011,7 +990,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) memcpy( &frame->u.xsave, context->ExtendedRegisters, sizeof(frame->u.xsave) ); /* reset the current interrupt status */ frame->u.xsave.StatusWord &= frame->u.xsave.ControlWord | 0xff80; - frame->xstate.mask |= XSTATE_MASK_LEGACY; + frame->xstate.Mask |= XSTATE_MASK_LEGACY; } else if (flags & CONTEXT_FLOATING_POINT) { @@ -1023,7 +1002,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) { frame->u.fsave = context->FloatSave; } - frame->xstate.mask |= XSTATE_MASK_LEGACY_FLOATING_POINT; + frame->xstate.Mask |= XSTATE_MASK_LEGACY_FLOATING_POINT; } if (flags & CONTEXT_XSTATE) { @@ -1032,10 +1011,10 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) if (xs->Mask & XSTATE_MASK_GSSE) { - frame->xstate.mask |= XSTATE_MASK_GSSE; - memcpy( &frame->xstate.ymm_high, &xs->YmmContext, sizeof(frame->xstate.ymm_high) ); + frame->xstate.Mask |= XSTATE_MASK_GSSE; + frame->xstate.YmmContext = xs->YmmContext; } - else frame->xstate.mask &= ~XSTATE_MASK_GSSE; + else frame->xstate.Mask &= ~XSTATE_MASK_GSSE; } frame->restore_flags |= flags & ~CONTEXT_INTEGER; @@ -1104,7 +1083,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) context->FloatSave = frame->u.fsave; } else if (!xstate_compaction_enabled || - (frame->xstate.mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) + (frame->xstate.Mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) { fpux_to_fpu( &context->FloatSave, &frame->u.xsave ); } @@ -1120,7 +1099,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) XSAVE_FORMAT *xs = (XSAVE_FORMAT *)context->ExtendedRegisters; if (!xstate_compaction_enabled || - (frame->xstate.mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) + (frame->xstate.Mask & XSTATE_MASK_LEGACY_FLOATING_POINT)) { memcpy( xs, &frame->u.xsave, FIELD_OFFSET( XSAVE_FORMAT, MxCsr )); memcpy( xs->FloatRegisters, frame->u.xsave.FloatRegisters, @@ -1133,7 +1112,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) xs->ControlWord = 0x37f; } - if (!xstate_compaction_enabled || (frame->xstate.mask & XSTATE_MASK_LEGACY_SSE)) + if (!xstate_compaction_enabled || (frame->xstate.Mask & XSTATE_MASK_LEGACY_SSE)) { memcpy( xs->XmmRegisters, frame->u.xsave.XmmRegisters, sizeof( xs->XmmRegisters )); xs->MxCsr = frame->u.xsave.MxCsr; @@ -1168,7 +1147,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) return STATUS_INVALID_PARAMETER; mask = (xstate_compaction_enabled ? xstate->CompactionMask : xstate->Mask) & XSTATE_MASK_GSSE; - xstate->Mask = frame->xstate.mask & mask; + xstate->Mask = frame->xstate.Mask & mask; xstate->CompactionMask = xstate_compaction_enabled ? (0x8000000000000000 | mask) : 0; memset( xstate->Reserved, 0, sizeof(xstate->Reserved) ); if (xstate->Mask) @@ -1176,7 +1155,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) if (context_ex->XState.Length < sizeof(XSTATE)) return STATUS_BUFFER_OVERFLOW; - memcpy( &xstate->YmmContext, frame->xstate.ymm_high, sizeof(frame->xstate.ymm_high) ); + xstate->YmmContext = frame->xstate.YmmContext; } } } @@ -2401,7 +2380,7 @@ __ASM_GLOBAL_FUNC( signal_start_thread, /* set syscall frame */ "cmpl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame */ "jnz 1f\n\t" - "leal -0x300(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */ + "leal -0x380(%esp),%eax\n\t" /* sizeof(struct syscall_frame) */ "andl $~63,%eax\n\t" "movl %eax,%fs:0x1f8\n" /* x86_thread_data()->syscall_frame */ /* switch to thread stack */ -- 2.30.2

3 2

[PATCH v2 2/2] dpnhupnp: Stub DirectPlayNATHelpCreate and DllGetClassObject
by Alistair Leslie-Hughes June 11, 2021

June 11, 2021

Stop crash in "STAR WARS Galactic Battlegrounds Saga" Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnhupnp/Makefile.in | 2 ++ dlls/dpnhupnp/dpnhupnp.spec | 4 ++-- dlls/dpnhupnp/main.c | 39 +++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 dlls/dpnhupnp/main.c diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in index 566ce038f82..6aa9ef1dd80 100644 --- a/dlls/dpnhupnp/Makefile.in +++ b/dlls/dpnhupnp/Makefile.in @@ -2,5 +2,7 @@ MODULE = dpnhupnp.dll EXTRADLLFLAGS = -Wb,--prefer-native +C_SRCS = \ + main.c RC_SRCS = version.rc diff --git a/dlls/dpnhupnp/dpnhupnp.spec b/dlls/dpnhupnp/dpnhupnp.spec index 2a750e53675..9145823b92a 100644 --- a/dlls/dpnhupnp/dpnhupnp.spec +++ b/dlls/dpnhupnp/dpnhupnp.spec @@ -1,6 +1,6 @@ -@ stub DirectPlayNATHelpCreate +@ stdcall DirectPlayNATHelpCreate(ptr ptr) @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject() @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/dpnhupnp/main.c b/dlls/dpnhupnp/main.c new file mode 100644 index 00000000000..10bca6e7c23 --- /dev/null +++ b/dlls/dpnhupnp/main.c @@ -0,0 +1,39 @@ +/* + * + * Copyright (C) 2021 Alistair Leslie-Hughes + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dpnhupnp); + +HRESULT WINAPI DirectPlayNATHelpCreate(LPCGUID pIID, void **ppv) +{ + FIXME("(%p, %p) stub\n", pIID, ppv); + return E_NOTIMPL; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + FIXME("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return E_FAIL; +} -- 2.30.2

1 0

[PATCH v2 1/2] dpnhupnp: add stub dll
by Alistair Leslie-Hughes June 11, 2021

June 11, 2021

From: Austin English <austinenglish(a)gmail.com> Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure.ac | 1 + dlls/dpnhupnp/Makefile.in | 6 ++++++ dlls/dpnhupnp/dpnhupnp.spec | 6 ++++++ dlls/dpnhupnp/version.rc | 26 ++++++++++++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 dlls/dpnhupnp/Makefile.in create mode 100644 dlls/dpnhupnp/dpnhupnp.spec create mode 100644 dlls/dpnhupnp/version.rc diff --git a/configure.ac b/configure.ac index 8c74532dabc..e7475de1f7d 100644 --- a/configure.ac +++ b/configure.ac @@ -3171,6 +3171,7 @@ WINE_CONFIG_MAKEFILE(dlls/dplay) WINE_CONFIG_MAKEFILE(dlls/dplayx) WINE_CONFIG_MAKEFILE(dlls/dplayx/tests) WINE_CONFIG_MAKEFILE(dlls/dpnaddr) +WINE_CONFIG_MAKEFILE(dlls/dpnhupnp) WINE_CONFIG_MAKEFILE(dlls/dpnet) WINE_CONFIG_MAKEFILE(dlls/dpnet/tests) WINE_CONFIG_MAKEFILE(dlls/dpnhpast) diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in new file mode 100644 index 00000000000..566ce038f82 --- /dev/null +++ b/dlls/dpnhupnp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dpnhupnp.dll + +EXTRADLLFLAGS = -Wb,--prefer-native + + +RC_SRCS = version.rc diff --git a/dlls/dpnhupnp/dpnhupnp.spec b/dlls/dpnhupnp/dpnhupnp.spec new file mode 100644 index 00000000000..2a750e53675 --- /dev/null +++ b/dlls/dpnhupnp/dpnhupnp.spec @@ -0,0 +1,6 @@ +@ stub DirectPlayNATHelpCreate + +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dpnhupnp/version.rc b/dlls/dpnhupnp/version.rc new file mode 100644 index 00000000000..21633a49815 --- /dev/null +++ b/dlls/dpnhupnp/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dpnhupnp" +#define WINE_FILENAME_STR "dpnhupnp.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc" -- 2.30.2

1 0

[PATCH 1/2] dpnhupnp: add stub dll
by Alistair Leslie-Hughes June 11, 2021

June 11, 2021

From: Austin English <austinenglish(a)gmail.com> Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure.ac | 1 + dlls/dpnhupnp/Makefile.in | 6 ++++++ dlls/dpnhupnp/dpnhupnp.spec | 6 ++++++ dlls/dpnhupnp/version.rc | 26 ++++++++++++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 dlls/dpnhupnp/Makefile.in create mode 100644 dlls/dpnhupnp/dpnhupnp.spec create mode 100644 dlls/dpnhupnp/version.rc diff --git a/configure.ac b/configure.ac index 431f4acef28..c07ad8114fc 100644 --- a/configure.ac +++ b/configure.ac @@ -3230,6 +3230,7 @@ WINE_CONFIG_MAKEFILE(dlls/dplay) WINE_CONFIG_MAKEFILE(dlls/dplayx) WINE_CONFIG_MAKEFILE(dlls/dplayx/tests) WINE_CONFIG_MAKEFILE(dlls/dpnaddr) +WINE_CONFIG_MAKEFILE(dlls/dpnhupnp) WINE_CONFIG_MAKEFILE(dlls/dpnet) WINE_CONFIG_MAKEFILE(dlls/dpnet/tests) WINE_CONFIG_MAKEFILE(dlls/dpnhpast) diff --git a/dlls/dpnhupnp/Makefile.in b/dlls/dpnhupnp/Makefile.in new file mode 100644 index 00000000000..566ce038f82 --- /dev/null +++ b/dlls/dpnhupnp/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dpnhupnp.dll + +EXTRADLLFLAGS = -Wb,--prefer-native + + +RC_SRCS = version.rc diff --git a/dlls/dpnhupnp/dpnhupnp.spec b/dlls/dpnhupnp/dpnhupnp.spec new file mode 100644 index 00000000000..2a750e53675 --- /dev/null +++ b/dlls/dpnhupnp/dpnhupnp.spec @@ -0,0 +1,6 @@ +@ stub DirectPlayNATHelpCreate + +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dpnhupnp/version.rc b/dlls/dpnhupnp/version.rc new file mode 100644 index 00000000000..21633a49815 --- /dev/null +++ b/dlls/dpnhupnp/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dpnhupnp" +#define WINE_FILENAME_STR "dpnhupnp.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc" -- 2.30.2

2 2

[PATCH resend] ntdll: Export ZwFilterToken().
by Kalen Alwardt June 11, 2021

June 11, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39142 Signed-off-by: Kalen Alwardt <kalenalwardt(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6bd6579d432..8cba4fa164a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1224,7 +1224,7 @@ # @ stub ZwEnumerateSystemEnvironmentValuesEx @ stdcall -private -syscall ZwEnumerateValueKey(long long long ptr long ptr) NtEnumerateValueKey @ stub ZwExtendSection -# @ stub ZwFilterToken +@ stdcall -private -syscall ZwFilterToken(long long ptr ptr ptr ptr) NtFilterToken @ stdcall -private -syscall ZwFindAtom(ptr long ptr) NtFindAtom @ stdcall -private -syscall ZwFlushBuffersFile(long ptr) NtFlushBuffersFile @ stdcall -private -syscall ZwFlushInstructionCache(long ptr long) NtFlushInstructionCache -- 2.18.0.windows.1

2 1

[PATCH 1/2] wined3d: Implement wined3d_deferred_context_update_sub_resource().
by Zebediah Figura June 11, 2021

June 11, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 50a08334dab..e6f84134795 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -490,6 +490,7 @@ struct wined3d_cs_update_sub_resource unsigned int sub_resource_idx; struct wined3d_box box; struct wined3d_sub_resource_data data; + /* If data.data is NULL, the structure is followed by the data in memory. */ }; struct wined3d_cs_add_dirty_texture_region @@ -2597,6 +2598,7 @@ void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_update_sub_resource *op = data; + const void *src_data = op->data.data ? op->data.data : (const BYTE *)(op + 1); struct wined3d_resource *resource = op->resource; const struct wined3d_box *box = &op->box; unsigned int width, height, depth, level; @@ -2617,7 +2619,7 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi goto done; } - wined3d_buffer_upload_data(buffer, context, box, op->data.data); + wined3d_buffer_upload_data(buffer, context, box, src_data); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); goto done; } @@ -2630,7 +2632,7 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi depth = wined3d_texture_get_level_depth(texture, level); addr.buffer_object = 0; - addr.addr = op->data.data; + addr.addr = src_data; /* Only load the sub-resource for partial updates. */ if (!box->left && !box->top && !box->front @@ -3375,8 +3377,35 @@ static void wined3d_deferred_context_update_sub_resource(struct wined3d_device_c struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int slice_pitch) { - FIXME("context %p, resource %p, sub_resource_idx %u, box %s, data %p, row_pitch %u, slice_pitch %u, stub!\n", - context, resource, sub_resource_idx, debug_box(box), data, row_pitch, slice_pitch); + struct wined3d_cs_update_sub_resource *op; + size_t data_size; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + data_size = box->right - box->left; + } + else + { + const struct wined3d_format *format = resource->format; + + data_size = (box->back - box->front - 1) * slice_pitch + + ((box->bottom - box->top - 1) / format->block_height) * row_pitch + + ((box->right - box->left + format->block_width - 1) / format->block_width) * format->block_byte_count; + } + + op = wined3d_device_context_require_space(context, sizeof(*op) + data_size, WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; + op->resource = resource; + op->sub_resource_idx = sub_resource_idx; + op->box = *box; + op->data.row_pitch = row_pitch; + op->data.slice_pitch = slice_pitch; + op->data.data = NULL; + memcpy(op + 1, data, data_size); + + wined3d_device_context_acquire_resource(context, resource); + + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_deferred_context_issue_query(struct wined3d_device_context *context, -- 2.30.2

5 14

[PATCH 1/2] sechost: Reject string SIDs with too many characters.
by Esme Povirk June 11, 2021

June 11, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/advapi32/tests/security.c | 17 +++++++++- dlls/sechost/security.c | 58 ++++++++++++++++++++-------------- 2 files changed, 51 insertions(+), 24 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3f1fffda273..9231c0243bf 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -338,6 +338,20 @@ static void test_ConvertStringSidToSid(void) "expected GetLastError() is ERROR_INVALID_SID, got %d\n", GetLastError() ); + r = ConvertStringSidToSidA( "WDandmorecharacters", &psid ); + ok( !r, + "expected failure with too many characters\n" ); + ok( GetLastError() == ERROR_INVALID_SID, + "expected GetLastError() is ERROR_INVALID_SID, got %d\n", + GetLastError() ); + + r = ConvertStringSidToSidA( "WD)", &psid ); + ok( !r, + "expected failure with too many characters\n" ); + ok( GetLastError() == ERROR_INVALID_SID, + "expected GetLastError() is ERROR_INVALID_SID, got %d\n", + GetLastError() ); + ok(ConvertStringSidToSidA("S-1-5-21-93476-23408-4576", &psid), "ConvertStringSidToSidA failed\n"); pisid = psid; ok(pisid->SubAuthorityCount == 4, "Invalid sub authority count - expected 4, got %d\n", pisid->SubAuthorityCount); @@ -4237,7 +4251,8 @@ static void test_ConvertStringSecurityDescriptor(void) { "", SDDL_REVISION_1, TRUE }, /* test ACE string SID */ { "D:(D;;GA;;;S-1-0-0)", SDDL_REVISION_1, TRUE }, - { "D:(D;;GA;;;Nonexistent account)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL, ERROR_INVALID_SID } /* W2K */ + { "D:(D;;GA;;;WDANDSUCH)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL }, + { "D:(D;;GA;;;Nonexistent account)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL, ERROR_INVALID_SID }, /* W2K */ }; for (i = 0; i < ARRAY_SIZE(cssd); i++) diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index b6731b1fe1c..940561cce79 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #include "windef.h" #include "winbase.h" @@ -593,18 +594,22 @@ static BOOL get_computer_sid( PSID sid ) return TRUE; } -static DWORD get_sid_size( const WCHAR *string ) +static DWORD get_sid_size( const WCHAR *string, const WCHAR **end ) { if (string[0] == 'S' && string[1] == '-') /* S-R-I(-S)+ */ { int token_count = 0; - while (*string) + string++; + while (*string == '-' || iswdigit(*string)) { if (*string == '-') token_count++; string++; } + if (end) + *end = string; + if (token_count >= 3) return GetSidLengthRequired( token_count - 2 ); } @@ -612,6 +617,9 @@ static DWORD get_sid_size( const WCHAR *string ) { unsigned int i; + if (end) + *end = string + 2; + for (i = 0; i < ARRAY_SIZE(well_known_sids); i++) { if (!wcsncmp( well_known_sids[i].str, string, 2 )) @@ -632,12 +640,12 @@ static DWORD get_sid_size( const WCHAR *string ) return GetSidLengthRequired( 0 ); } -static BOOL parse_sid( const WCHAR *string, SID *pisid, DWORD *size ) +static BOOL parse_sid( const WCHAR *string, const WCHAR **end, SID *pisid, DWORD *size ) { while (*string == ' ') string++; - *size = get_sid_size( string ); + *size = get_sid_size( string, end ); if (!pisid) /* Simply compute the size */ return TRUE; @@ -647,7 +655,7 @@ static BOOL parse_sid( const WCHAR *string, SID *pisid, DWORD *size ) DWORD csubauth = ((*size - GetSidLengthRequired(0)) / sizeof(DWORD)); string += 2; /* Advance to Revision */ - pisid->Revision = wcstoul( string, NULL, 10 ); + pisid->Revision = wcstoul( string, (WCHAR**)&string, 10 ); if (pisid->Revision != SDDL_REVISION) { @@ -665,8 +673,6 @@ static BOOL parse_sid( const WCHAR *string, SID *pisid, DWORD *size ) pisid->SubAuthorityCount = csubauth; /* Advance to identifier authority */ - while (*string && *string != '-') - string++; if (*string == '-') string++; @@ -675,24 +681,20 @@ static BOOL parse_sid( const WCHAR *string, SID *pisid, DWORD *size ) */ pisid->IdentifierAuthority.Value[0] = 0; pisid->IdentifierAuthority.Value[1] = 0; - identAuth = wcstoul( string, NULL, 10 ); + identAuth = wcstoul( string, (WCHAR**)&string, 10 ); pisid->IdentifierAuthority.Value[5] = identAuth & 0xff; pisid->IdentifierAuthority.Value[4] = (identAuth & 0xff00) >> 8; pisid->IdentifierAuthority.Value[3] = (identAuth & 0xff0000) >> 16; pisid->IdentifierAuthority.Value[2] = (identAuth & 0xff000000) >> 24; /* Advance to first sub authority */ - while (*string && *string != '-') - string++; if (*string == '-') string++; - while (*string) + while (iswdigit(*string) || *string == '-') { - pisid->SubAuthority[i++] = wcstoul( string, NULL, 10 ); + pisid->SubAuthority[i++] = wcstoul( string, (WCHAR**)&string, 10 ); - while (*string && *string != '-') - string++; if (*string == '-') string++; } @@ -703,6 +705,9 @@ static BOOL parse_sid( const WCHAR *string, SID *pisid, DWORD *size ) return FALSE; } + if (end) + assert(*end == string); + return TRUE; } else /* String constant format - Only available in winxp and above */ @@ -746,6 +751,7 @@ static BOOL parse_sid( const WCHAR *string, SID *pisid, DWORD *size ) BOOL WINAPI DECLSPEC_HOTPATCH ConvertStringSidToSidW( const WCHAR *string, PSID *sid ) { DWORD size; + const WCHAR *string_end; TRACE("%s, %p\n", debugstr_w(string), sid); @@ -761,12 +767,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH ConvertStringSidToSidW( const WCHAR *string, PSID return FALSE; } - if (!parse_sid( string, NULL, &size )) + if (!parse_sid( string, &string_end, NULL, &size )) return FALSE; + if (*string_end) + { + SetLastError(ERROR_INVALID_SID); + return FALSE; + } + *sid = LocalAlloc( 0, size ); - if (!parse_sid( string, *sid, &size )) + if (!parse_sid( string, NULL, *sid, &size )) { LocalFree( *sid ); return FALSE; @@ -996,11 +1008,11 @@ static BOOL parse_acl( const WCHAR *string, DWORD *flags, ACL *acl, DWORD *ret_s string++; /* Parse ACE account sid */ - if (parse_sid( string, ace ? (SID *)&ace->SidStart : NULL, &sidlen )) - { - while (*string && *string != ')') - string++; - } + if (!parse_sid( string, &string, ace ? (SID *)&ace->SidStart : NULL, &sidlen )) + goto err; + + while (*string == ' ') + string++; if (*string != ')') goto err; @@ -1095,7 +1107,7 @@ static BOOL parse_sd( const WCHAR *string, SECURITY_DESCRIPTOR_RELATIVE *sd, DWO { DWORD bytes; - if (!parse_sid( tok, (SID *)next, &bytes )) + if (!parse_sid( tok, NULL, (SID *)next, &bytes )) goto out; if (sd) @@ -1113,7 +1125,7 @@ static BOOL parse_sd( const WCHAR *string, SECURITY_DESCRIPTOR_RELATIVE *sd, DWO { DWORD bytes; - if (!parse_sid( tok, (SID *)next, &bytes )) + if (!parse_sid( tok, NULL, (SID *)next, &bytes )) goto out; if (sd) -- 2.25.1

1 1