May 2017 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/taskdialog: Display content text label.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 8967e87c8a890aed7a81051c2d372f065e825bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8967e87c8a890aed7a81051c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 24 20:43:25 2017 +0300 comctl32/taskdialog: Display content text label. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index e452d34..fcc7db7 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -47,6 +47,7 @@ static const UINT DIALOG_BUTTON_WIDTH = 50; static const UINT DIALOG_BUTTON_HEIGHT = 14; static const UINT ID_MAIN_INSTRUCTION = 0xf000; +static const UINT ID_CONTENT = 0xf001; struct taskdialog_control { @@ -134,7 +135,7 @@ static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc return ALIGNED_LENGTH(size, 3); } -static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_desc *desc) +static unsigned int taskdialog_add_static_label(struct taskdialog_template_desc *desc, WORD id, const WCHAR *str) { RECT rect = { 0, 0, desc->dialog_width - DIALOG_SPACING * 2, 0}; /* padding left and right of the control */ const WCHAR *textW = NULL; @@ -142,21 +143,20 @@ static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_d HFONT oldfont; HDC hdc; - if (!desc->taskconfig->pszMainInstruction) + if (!str) return 0; - if (IS_INTRESOURCE(desc->taskconfig->pszMainInstruction)) + if (IS_INTRESOURCE(str)) { - if (!(length = LoadStringW(desc->taskconfig->hInstance, (UINT_PTR)desc->taskconfig->pszMainInstruction, - (WCHAR *)&textW, 0))) + if (!(length = LoadStringW(desc->taskconfig->hInstance, (UINT_PTR)str, (WCHAR *)&textW, 0))) { - WARN("Failed to load main instruction text\n"); + WARN("Failed to load static text %s, id %#x\n", debugstr_w(str), id); return 0; } } else { - textW = desc->taskconfig->pszMainInstruction; + textW = str; length = strlenW(textW); } @@ -170,13 +170,23 @@ static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_d SelectObject(hdc, oldfont); ReleaseDC(0, hdc); - size = taskdialog_add_control(desc, ID_MAIN_INSTRUCTION, WC_STATICW, desc->taskconfig->hInstance, - desc->taskconfig->pszMainInstruction, DIALOG_SPACING, desc->dialog_height, - rect.right, rect.bottom); + desc->dialog_height += DIALOG_SPACING; + size = taskdialog_add_control(desc, id, WC_STATICW, desc->taskconfig->hInstance, str, DIALOG_SPACING, + desc->dialog_height, rect.right, rect.bottom); desc->dialog_height += rect.bottom; return size; } +static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_desc *desc) +{ + return taskdialog_add_static_label(desc, ID_MAIN_INSTRUCTION, desc->taskconfig->pszMainInstruction); +} + +static unsigned int taskdialog_add_content(struct taskdialog_template_desc *desc) +{ + return taskdialog_add_static_label(desc, ID_CONTENT, desc->taskconfig->pszContent); +} + static unsigned int taskdialog_add_common_buttons(struct taskdialog_template_desc *desc) { short button_x = desc->dialog_width - DIALOG_BUTTON_WIDTH - DIALOG_SPACING; @@ -289,11 +299,12 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi screen_width = taskdialog_get_reference_rect(&desc, &ref_rect); - desc.dialog_height = DIALOG_SPACING; + desc.dialog_height = 0; desc.dialog_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); desc.dialog_width = min(desc.dialog_width, screen_width); size += taskdialog_add_main_instruction(&desc); + size += taskdialog_add_content(&desc); size += taskdialog_add_common_buttons(&desc); template = Alloc(size);

1 0

