February 2022 - Wine-devel - list.winehq.org

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

23 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 23 Feb '22

23 Feb '22

3 2

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

23 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 23 Feb '22

23 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 23 Feb '22

23 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 23 Feb '22

23 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 23 Feb '22

23 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

[PATCH 2/8] win32u: Move NtUserGetIconSize implementation from user32.
by Jacek Caban 23 Feb '22

23 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/cursoricon.c | 13 +++---------- dlls/win32u/cursoricon.c | 35 +++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 7 files changed, 52 insertions(+), 11 deletions(-)

3 2

[PATCH 1/8] win32u: Move NtUserSetCursor implementation from user32.
by Jacek Caban 23 Feb '22

23 Feb '22

3 2

[v3 PATCH] mfuuid: Add more schema CLSIDs
by Nikolay Sivov 23 Feb '22

23 Feb '22

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v3: using consistent guid fields formatting wrt leading zeroes. include/mfidl.idl | 4 ++++ libs/mfuuid/mfuuid.c | 1 + 2 files changed, 5 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 4df1d0c85ba..7034378f585 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1634,3 +1634,7 @@ cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2 cpp_quote("EXTERN_GUID(CLSID_WMVDecoderMFT, 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);") cpp_quote("EXTERN_GUID(CLSID_WMADecMediaObject, 0x2eeb4adf, 0x4578, 0x4d10, 0xbc, 0xa7, 0xbb, 0x95, 0x5f, 0x56, 0x32, 0x0a);") + +cpp_quote("EXTERN_GUID(CLSID_HttpSchemePlugin, 0x44cb442b, 0x9da9, 0x49df, 0xb3, 0xfd, 0x02, 0x37, 0x77, 0xb1, 0x6e, 0x50);") +cpp_quote("EXTERN_GUID(CLSID_NetSchemePlugin, 0xe9f4ebab, 0xd97b, 0x463e, 0xa2, 0xb1, 0xc5, 0x4e, 0xe3, 0xf9, 0x41, 0x4d);") +cpp_quote("EXTERN_GUID(CLSID_UrlmonSchemePlugin, 0x9ec4b4f9, 0x3029, 0x45ad, 0x94, 0x7b, 0x34, 0x4d, 0xe2, 0xa2, 0x49, 0xe2);") diff --git a/libs/mfuuid/mfuuid.c b/libs/mfuuid/mfuuid.c index 537eaef6427..ce50eedb0a0 100644 --- a/libs/mfuuid/mfuuid.c +++ b/libs/mfuuid/mfuuid.c @@ -35,3 +35,4 @@ DEFINE_GUID(MF_SCRUBBING_SERVICE, 0xdd0ac3d8,0x40e3,0x4128,0xac,0x48,0xc0,0xad,0xd0,0x67,0xb7,0x14); DEFINE_GUID(CLSID_FileSchemePlugin, 0x477ec299,0x1421,0x4bdd,0x97,0x1f,0x7c,0xcb,0x93,0x3f,0x21,0xad); +DEFINE_GUID(CLSID_SecureHttpSchemePlugin, 0x37a61c8b,0x7f8e,0x4d08,0xb1,0x2b,0x24,0x8d,0x73,0xe9,0xab,0x4f); -- 2.34.1

2 1