- Wine-devel - list.winehq.org

[PATCH 1/4] winedbg: Sanity check the dwType field of thread naming exceptions.
by Brendan Shanks 24 Feb '22

24 Feb '22

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/winedbg/gdbproxy.c | 2 ++ programs/winedbg/tgt_active.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index e7f9ddaf226..89985c06666 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -485,6 +485,8 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e char name[9]; SIZE_T read; + if (threadname->dwType != 0x1000) + return FALSE; if (threadname->dwThreadID == -1) thread = dbg_get_thread(gdbctx->process, gdbctx->de.dwThreadId); else diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8c365a1e55d..50f48e8d1b8 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -245,6 +245,9 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance break; case EXCEPTION_WINE_NAME_THREAD: pThreadName = (const THREADNAME_INFO*)(rec->ExceptionInformation); + + if (pThreadName->dwType != 0x1000) + return DBG_EXCEPTION_NOT_HANDLED; if (pThreadName->dwThreadID == -1) pThread = dbg_curr_thread; else -- 2.34.1

1 3

[Issue] make_specfiles deletes a spec entry from sfc
by Mohamad Al-Jaf 24 Feb '22

24 Feb '22

Hi Alexandre, Just wanted to let you know that the latest Wine git causes a spec entry in sfc to turn into a stub when tools/make_specfiles is run: $ ./tools/make_specfiles dlls/sfc/sfc.spec updated $ git diff diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec index 7509c98b666..25341091541 100644 --- a/dlls/sfc/sfc.spec +++ b/dlls/sfc/sfc.spec @@ -13,4 +13,4 @@ @ stdcall SfcGetNextProtectedFile(long ptr) sfc_os.SfcGetNextProtectedFile @ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected @ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected -@ stdcall SfpVerifyFile() sfc_os.SfpVerifyFile +@ stub SfpVerifyFile -- Kind regards, Mohamad

3 2

[PATCH vkd3d 2/2] configure: Build demos with -municode on Mingw.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index bd580000b7a1..265dccc364c2 100644 --- a/configure.ac +++ b/configure.ac @@ -142,7 +142,7 @@ dnl Makefiles case $host_os in mingw32*) AC_SUBST([DEMO_LIBS],["-ld3d12 -ldxgi -lgdi32"]) - AC_SUBST([DEMO_CFLAGS],[""]) + AC_SUBST([DEMO_CFLAGS],["-municode"]) ;; *) AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])]) -- 2.34.1

3 2

[PATCH vkd3d 1/2] configure: Don't require libxcb to build demos on Mingw.
by Alexandre Julliard 24 Feb '22

24 Feb '22

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 4 ++-- configure.ac | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8617a09dae9e..24257062d02f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -339,8 +339,8 @@ XFAIL_TESTS = \ endif if BUILD_DEMOS -DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ -DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ +DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DEMO_LIBS@ @VULKAN_LIBS@ +DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@ bin_PROGRAMS += $(vkd3d_demos) demos_vkd3d_gears_SOURCES = demos/gears.c diff --git a/configure.ac b/configure.ac index 45220f840bfb..bd580000b7a1 100644 --- a/configure.ac +++ b/configure.ac @@ -139,8 +139,17 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) dnl Makefiles -AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], +case $host_os in + mingw32*) + AC_SUBST([DEMO_LIBS],["-ld3d12 -ldxgi -lgdi32"]) + AC_SUBST([DEMO_CFLAGS],[""]) + ;; + *) AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], [AC_MSG_ERROR([libxcb is required for demos.])]) + AC_SUBST([DEMO_LIBS],[$XCB_LIBS]) + AC_SUBST([DEMO_CFLAGS],[$XCB_CFLAGS]) + ;; +esac AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([BUILD_DOC], [test $DX_FLAG_doc = 1]) AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"]) -- 2.34.1

3 2

[PATCH 8/8] win32u: Move NtUserDrawIconEx implementation from user32.
by Jacek Caban 24 Feb '22

24 Feb '22

3 2

[PATCH 7/8] user32: Use GetIconInfo in CopyIcon.
by Jacek Caban 24 Feb '22

24 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

3 2

[PATCH 6/8] user32: Directly use NtUserGetIconInfo in GetIconInfo.
by Jacek Caban 24 Feb '22

24 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)

3 2

[PATCH 5/8] win32u: Move NtUserGetIconInfo implementation from user32.
by Jacek Caban 24 Feb '22

24 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 91 +++++++-------------------------- dlls/win32u/cursoricon.c | 98 ++++++++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/tests/win32u.c | 53 +++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 7 +++ include/ntuser.h | 2 + 8 files changed, 182 insertions(+), 74 deletions(-)

3 2

[PATCH 4/8] win32u: Move NtUserGetCursorFrameInfo implementation from user32.
by Jacek Caban 24 Feb '22

24 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 55 ++----------------------------------- dlls/win32u/cursoricon.c | 56 ++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 8 ++++++ dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 +++++++ include/ntuser.h | 2 ++ 8 files changed, 82 insertions(+), 53 deletions(-)

3 2

[PATCH 3/8] win32u/tests: Add cursor icon tests.
by Jacek Caban 24 Feb '22

24 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/tests/Makefile.in | 2 +- dlls/win32u/tests/win32u.c | 46 +++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-)

3 2