Piotr Caban : configure: Add configure checks for Xfixes library.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 4208bc8cdd2661af5c26ac114fc6c937a30d7deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4208bc8cdd2661af5c26ac114… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 24 15:17:44 2017 +0200 configure: Add configure checks for Xfixes library. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 13 ++++++++ include/config.h.in | 6 ++++ 3 files changed, 109 insertions(+) diff --git a/configure b/configure index 6623896..da270dd 100755 --- a/configure +++ b/configure @@ -853,6 +853,7 @@ with_udev with_v4l with_xcomposite with_xcursor +with_xfixes with_xinerama with_xinput with_xinput2 @@ -2363,6 +2364,7 @@ Optional Packages: --without-v4l do not use v4l1 (v4l support) --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension + --without-xfixes do not use Xfixes for clipboard change notifications --without-xinerama do not use Xinerama (multi-monitor support) --without-xinput do not use the Xinput extension --without-xinput2 do not use the Xinput 2 extension @@ -3657,6 +3659,12 @@ if test "${with_xcursor+set}" = set; then : fi +# Check whether --with-xfixes was given. +if test "${with_xfixes+set}" = set; then : + withval=$with_xfixes; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xfixes_h=no; fi +fi + + # Check whether --with-xinerama was given. if test "${with_xinerama+set}" = set; then : withval=$with_xinerama; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi @@ -9834,6 +9842,7 @@ fi X11/extensions/XInput2.h \ X11/extensions/XShm.h \ X11/extensions/Xcomposite.h \ + X11/extensions/Xfixes.h \ X11/extensions/Xinerama.h \ X11/extensions/Xrandr.h \ X11/extensions/Xrender.h \ @@ -10473,6 +10482,87 @@ esac fi + if test "$ac_cv_header_X11_extensions_Xfixes_h" = "yes" + then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <X11/Xlib.h> +#include <X11/extensions/Xfixes.h> +int +main () +{ +static typeof(XFixesQueryVersion) * func; if (func) return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lXfixes" >&5 +$as_echo_n "checking for -lXfixes... " >&6; } +if ${ac_cv_lib_soname_Xfixes+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lXfixes $X_LIBS $X_EXTRA_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. */ +#ifdef __cplusplus +extern "C" +#endif +char XFixesQueryVersion (); +int +main () +{ +return XFixesQueryVersion (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ac_cv_lib_soname_Xfixes=`$ac_cv_path_LDD conftest.exe | grep "Xfixes" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_Xfixes=`$OTOOL -L conftest$ac_exeext | grep "libXfixes\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libXfixes\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_Xfixes=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libXfixes\\.$LIBEXT" | sed -e "s/^.*\\[\$libXfixes\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + if ${ac_cv_lib_soname_Xfixes:+false} :; then : + ac_cv_lib_soname_Xfixes=`$LDD conftest$ac_exeext | grep "libXfixes\\.$LIBEXT" | sed -e "s/^.*$libXfixes\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` +fi ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if ${ac_cv_lib_soname_Xfixes:+false} :; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_Xfixes" >&5 +$as_echo "$ac_cv_lib_soname_Xfixes" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBXFIXES "$ac_cv_lib_soname_Xfixes" +_ACEOF + + +fi +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test "x$ac_cv_lib_soname_Xfixes" = "x"; then : + case "x$with_xfixes" in + x) as_fn_append wine_notices "|libxfixes ${notice_platform}development files not found, Xfixes won't be supported." ;; + xno) ;; + *) as_fn_error $? "libxfixes ${notice_platform}development files not found, Xfixes won't be supported. +This is an error since --with-xfixes was requested." "$LINENO" 5 ;; +esac + +fi + if test "$ac_cv_header_X11_extensions_Xinerama_h" = "yes" then cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/configure.ac b/configure.ac index b5e76aa..db4d168 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,8 @@ AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xco [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi]) +AC_ARG_WITH(xfixes, AS_HELP_STRING([--without-xfixes],[do not use Xfixes for clipboard change notifications]), + [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xfixes_h=no; fi]) AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi]) AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]), @@ -999,6 +1001,7 @@ then X11/extensions/XInput2.h \ X11/extensions/XShm.h \ X11/extensions/Xcomposite.h \ + X11/extensions/Xfixes.h \ X11/extensions/Xinerama.h \ X11/extensions/Xrandr.h \ X11/extensions/Xrender.h \ @@ -1096,6 +1099,16 @@ then WINE_NOTICE_WITH(xrandr,[test "x$ac_cv_lib_soname_Xrandr" = "x"], [libxrandr ${notice_platform}development files not found, XRandr won't be supported.]) + dnl *** Check for Xfixes extension + if test "$ac_cv_header_X11_extensions_Xfixes_h" = "yes" + then + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> +#include <X11/extensions/Xfixes.h>]], [[static typeof(XFixesQueryVersion) * func; if (func) return 0;]])], + [WINE_CHECK_SONAME(Xfixes,XFixesQueryVersion,,,[$X_LIBS $X_EXTRA_LIBS])]) + fi + WINE_NOTICE_WITH(xfixes,[test "x$ac_cv_lib_soname_Xfixes" = "x"], + [libxfixes ${notice_platform}development files not found, Xfixes won't be supported.]) + dnl *** Check for Xinerama extension if test "$ac_cv_header_X11_extensions_Xinerama_h" = "yes" then diff --git a/include/config.h.in b/include/config.h.in index 1d4d6fa..7cdf70c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1251,6 +1251,9 @@ /* Define to 1 if you have the <X11/extensions/xf86vmproto.h> header file. */ #undef HAVE_X11_EXTENSIONS_XF86VMPROTO_H +/* Define to 1 if you have the <X11/extensions/Xfixes.h> header file. */ +#undef HAVE_X11_EXTENSIONS_XFIXES_H + /* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */ #undef HAVE_X11_EXTENSIONS_XINERAMA_H @@ -1472,6 +1475,9 @@ /* Define to the soname of the libXext library. */ #undef SONAME_LIBXEXT +/* Define to the soname of the libXfixes library. */ +#undef SONAME_LIBXFIXES + /* Define to the soname of the libXi library. */ #undef SONAME_LIBXI

1 0

