December 2021 - Wine-commits

Zebediah Figura : configure: Try to detect MinGW libxml2 using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: be8dd96d6671fdac1acd48d4e883a73c619c1fdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8dd96d6671fdac1acd48d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 2 19:22:09 2021 -0600 configure: Try to detect MinGW libxml2 using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 16 +++++ 2 files changed, 207 insertions(+) diff --git a/configure b/configure index 4fc23fb058d..e40ac5d2c1c 100755 --- a/configure +++ b/configure @@ -13014,6 +13014,197 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libtiff ${notice_platform}MinGW development files not found; using bundled version." fi + if ${XML2_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + XML2_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libxml-2.0 2>/dev/null` +fi +fi +if ${XML2_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + XML2_PE_LIBS=`$MINGW_PKG_CONFIG --libs libxml-2.0 2>/dev/null` +fi +fi +XML2_PE_LIBS=${XML2_PE_LIBS:-"-lxml2"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $XML2_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW libxml/parser.h" >&5 +printf %s "checking for MinGW libxml/parser.h... " >&6; } +if test ${ac_cv_mingw_header_libxml_parser_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libxml/parser.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_libxml_parser_h=yes +else $as_nop + ac_cv_mingw_header_libxml_parser_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_libxml_parser_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_libxml_parser_h" >&6; } +if test "x$ac_cv_mingw_header_libxml_parser_h" = xyes +then : + +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW libxml/xmlsave.h" >&5 +printf %s "checking for MinGW libxml/xmlsave.h... " >&6; } +if test ${ac_cv_mingw_header_libxml_xmlsave_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libxml/xmlsave.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_libxml_xmlsave_h=yes +else $as_nop + ac_cv_mingw_header_libxml_xmlsave_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_libxml_xmlsave_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_libxml_xmlsave_h" >&6; } +if test "x$ac_cv_mingw_header_libxml_xmlsave_h" = xyes +then : + +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW libxml/SAX2.h" >&5 +printf %s "checking for MinGW libxml/SAX2.h... " >&6; } +if test ${ac_cv_mingw_header_libxml_SAX2_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libxml/SAX2.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_libxml_SAX2_h=yes +else $as_nop + ac_cv_mingw_header_libxml_SAX2_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_libxml_SAX2_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_libxml_SAX2_h" >&6; } +if test "x$ac_cv_mingw_header_libxml_SAX2_h" = xyes +then : + +fi + if test "$ac_cv_mingw_header_libxml_parser_h" = "yes" -a "$ac_cv_mingw_header_libxml_xmlsave_h" = "yes" -a "$ac_cv_mingw_header_libxml_SAX2_h" = "yes" + then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xmlFirstElementChild in MinGW -lxml2" >&5 +printf %s "checking for xmlFirstElementChild in MinGW -lxml2... " >&6; } +if test ${ac_cv_mingw_lib_xml2+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lxml2 $XML2_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char xmlFirstElementChild (); +int +main (void) +{ +return xmlFirstElementChild (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_xml2=yes +else $as_nop + ac_cv_mingw_lib_xml2=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_xml2" >&5 +printf "%s\n" "$ac_cv_mingw_lib_xml2" >&6; } +if test "x$ac_cv_mingw_lib_xml2" = xyes +then : + : +else $as_nop + XML2_PE_CFLAGS=""; XML2_PE_LIBS="" +fi + else + XML2_PE_CFLAGS="" + XML2_PE_LIBS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$XML2_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libxml2 ${notice_platform}MinGW development files not found (or too old); using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index e935a5ae27e..818d380419b 100644 --- a/configure.ac +++ b/configure.ac @@ -1091,6 +1091,22 @@ then WINE_NOTICE([libtiff ${notice_platform}MinGW development files not found; using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(XML2,[libxml-2.0],[-lxml2], + [WINE_CHECK_MINGW_HEADER(libxml/parser.h) + WINE_CHECK_MINGW_HEADER(libxml/xmlsave.h) + WINE_CHECK_MINGW_HEADER(libxml/SAX2.h) + if test "$ac_cv_mingw_header_libxml_parser_h" = "yes" -a "$ac_cv_mingw_header_libxml_xmlsave_h" = "yes" -a "$ac_cv_mingw_header_libxml_SAX2_h" = "yes" + then + WINE_CHECK_MINGW_LIB(xml2,xmlFirstElementChild,[:],[XML2_PE_CFLAGS=""; XML2_PE_LIBS=""],[$XML2_PE_LIBS]) + else + XML2_PE_CFLAGS="" + XML2_PE_LIBS="" + fi]) + if test "x$XML2_PE_LIBS" = "x" + then + WINE_NOTICE([libxml2 ${notice_platform}MinGW development files not found (or too old); using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Zebediah Figura : configure: Try to detect MinGW libxslt using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 9469711946552f1dcba95f47a020aff85f443523 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9469711946552f1dcba95f47… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 2 19:22:10 2021 -0600 configure: Try to detect MinGW libxslt using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 15 ++++++ 2 files changed, 168 insertions(+) diff --git a/configure b/configure index e40ac5d2c1c..c37268fddad 100755 --- a/configure +++ b/configure @@ -13205,6 +13205,159 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libxml2 ${notice_platform}MinGW development files not found (or too old); using bundled version." fi + if ${XSLT_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + XSLT_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libxslt 2>/dev/null` +fi +fi +if ${XSLT_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + XSLT_PE_LIBS=`$MINGW_PKG_CONFIG --libs libxslt 2>/dev/null` +fi +fi +XSLT_PE_LIBS=${XSLT_PE_LIBS:-"-lxslt"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $XSLT_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW libxslt/pattern.h" >&5 +printf %s "checking for MinGW libxslt/pattern.h... " >&6; } +if test ${ac_cv_mingw_header_libxslt_pattern_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libxslt/pattern.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_libxslt_pattern_h=yes +else $as_nop + ac_cv_mingw_header_libxslt_pattern_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_libxslt_pattern_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_libxslt_pattern_h" >&6; } +if test "x$ac_cv_mingw_header_libxslt_pattern_h" = xyes +then : + +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW libxslt/transform.h" >&5 +printf %s "checking for MinGW libxslt/transform.h... " >&6; } +if test ${ac_cv_mingw_header_libxslt_transform_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libxslt/transform.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_libxslt_transform_h=yes +else $as_nop + ac_cv_mingw_header_libxslt_transform_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_libxslt_transform_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_libxslt_transform_h" >&6; } +if test "x$ac_cv_mingw_header_libxslt_transform_h" = xyes +then : + +fi + if test "$ac_cv_mingw_header_libxslt_pattern_h" = "yes" -a "$ac_cv_mingw_header_libxslt_transform_h" = "yes" + then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xsltCompilePattern in MinGW -lxslt" >&5 +printf %s "checking for xsltCompilePattern in MinGW -lxslt... " >&6; } +if test ${ac_cv_mingw_lib_xslt+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lxslt $XSLT_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char xsltCompilePattern (); +int +main (void) +{ +return xsltCompilePattern (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_xslt=yes +else $as_nop + ac_cv_mingw_lib_xslt=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_xslt" >&5 +printf "%s\n" "$ac_cv_mingw_lib_xslt" >&6; } +if test "x$ac_cv_mingw_lib_xslt" = xyes +then : + : +else $as_nop + XSLT_PE_CFLAGS=""; XSLT_PE_LIBS="" +fi + else + XSLT_PE_CFLAGS="" + XSLT_PE_LIBS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$XSLT_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libxslt ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index 818d380419b..4fdb1ef33df 100644 --- a/configure.ac +++ b/configure.ac @@ -1107,6 +1107,21 @@ then WINE_NOTICE([libxml2 ${notice_platform}MinGW development files not found (or too old); using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(XSLT,[libxslt],[-lxslt], + [WINE_CHECK_MINGW_HEADER(libxslt/pattern.h) + WINE_CHECK_MINGW_HEADER(libxslt/transform.h) + if test "$ac_cv_mingw_header_libxslt_pattern_h" = "yes" -a "$ac_cv_mingw_header_libxslt_transform_h" = "yes" + then + WINE_CHECK_MINGW_LIB(xslt,xsltCompilePattern,[:],[XSLT_PE_CFLAGS=""; XSLT_PE_LIBS=""],[$XSLT_PE_LIBS]) + else + XSLT_PE_CFLAGS="" + XSLT_PE_LIBS="" + fi]) + if test "x$XSLT_PE_LIBS" = "x" + then + WINE_NOTICE([libxslt ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Alexandre Julliard : kernel32/tests: Use the correct scanf format for a handle.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 3c715f14c729116992619f13ea241ad6b973b20c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c715f14c729116992619f13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 16:27:18 2021 +0100 kernel32/tests: Use the correct scanf format for a handle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52155 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 1ed4ecec7e6..93eeca16c75 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -4206,9 +4206,9 @@ START_TEST(pipe) { if (!strcmp(argv[2], "writepipe")) { - UINT_PTR handle; - sscanf(argv[3], "%lx", &handle); - child_process_write_pipe((HANDLE)handle); + ULONG handle; + sscanf(argv[3], "%x", &handle); + child_process_write_pipe(ULongToHandle(handle)); return; } if (!strcmp(argv[2], "checkpid"))

1 0

Alexandre Julliard : rpcrt4/tests: Use the correct scanf format for a handle.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 8e0b337df1fe64b4a0d27e9cded611faff61c29d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e0b337df1fe64b4a0d27e9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 16:29:00 2021 +0100 rpcrt4/tests: Use the correct scanf format for a handle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 7b340a11f87..3f34aac681d 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -2561,9 +2561,9 @@ START_TEST(server) } else if(!strcmp(argv[2], "run")) { - UINT_PTR event; - sscanf(argv[3], "%lx", &event); - run_server((HANDLE)event); + ULONG event; + sscanf(argv[3], "%x", &event); + run_server(ULongToHandle(event)); } } else

1 0

Huw Davies : winealsa: Don't acquire the sessions lock after the client lock.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 1acba9d959377074110cc05a74e47f9af3f5005d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1acba9d959377074110cc05a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 2 12:02:38 2021 +0000 winealsa: Don't acquire the sessions lock after the client lock. 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> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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; }

1 0

Huw Davies : wineoss: Don't acquire the sessions lock after the client lock.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 7b426971245bea1c8884bca7c34f53ba8cf9c0e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b426971245bea1c8884bca7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 2 12:02:39 2021 +0000 wineoss: Don't acquire the sessions lock after the client lock. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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; }

1 0

Jacek Caban : win32u: Move NtUserShowCursor implementation from user32.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: c87925bae30c698ab36999afe04179343db42f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c87925bae30c698ab36999af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 3 12:55:30 2021 +0100 win32u: Move NtUserShowCursor implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 27 ------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/cursoricon.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 6 +++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 ++++ 9 files changed, 79 insertions(+), 29 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index b02ee6d8723..eb033e72005 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1933,33 +1933,6 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu return hOldCursor; } -/*********************************************************************** - * ShowCursor (USER32.@) - */ -INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) -{ - HCURSOR cursor; - int increment = bShow ? 1 : -1; - int count; - - SERVER_START_REQ( set_cursor ) - { - req->flags = SET_CURSOR_COUNT; - req->show_count = increment; - wine_server_call( req ); - cursor = wine_server_ptr_handle( reply->prev_handle ); - count = reply->prev_count + increment; - } - SERVER_END_REQ; - - TRACE("%d, count=%d\n", bShow, count ); - - if (bShow && !count) USER_Driver->pSetCursor( cursor ); - else if (!bShow && count == -1) USER_Driver->pSetCursor( 0 ); - - return count; -} - /*********************************************************************** * GetCursor (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 9955add4252..a89bcdc8c56 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -736,7 +736,7 @@ @ stdcall SetWindowsHookExW(long long long long) @ stdcall SetWindowsHookW(long ptr) @ stdcall ShowCaret(long) -@ stdcall ShowCursor(long) +@ stdcall -import ShowCursor(long) NtUserShowCursor @ stdcall ShowOwnedPopups(long long) @ stdcall ShowScrollBar(long long long) @ stub ShowStartGlass diff --git a/dlls/win32u/Makefile.in b/dlls/win32u/Makefile.in index 184271174f2..41c252be59c 100644 --- a/dlls/win32u/Makefile.in +++ b/dlls/win32u/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ brush.c \ clipboard.c \ clipping.c \ + cursoricon.c \ dc.c \ dib.c \ dibdrv/bitblt.c \ diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c new file mode 100644 index 00000000000..8d297e838c9 --- /dev/null +++ b/dlls/win32u/cursoricon.c @@ -0,0 +1,63 @@ +/* + * Cursor and icon support + * + * Copyright 1995 Alexandre Julliard + * Copyright 1996 Martin Von Loewis + * Copyright 1997 Alex Korobka + * Copyright 1998 Turchanov Sergey + * Copyright 2007 Henri Verbeet + * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov + * + * 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 + */ + +#if 0 +#pragma makedep unix +#endif + +#include "win32u_private.h" +#include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cursor); + + +/*********************************************************************** + * NtUserShowCursor (win32u.@) + */ +INT WINAPI NtUserShowCursor( BOOL show ) +{ + HCURSOR cursor; + int increment = show ? 1 : -1; + int count; + + SERVER_START_REQ( set_cursor ) + { + req->flags = SET_CURSOR_COUNT; + req->show_count = increment; + wine_server_call( req ); + cursor = wine_server_ptr_handle( reply->prev_handle ); + count = reply->prev_count + increment; + } + SERVER_END_REQ; + + TRACE("%d, count=%d\n", show, count ); + + if (show && !count) user_driver->pSetCursor( cursor ); + else if (!show && count == -1) user_driver->pSetCursor( 0 ); + + return count; +} diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 5d43daf2355..adffdaca8d2 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1032,6 +1032,11 @@ static BOOL CDECL loaderdrv_EnumDisplaySettingsEx( LPCWSTR name, DWORD num, LPDE return load_driver()->pEnumDisplaySettingsEx( name, num, mode, flags ); } +static void CDECL loaderdrv_SetCursor( HCURSOR cursor ) +{ + load_driver()->pSetCursor( cursor ); +} + static void CDECL loaderdrv_UpdateClipboard(void) { load_driver()->pUpdateClipboard(); @@ -1055,6 +1060,7 @@ static const struct user_driver_funcs lazy_load_driver = .pChangeDisplaySettingsEx = loaderdrv_ChangeDisplaySettingsEx, .pEnumDisplaySettingsEx = loaderdrv_EnumDisplaySettingsEx, .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, + .pSetCursor = loaderdrv_SetCursor, .pUpdateClipboard = loaderdrv_UpdateClipboard, .pScrollDC = nulldrv_ScrollDC, }; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index e0a036f4d0d..e68c9126cd6 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1182,6 +1182,7 @@ static struct unix_funcs unix_funcs = NtUserIsClipboardFormatAvailable, NtUserMapVirtualKeyEx, NtUserScrollDC, + NtUserShowCursor, NtUserToUnicodeEx, NtUserUnregisterHotKey, NtUserVkKeyScanEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 82c232617fb..95bddc09e5a 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1258,7 +1258,7 @@ @ stub NtUserSetWindowsHookAW @ stub NtUserSetWindowsHookEx @ stub NtUserShowCaret -@ stub NtUserShowCursor +@ stdcall NtUserShowCursor(long) @ stub NtUserShowScrollBar @ stub NtUserShowSystemCursor @ stub NtUserShowWindow diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d301d8b6b8b..c8b5e0f4246 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -214,6 +214,7 @@ struct unix_funcs UINT (WINAPI *pNtUserMapVirtualKeyEx)( UINT code, UINT type, HKL layout ); BOOL (WINAPI *pNtUserScrollDC)( HDC hdc, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN ret_update_rgn, RECT *update_rect ); + INT (WINAPI *pNtUserShowCursor)( BOOL show ); INT (WINAPI *pNtUserToUnicodeEx)( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ); BOOL (WINAPI *pNtUserUnregisterHotKey)( HWND hwnd, INT id ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 4b9a291bf6b..a9a72eaa903 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -676,6 +676,11 @@ BOOL WINAPI NtUserScrollDC( HDC hdc, INT dx, INT dy, const RECT *scroll, const R return unix_funcs->pNtUserScrollDC( hdc, dx, dy, scroll, clip, ret_update_rgn, update_rect ); } +INT WINAPI NtUserShowCursor( BOOL show ) +{ + return unix_funcs->pNtUserShowCursor( show ); +} + INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ) {

1 0

Jacek Caban : win32u: Move NtUserGetCursor implementation from user32.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: a25148ae46b15b3644b57828739e230b08f920e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a25148ae46b15b3644b57828… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 3 12:55:44 2021 +0100 win32u: Move NtUserGetCursor implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 19 +------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/cursoricon.c | 18 ++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 5 +++++ include/ntuser.h | 1 + 8 files changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index eb033e72005..ba5c5d8904c 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1873,7 +1873,7 @@ BOOL WINAPI DestroyIcon( HICON hIcon ) { BOOL shared = (obj->rsrc != NULL); release_user_handle_ptr( obj ); - ret = (GetCursor() != hIcon); + ret = (NtUserGetCursor() != hIcon); if (!shared) free_icon_handle( hIcon ); } return ret; @@ -1933,23 +1933,6 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu return hOldCursor; } -/*********************************************************************** - * GetCursor (USER32.@) - */ -HCURSOR WINAPI GetCursor(void) -{ - HCURSOR ret; - - SERVER_START_REQ( set_cursor ) - { - req->flags = 0; - wine_server_call( req ); - ret = wine_server_ptr_handle( reply->prev_handle ); - } - SERVER_END_REQ; - return ret; -} - /*********************************************************************** * ClipCursor (USER32.@) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index a89bcdc8c56..8b8dcb611f9 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -282,7 +282,7 @@ @ stdcall GetClipboardViewer() NtUserGetClipboardViewer @ stdcall GetComboBoxInfo(long ptr) @ stdcall GetCurrentInputMessageSource(ptr) -@ stdcall GetCursor() +@ stdcall GetCursor() NtUserGetCursor @ stdcall GetCursorFrameInfo(long long long ptr ptr) @ stdcall GetCursorInfo(ptr) @ stdcall GetCursorPos(ptr) diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index 8d297e838c9..ad7e51b507e 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -61,3 +61,21 @@ INT WINAPI NtUserShowCursor( BOOL show ) return count; } + + +/*********************************************************************** + * NtUserGetCursor (win32u.@) + */ +HCURSOR WINAPI NtUserGetCursor(void) +{ + HCURSOR ret; + + SERVER_START_REQ( set_cursor ) + { + req->flags = 0; + wine_server_call( req ); + ret = wine_server_ptr_handle( reply->prev_handle ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index e07fdcc6953..c8f08e3c2a6 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -111,6 +111,7 @@ static void * const syscalls[] = NtUserGetClipboardOwner, NtUserGetClipboardSequenceNumber, NtUserGetClipboardViewer, + NtUserGetCursor, NtUserGetKeyState, NtUserGetKeyboardLayout, NtUserGetKeyboardState, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 95bddc09e5a..7d3421efbcc 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -912,7 +912,7 @@ @ stub NtUserGetControlColor @ stub NtUserGetCurrentDpiInfoForWindow @ stub NtUserGetCurrentInputMessageSource -@ stub NtUserGetCursor +@ stdcall -syscall NtUserGetCursor() @ stub NtUserGetCursorFrameInfo @ stub NtUserGetCursorInfo @ stub NtUserGetDC diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 2ffe10b733c..7a148935444 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -98,6 +98,7 @@ SYSCALL_ENTRY( NtUserGetClipboardOwner ) \ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ SYSCALL_ENTRY( NtUserGetClipboardViewer ) \ + SYSCALL_ENTRY( NtUserGetCursor ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ SYSCALL_ENTRY( NtUserGetKeyboardState ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index da94ea02dc0..eea3879b9b5 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -234,6 +234,11 @@ NTSTATUS WINAPI wow64_NtUserRemoveClipboardFormatListener( UINT *args ) return NtUserRemoveClipboardFormatListener( hwnd ); } +NTSTATUS WINAPI wow64_NtUserGetCursor( UINT *args ) +{ + return HandleToUlong( NtUserGetCursor() ); +} + NTSTATUS WINAPI wow64_NtUserAttachThreadInput( UINT *args ) { DWORD from = get_ulong( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index ec0ccc0c2c5..e962c5b3fa2 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -98,6 +98,7 @@ INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT max HWND WINAPI NtUserGetClipboardOwner(void); DWORD WINAPI NtUserGetClipboardSequenceNumber(void); HWND WINAPI NtUserGetClipboardViewer(void); +HCURSOR WINAPI NtUserGetCursor(void); LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info ); INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size );

1 0

Jacek Caban : win32u: Move NtUserGetKeyboardLayoutName implementation from user32.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 72e3c91380efdbdd402dcd709ecb7cafd2ccc860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72e3c91380efdbdd402dcd70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 3 12:56:05 2021 +0100 win32u: Move NtUserGetKeyboardLayoutName implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 76 +-------------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/user32/user_private.h | 1 - dlls/win32u/font.c | 2 +- dlls/win32u/input.c | 85 ++++++++++++++++++++++++++++++++++++++------ dlls/win32u/syscall.c | 2 ++ dlls/win32u/sysparams.c | 21 +++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 ++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 ++++ include/ntuser.h | 1 + 13 files changed, 114 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72e3c91380efdbdd402d…

1 0

Jacek Caban : win32u: Use NtUserCallOneParam instead of GDIRealizePalette.
by Alexandre Julliard 03 Dec '21

03 Dec '21

Module: wine Branch: master Commit: 41eac6e25c767e3dba979ad15748b61b7dada17d URL: https://source.winehq.org/git/wine.git/?a=commit;h=41eac6e25c767e3dba979ad1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 3 12:56:30 2021 +0100 win32u: Use NtUserCallOneParam instead of GDIRealizePalette. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 10 +++++++--- dlls/win32u/gdiobj.c | 2 +- dlls/win32u/ntgdi_private.h | 1 + dlls/win32u/palette.c | 7 ++++--- dlls/win32u/sysparams.c | 18 ++++++++++++++++++ dlls/win32u/win32u.spec | 3 +-- dlls/win32u/win32u_private.h | 3 +-- dlls/win32u/wrappers.c | 10 +++++----- include/ntuser.h | 8 ++++++++ 9 files changed, 46 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1511c565194..705593ac6f7 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -22,7 +22,7 @@ */ #include "gdi_private.h" -#include "winternl.h" +#include "ntuser.h" #include "ddrawgdi.h" #include "winnls.h" @@ -2090,12 +2090,16 @@ BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT x_num, INT x_denom, return NtGdiScaleWindowExtEx( hdc, x_num, x_denom, y_num, y_denom, size ); } +static UINT WINAPI realize_palette( HDC hdc ) +{ + return NtUserCallOneParam( HandleToUlong(hdc), NtUserRealizePalette ); +} + /* Pointers to USER implementation of SelectPalette/RealizePalette */ /* they will be patched by USER on startup */ extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg ); -extern UINT WINAPI GDIRealizePalette( HDC hdc ); HPALETTE (WINAPI *pfnSelectPalette)( HDC hdc, HPALETTE hpal, WORD bkgnd ) = GDISelectPalette; -UINT (WINAPI *pfnRealizePalette)( HDC hdc ) = GDIRealizePalette; +UINT (WINAPI *pfnRealizePalette)( HDC hdc ) = realize_palette; /*********************************************************************** * SelectPalette (GDI32.@) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index e68c9126cd6..3dc87509313 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1168,6 +1168,7 @@ static struct unix_funcs unix_funcs = NtGdiUpdateColors, NtGdiWidenPath, NtUserActivateKeyboardLayout, + NtUserCallOneParam, NtUserCallTwoParam, NtUserChangeDisplaySettings, NtUserCountClipboardFormats, @@ -1187,7 +1188,6 @@ static struct unix_funcs unix_funcs = NtUserUnregisterHotKey, NtUserVkKeyScanEx, - GDIRealizePalette, GDISelectPalette, GetDCHook, MirrorRgn, diff --git a/dlls/win32u/ntgdi_private.h b/dlls/win32u/ntgdi_private.h index 8aaf8ba231d..0244882ce3e 100644 --- a/dlls/win32u/ntgdi_private.h +++ b/dlls/win32u/ntgdi_private.h @@ -403,6 +403,7 @@ extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) DECL extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN; extern UINT get_palette_entries( HPALETTE hpalette, UINT start, UINT count, PALETTEENTRY *entries ) DECLSPEC_HIDDEN; +extern UINT realize_palette( HDC hdc ) DECLSPEC_HIDDEN; /* pen.c */ extern HPEN create_pen( INT style, INT width, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index 8e9e51295bb..b59a196caff 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -539,16 +539,17 @@ HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) /*********************************************************************** - * GDIRealizePalette (Not a Windows API) + * realize_palette */ -UINT WINAPI GDIRealizePalette( HDC hdc ) +UINT realize_palette( HDC hdc ) { UINT realized = 0; DC* dc = get_dc_ptr( hdc ); + TRACE( "%p\n", hdc ); if (!dc) return 0; - TRACE("%p...\n", hdc ); + /* FIXME: move primary palette handling from user32 */ if( dc->hPalette == get_stock_object( DEFAULT_PALETTE )) { diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e0de4edc6e5..095a6cfe680 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1657,6 +1657,24 @@ void sysparams_init(void) } } +/*********************************************************************** + * NtUserCallOneParam (win32u.@) + */ +ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) +{ + switch(code) + { + case NtUserRealizePalette: + return realize_palette( UlongToHandle(arg) ); + default: + FIXME( "invalid code %u\n", code ); + return 0; + } +} + +/*********************************************************************** + * NtUserCallTwoParam (win32u.@) + */ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ) { switch(code) diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 8499d52e32c..8d1a1bbb234 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -779,7 +779,7 @@ @ stub NtUserCallMsgFilter @ stub NtUserCallNextHookEx @ stub NtUserCallNoParam -@ stub NtUserCallOneParam +@ stdcall NtUserCallOneParam(long long) @ stdcall NtUserCallTwoParam(long long long) @ stub NtUserCanBrokerForceForeground @ stub NtUserChangeClipboardChain @@ -1325,7 +1325,6 @@ @ stdcall SetDCHook(long ptr long) @ stdcall SetHookFlags(long long) @ stdcall GDISelectPalette(long long long) -@ stdcall GDIRealizePalette(long) @ cdecl __wine_make_gdi_object_system(long long) @ cdecl __wine_set_visible_region(long long ptr ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 7fbc92cde7b..d6454b7ad47 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -195,6 +195,7 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); HKL (WINAPI *pNtUserActivateKeyboardLayout)( HKL layout, UINT flags ); + ULONG_PTR (WINAPI *pNtUserCallOneParam)( ULONG_PTR arg, ULONG code ); ULONG_PTR (WINAPI *pNtUserCallTwoParam)( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); LONG (WINAPI *pNtUserChangeDisplaySettings)( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); @@ -221,7 +222,6 @@ struct unix_funcs WORD (WINAPI *pNtUserVkKeyScanEx)( WCHAR chr, HKL layout ); /* Wine-specific functions */ - UINT (WINAPI *pGDIRealizePalette)( HDC hdc ); HPALETTE (WINAPI *pGDISelectPalette)( HDC hdc, HPALETTE hpal, WORD bkg ); DWORD_PTR (WINAPI *pGetDCHook)( HDC hdc, DCHOOKPROC *proc ); BOOL (WINAPI *pMirrorRgn)( HWND hwnd, HRGN hrgn ); @@ -241,7 +241,6 @@ struct unix_funcs struct window_surface *surface ); }; -UINT WINAPI GDIRealizePalette( HDC hdc ); HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg ); extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index a9a72eaa903..1ea45e42c21 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -601,6 +601,11 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) return unix_funcs->pNtUserActivateKeyboardLayout( layout, flags ); } +ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) +{ + return unix_funcs->pNtUserCallOneParam( arg, code ); +} + ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ) { return unix_funcs->pNtUserCallTwoParam( arg1, arg2, code ); @@ -697,11 +702,6 @@ WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ) return unix_funcs->pNtUserVkKeyScanEx( chr, layout ); } -UINT WINAPI GDIRealizePalette( HDC hdc ) -{ - return unix_funcs->pGDIRealizePalette( hdc ); -} - HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) { return unix_funcs->pGDISelectPalette( hdc, hpal, bkg ); diff --git a/include/ntuser.h b/include/ntuser.h index 3904daf5a82..3edfeab188e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -39,6 +39,12 @@ struct enum_display_monitor_params LPARAM lparam; }; +/* NtUserCallOneParam codes, not compatible with Windows */ +enum +{ + NtUserRealizePalette, +}; + /* NtUserCallTwoParam codes, not compatible with Windows */ enum { @@ -78,6 +84,7 @@ C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ); BOOL WINAPI NtUserAddClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach ); +ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ); ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code ); LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ); @@ -128,6 +135,7 @@ BOOL WINAPI NtUserRemoveClipboardFormatListener( HWND hwnd ); HANDLE WINAPI NtUserRemoveProp( HWND hwnd, const WCHAR *str ); BOOL WINAPI NtUserScrollDC( HDC hdc, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN ret_update_rgn, RECT *update_rect ); +HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE palette, WORD force_background ); BOOL WINAPI NtUserSetKeyboardState( BYTE *state ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle );

1 0