Piotr Caban : winex11: Implement clipboard changes tracking using xfixes extension.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 22a75a8f077615f892d85761b88d90eba26f43ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a75a8f077615f892d85761b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 24 15:17:57 2017 +0200 winex11: Implement clipboard changes tracking using xfixes extension. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 87 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 3c1f3b4..3da4081 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -78,12 +78,16 @@ #include <time.h> #include <assert.h> -#include "windef.h" -#include "winbase.h" +#include "x11drv.h" + +#ifdef HAVE_X11_EXTENSIONS_XFIXES_H +#include <X11/extensions/Xfixes.h> +#endif + #include "shlobj.h" #include "shellapi.h" #include "shlwapi.h" -#include "x11drv.h" +#include "wine/library.h" #include "wine/list.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -196,6 +200,7 @@ static UINT rendered_formats; static ULONG64 last_clipboard_update; static struct clipboard_format **current_x11_formats; static unsigned int nb_current_x11_formats; +static BOOL use_xfixes; Display *clipboard_display = NULL; @@ -1866,7 +1871,8 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_size = size; last_clipboard_update = GetTickCount64(); CloseClipboard(); - SetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL ); + if (!use_xfixes) + SetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL ); return TRUE; } @@ -1878,6 +1884,7 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) */ BOOL update_clipboard( HWND hwnd ) { + if (use_xfixes) return TRUE; if (hwnd != clipboard_hwnd) return TRUE; if (!is_clipboard_owner) return TRUE; if (GetTickCount64() - last_clipboard_update <= SELECTION_UPDATE_DELAY) return TRUE; @@ -1947,6 +1954,75 @@ static BOOL wait_clipboard_mutex(void) /************************************************************************** + * handle_selection_notify_event + * + * Called when x11 clipboard content changes + */ +static BOOL selection_notify_event( HWND hwnd, XEvent *event ) +{ +#ifdef SONAME_LIBXFIXES + XFixesSelectionNotifyEvent *req = (XFixesSelectionNotifyEvent*)event; + + if (!is_clipboard_owner) return FALSE; + if (req->owner == selection_window) return FALSE; + request_selection_contents( req->display, TRUE ); + return FALSE; +#endif +} + +/************************************************************************** + * xfixes_init + * + * Initialize xfixes to receive clipboard update notifications + */ +static void xfixes_init(void) +{ +#ifdef SONAME_LIBXFIXES + typeof(XFixesSelectSelectionInput) *pXFixesSelectSelectionInput; + typeof(XFixesQueryExtension) *pXFixesQueryExtension; + typeof(XFixesQueryVersion) *pXFixesQueryVersion; + + int event_base, error_base; + int major = 3, minor = 0; + void *handle; + + handle = wine_dlopen(SONAME_LIBXFIXES, RTLD_NOW, NULL, 0); + if (!handle) return; + + pXFixesQueryExtension = wine_dlsym(handle, "XFixesQueryExtension", NULL, 0); + if (!pXFixesQueryExtension) return; + pXFixesQueryVersion = wine_dlsym(handle, "XFixesQueryVersion", NULL, 0); + if (!pXFixesQueryVersion) return; + pXFixesSelectSelectionInput = wine_dlsym(handle, "XFixesSelectSelectionInput", NULL, 0); + if (!pXFixesSelectSelectionInput) return; + + if (!pXFixesQueryExtension(clipboard_display, &event_base, &error_base)) + return; + pXFixesQueryVersion(clipboard_display, &major, &minor); + use_xfixes = (major >= 1); + if (!use_xfixes) return; + + pXFixesSelectSelectionInput(clipboard_display, import_window, x11drv_atom(CLIPBOARD), + XFixesSetSelectionOwnerNotifyMask | + XFixesSelectionWindowDestroyNotifyMask | + XFixesSelectionClientCloseNotifyMask); + if (use_primary_selection) + { + pXFixesSelectSelectionInput(clipboard_display, import_window, XA_PRIMARY, + XFixesSetSelectionOwnerNotifyMask | + XFixesSelectionWindowDestroyNotifyMask | + XFixesSelectionClientCloseNotifyMask); + } + X11DRV_register_event_handler(event_base + XFixesSelectionNotify, + selection_notify_event, "XFixesSelectionNotify"); + TRACE("xfixes succesully initialized\n"); +#else + WARN("xfixes not supported\n"); +#endif +} + + +/************************************************************************** * clipboard_thread * * Thread running inside the desktop process to manage the clipboard @@ -1991,6 +2067,8 @@ static DWORD WINAPI clipboard_thread( void *arg ) register_builtin_formats(); request_selection_contents( clipboard_display, TRUE ); + xfixes_init(); + TRACE( "clipboard thread %04x running\n", GetCurrentThreadId() ); while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg ); return 0; @@ -2006,6 +2084,7 @@ void CDECL X11DRV_UpdateClipboard(void) ULONG now; DWORD_PTR ret; + if (use_xfixes) return; if (GetCurrentThreadId() == clipboard_thread_id) return; now = GetTickCount(); if ((int)(now - last_update) <= SELECTION_UPDATE_DELAY) return;

1 0

Sven Hesse : d3d10core/tests: Port SM4 continuec instruction test from d3d11.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 79ab945f7463d79a637460e6854d895a18c6c52e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ab945f7463d79a637460e68… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Wed May 24 12:58:50 2017 +0200 d3d10core/tests: Port SM4 continuec instruction test from d3d11. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 115 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6abc79a..b63ba87 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9187,6 +9187,120 @@ static void test_sm4_breakc_instruction(void) release_test_context(&test_context); } +static void test_sm4_continuec_instruction(void) +{ + struct d3d10core_test_context test_context; + ID3D10PixelShader *ps; + ID3D10Device *device; + HRESULT hr; + + /* To get fxc to output continuec_z/continuec_nz instead of an if-block + * with a normal continue inside, the shaders have been compiled with + * the /Gfa flag. */ + static const DWORD ps_continuec_nz_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + int i = -1; + + while (i < 255) { + ++i; + + if (i != 0) + continue; + + ++counter; + } + + if (counter == 1) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0xaadaac96, 0xbe00fdfb, 0x29356be0, 0x47e79bd6, 0x00000001, 0x00000208, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000190, 0x00000040, 0x00000064, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000003, 0x08000036, 0x00100032, 0x00000000, + 0x00004002, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x01000030, 0x07000021, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, 0x00000000, + 0x0700001e, 0x00100022, 0x00000001, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x09000037, + 0x00100022, 0x00000002, 0x0010001a, 0x00000001, 0x0010001a, 0x00000001, 0x00004001, 0x00000000, + 0x05000036, 0x00100012, 0x00000002, 0x0010000a, 0x00000000, 0x05000036, 0x00100032, 0x00000000, + 0x00100046, 0x00000002, 0x05000036, 0x00100042, 0x00000000, 0x0010001a, 0x00000001, 0x03040008, + 0x0010002a, 0x00000000, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, 0x00000000, 0x00004001, + 0x00000001, 0x05000036, 0x00100032, 0x00000000, 0x00100046, 0x00000001, 0x01000016, 0x07000020, + 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001, 0x08000036, 0x001020f2, + 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0304003f, 0x0010000a, + 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, + 0x3f800000, 0x0100003e, + + }; + static const DWORD ps_continuec_z_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + int i = -1; + + while (i < 255) { + ++i; + + if (i == 0) + continue; + + ++counter; + } + + if (counter == 255) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x0322b23d, 0x52b25dc8, 0xa625f5f1, 0x271e3f46, 0x00000001, 0x000001d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000158, 0x00000040, 0x00000056, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x08000036, 0x00100032, 0x00000000, + 0x00004002, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x01000030, 0x07000021, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, 0x00000000, + 0x0700001e, 0x00100022, 0x00000001, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x05000036, + 0x00100042, 0x00000001, 0x0010000a, 0x00000000, 0x05000036, 0x00100072, 0x00000000, 0x00100966, + 0x00000001, 0x03000008, 0x0010002a, 0x00000000, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, + 0x00000000, 0x00004001, 0x00000001, 0x05000036, 0x00100032, 0x00000000, 0x00100046, 0x00000001, + 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x000000ff, + 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, + 0x0304003f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, + 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_continuec_nz_code, sizeof(ps_continuec_nz_code), &ps); + ok(SUCCEEDED(hr), "Failed to create continuec_nz pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D10PixelShader_Release(ps); + + hr = ID3D10Device_CreatePixelShader(device, ps_continuec_z_code, sizeof(ps_continuec_z_code), &ps); + ok(SUCCEEDED(hr), "Failed to create continuec_z pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D10PixelShader_Release(ps); + + release_test_context(&test_context); +} + static void test_create_input_layout(void) { D3D10_INPUT_ELEMENT_DESC layout_desc[] = @@ -12447,6 +12561,7 @@ START_TEST(device) test_shader_stage_input_output_matching(); test_sm4_if_instruction(); test_sm4_breakc_instruction(); + test_sm4_continuec_instruction(); test_create_input_layout(); test_input_assembler(); test_null_sampler();

1 0

Hugh McMaster : regedit: Add 'Expand' and 'Collapse' options to the treeview pop-up menu.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: d09571d181215ba01000a2815d30350ad8ec6e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09571d181215ba01000a2815… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 24 10:41:50 2017 +0000 regedit: Add 'Expand' and 'Collapse' options to the treeview pop-up menu. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 276 ++++++++++++++++++++++--------------------- po/bg.po | 276 ++++++++++++++++++++++--------------------- po/ca.po | 280 +++++++++++++++++++++++--------------------- po/cs.po | 276 ++++++++++++++++++++++--------------------- po/da.po | 276 ++++++++++++++++++++++--------------------- po/de.po | 280 +++++++++++++++++++++++--------------------- po/el.po | 274 ++++++++++++++++++++++--------------------- po/en.po | 274 ++++++++++++++++++++++--------------------- po/en_US.po | 274 ++++++++++++++++++++++--------------------- po/eo.po | 276 ++++++++++++++++++++++--------------------- po/es.po | 276 ++++++++++++++++++++++--------------------- po/fa.po | 274 ++++++++++++++++++++++--------------------- po/fi.po | 280 +++++++++++++++++++++++--------------------- po/fr.po | 278 ++++++++++++++++++++++--------------------- po/he.po | 276 ++++++++++++++++++++++--------------------- po/hi.po | 274 ++++++++++++++++++++++--------------------- po/hr.po | 276 ++++++++++++++++++++++--------------------- po/hu.po | 276 ++++++++++++++++++++++--------------------- po/it.po | 276 ++++++++++++++++++++++--------------------- po/ja.po | 280 +++++++++++++++++++++++--------------------- po/ko.po | 276 ++++++++++++++++++++++--------------------- po/lt.po | 280 +++++++++++++++++++++++--------------------- po/ml.po | 274 ++++++++++++++++++++++--------------------- po/nb_NO.po | 280 +++++++++++++++++++++++--------------------- po/nl.po | 276 ++++++++++++++++++++++--------------------- po/or.po | 274 ++++++++++++++++++++++--------------------- po/pa.po | 274 ++++++++++++++++++++++--------------------- po/pl.po | 280 +++++++++++++++++++++++--------------------- po/pt_BR.po | 280 +++++++++++++++++++++++--------------------- po/pt_PT.po | 280 +++++++++++++++++++++++--------------------- po/rm.po | 274 ++++++++++++++++++++++--------------------- po/ro.po | 280 +++++++++++++++++++++++--------------------- po/ru.po | 280 +++++++++++++++++++++++--------------------- po/sk.po | 276 ++++++++++++++++++++++--------------------- po/sl.po | 276 ++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 276 ++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 274 ++++++++++++++++++++++--------------------- po/sv.po | 276 ++++++++++++++++++++++--------------------- po/te.po | 274 ++++++++++++++++++++++--------------------- po/th.po | 276 ++++++++++++++++++++++--------------------- po/tr.po | 280 +++++++++++++++++++++++--------------------- po/uk.po | 276 ++++++++++++++++++++++--------------------- po/wa.po | 274 ++++++++++++++++++++++--------------------- po/wine.pot | 274 ++++++++++++++++++++++--------------------- po/zh_CN.po | 280 +++++++++++++++++++++++--------------------- po/zh_TW.po | 276 ++++++++++++++++++++++--------------------- programs/regedit/framewnd.c | 42 ++++++- programs/regedit/regedit.rc | 7 ++ programs/regedit/resource.h | 3 + 49 files changed, 6657 insertions(+), 6119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d09571d181215ba01000a…

1 0

Sebastian Lackner : appwiz.cpl: Use sha256 checksums to validate Mono/ Gecko downloads.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 4213a83525d5c22d43ab18b50001529185a1fed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4213a83525d5c22d43ab18b50… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed May 17 20:06:07 2017 -0600 appwiz.cpl: Use sha256 checksums to validate Mono/Gecko downloads. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/Makefile.in | 2 +- dlls/appwiz.cpl/addons.c | 55 +++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index a8341fa..97bc150 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -1,5 +1,5 @@ MODULE = appwiz.cpl -IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 +IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 bcrypt DELAYIMPORTS = msi C_SRCS = \ diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index c3847b5..dcd6535 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -42,6 +42,7 @@ #include "shellapi.h" #include "urlmon.h" #include "msi.h" +#include "bcrypt.h" #include "appwiz.h" #include "res.h" @@ -55,17 +56,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #ifdef __i386__ #define ARCH_STRING "x86" -#define GECKO_SHA "f9a937e9a46d47fda701d257e60601f22e7a4510" +#define GECKO_SHA "3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a" #elif defined(__x86_64__) #define ARCH_STRING "x86_64" -#define GECKO_SHA "8efa810b1ac83d59e0171d4347d21730560926da" +#define GECKO_SHA "c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d" #else #define ARCH_STRING "" #define GECKO_SHA "???" #endif #define MONO_VERSION "4.7.0" -#define MONO_SHA "ff05e1d2a93c3a07672cefc7a8f3a087d75828ac" +#define MONO_SHA "7698474dd9cb9eb80796b5812dff37386ba97b78b21ca23b20079ca5ad6ca5a1" typedef struct { const char *version; @@ -110,28 +111,16 @@ static WCHAR *msi_file; static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); static const WCHAR kernel32_dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; - -/* SHA definitions are copied from advapi32. They aren't available in headers. */ - -typedef struct { - ULONG Unknown[6]; - ULONG State[5]; - ULONG Count[2]; - UCHAR Buffer[64]; -} SHA_CTX, *PSHA_CTX; - -void WINAPI A_SHAInit(PSHA_CTX); -void WINAPI A_SHAUpdate(PSHA_CTX,const unsigned char*,UINT); -void WINAPI A_SHAFinal(PSHA_CTX,PULONG); - static BOOL sha_check(const WCHAR *file_name) { const unsigned char *file_map; HANDLE file, map; - ULONG sha[5]; - char buf[2*sizeof(sha)+1]; - SHA_CTX ctx; DWORD size, i; + BCRYPT_HASH_HANDLE hash = NULL; + BCRYPT_ALG_HANDLE alg = NULL; + UCHAR sha[32]; + char buf[1024]; + BOOL ret = FALSE; file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); if(file == INVALID_HANDLE_VALUE) { @@ -151,21 +140,27 @@ static BOOL sha_check(const WCHAR *file_name) if(!file_map) return FALSE; - A_SHAInit(&ctx); - A_SHAUpdate(&ctx, file_map, size); - A_SHAFinal(&ctx, sha); - - UnmapViewOfFile(file_map); + if(BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0)) + goto end; + if(BCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0)) + goto end; + if(BCryptHashData(hash, (UCHAR *)file_map, size, 0)) + goto end; + if(BCryptFinishHash(hash, sha, sizeof(sha), 0)) + goto end; for(i=0; i < sizeof(sha); i++) - sprintf(buf + i*2, "%02x", *((unsigned char*)sha+i)); + sprintf(buf + i * 2, "%02x", sha[i]); - if(strcmp(buf, addon->sha)) { + ret = !strcmp(buf, addon->sha); + if(!ret) WARN("Got %s, expected %s\n", buf, addon->sha); - return FALSE; - } - return TRUE; +end: + UnmapViewOfFile(file_map); + if(hash) BCryptDestroyHash(hash); + if(alg) BCryptCloseAlgorithmProvider(alg, 0); + return ret; } static void set_status(DWORD id)

1 0

Alexandre Julliard : server: Don' t increment the clipboard sequence number for delayed rendering or synthesized formats.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 719e28bd2c8393e5940df11894ea3e03ce35e2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719e28bd2c8393e5940df1189… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 13:03:39 2017 +0200 server: Don't increment the clipboard sequence number for delayed rendering or synthesized formats. Based on a patch by Piotr Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 9 +++++++-- dlls/user32/tests/clipboard.c | 15 +++++++-------- include/wine/server_protocol.h | 4 +++- server/clipboard.c | 30 ++++++++++++++++++++++++------ server/protocol.def | 1 + server/request.h | 7 ++++--- server/trace.c | 1 + 7 files changed, 47 insertions(+), 20 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index d33459c..2fc5c76 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -1047,6 +1047,7 @@ HANDLE WINAPI GetClipboardData( UINT format ) SERVER_START_REQ( get_clipboard_data ) { req->format = format; + req->render = render; if (cache) { req->cached = 1; @@ -1081,13 +1082,17 @@ HANDLE WINAPI GetClipboardData( UINT format ) if (render) /* try rendering it */ { render = FALSE; - if (owner) + if (from) + { + render_synthesized_format( format, from ); + continue; + } + else if (owner) { TRACE( "%s sending WM_RENDERFORMAT to %p\n", debugstr_format( format ), owner ); SendMessageW( owner, WM_RENDERFORMAT, format, 0 ); continue; } - if (from) return render_synthesized_format( format, from ); } TRACE( "%s returning 0\n", debugstr_format( format )); return 0; diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 434a325..f0a24cb 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -768,8 +768,7 @@ static void test_synthesized(void) broken( tests[i].format == CF_DIBV5 && cf == CF_DIB ), /* >= Vista */ "%u: couldn't get data, cf %04x err %d\n", i, cf, GetLastError()); seq = GetClipboardSequenceNumber(); - todo_wine_if(cf != tests[i].format && cf != CF_LOCALE) - ok(seq == old_seq, "sequence changed (test %d %d)\n", i, cf); + ok(seq == old_seq, "sequence changed (test %d %d)\n", i, cf); switch (cf) { case CF_LOCALE: @@ -935,7 +934,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA handle = SetClipboardData( CF_TEXT, create_textA() ); ok( handle != 0, "SetClipboardData failed: %d\n", GetLastError() ); seq = GetClipboardSequenceNumber(); - todo_wine ok( seq == old_seq, "sequence changed\n" ); + ok( seq == old_seq, "sequence changed\n" ); old_seq = seq; handle = CreateThread( NULL, 0, clipboard_render_data_thread, NULL, 0, NULL ); @@ -943,7 +942,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA ok( WaitForSingleObject(handle, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); CloseHandle( handle ); seq = GetClipboardSequenceNumber(); - todo_wine ok( seq == old_seq, "sequence changed\n" ); + ok( seq == old_seq, "sequence changed\n" ); } break; @@ -1250,7 +1249,7 @@ static DWORD WINAPI clipboard_thread(void *param) SetClipboardData( CF_WAVE, 0 ); seq = GetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); + ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; if (!cross_thread) { @@ -1521,13 +1520,13 @@ static DWORD WINAPI clipboard_thread(void *param) old_seq = GetClipboardSequenceNumber(); run_process( "get_clipboard_data" ); seq = GetClipboardSequenceNumber(); - todo_wine ok( seq == old_seq, "sequence changed\n" ); + ok( seq == old_seq, "sequence changed\n" ); do_render_format = FALSE; count = SendMessageA( win, WM_USER+1, 0, 0 ); - todo_wine ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); + ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); count = SendMessageA( win, WM_USER+2, 0, 0 ); - todo_wine ok( count == 1 || broken(!pAddClipboardFormatListener) /* < Vista */, "WM_CLIPBOARDUPDATE not received\n" ); + ok( count == 1 || broken(!pAddClipboardFormatListener) /* < Vista */, "WM_CLIPBOARDUPDATE not received\n" ); fmt = SendMessageA( win, WM_USER+4, 0, 0 ); ok( fmt == CF_TEXT, "WM_RENDERFORMAT received\n" ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index cee0f57..0d7a7cd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4522,8 +4522,10 @@ struct get_clipboard_data_request { struct request_header __header; unsigned int format; + int render; int cached; unsigned int seqno; + char __pad_28[4]; }; struct get_clipboard_data_reply { @@ -6416,6 +6418,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 531 +#define SERVER_PROTOCOL_VERSION 532 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/clipboard.c b/server/clipboard.c index a93319a..160eb46 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -57,6 +57,7 @@ struct clipboard unsigned int lcid; /* locale id to use for synthesizing text formats */ unsigned int seqno; /* clipboard change sequence number */ unsigned int open_seqno; /* sequence number at open time */ + unsigned int rendering; /* format rendering recursion counter */ struct list formats; /* list of data formats */ unsigned int format_count; /* count of data formats */ unsigned int format_map; /* existence bitmap for formats < CF_MAX */ @@ -366,6 +367,7 @@ DECL_HANDLER(open_clipboard) } if (!clipboard->open_thread) clipboard->open_seqno = clipboard->seqno; /* first open */ + if (clipboard->open_thread != current) clipboard->rendering = 0; clipboard->open_win = win; clipboard->open_thread = current; @@ -418,9 +420,10 @@ DECL_HANDLER(set_clipboard_data) free( format->data ); format->from = 0; - format->seqno = clipboard->seqno++; + format->seqno = clipboard->seqno; format->size = get_req_data_size(); format->data = data; + if (!clipboard->rendering) clipboard->seqno++; if (req->format == CF_TEXT || req->format == CF_OEMTEXT || req->format == CF_UNICODETEXT) clipboard->lcid = req->lcid; @@ -445,15 +448,30 @@ DECL_HANDLER(get_clipboard_data) if (!(format = get_format( clipboard, req->format ))) { set_error( STATUS_OBJECT_NAME_NOT_FOUND ); - return; + goto done; } reply->from = format->from; reply->total = format->size; reply->seqno = format->seqno; - if (!format->data && !format->from) reply->owner = clipboard->owner; - if (req->cached && req->seqno == format->seqno) return; /* client-side cache still valid */ - if (format->size <= get_reply_max_size()) set_reply_data( format->data, format->size ); - else set_error( STATUS_BUFFER_OVERFLOW ); + reply->owner = clipboard->owner; + + if (!format->data && req->render) /* try rendering it client-side */ + { + if (format->from || clipboard->owner) clipboard->rendering++; + return; + } + + if (req->cached && req->seqno == format->seqno) goto done; /* client-side cache still valid */ + + if (format->size > get_reply_max_size()) + { + set_error( STATUS_BUFFER_OVERFLOW ); + return; + } + set_reply_data( format->data, format->size ); + +done: + if (!req->render) clipboard->rendering--; } diff --git a/server/protocol.def b/server/protocol.def index 6cafa70..7eaaec2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3184,6 +3184,7 @@ enum caret_state /* Fetch a data format from the clipboard */ @REQ(get_clipboard_data) unsigned int format; /* clipboard format of the data */ + int render; /* will we try to render it if missing? */ int cached; /* do we already have it in the client-side cache? */ unsigned int seqno; /* sequence number for the data in the cache */ @REPLY diff --git a/server/request.h b/server/request.h index 8b9d9b6..ad89f30 100644 --- a/server/request.h +++ b/server/request.h @@ -2040,9 +2040,10 @@ C_ASSERT( sizeof(struct set_clipboard_data_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_clipboard_data_reply, seqno) == 8 ); C_ASSERT( sizeof(struct set_clipboard_data_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, format) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, cached) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, seqno) == 20 ); -C_ASSERT( sizeof(struct get_clipboard_data_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, render) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, cached) == 20 ); +C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_request, seqno) == 24 ); +C_ASSERT( sizeof(struct get_clipboard_data_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_reply, from) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_reply, owner) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_clipboard_data_reply, seqno) == 16 ); diff --git a/server/trace.c b/server/trace.c index 7b33043..6e23184 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3775,6 +3775,7 @@ static void dump_set_clipboard_data_reply( const struct set_clipboard_data_reply static void dump_get_clipboard_data_request( const struct get_clipboard_data_request *req ) { fprintf( stderr, " format=%08x", req->format ); + fprintf( stderr, ", render=%d", req->render ); fprintf( stderr, ", cached=%d", req->cached ); fprintf( stderr, ", seqno=%08x", req->seqno ); }

1 0

Jacek Caban : rpcrt4: Introduce op for closing connection read end and use it when shutting down server.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 42ba4d731abf24ba0653c5a9f709de18ab33b82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ba4d731abf24ba0653c5a9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 13:52:07 2017 +0200 rpcrt4: Introduce op for closing connection read end and use it when shutting down server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.h | 6 ++++++ dlls/rpcrt4/rpc_server.c | 3 +++ dlls/rpcrt4/rpc_transport.c | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index ff14bbd..affc060 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -104,6 +104,7 @@ struct connection_ops { int (*read)(RpcConnection *conn, void *buffer, unsigned int len); int (*write)(RpcConnection *conn, const void *buffer, unsigned int len); int (*close)(RpcConnection *conn); + void (*close_read)(RpcConnection *conn); void (*cancel_call)(RpcConnection *conn); RPC_STATUS (*is_server_listening)(const char *endpoint); int (*wait_for_incoming_data)(RpcConnection *conn); @@ -197,6 +198,11 @@ static inline int rpcrt4_conn_close(RpcConnection *Connection) return Connection->ops->close(Connection); } +static inline void rpcrt4_conn_close_read(RpcConnection *connection) +{ + connection->ops->close_read(connection); +} + static inline void rpcrt4_conn_cancel_call(RpcConnection *Connection) { Connection->ops->cancel_call(Connection); diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index b76185b..901801e 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -669,9 +669,12 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg) { /* cleanup */ cps->ops->free_wait_array(cps, objs); + EnterCriticalSection(&cps->cs); LIST_FOR_EACH_ENTRY(conn, &cps->listeners, RpcConnection, protseq_entry) RPCRT4_CloseConnection(conn); + LIST_FOR_EACH_ENTRY(conn, &cps->connections, RpcConnection, protseq_entry) + rpcrt4_conn_close_read(conn); LeaveCriticalSection(&cps->cs); if (res == 0 && !std_listen) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b88eeb7..6f83a24 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -449,6 +449,11 @@ static int rpcrt4_conn_np_close(RpcConnection *conn) return 0; } +static void rpcrt4_conn_np_close_read(RpcConnection *conn) +{ + /* FIXME */ +} + static void rpcrt4_conn_np_cancel_call(RpcConnection *conn) { RpcConnection_np *connection = (RpcConnection_np *)conn; @@ -1441,6 +1446,11 @@ static int rpcrt4_conn_tcp_close(RpcConnection *conn) return 0; } +static void rpcrt4_conn_tcp_close_read(RpcConnection *conn) +{ + /* FIXME */ +} + static void rpcrt4_conn_tcp_cancel_call(RpcConnection *conn) { RpcConnection_tcp *connection = (RpcConnection_tcp *) conn; @@ -3066,6 +3076,11 @@ static int rpcrt4_ncacn_http_close(RpcConnection *Connection) return 0; } +static void rpcrt4_ncacn_http_close_read(RpcConnection *conn) +{ + rpcrt4_ncacn_http_close(conn); /* FIXME */ +} + static void rpcrt4_ncacn_http_cancel_call(RpcConnection *Connection) { RpcConnection_http *httpc = (RpcConnection_http *) Connection; @@ -3119,6 +3134,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_read, rpcrt4_conn_np_write, rpcrt4_conn_np_close, + rpcrt4_conn_np_close_read, rpcrt4_conn_np_cancel_call, rpcrt4_ncacn_np_is_server_listening, rpcrt4_conn_np_wait_for_incoming_data, @@ -3140,6 +3156,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_read, rpcrt4_conn_np_write, rpcrt4_conn_np_close, + rpcrt4_conn_np_close_read, rpcrt4_conn_np_cancel_call, rpcrt4_ncalrpc_np_is_server_listening, rpcrt4_conn_np_wait_for_incoming_data, @@ -3161,6 +3178,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_tcp_read, rpcrt4_conn_tcp_write, rpcrt4_conn_tcp_close, + rpcrt4_conn_tcp_close_read, rpcrt4_conn_tcp_cancel_call, rpcrt4_conn_tcp_is_server_listening, rpcrt4_conn_tcp_wait_for_incoming_data, @@ -3182,6 +3200,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncacn_http_read, rpcrt4_ncacn_http_write, rpcrt4_ncacn_http_close, + rpcrt4_ncacn_http_close_read, rpcrt4_ncacn_http_cancel_call, rpcrt4_ncacn_http_is_server_listening, rpcrt4_ncacn_http_wait_for_incoming_data,

1 0

Jacek Caban : rpcrt4: Add close_read implementation for named pipe connections.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 29f0b2824068496eca4a0e19ce3e464d965cf010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f0b2824068496eca4a0e19c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 13:52:14 2017 +0200 rpcrt4: Add close_read implementation for named pipe connections. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6f83a24..293d09f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -69,6 +69,7 @@ typedef struct _RpcConnection_np HANDLE listen_event; IO_STATUS_BLOCK io_status; HANDLE event_cache; + BOOL read_closed; } RpcConnection_np; static RpcConnection *rpcrt4_conn_np_alloc(void) @@ -384,7 +385,6 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int count) { RpcConnection_np *connection = (RpcConnection_np *) conn; - IO_STATUS_BLOCK io_status; HANDLE event; NTSTATUS status; @@ -392,14 +392,23 @@ static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int c if (!event) return -1; - status = NtReadFile(connection->pipe, event, NULL, NULL, &io_status, buffer, count, NULL, NULL); + if (connection->read_closed) + status = STATUS_CANCELLED; + else + status = NtReadFile(connection->pipe, event, NULL, NULL, &connection->io_status, buffer, count, NULL, NULL); if (status == STATUS_PENDING) { + /* check read_closed again before waiting to avoid a race */ + if (connection->read_closed) + { + IO_STATUS_BLOCK io_status; + NtCancelIoFileEx(connection->pipe, &connection->io_status, &io_status); + } WaitForSingleObject(event, INFINITE); - status = io_status.Status; + status = connection->io_status.Status; } release_np_event(connection, event); - return status && status != STATUS_BUFFER_OVERFLOW ? -1 : io_status.Information; + return status && status != STATUS_BUFFER_OVERFLOW ? -1 : connection->io_status.Information; } static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigned int count) @@ -451,7 +460,11 @@ static int rpcrt4_conn_np_close(RpcConnection *conn) static void rpcrt4_conn_np_close_read(RpcConnection *conn) { - /* FIXME */ + RpcConnection_np *connection = (RpcConnection_np*)conn; + IO_STATUS_BLOCK io_status; + + connection->read_closed = TRUE; + NtCancelIoFileEx(connection->pipe, &connection->io_status, &io_status); } static void rpcrt4_conn_np_cancel_call(RpcConnection *conn)

1 0

Jacek Caban : rpcrt4: Add close_read implementation for TCP connections.
by Alexandre Julliard 24 May '17

24 May '17

Module: wine Branch: master Commit: 28f865b134279c1bcbe9fbd1f5eaaf0a4129a765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f865b134279c1bcbe9fbd1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 24 13:52:19 2017 +0200 rpcrt4: Add close_read implementation for TCP connections. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 293d09f..e6e9aaa 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1461,7 +1461,8 @@ static int rpcrt4_conn_tcp_close(RpcConnection *conn) static void rpcrt4_conn_tcp_close_read(RpcConnection *conn) { - /* FIXME */ + RpcConnection_tcp *connection = (RpcConnection_tcp *) conn; + shutdown(connection->sock, SD_RECEIVE); } static void rpcrt4_conn_tcp_cancel_call(RpcConnection *conn)

1 0