April 2019 - Wine-Commits - list.winehq.org

Damjan Jovanovic : qcap/tests: Fix a COM reference leak in the audiorecord test.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 9d75caf4e1deea0ec8d5ad3f829e7218bc1e3c16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d75caf4e1deea0ec8d5ad3f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Apr 22 12:49:53 2019 -0500 qcap/tests: Fix a COM reference leak in the audiorecord test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/audiorecord.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index 5de0198..af27017 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -152,6 +152,7 @@ START_TEST(audiorecord) IMoniker *mon; WCHAR *name; HRESULT hr; + ULONG ref; CoInitialize(NULL); @@ -182,6 +183,8 @@ START_TEST(audiorecord) test_interfaces(filter); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); IMoniker_Release(mon); }

1 0

Damjan Jovanovic : configure: Link wineserver to libinotify if necessary.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 07c2e8581a2745725cd7ce4282eedb9a8084a1e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07c2e8581a2745725cd7ce42… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Apr 20 15:14:53 2019 +0200 configure: Link wineserver to libinotify if necessary. Outside Linux, wineserver fails to link when sys/inotify.h is present, as it tries to find inotify symbols in libc, which doesn't have them. The inotify symbols are in libinotify.so. Detect it properly, and link to it where available. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 12 +++++- server/Makefile.in | 2 +- server/change.c | 57 +++------------------------- 4 files changed, 123 insertions(+), 55 deletions(-) diff --git a/configure b/configure index 451c92d..158d983 100755 --- a/configure +++ b/configure @@ -690,6 +690,8 @@ HAL_LIBS HAL_CFLAGS DBUS_LIBS DBUS_CFLAGS +INOTIFY_LIBS +INOTIFY_CFLAGS XSLT_LIBS XSLT_CFLAGS XML2_LIBS @@ -851,6 +853,7 @@ with_gsm with_gssapi with_gstreamer with_hal +with_inotify with_jpeg with_krb5 with_ldap @@ -1813,6 +1816,8 @@ XML2_CFLAGS XML2_LIBS XSLT_CFLAGS XSLT_LIBS +INOTIFY_CFLAGS +INOTIFY_LIBS DBUS_CFLAGS DBUS_LIBS HAL_CFLAGS @@ -2522,6 +2527,7 @@ Optional Packages: --without-gssapi do not use GSSAPI (Kerberos SSP support) --without-gstreamer do not use GStreamer (codecs support) --without-hal do not use HAL (dynamic device support) + --without-inotify do not use inotify (filesystem change notifications) --without-jpeg do not use JPEG --without-krb5 do not use krb5 (Kerberos) --without-ldap do not use LDAP @@ -2581,6 +2587,10 @@ Some influential environment variables: XML2_LIBS Linker flags for libxml-2.0, overriding pkg-config XSLT_CFLAGS C compiler flags for libxslt, overriding pkg-config XSLT_LIBS Linker flags for libxslt, overriding pkg-config + INOTIFY_CFLAGS + C compiler flags for libinotify, overriding pkg-config + INOTIFY_LIBS + Linker flags for libinotify, overriding pkg-config DBUS_CFLAGS C compiler flags for dbus-1, overriding pkg-config DBUS_LIBS Linker flags for dbus-1, overriding pkg-config HAL_CFLAGS C compiler flags for hal, overriding pkg-config @@ -3931,6 +3941,12 @@ if test "${with_hal+set}" = set; then : fi +# Check whether --with-inotify was given. +if test "${with_inotify+set}" = set; then : + withval=$with_inotify; +fi + + # Check whether --with-jpeg was given. if test "${with_jpeg+set}" = set; then : withval=$with_jpeg; @@ -7401,7 +7417,6 @@ for ac_header in \ sys/event.h \ sys/exec_elf.h \ sys/filio.h \ - sys/inotify.h \ sys/ioctl.h \ sys/ipc.h \ sys/limits.h \ @@ -13009,6 +13024,94 @@ esac fi +if test "x$with_inotify" != "xno" +then + if ${INOTIFY_CFLAGS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + INOTIFY_CFLAGS=`$PKG_CONFIG --cflags libinotify 2>/dev/null` +fi +fi + +if ${INOTIFY_LIBS:+false} :; then : + if ${PKG_CONFIG+:} false; then : + INOTIFY_LIBS=`$PKG_CONFIG --libs libinotify 2>/dev/null` +fi +fi + + +$as_echo "$as_me:${as_lineno-$LINENO}: libinotify cflags: $INOTIFY_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: libinotify libs: $INOTIFY_LIBS" >&5 +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $INOTIFY_CFLAGS" +for ac_header in sys/inotify.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_inotify_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_INOTIFY_H 1 +_ACEOF + +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify_add_watch in -linotify" >&5 +$as_echo_n "checking for inotify_add_watch in -linotify... " >&6; } +if ${ac_cv_lib_inotify_inotify_add_watch+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-linotify $INOTIFY_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 inotify_add_watch (); +int +main () +{ +return inotify_add_watch (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_inotify_inotify_add_watch=yes +else + ac_cv_lib_inotify_inotify_add_watch=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inotify_inotify_add_watch" >&5 +$as_echo "$ac_cv_lib_inotify_inotify_add_watch" >&6; } +if test "x$ac_cv_lib_inotify_inotify_add_watch" = xyes; then : + : +else + INOTIFY_LIBS="" +fi + +CPPFLAGS=$ac_save_CPPFLAGS +test -z "$INOTIFY_CFLAGS" || INOTIFY_CFLAGS=`echo " $INOTIFY_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` +test -z "$INOTIFY_LIBS" || INOTIFY_LIBS=`echo " $INOTIFY_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` + +fi +if test "$ac_cv_header_sys_inotify_h" != "yes"; then : + case "x$with_inotify" in + x) as_fn_append wine_notices "|libinotify ${notice_platform}development files not found (or too old), filesystem change notifications won't be supported." ;; + xno) ;; + *) as_fn_error $? "libinotify ${notice_platform}development files not found (or too old), filesystem change notifications won't be supported. +This is an error since --with-inotify was requested." "$LINENO" 5 ;; +esac + +fi + if test "x$with_dbus" != "xno" then if ${DBUS_CFLAGS:+false} :; then : @@ -19683,6 +19786,8 @@ XML2_CFLAGS = $XML2_CFLAGS XML2_LIBS = $XML2_LIBS XSLT_CFLAGS = $XSLT_CFLAGS XSLT_LIBS = $XSLT_LIBS +INOTIFY_CFLAGS = $INOTIFY_CFLAGS +INOTIFY_LIBS = $INOTIFY_LIBS DBUS_CFLAGS = $DBUS_CFLAGS DBUS_LIBS = $DBUS_LIBS HAL_CFLAGS = $HAL_CFLAGS diff --git a/configure.ac b/configure.ac index 611dc69..c2f97e0 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,7 @@ AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06 AC_ARG_WITH(gssapi, AS_HELP_STRING([--without-gssapi],[do not use GSSAPI (Kerberos SSP support)])) AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreamer (codecs support)])) AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) +AC_ARG_WITH(inotify, AS_HELP_STRING([--without-inotify],[do not use inotify (filesystem change notifications)])) AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)])) AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]), @@ -491,7 +492,6 @@ AC_CHECK_HEADERS(\ sys/event.h \ sys/exec_elf.h \ sys/filio.h \ - sys/inotify.h \ sys/ioctl.h \ sys/ipc.h \ sys/limits.h \ @@ -1347,6 +1347,16 @@ fi WINE_WARNING_WITH(xslt,[test "x$ac_cv_lib_soname_xslt" = "x"], [libxslt ${notice_platform}development files not found, xslt won't be supported.]) +dnl **** Check for inotify **** +if test "x$with_inotify" != "xno" +then + WINE_PACKAGE_FLAGS(INOTIFY,[libinotify],,,, + [AC_CHECK_HEADERS([sys/inotify.h]) + AC_CHECK_LIB(inotify,inotify_add_watch,[:],[INOTIFY_LIBS=""],[$INOTIFY_LIBS])]) +fi +WINE_NOTICE_WITH(inotify,[test "$ac_cv_header_sys_inotify_h" != "yes"], + [libinotify ${notice_platform}development files not found (or too old), filesystem change notifications won't be supported.]) + dnl **** Check for libdbus **** if test "x$with_dbus" != "xno" then diff --git a/server/Makefile.in b/server/Makefile.in index 29f17f3..b39bd30 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -50,4 +50,4 @@ MANPAGES = \ wineserver.fr.UTF-8.man.in \ wineserver.man.in -EXTRALIBS = $(LDEXECFLAGS) -lwine $(POLL_LIBS) $(RT_LIBS) +EXTRALIBS = $(LDEXECFLAGS) -lwine $(POLL_LIBS) $(RT_LIBS) $(INOTIFY_LIBS) diff --git a/server/change.c b/server/change.c index eb27dae..6091d21f 100644 --- a/server/change.c +++ b/server/change.c @@ -35,6 +35,9 @@ #ifdef HAVE_POLL_H # include <poll.h> #endif +#ifdef HAVE_SYS_INOTIFY_H +#include <sys/inotify.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -65,56 +68,6 @@ /* inotify support */ -#ifdef HAVE_SYS_INOTIFY_H -#include <sys/inotify.h> -#define USE_INOTIFY -#elif defined(__linux__) && defined(__i386__) - -#define SYS_inotify_init 291 -#define SYS_inotify_add_watch 292 -#define SYS_inotify_rm_watch 293 - -struct inotify_event { - int wd; - unsigned int mask; - unsigned int cookie; - unsigned int len; - char name[1]; -}; - -#define IN_ACCESS 0x00000001 -#define IN_MODIFY 0x00000002 -#define IN_ATTRIB 0x00000004 -#define IN_CLOSE_WRITE 0x00000008 -#define IN_CLOSE_NOWRITE 0x00000010 -#define IN_OPEN 0x00000020 -#define IN_MOVED_FROM 0x00000040 -#define IN_MOVED_TO 0x00000080 -#define IN_CREATE 0x00000100 -#define IN_DELETE 0x00000200 -#define IN_DELETE_SELF 0x00000400 - -#define IN_ISDIR 0x40000000 - -static inline int inotify_init( void ) -{ - return syscall( SYS_inotify_init ); -} - -static inline int inotify_add_watch( int fd, const char *name, unsigned int mask ) -{ - return syscall( SYS_inotify_add_watch, fd, name, mask ); -} - -static inline int inotify_rm_watch( int fd, int wd ) -{ - return syscall( SYS_inotify_rm_watch, fd, wd ); -} - -#define USE_INOTIFY - -#endif - struct inode; static void free_inode( struct inode *inode ); @@ -521,7 +474,7 @@ static enum server_fd_type dir_get_fd_type( struct fd *fd ) return FD_TYPE_DIR; } -#ifdef USE_INOTIFY +#ifdef HAVE_SYS_INOTIFY_H #define HASH_SIZE 31 @@ -1175,7 +1128,7 @@ static int dir_add_to_existing_notify( struct dir *dir ) return 0; } -#endif /* USE_INOTIFY */ +#endif /* HAVE_SYS_INOTIFY_H */ struct object *create_dir_obj( struct fd *fd, unsigned int access, mode_t mode ) {

1 0

Nikolay Sivov : mfplay: Add a stub for MFPCreateMediaPlayer().
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 194e22f9ffd15c46811c9da6e596f5d67cf83f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=194e22f9ffd15c46811c9da6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 22 18:13:38 2019 +0300 mfplay: Add a stub for MFPCreateMediaPlayer(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47016 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/mfplay.spec | 2 +- dlls/mfplay/player.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/mfplay.spec b/dlls/mfplay/mfplay.spec index 964b90a..5593ebf 100644 --- a/dlls/mfplay/mfplay.spec +++ b/dlls/mfplay/mfplay.spec @@ -2,5 +2,5 @@ @ stub DllGetClassObject @ stub DllRegisterServer @ stub DllUnregisterServer -@ stub MFPCreateMediaPlayer +@ stdcall MFPCreateMediaPlayer(wstr long long ptr long ptr) @ stub MFPCreateMediaPlayerEx diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 8873f52..d75ccfb 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -20,6 +20,11 @@ #include "windef.h" #include "winbase.h" +#include "mfplay.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { @@ -34,3 +39,11 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) return TRUE; } + +HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, + IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player) +{ + FIXME("%s, %d, %#x, %p, %p, %p.\n", debugstr_w(url), start_playback, options, callback, hwnd, player); + + return E_NOTIMPL; +}

1 0

Gabriel Ivăncescu : comctl32/tests: Avoid leaks by moving creation calls outside the loop.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 83503d04d4ebd77b2b6b03b1b4e2e0ff3cce8445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83503d04d4ebd77b2b6b03b1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 19 15:13:57 2019 +0300 comctl32/tests: Avoid leaks by moving creation calls outside the loop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index f31f526..e0c4736 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1908,7 +1908,7 @@ static void test_bcm_get_ideal_size(void) { BS_SPLITBUTTON, extra_width * 2 + GetSystemMetrics(SM_CXEDGE) }, { BS_DEFSPLITBUTTON, extra_width * 2 + GetSystemMetrics(SM_CXEDGE) } }; - LONG image_width, height, line_count, text_width; + LONG image_width = 48, height = 48, line_count, text_width; HFONT hfont, prev_font; DWORD style, type; BOOL ret; @@ -1964,6 +1964,14 @@ static void test_bcm_get_ideal_size(void) return; } + /* Tests for image placements */ + /* Prepare bitmap */ + hdc = GetDC(0); + hmask = CreateCompatibleBitmap(hdc, image_width, height); + hbmp = CreateCompatibleBitmap(hdc, image_width, height); + himl = pImageList_Create(image_width, height, ILC_COLOR, 1, 1); + pImageList_Add(himl, hbmp, 0); + #define set_split_info(hwnd) do { \ BUTTON_SPLITINFO _info; \ int _ret; \ @@ -1976,14 +1984,6 @@ static void test_bcm_get_ideal_size(void) for (k = 0; k < ARRAY_SIZE(pushtype); k++) { - /* Tests for image placements */ - /* Prepare bitmap */ - image_width = 48; - height = 48; - hdc = GetDC(0); - hmask = CreateCompatibleBitmap(hdc, image_width, height); - hbmp = CreateCompatibleBitmap(hdc, image_width, height); - /* Only bitmap for push button, ideal size should be enough for image and text */ hwnd = CreateWindowA(WC_BUTTONA, button_text, pushtype[k].style | BS_BITMAP | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); @@ -2028,8 +2028,6 @@ static void test_bcm_get_ideal_size(void) } /* Image list alignments */ - himl = pImageList_Create(image_width, height, ILC_COLOR, 1, 1); - pImageList_Add(himl, hbmp, 0); biml.himl = himl; for (i = 0; i < ARRAY_SIZE(imagelist_aligns); i++) { @@ -2099,6 +2097,7 @@ static void test_bcm_get_ideal_size(void) image_width + text_width + pushtype[k].extra_width, size.cy, max(height, tm.tmHeight)); ok(size.cy < large_height, "Expect ideal cy %d < %d\n", size.cy, large_height); DestroyWindow(hwnd); + DestroyIcon(hicon); } #undef set_split_info @@ -2215,7 +2214,6 @@ static void test_bcm_get_ideal_size(void) } pImageList_Destroy(himl); - DestroyIcon(hicon); DeleteObject(hbmp); DeleteObject(hmask); ReleaseDC(0, hdc);

1 0

Vijay Kiran Kamuju : kernel/nls: Fix country name in Manx Gaelic locale.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: b2433315501901031105914ebaea664e50f8ee80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2433315501901031105914e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 12:37:53 2019 +0200 kernel/nls: Fix country name in Manx Gaelic locale. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/gdv.nls | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/gdv.nls b/dlls/kernel32/nls/gdv.nls index 5410325..51e9ad0 100644 --- a/dlls/kernel32/nls/gdv.nls +++ b/dlls/kernel32/nls/gdv.nls @@ -103,7 +103,8 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC LOCALE_SENGLANGUAGE "Manx Gaelic" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "GBP" - LOCALE_SISO3166CTRYNAME "GB" + LOCALE_SISO3166CTRYNAME "IM" + LOCALE_SISO639LANGNAME "gv" LOCALE_SLANGUAGE "Gaelg (Manninn)" LOCALE_SLIST "," @@ -124,7 +125,7 @@ STRINGTABLE LANGUAGE LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC LOCALE_SMONTHNAME12 "Mee ny Nollick" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," - LOCALE_SNAME "gv-GB" + LOCALE_SNAME "gv-IM" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Manninn" LOCALE_SNATIVECURRNAME "Punt Manninagh"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SNAME for Uzbek (Cyrillic).
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 1a759b792a26f99ed6a48d56eb01f18aba49254f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a759b792a26f99ed6a48d56… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 11:32:31 2019 +0200 kernel/nls: Fix LOCALE_SNAME for Uzbek (Cyrillic). Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/uzb.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/uzb.nls b/dlls/kernel32/nls/uzb.nls index 2d4cf3f..7d0b4a8 100644 --- a/dlls/kernel32/nls/uzb.nls +++ b/dlls/kernel32/nls/uzb.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_UZBEK, SUBLANG_UZBEK_CYRILLIC LOCALE_SMONTHNAME12 "Декабр" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " - LOCALE_SNAME "uz-UZ" + LOCALE_SNAME "uz-Cyrl-UZ" LOCALE_SNAN "ҳақиқий сон эмас" LOCALE_SNATIVECTRYNAME "Ўзбекистон" LOCALE_SNATIVECURRNAME "рубль"

1 0

Gabriel Ivăncescu : comctl32/button: Implement command links.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 9fee8a7d258c1776d7358e6498afb3adc3d36812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fee8a7d258c1776d7358e64… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 19 15:14:00 2019 +0300 comctl32/button: Implement command links. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 191 +++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/comctl32.h | 3 + dlls/comctl32/comctl32.rc | 3 + dlls/comctl32/idb_cmdlink.bmp | Bin 0 -> 3522 bytes 4 files changed, 195 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index baa58d8..4f2fbce 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -105,6 +105,7 @@ static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ); static void UB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ); static void OB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ); static void SB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ); +static void CL_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ); static void BUTTON_CheckAutoRadioButton( HWND hwnd ); static void get_split_button_rects(const BUTTON_INFO*, const RECT*, RECT*, RECT*); static BOOL notify_split_button_dropdown(const BUTTON_INFO*, const POINT*, HWND); @@ -161,8 +162,8 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = OB_Paint, /* BS_OWNERDRAW */ SB_Paint, /* BS_SPLITBUTTON */ SB_Paint, /* BS_DEFSPLITBUTTON */ - PB_Paint, /* BS_COMMANDLINK */ - PB_Paint /* BS_DEFCOMMANDLINK */ + CL_Paint, /* BS_COMMANDLINK */ + CL_Paint /* BS_DEFCOMMANDLINK */ }; typedef void (*pfThemedPaint)( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); @@ -219,6 +220,12 @@ static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { PB_GetIdealSize /* BS_DEFCOMMANDLINK */ }; +/* Fixed margin for command links, regardless of DPI (based on tests done on Windows) */ +enum { command_link_margin = 6 }; + +/* The width and height for the default command link glyph (when there's no image) */ +enum { command_link_defglyph_size = 17 }; + static inline UINT get_button_type( LONG window_style ) { return (window_style & BS_TYPEMASK); @@ -2298,6 +2305,186 @@ static void draw_split_button_dropdown_glyph(const BUTTON_INFO *infoPtr, HDC hdc /********************************************************************** + * Command Link Functions + */ +static void CL_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + LONG state = infoPtr->state; + + RECT rc, content_rect; + NMCUSTOMDRAW nmcd; + HPEN pen, old_pen; + HBRUSH old_brush; + INT old_bk_mode; + LRESULT cdrf; + HWND parent; + HRGN hrgn; + + GetClientRect(infoPtr->hwnd, &rc); + + /* Command Links are not affected by the button's font, and are based + on the default message font. Furthermore, they are not affected by + any of the alignment styles (and always align with the top-left). */ + if (!(parent = GetParent(infoPtr->hwnd))) parent = infoPtr->hwnd; + SendMessageW(parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); + + hrgn = set_control_clipping(hDC, &rc); + + pen = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_WINDOWFRAME)); + old_pen = SelectObject(hDC, pen); + old_brush = SelectObject(hDC, GetSysColorBrush(COLOR_BTNFACE)); + old_bk_mode = SetBkMode(hDC, TRANSPARENT); + + init_custom_draw(&nmcd, infoPtr, hDC, &rc); + + /* Send erase notifications */ + cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + content_rect = rc; + + if (get_button_type(style) == BS_DEFCOMMANDLINK) + { + if (action != ODA_FOCUS) + Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom); + InflateRect(&rc, -1, -1); + } + + /* Skip the frame drawing if only focus has changed */ + if (action != ODA_FOCUS) + { + if (!(state & (BST_HOT | BST_PUSHED | BST_CHECKED | BST_INDETERMINATE))) + FillRect(hDC, &rc, GetSysColorBrush(COLOR_BTNFACE)); + else + { + UINT flags = DFCS_BUTTONPUSH; + + if (style & BS_FLAT) flags |= DFCS_MONO; + else if (state & BST_PUSHED) flags |= DFCS_PUSHED; + + if (state & (BST_CHECKED | BST_INDETERMINATE)) + flags |= DFCS_CHECKED; + DrawFrameControl(hDC, &rc, DFC_BUTTON, flags); + } + } + + if (cdrf & CDRF_NOTIFYPOSTERASE) + { + nmcd.dwDrawStage = CDDS_POSTERASE; + SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + } + + /* Send paint notifications */ + nmcd.dwDrawStage = CDDS_PREPAINT; + cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + + if (!(cdrf & CDRF_DOERASE) && action != ODA_FOCUS) + { + UINT flags = IsWindowEnabled(infoPtr->hwnd) ? DSS_NORMAL : DSS_DISABLED; + COLORREF old_color = SetTextColor(hDC, GetSysColor(flags == DSS_NORMAL ? + COLOR_BTNTEXT : COLOR_GRAYTEXT)); + HIMAGELIST defimg = NULL; + NONCLIENTMETRICSW ncm; + UINT txt_h = 0; + SIZE img_size; + + /* Command Links ignore the margins of the image list or its alignment */ + if (infoPtr->u.image || infoPtr->imagelist.himl) + img_size = BUTTON_GetImageSize(infoPtr); + else + { + img_size.cx = img_size.cy = command_link_defglyph_size; + defimg = ImageList_LoadImageW(COMCTL32_hModule, (LPCWSTR)MAKEINTRESOURCE(IDB_CMDLINK), + img_size.cx, 3, CLR_NONE, IMAGE_BITMAP, LR_CREATEDIBSECTION); + } + + /* Shrink rect by the command link margin, except on bottom (just the frame) */ + InflateRect(&content_rect, -command_link_margin, -command_link_margin); + content_rect.bottom += command_link_margin - 2; + + ncm.cbSize = sizeof(ncm); + if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) + { + LONG note_weight = ncm.lfMessageFont.lfWeight; + RECT r = content_rect; + WCHAR *text; + HFONT font; + + if (img_size.cx) r.left += img_size.cx + command_link_margin; + + /* Draw the text */ + ncm.lfMessageFont.lfWeight = FW_BOLD; + if ((font = CreateFontIndirectW(&ncm.lfMessageFont))) + { + if ((text = get_button_text(infoPtr))) + { + SelectObject(hDC, font); + txt_h = DrawTextW(hDC, text, -1, &r, + DT_TOP | DT_LEFT | DT_WORDBREAK | DT_END_ELLIPSIS); + heap_free(text); + } + DeleteObject(font); + } + + /* Draw the note */ + ncm.lfMessageFont.lfWeight = note_weight; + if (infoPtr->note && (font = CreateFontIndirectW(&ncm.lfMessageFont))) + { + r.top += txt_h + 2; + SelectObject(hDC, font); + DrawTextW(hDC, infoPtr->note, infoPtr->note_length, &r, + DT_TOP | DT_LEFT | DT_WORDBREAK | DT_NOPREFIX); + DeleteObject(font); + } + } + + /* Position the image at the vertical center of the drawn text (not note) */ + txt_h = min(txt_h, content_rect.bottom - content_rect.top); + if (img_size.cy < txt_h) content_rect.top += (txt_h - img_size.cy) / 2; + + content_rect.right = content_rect.left + img_size.cx; + content_rect.bottom = content_rect.top + img_size.cy; + + if (defimg) + { + int i = 0; + if (flags == DSS_DISABLED) i = 2; + else if (state & BST_HOT) i = 1; + + ImageList_Draw(defimg, i, hDC, content_rect.left, content_rect.top, ILD_NORMAL); + ImageList_Destroy(defimg); + } + else + BUTTON_DrawImage(infoPtr, hDC, NULL, flags, &content_rect); + + SetTextColor(hDC, old_color); + } + + if (cdrf & CDRF_NOTIFYPOSTPAINT) + { + nmcd.dwDrawStage = CDDS_POSTPAINT; + SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + } + if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + + if (action == ODA_FOCUS || (state & BST_FOCUS)) + { + InflateRect(&rc, -2, -2); + DrawFocusRect(hDC, &rc); + } + +cleanup: + SelectObject(hDC, old_pen); + SelectObject(hDC, old_brush); + SetBkMode(hDC, old_bk_mode); + SelectClipRgn(hDC, hrgn); + if (hrgn) DeleteObject(hrgn); + DeleteObject(pen); +} + + +/********************************************************************** * Themed Paint Functions */ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index b68b914..f3e889c 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -80,6 +80,9 @@ extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; #define IDT_CHECK 401 +/* Command Link arrow */ +#define IDB_CMDLINK 402 + /* Cursors */ #define IDC_MOVEBUTTON 102 diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc index 3f8e148..c9aa1ba 100644 --- a/dlls/comctl32/comctl32.rc +++ b/dlls/comctl32/comctl32.rc @@ -144,6 +144,9 @@ IDB_HIST_SMALL BITMAP idb_hist_small.bmp /* @makedep: idb_hist_large.bmp */ IDB_HIST_LARGE BITMAP idb_hist_large.bmp +/* @makedep: idb_cmdlink.bmp */ +IDB_CMDLINK BITMAP idb_cmdlink.bmp + /* @makedep: idc_copy.cur */ IDC_COPY CURSOR idc_copy.cur diff --git a/dlls/comctl32/idb_cmdlink.bmp b/dlls/comctl32/idb_cmdlink.bmp new file mode 100644 index 0000000..4b3f07b Binary files /dev/null and b/dlls/comctl32/idb_cmdlink.bmp differ

1 0

Gabriel Ivăncescu : comctl32/button: Implement themed command links.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 7316f6938992c8534dfca037642ad9cfb9123790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7316f6938992c8534dfca037… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 19 15:14:01 2019 +0300 comctl32/button: Implement themed command links. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 126 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 4f2fbce..37212fb 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -172,6 +172,7 @@ static void PB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, i static void CB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static void GB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static void SB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); +static void CL_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static const pfThemedPaint btnThemedPaintFunc[MAX_BTN_TYPE] = { @@ -189,8 +190,8 @@ static const pfThemedPaint btnThemedPaintFunc[MAX_BTN_TYPE] = NULL, /* BS_OWNERDRAW */ SB_ThemedPaint, /* BS_SPLITBUTTON */ SB_ThemedPaint, /* BS_DEFSPLITBUTTON */ - NULL, /* BS_COMMANDLINK */ - NULL, /* BS_DEFCOMMANDLINK */ + CL_ThemedPaint, /* BS_COMMANDLINK */ + CL_ThemedPaint /* BS_DEFCOMMANDLINK */ }; typedef BOOL (*pfGetIdealSize)(BUTTON_INFO *infoPtr, SIZE *size); @@ -2820,6 +2821,129 @@ cleanup: if (old_font) SelectObject(hDC, old_font); } +static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) +{ + HFONT old_font = infoPtr->font ? SelectObject(hDC, infoPtr->font) : NULL; + NMCUSTOMDRAW nmcd; + LRESULT cdrf; + HWND parent; + RECT rc; + + GetClientRect(infoPtr->hwnd, &rc); + init_custom_draw(&nmcd, infoPtr, hDC, &rc); + + parent = GetParent(infoPtr->hwnd); + if (!parent) parent = infoPtr->hwnd; + + /* Send erase notifications */ + cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_COMMANDLINK, state)) + DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); + DrawThemeBackground(theme, hDC, BP_COMMANDLINK, state, &rc, NULL); + + if (cdrf & CDRF_NOTIFYPOSTERASE) + { + nmcd.dwDrawStage = CDDS_POSTERASE; + SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + } + + /* Send paint notifications */ + nmcd.dwDrawStage = CDDS_PREPAINT; + cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + + if (!(cdrf & CDRF_DOERASE)) + { + RECT r, img_rect; + UINT txt_h = 0; + SIZE img_size; + WCHAR *text; + + GetThemeBackgroundContentRect(theme, hDC, BP_COMMANDLINK, state, &rc, &r); + + /* The text alignment and styles are fixed and don't depend on button styles */ + dtFlags = DT_TOP | DT_LEFT | DT_WORDBREAK; + + /* Command Links ignore the margins of the image list or its alignment */ + if (infoPtr->u.image || infoPtr->imagelist.himl) + img_size = BUTTON_GetImageSize(infoPtr); + else + GetThemePartSize(theme, NULL, BP_COMMANDLINKGLYPH, state, NULL, TS_DRAW, &img_size); + + img_rect = r; + if (img_size.cx) r.left += img_size.cx + command_link_margin; + + /* Draw the text */ + if ((text = get_button_text(infoPtr))) + { + UINT len = lstrlenW(text); + RECT text_rect; + + GetThemeTextExtent(theme, hDC, BP_COMMANDLINK, state, text, len, + dtFlags | DT_END_ELLIPSIS, &r, &text_rect); + DrawThemeText(theme, hDC, BP_COMMANDLINK, state, text, len, + dtFlags | DT_END_ELLIPSIS, 0, &r); + + txt_h = text_rect.bottom - text_rect.top; + heap_free(text); + } + + /* Draw the note */ + if (infoPtr->note) + { + DTTOPTS opts; + + r.top += txt_h; + opts.dwSize = sizeof(opts); + opts.dwFlags = DTT_FONTPROP; + opts.iFontPropId = TMT_BODYFONT; + DrawThemeTextEx(theme, hDC, BP_COMMANDLINK, state, + infoPtr->note, infoPtr->note_length, + dtFlags | DT_NOPREFIX, &r, &opts); + } + + /* Position the image at the vertical center of the drawn text (not note) */ + txt_h = min(txt_h, img_rect.bottom - img_rect.top); + if (img_size.cy < txt_h) img_rect.top += (txt_h - img_size.cy) / 2; + + img_rect.right = img_rect.left + img_size.cx; + img_rect.bottom = img_rect.top + img_size.cy; + + if (infoPtr->u.image || infoPtr->imagelist.himl) + BUTTON_DrawImage(infoPtr, hDC, NULL, + (state == CMDLS_DISABLED) ? DSS_DISABLED : DSS_NORMAL, + &img_rect); + else + DrawThemeBackground(theme, hDC, BP_COMMANDLINKGLYPH, state, &img_rect, NULL); + } + + if (cdrf & CDRF_NOTIFYPOSTPAINT) + { + nmcd.dwDrawStage = CDDS_POSTPAINT; + SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); + } + if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + + if (focused) + { + MARGINS margins; + + /* The focus rect has margins of a push button rather than command link... */ + GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); + + rc.left += margins.cxLeftWidth; + rc.top += margins.cyTopHeight; + rc.right -= margins.cxRightWidth; + rc.bottom -= margins.cyBottomHeight; + DrawFocusRect(hDC, &rc); + } + +cleanup: + if (old_font) SelectObject(hDC, old_font); +} + void BUTTON_Register(void) { WNDCLASSW wndClass;

1 0

Vijay Kiran Kamuju : ntdll: Report system information SystemPerformanceInformation info class.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 99ba65a1ea2c1546a61c3ed40996cbfee9d25f69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99ba65a1ea2c1546a61c3ed4… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Apr 16 11:27:16 2019 +0200 ntdll: Report system information SystemPerformanceInformation info class. Based on patch from Michael Müller. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index f429349..c8794e5 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2319,6 +2319,37 @@ NTSTATUS WINAPI NtQuerySystemInformation( spi.IdleTime.QuadPart = ++idle; } + if ((fp = fopen("/proc/meminfo", "r"))) + { + ULONG64 totalram, freeram, totalswap, freeswap; + char line[64]; + while (fgets(line, sizeof(line), fp)) + { + if(sscanf(line, "MemTotal: %llu kB", &totalram) == 1) + { + totalram *= 1024; + } + else if(sscanf(line, "MemFree: %llu kB", &freeram) == 1) + { + freeram *= 1024; + } + else if(sscanf(line, "SwapTotal: %llu kB", &totalswap) == 1) + { + totalswap *= 1024; + } + else if(sscanf(line, "SwapFree: %llu kB", &freeswap) == 1) + { + freeswap *= 1024; + break; + } + } + fclose(fp); + + spi.AvailablePages = freeram / page_size; + spi.TotalCommittedPages = (totalram + totalswap - freeram - freeswap) / page_size; + spi.TotalCommitLimit = (totalram + totalswap) / page_size; + } + if (Length >= len) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION;

1 0

Fabian Maurer : kernel32: Partially implement VirtualAllocExNuma.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 63743c3984db97055ed9a86ae98ba07fd34c363a URL: https://source.winehq.org/git/wine.git/?a=commit;h=63743c3984db97055ed9a86a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Apr 16 23:12:33 2019 +0200 kernel32: Partially implement VirtualAllocExNuma. Ignoring the preferred node should be good enough. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46927 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/virtual.c | 12 ++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index 57a5b10..9d96da9 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -28,7 +28,7 @@ @ stub UnregisterBadMemoryNotification @ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc @ stdcall VirtualAllocEx(long ptr long long long) kernel32.VirtualAllocEx -@ stub VirtualAllocExNuma +@ stdcall VirtualAllocExNuma(long ptr long long long long) kernel32.VirtualAllocExNuma @ stdcall VirtualFree(ptr long long) kernel32.VirtualFree @ stdcall VirtualFreeEx(long ptr long long) kernel32.VirtualFreeEx @ stdcall VirtualLock(ptr long) kernel32.VirtualLock diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1085879..3edfe21 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1559,7 +1559,7 @@ @ stdcall VerifyVersionInfoW(long long int64) @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) -# @ stub VirtualAllocExNuma +@ stdcall VirtualAllocExNuma(long ptr long long long long) @ stub VirtualBufferExceptionHandler @ stdcall VirtualFree(ptr long long) @ stdcall VirtualFreeEx(long ptr long long) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 42da7f0..59c96bd 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -46,6 +46,7 @@ WINE_DECLARE_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(file); +WINE_DECLARE_DEBUG_CHANNEL(virtual); /*********************************************************************** @@ -102,6 +103,17 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocEx( HANDLE hProcess, LPVOID addr, SI /*********************************************************************** + * VirtualAllocExNuma (KERNEL32.@) + */ +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocExNuma(HANDLE process, void *addr, SIZE_T size, + DWORD type, DWORD protect, DWORD numa_node) +{ + FIXME_(virtual)("Ignoring preferred numa_node\n"); + return VirtualAllocEx(process, addr, size, type, protect); +} + + +/*********************************************************************** * VirtualFree (KERNEL32.@) * * Releases or decommits a region of pages in virtual address space. diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c43ccce..71ca260 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1669,7 +1669,7 @@ # @ stub VerifyScripts @ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc @ stdcall VirtualAllocEx(long ptr long long long) kernel32.VirtualAllocEx -@ stub VirtualAllocExNuma +@ stdcall VirtualAllocExNuma(long ptr long long long long) kernel32.VirtualAllocExNuma # @ stub VirtualAllocFromApp @ stdcall VirtualFree(ptr long long) kernel32.VirtualFree @ stdcall VirtualFreeEx(long ptr long long) kernel32.VirtualFreeEx diff --git a/include/winbase.h b/include/winbase.h index 20c73af..49d0e7e 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2698,6 +2698,7 @@ WINBASEAPI BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDL #define VerifyVersionInfo WINELIB_NAME_AW(VerifyVersionInfo) WINBASEAPI LPVOID WINAPI VirtualAlloc(LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocEx(HANDLE,LPVOID,SIZE_T,DWORD,DWORD); +WINBASEAPI LPVOID WINAPI VirtualAllocExNuma(HANDLE,void*,SIZE_T,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI VirtualFree(LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualFreeEx(HANDLE,LPVOID,SIZE_T,DWORD); WINBASEAPI BOOL WINAPI VirtualLock(LPVOID,SIZE_T);

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SNAME for Azeri (Cyrillic).
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: ba7144bfae205b4c8a4cd8442eaf31bfea5dbd0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba7144bfae205b4c8a4cd844… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 11:27:55 2019 +0200 kernel/nls: Fix LOCALE_SNAME for Azeri (Cyrillic). Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/aze.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/aze.nls b/dlls/kernel32/nls/aze.nls index cb8d384..bc2db0d 100644 --- a/dlls/kernel32/nls/aze.nls +++ b/dlls/kernel32/nls/aze.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_SMONTHNAME12 "Декабр" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " - LOCALE_SNAME "az-AZ" + LOCALE_SNAME "az-Cyrl-AZ" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME L"\x0410\x0437\x04d9\x0440\x0431\x0430\x0458\x04b9\x0430\x043d" LOCALE_SNATIVECURRNAME "рубль"

1 0

Gabriel Ivăncescu : comctl32/button: Preserve BST_HOT when mouse button is released.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: d89facbc50db52f3269173f4989943902c9cac9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d89facbc50db52f3269173f4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 19 15:13:58 2019 +0300 comctl32/button: Preserve BST_HOT when mouse button is released. This fixes button state when it is released and the mouse is still hot-tracking it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 5338ef8..38e2f5d 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -599,7 +599,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L if (state & BST_DROPDOWNPUSHED) SendMessageW(hWnd, BCM_SETDROPDOWNSTATE, FALSE, 0); if (!(state & BUTTON_BTNPRESSED)) break; - infoPtr->state &= BUTTON_NSTATES; + infoPtr->state &= BUTTON_NSTATES | BST_HOT; if (!(state & BST_PUSHED)) { ReleaseCapture();

1 0

Vijay Kiran Kamuju : kernel/nls: Fix LOCALE_SNAME for Serbian (Cyrillic).
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 982ec5fcd6ec77e5dbd0933ae320d3faea4a4e92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=982ec5fcd6ec77e5dbd0933a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 12:37:51 2019 +0200 kernel/nls: Fix LOCALE_SNAME for Serbian (Cyrillic). Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/srb.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 4a3e006..348cf40 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_SMONTHNAME12 "децембар" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "sr-RS" + LOCALE_SNAME "sr-Cyrl-RS" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Југославија" LOCALE_SNATIVECURRNAME "динар"

1 0

Vijay Kiran Kamuju : kernel/nls: Fix country name and sname in English-Caribbean locale.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: d3cdff985fd836c8bea714860c1c27c48ab77704 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3cdff985fd836c8bea71486… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 12:37:52 2019 +0200 kernel/nls: Fix country name and sname in English-Caribbean locale. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/enb.nls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/enb.nls b/dlls/kernel32/nls/enb.nls index fb79284..7aa6fac 100644 --- a/dlls/kernel32/nls/enb.nls +++ b/dlls/kernel32/nls/enb.nls @@ -102,7 +102,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN LOCALE_SENGLANGUAGE "English" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "USD" - LOCALE_SISO3166CTRYNAME "CB" + LOCALE_SISO3166CTRYNAME "029" LOCALE_SISO639LANGNAME "en" LOCALE_SLANGUAGE "English (Caribbean)" LOCALE_SLIST "," @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN LOCALE_SMONTHNAME12 "December" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," - LOCALE_SNAME "en-CB" + LOCALE_SNAME "en-029" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Caribbean" LOCALE_SNATIVECURRNAME "US Dollar"

1 0

Vijay Kiran Kamuju : kernel32: Add implementation of CAL_SSHORTESTDAYNAME*.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: ded7efd27cae89a0f1bebd05dcf2e8a0ef71e2dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ded7efd27cae89a0f1bebd05… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Apr 19 22:14:37 2019 +0200 kernel32: Add implementation of CAL_SSHORTESTDAYNAME*. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index c425eb8..7807f99 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1068,6 +1068,13 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SABBREVMONTHNAME12: case CAL_SABBREVMONTHNAME13: case CAL_SYEARMONTH: + case CAL_SSHORTESTDAYNAME1: + case CAL_SSHORTESTDAYNAME2: + case CAL_SSHORTESTDAYNAME3: + case CAL_SSHORTESTDAYNAME4: + case CAL_SSHORTESTDAYNAME5: + case CAL_SSHORTESTDAYNAME6: + case CAL_SSHORTESTDAYNAME7: return GetLocaleInfoW(Locale, caltype_lctype_map[calinfo] | localeflags, lpCalData, cchData); case CAL_ITWODIGITYEARMAX: if (CalType & CAL_RETURN_NUMBER) @@ -1090,6 +1097,12 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return 0; } break; + case CAL_SMONTHDAY: + FIXME("Unimplemented caltype %d\n", calinfo); + return 0; + case CAL_SABBREVERASTRING: + FIXME("Unimplemented caltype %d\n", calinfo); + return 0; default: FIXME("Unknown caltype %d\n", calinfo); SetLastError(ERROR_INVALID_FLAGS);

1 0

André Hentschel : ntdll: Reuse signal to trap translation for FreeBSD on ARM.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: ed968c23d68d417bdb2de7de3fbab160d15bacb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed968c23d68d417bdb2de7de… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 19 19:03:32 2019 +0200 ntdll: Reuse signal to trap translation for FreeBSD on ARM. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 5db3c51..e01c8ce 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -148,7 +148,8 @@ static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *si enum arm_trap_code trap = TRAP_sig(sigcontext); if (trap) return trap; - /* trap is 0 on arm64 kernel */ +#endif + switch (signal) { case SIGILL: @@ -158,11 +159,8 @@ static inline enum arm_trap_code get_trap_code( int signal, const ucontext_t *si case SIGBUS: return TRAP_ARM_ALIGNFLT; default: - return trap; + return TRAP_ARM_UNKNOWN; } -#else - return TRAP_ARM_UNKNOWN; /* unknown trap code */ -#endif } /***********************************************************************

1 0

Jacek Caban : msvcp140: Add _Resize implementation.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: e8f083bd37becffdc8d41cb76e7189d194bf48d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8f083bd37becffdc8d41cb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 22 14:13:21 2019 +0200 msvcp140: Add _Resize implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 22 ++++++++++++++++++++++ dlls/msvcp90/ios.c | 20 ++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 5bd627c..8d2f43b 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3695,7 +3695,7 @@ @ cdecl _Read_dir(ptr ptr ptr) tr2_sys__Read_dir_wchar @ cdecl _Remove_dir(wstr) tr2_sys__Remove_dir_wchar @ cdecl _Rename(wstr wstr) tr2_sys__Rename_wchar -@ stub _Resize +@ cdecl _Resize(wstr int64) @ cdecl _Set_last_write_time(wstr int64) @ stub _Sinh @ extern _Snan _Snan diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 2f9cb6b..0440624 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -178,6 +178,7 @@ static MSVCP_bool (__cdecl *p_Current_get)(WCHAR *); static MSVCP_bool (__cdecl *p_Current_set)(WCHAR const *); static int (__cdecl *p_Equivalent)(WCHAR const*, WCHAR const*); static ULONGLONG (__cdecl *p_File_size)(WCHAR const *); +static int (__cdecl *p_Resize)(const WCHAR *, UINT64); static __int64 (__cdecl *p_Last_write_time)(WCHAR const*); static void (__cdecl *p_Set_last_write_time)(WCHAR const*, __int64); static int (__cdecl *p_Link)(WCHAR const*, WCHAR const*); @@ -270,6 +271,7 @@ static BOOL init(void) SET(p_Current_set, "_Current_set"); SET(p_Equivalent, "_Equivalent"); SET(p_File_size, "_File_size"); + SET(p_Resize, "_Resize"); SET(p_Last_write_time, "_Last_write_time"); SET(p_Set_last_write_time, "_Set_last_write_time"); SET(p_Link, "_Link"); @@ -657,6 +659,7 @@ static void test_File_size(void) WCHAR test_dir_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; WCHAR test_ne_W[] = {'w','i','n','e','_','t','e','s','t','_','d','i','r','/','n','e',0}; WCHAR temp_path[MAX_PATH], origin_path[MAX_PATH]; + int r; GetCurrentDirectoryW(MAX_PATH, origin_path); GetTempPathW(MAX_PATH, temp_path); @@ -692,7 +695,26 @@ static void test_File_size(void) ok(val == ~(ULONGLONG)0, "file_size is %s\n", wine_dbgstr_longlong(val)); ok(errno == 0xdeadbeef, "errno = %d\n", errno); + r = p_Resize(test_f1_W, 1000); + ok(!r, "p_Resize returned %d\n", r); + val = p_File_size(test_f1_W); + ok(val == 1000, "file_size is %s\n", wine_dbgstr_longlong(val)); + + r = p_Resize(test_f1_W, 100); + ok(!r, "p_Resize returned %d\n", r); + val = p_File_size(test_f1_W); + ok(val == 100, "file_size is %s\n", wine_dbgstr_longlong(val)); + + r = p_Resize(test_f1_W, 0); + ok(!r, "p_Resize returned %d\n", r); + val = p_File_size(test_f1_W); + ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); + ok(DeleteFileW(test_f1_W), "expect wine_test_dir/f1 to exist\n"); + + r = p_Resize(test_f1_W, 0); + ok(r == ERROR_FILE_NOT_FOUND, "p_Resize returned %d\n", r); + ok(DeleteFileW(test_f2_W), "expect wine_test_dir/f2 to exist\n"); ok(RemoveDirectoryW(test_dir_W), "expect wine_test_dir to exist\n"); ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 6b94737..94d43cb 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15593,6 +15593,26 @@ ULONGLONG __cdecl _File_size(WCHAR const* path) return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; } +int __cdecl _Resize(const WCHAR *path, UINT64 size) +{ + LARGE_INTEGER offset; + HANDLE file; + BOOL ret; + + TRACE("(%s %s)\n", debugstr_w(path), wine_dbgstr_longlong(size)); + + file = CreateFileW(path, FILE_GENERIC_WRITE, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + if(file == INVALID_HANDLE_VALUE) + return GetLastError(); + + offset.QuadPart = size; + if((ret = SetFilePointerEx(file, offset, NULL, FILE_BEGIN))) + ret = SetEndOfFile(file); + CloseHandle(file); + return ret ? 0 : GetLastError(); +} + /* ?_Equivalent(a)sys@tr2(a)std@@YAHPB_W0(a)Z */ /* ?_Equivalent(a)sys@tr2(a)std@@YAHPEB_W0(a)Z */ int __cdecl tr2_sys__Equivalent_wchar(WCHAR const* path1, WCHAR const* path2)

1 0

Gabriel Ivăncescu : comctl32/button: Move the drawing of the button's image into a separate function.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 4fa7aa29b56019ddc63c1d44a73d03e2e9515d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fa7aa29b56019ddc63c1d44… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 19 15:13:59 2019 +0300 comctl32/button: Move the drawing of the button's image into a separate function. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 85 ++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 47 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 38e2f5d..baa58d8 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1497,6 +1497,39 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la /********************************************************************** + * BUTTON_DrawImage + * + * Draw the button's image into the specified rectangle. + */ +static void BUTTON_DrawImage(const BUTTON_INFO *infoPtr, HDC hdc, HBRUSH hbr, UINT flags, const RECT *rect) +{ + if (infoPtr->imagelist.himl) + { + int i = (ImageList_GetImageCount(infoPtr->imagelist.himl) == 1) ? 0 : get_draw_state(infoPtr) - 1; + + ImageList_Draw(infoPtr->imagelist.himl, i, hdc, rect->left, rect->top, ILD_NORMAL); + } + else + { + switch (infoPtr->image_type) + { + case IMAGE_ICON: + flags |= DST_ICON; + break; + case IMAGE_BITMAP: + flags |= DST_BITMAP; + break; + default: + return; + } + + DrawStateW(hdc, hbr, NULL, (LPARAM)infoPtr->u.image, 0, rect->left, rect->top, + rect->right - rect->left, rect->bottom - rect->top, flags); + } +} + + +/********************************************************************** * BUTTON_DrawTextCallback * * Callback function used by DrawStateW function. @@ -1523,71 +1556,29 @@ static BOOL CALLBACK BUTTON_DrawTextCallback(HDC hdc, LPARAM lp, WPARAM wp, int static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, const RECT *imageRect, const RECT *textRect) { - DRAWSTATEPROC lpOutputProc = NULL; - LPARAM lp; - WPARAM wp = 0; HBRUSH hbr = 0; UINT flags = IsWindowEnabled(infoPtr->hwnd) ? DSS_NORMAL : DSS_DISABLED; - UINT imageFlags; - LONG state = infoPtr->state; - LONG draw_state; LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); - WCHAR *text = NULL; + WCHAR *text; /* FIXME: To draw disabled label in Win31 look-and-feel, we probably * must use DSS_MONO flag and COLOR_GRAYTEXT brush (or maybe DSS_UNION). * I don't have Win31 on hand to verify that, so I leave it as is. */ - if ((style & BS_PUSHLIKE) && (state & BST_INDETERMINATE)) + if ((style & BS_PUSHLIKE) && (infoPtr->state & BST_INDETERMINATE)) { hbr = GetSysColorBrush(COLOR_GRAYTEXT); flags |= DSS_MONO; } - if (show_image(infoPtr)) - { - if (infoPtr->imagelist.himl) - { - if (ImageList_GetImageCount(infoPtr->imagelist.himl) == 1) - ImageList_Draw(infoPtr->imagelist.himl, 0, hdc, imageRect->left, imageRect->top, ILD_NORMAL); - else - { - draw_state = get_draw_state(infoPtr); - ImageList_Draw(infoPtr->imagelist.himl, draw_state - 1, hdc, imageRect->left, imageRect->top, - ILD_NORMAL); - } - } - else - { - switch (infoPtr->image_type) - { - case IMAGE_ICON: - imageFlags = flags | DST_ICON; - lp = (LPARAM)infoPtr->u.icon; - break; - case IMAGE_BITMAP: - imageFlags = flags | DST_BITMAP; - lp = (LPARAM)infoPtr->u.bitmap; - break; - default: - return; - } - - DrawStateW(hdc, hbr, lpOutputProc, lp, wp, imageRect->left, imageRect->top, - imageRect->right - imageRect->left, imageRect->bottom - imageRect->top, imageFlags); - } - } - + if (show_image(infoPtr)) BUTTON_DrawImage(infoPtr, hdc, hbr, flags, imageRect); if (show_image_only(infoPtr)) return; /* DST_COMPLEX -- is 0 */ - lpOutputProc = BUTTON_DrawTextCallback; if (!(text = get_button_text(infoPtr))) return; - lp = (LPARAM)text; - wp = dtFlags; - DrawStateW(hdc, hbr, lpOutputProc, lp, wp, textRect->left, textRect->top, textRect->right - textRect->left, - textRect->bottom - textRect->top, flags); + DrawStateW(hdc, hbr, BUTTON_DrawTextCallback, (LPARAM)text, dtFlags, textRect->left, textRect->top, + textRect->right - textRect->left, textRect->bottom - textRect->top, flags); heap_free(text); }

1 0

Fabian Maurer : kernel32: Stub FindFirstStreamW/FindNextStreamW.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 28e6fe3782a4eb1712cf4e9274359ea2ec4cb211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28e6fe3782a4eb1712cf4e92… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Apr 16 23:12:34 2019 +0200 kernel32: Stub FindFirstStreamW/FindNextStreamW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46934 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-file-l1-2-2.spec | 4 ++-- dlls/kernel32/file.c | 22 +++++++++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/tests/file.c | 23 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 ++-- include/winbase.h | 13 ++++++++++++ 6 files changed, 64 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-file-l1-2-2/api-ms-win-core-file-l1-2-2.spec b/dlls/api-ms-win-core-file-l1-2-2/api-ms-win-core-file-l1-2-2.spec index bb58af1..7237890 100644 --- a/dlls/api-ms-win-core-file-l1-2-2/api-ms-win-core-file-l1-2-2.spec +++ b/dlls/api-ms-win-core-file-l1-2-2/api-ms-win-core-file-l1-2-2.spec @@ -1,8 +1,8 @@ @ stdcall AreFileApisANSI() kernel32.AreFileApisANSI @ stub FindFirstFileNameW -@ stub FindFirstStreamW +@ stdcall FindFirstStreamW(wstr long ptr long) kernel32.FindFirstStreamW @ stub FindNextFileNameW -@ stub FindNextStreamW +@ stdcall FindNextStreamW(long ptr) kernel32.FindNextStreamW @ stdcall GetTempFileNameA(str str long ptr) kernel32.GetTempFileNameA @ stdcall GetTempPathA(long ptr) kernel32.GetTempPathA @ stdcall GetVolumeInformationA(str ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationA diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 64c3e3e..6c82613 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2363,6 +2363,28 @@ BOOL WINAPI FindNextFileA( HANDLE handle, WIN32_FIND_DATAA *data ) return TRUE; } +/************************************************************************** + * FindFirstStreamW (KERNEL32.@) + */ +HANDLE WINAPI FindFirstStreamW(LPCWSTR filename, STREAM_INFO_LEVELS infolevel, void *data, DWORD flags) +{ + FIXME("(%s, %d, %p, %x): stub!\n", debugstr_w(filename), infolevel, data, flags); + + SetLastError(ERROR_HANDLE_EOF); + return INVALID_HANDLE_VALUE; +} + +/************************************************************************** + * FindNextStreamW (KERNEL32.@) + */ +BOOL WINAPI FindNextStreamW(HANDLE handle, void *data) +{ + FIXME("(%p, %p): stub!\n", handle, data); + + SetLastError(ERROR_HANDLE_EOF); + return FALSE; +} + /************************************************************************** * GetFileAttributesW (KERNEL32.@) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3edfe21..75e7cc5 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -488,7 +488,7 @@ # @ stub FindFirstFileTransactedW @ stdcall FindFirstFileW(wstr ptr) # @ stub FindFirstStreamTransactedW -# @ stub FindFirstStreamW +@ stdcall FindFirstStreamW(wstr long ptr long) @ stdcall FindFirstVolumeA(ptr long) @ stdcall FindFirstVolumeMountPointA(str ptr long) @ stdcall FindFirstVolumeMountPointW(wstr ptr long) @@ -497,7 +497,7 @@ @ stdcall FindNextFileA(long ptr) # @ stub FindNextFileNameW @ stdcall FindNextFileW(long ptr) -# @ stub FindNextStreamW +@ stdcall FindNextStreamW(long ptr) @ stdcall FindNextVolumeA(long ptr long) @ stub FindNextVolumeMountPointA @ stub FindNextVolumeMountPointW diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4df31c1..9bf80f6 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -62,6 +62,7 @@ static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, UL static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static BOOL (WINAPI *pSetFileCompletionNotificationModes)(HANDLE, UCHAR); +static HANDLE (WINAPI *pFindFirstStreamW)(LPCWSTR filename, STREAM_INFO_LEVELS infolevel, void *data, DWORD flags); static char filename[MAX_PATH]; static const char sillytext[] = @@ -111,6 +112,7 @@ static void InitFunctionPointers(void) pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); pGetQueuedCompletionStatusEx = (void *) GetProcAddress(hkernel32, "GetQueuedCompletionStatusEx"); pSetFileCompletionNotificationModes = (void *)GetProcAddress(hkernel32, "SetFileCompletionNotificationModes"); + pFindFirstStreamW = (void *)GetProcAddress(hkernel32, "FindFirstStreamW"); } static void test__hread( void ) @@ -5314,6 +5316,26 @@ static void test_file_readonly_access(void) ok(ret, "DeleteFileA: error %d\n", GetLastError()); } +static void test_find_file_stream(void) +{ + WCHAR path[] = {'C',':','\\','w','i','n','d','o','w','s',0}; + HANDLE handle; + int error; + WIN32_FIND_STREAM_DATA data; + + if (!pFindFirstStreamW) + { + win_skip("FindFirstStreamW is missing\n"); + return; + } + + SetLastError(0xdeadbeef); + handle = pFindFirstStreamW(path, FindStreamInfoStandard, &data, 0); + error = GetLastError(); + ok(handle == INVALID_HANDLE_VALUE, "Expected INVALID_HANDLE_VALUE, got %p\n", handle); + ok(error == ERROR_HANDLE_EOF, "Expected ERROR_HANDLE_EOF, got %d\n", error); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5385,4 +5407,5 @@ START_TEST(file) test_post_completion(); test_overlapped_read(); test_file_readonly_access(); + test_find_file_stream(); } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 71ca260..ac6fc12 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -360,7 +360,7 @@ # @ stub FindFirstFileNameW @ stdcall FindFirstFileW(wstr ptr) kernel32.FindFirstFileW @ stdcall FindFirstFreeAce(ptr ptr) advapi32.FindFirstFreeAce -# @ stub FindFirstStreamW +@ stdcall FindFirstStreamW(wstr long ptr long) kernel32.FindFirstStreamW @ stdcall FindFirstVolumeW(ptr long) kernel32.FindFirstVolumeW @ stub FindNLSString @ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx @@ -368,7 +368,7 @@ @ stdcall FindNextFileA(long ptr) kernel32.FindNextFileA # @ stub FindNextFileNameW @ stdcall FindNextFileW(long ptr) kernel32.FindNextFileW -# @ stub FindNextStreamW +@ stdcall FindNextStreamW(long ptr) kernel32.FindNextStreamW @ stdcall FindNextVolumeW(long ptr long) kernel32.FindNextVolumeW # @ stub FindPackagesByPackageFamily @ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW diff --git a/include/winbase.h b/include/winbase.h index 49d0e7e..c2e216c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1717,6 +1717,17 @@ typedef struct _UMS_SCHEDULER_STARTUP_INFO typedef enum _RTL_UMS_SCHEDULER_REASON UMS_SCHEDULER_REASON; typedef enum _RTL_UMS_THREAD_INFO_CLASS UMS_THREAD_INFO_CLASS, *PUMS_THREAD_INFO_CLASS; +typedef enum _STREAM_INFO_LEVELS +{ + FindStreamInfoStandard, + FindStreamInfoMaxInfoLevel +} STREAM_INFO_LEVELS; + +typedef struct _WIN32_FIND_STREAM_DATA { + LARGE_INTEGER StreamSize; + WCHAR cStreamName[MAX_PATH + 36]; +} WIN32_FIND_STREAM_DATA,*PWIN32_FIND_STREAM_DATA; + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); @@ -2002,10 +2013,12 @@ WINBASEAPI HANDLE WINAPI FindFirstFileExA(LPCSTR,FINDEX_INFO_LEVELS,LPVOID, WINBASEAPI HANDLE WINAPI FindFirstFileExW(LPCWSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); #define FindFirstFileEx WINELIB_NAME_AW(FindFirstFileEx) WINADVAPI BOOL WINAPI FindFirstFreeAce(PACL,LPVOID*); +WINBASEAPI HANDLE WINAPI FindFirstStreamW(LPCWSTR,STREAM_INFO_LEVELS,void*,DWORD); WINBASEAPI BOOL WINAPI FindNextChangeNotification(HANDLE); WINBASEAPI BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA); WINBASEAPI BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW); #define FindNextFile WINELIB_NAME_AW(FindNextFile) +WINBASEAPI BOOL WINAPI FindNextStreamW(HANDLE,void*); WINBASEAPI BOOL WINAPI FindCloseChangeNotification(HANDLE); WINBASEAPI HRSRC WINAPI FindResourceA(HMODULE,LPCSTR,LPCSTR); WINBASEAPI HRSRC WINAPI FindResourceW(HMODULE,LPCWSTR,LPCWSTR);

1 0

Bruno Jesus : mciavi32: Add Support for MCI_MCIAVI_PLAY_FULLSCREEN.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 08af837a8c3732da2053d600a058b3e17075df43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08af837a8c3732da2053d600… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Wed Apr 17 10:55:52 2019 +0200 mciavi32: Add Support for MCI_MCIAVI_PLAY_FULLSCREEN. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=15934 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/mciavi.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index b32accb..9aa6cd8 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -556,7 +556,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms if (dwFlags & MCI_DGV_PLAY_REVERSE) return MCIERR_UNSUPPORTED_FUNCTION; if (dwFlags & MCI_TEST) return 0; - if (dwFlags & (MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN|MCI_MCIAVI_PLAY_FULLBY2)) + if (dwFlags & (MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLBY2)) FIXME("Unsupported flag %08x\n", dwFlags); EnterCriticalSection(&wma->cs); @@ -591,7 +591,18 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms LeaveCriticalSection(&wma->cs); - if (!(GetWindowLongW(wma->hWndPaint, GWL_STYLE) & WS_VISIBLE)) + if (dwFlags & MCI_MCIAVI_PLAY_FULLSCREEN) + { + HMONITOR mon = MonitorFromWindow(wma->hWndPaint, MONITOR_DEFAULTTONEAREST); + MONITORINFO mi; + mi.cbSize = sizeof(mi); + GetMonitorInfoA(mon, &mi); + wma->hWndPaint = CreateWindowA("STATIC", NULL, WS_POPUP | WS_VISIBLE, mi.rcMonitor.left, + mi.rcMonitor.top, mi.rcMonitor.right - mi.rcMonitor.left, mi.rcMonitor.bottom - mi.rcMonitor.top, + NULL, NULL, NULL, 0); + } + /* if not fullscreen ensure the window is visible */ + else if (!(GetWindowLongW(wma->hWndPaint, GWL_STYLE) & WS_VISIBLE)) ShowWindow(wma->hWndPaint, SW_SHOWNA); EnterCriticalSection(&wma->cs);

1 0

Detlef Riekenberg : qcap/tests: Avoid a crash in a test.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: b1a62796759e5b916c90a16c05e6ca949e956277 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1a62796759e5b916c90a16c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 16 19:16:45 2019 +0200 qcap/tests: Avoid a crash in a test. VfW is not supported on 64-Bit Windows Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/qcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index a250139..c460991 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1771,9 +1771,9 @@ static void test_COM_vfwcapture(void) /* COM aggregation */ hr = CoCreateInstance(&CLSID_VfwCapture, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); - if (hr == REGDB_E_CLASSNOTREG) + if ((hr == REGDB_E_CLASSNOTREG) || (hr == CLASS_E_CLASSNOTAVAILABLE)) { - win_skip("CLSID_VfwCapture not registered\n"); + win_skip("CLSID_VfwCapture not supported (0x%x)\n", hr); return; } ok(hr == S_OK, "VfwCapture create failed: %08x\n", hr);

1 0

Vijay Kiran Kamuju : kernel/nls: Fix country name in Tatar locale.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 3c45bfc7da6a1ff5bea1cfe5372c5eeacf6e0edb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c45bfc7da6a1ff5bea1cfe5… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 20 10:59:16 2019 +0200 kernel/nls: Fix country name in Tatar locale. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/ttt.nls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/ttt.nls b/dlls/kernel32/nls/ttt.nls index 43b6fe5..86236d9 100644 --- a/dlls/kernel32/nls/ttt.nls +++ b/dlls/kernel32/nls/ttt.nls @@ -102,7 +102,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT LOCALE_SENGLANGUAGE "Tatar" LOCALE_SGROUPING "3;0" LOCALE_SINTLSYMBOL "RUR" - LOCALE_SISO3166CTRYNAME "TA" + LOCALE_SISO3166CTRYNAME "RU" LOCALE_SISO639LANGNAME "tt" LOCALE_SLANGUAGE "Tatar" LOCALE_SLIST ";" @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_TATAR, SUBLANG_DEFAULT LOCALE_SMONTHNAME12 "Декабрь" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP " " - LOCALE_SNAME "tt-TA" + LOCALE_SNAME "tt-RU" LOCALE_SNAN "NaN" LOCALE_SNATIVECTRYNAME "Татарстан" LOCALE_SNATIVECURRNAME "рубль"

1 0

Gabriel Ivăncescu : comctl32/tests: Test for BCM_GETIDEALSIZE on command links with notes.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: 475f219738d351fd99d591d07fa3a5675438081b URL: https://source.winehq.org/git/wine.git/?a=commit;h=475f219738d351fd99d591d0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 19 15:14:03 2019 +0300 comctl32/tests: Test for BCM_GETIDEALSIZE on command links with notes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index c31603f..e7789dc 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1890,6 +1890,12 @@ static void test_bcm_get_ideal_size(void) { static const char *button_text2 = "WWWW\nWWWW"; static const char *button_text = "WWWW"; + static const WCHAR button_note_short[] = { 'W',0 }; + static const WCHAR button_note_long[] = { 'W','W','W','W','W','W','W','W','W','W','W','W','W','W','W','W',0 }; + static const WCHAR button_note_wordy[] = { 'T','h','i','s',' ','i','s',' ','a',' ','l','o','n','g',' ','n','o','t','e',' ','f','o','r',' ','t','h','e',' ','b','u','t','t','o','n',',',' ', + 'w','i','t','h',' ','m','a','n','y',' ','w','o','r','d','s',',',' ','w','h','i','c','h',' ','s','h','o','u','l','d',' ','b','e',' ', + 'o','v','e','r','a','l','l',' ','l','o','n','g','e','r',' ','t','h','a','n',' ','t','h','e',' ','t','e','x','t',' ','(','g','i','v','e','n',' ', + 't','h','e',' ','s','m','a','l','l','e','r',' ','f','o','n','t',')',' ','a','n','d',' ','t','h','u','s',' ','w','r','a','p','.',0 }; static const DWORD imagelist_aligns[] = {BUTTON_IMAGELIST_ALIGN_LEFT, BUTTON_IMAGELIST_ALIGN_RIGHT, BUTTON_IMAGELIST_ALIGN_TOP, BUTTON_IMAGELIST_ALIGN_BOTTOM, BUTTON_IMAGELIST_ALIGN_CENTER}; @@ -2213,6 +2219,57 @@ static void test_bcm_get_ideal_size(void) } } + /* Command Link with note */ + hwnd = CreateWindowA(WC_BUTTONA, "a", style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expected hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hbmp); + ret = SendMessageA(hwnd, BCM_SETNOTE, 0, (LPARAM)button_note_short); + ok(ret == TRUE, "Expected BCM_SETNOTE to return true\n"); + size.cx = 13; + size.cy = 0; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx == 13 && size.cy > 0, "Expected ideal cx %d == %d and ideal cy %d > %d\n", size.cx, 13, size.cy, 0); + height = size.cy; + size.cx = 32767; + size.cy = 7; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx < 32767, "Expected ideal cx to have been adjusted\n"); + ok(size.cx > image_width && size.cy == height, "Expected ideal cx %d > %d and ideal cy %d == %d\n", size.cx, image_width, size.cy, height); + + /* Try longer note without word breaks, shouldn't extend height because no word splitting */ + ret = SendMessageA(hwnd, BCM_SETNOTE, 0, (LPARAM)button_note_long); + ok(ret == TRUE, "Expected BCM_SETNOTE to return true\n"); + k = size.cx; + size.cy = 0; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx == k && size.cy == height, "Expected ideal cx %d == %d and ideal cy %d == %d\n", size.cx, k, size.cy, height); + + /* Now let it extend the width */ + size.cx = 32767; + size.cy = 0; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx > k && size.cy == height, "Expected ideal cx %d > %d and ideal cy %d == %d\n", size.cx, k, size.cy, height); + + /* Use a very long note with words and the same width, should extend the height due to word wrap */ + ret = SendMessageA(hwnd, BCM_SETNOTE, 0, (LPARAM)button_note_wordy); + ok(ret == TRUE, "Expected BCM_SETNOTE to return true\n"); + k = size.cx; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx <= k && size.cy > height, "Expected ideal cx %d <= %d and ideal cy %d > %d\n", size.cx, k, size.cy, height); + + /* Now try the wordy note with a width smaller than the image itself, which prevents wrapping */ + size.cx = 13; + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret == TRUE, "Expected BCM_GETIDEALSIZE message to return true\n"); + ok(size.cx == 13 && size.cy == height, "Expected ideal cx %d == %d and ideal cy %d == %d\n", size.cx, 13, size.cy, height); + DestroyWindow(hwnd); + + pImageList_Destroy(himl); DeleteObject(hbmp); DeleteObject(hmask);

1 0

Marko Friedemann : wintrust: Use enhanced crypto provider in VerifyImageHash.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: b2e72dd09da88e2a4562eb668727c381ea91d91d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2e72dd09da88e2a4562eb66… Author: Marko Friedemann <marko(a)friedemann.email> Date: Thu Apr 18 15:10:46 2019 +0200 wintrust: Use enhanced crypto provider in VerifyImageHash. Softpub VerifyImageHash uses the default crypto provider and fails for certificates using SHA256 et al. with NTE_BAD_ALGID (80090008) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47034 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/softpub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 1273a58..475f55a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -328,7 +328,7 @@ static DWORD SOFTPUB_VerifyImageHash(CRYPT_PROVIDER_DATA *data, HANDLE file) if (!prov) { - if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + if (!CryptAcquireContextW(&prov, NULL, MS_ENH_RSA_AES_PROV_W, PROV_RSA_AES, CRYPT_VERIFYCONTEXT)) return GetLastError(); release_prov = TRUE; }

1 0

Gabriel Ivăncescu : comctl32/button: Implement BCM_GETIDEALSIZE for command links.
by Alexandre Julliard April 22, 2019

April 22, 2019

Module: wine Branch: master Commit: b15859d871c50fff812c117ebc5d6eaa2e06fb5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b15859d871c50fff812c117e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 19 15:14:02 2019 +0300 comctl32/button: Implement BCM_GETIDEALSIZE for command links. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 137 ++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/tests/button.c | 10 ++-- 2 files changed, 139 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 37212fb..0a8bdf1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -200,6 +200,7 @@ static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); +static BOOL CL_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { PB_GetIdealSize, /* BS_PUSHBUTTON */ @@ -216,9 +217,8 @@ static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { GB_GetIdealSize, /* BS_OWNERDRAW */ SB_GetIdealSize, /* BS_SPLITBUTTON */ SB_GetIdealSize, /* BS_DEFSPLITBUTTON */ - /* GetIdealSize() for following types are unimplemented, use BS_PUSHBUTTON's for now */ - PB_GetIdealSize, /* BS_COMMANDLINK */ - PB_GetIdealSize /* BS_DEFCOMMANDLINK */ + CL_GetIdealSize, /* BS_COMMANDLINK */ + CL_GetIdealSize /* BS_DEFCOMMANDLINK */ }; /* Fixed margin for command links, regardless of DPI (based on tests done on Windows) */ @@ -1363,6 +1363,137 @@ static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) return TRUE; } +static BOOL CL_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + HTHEME theme = GetWindowTheme(infoPtr->hwnd); + HDC hdc = GetDC(infoPtr->hwnd); + LONG w, text_w = 0, text_h = 0; + UINT flags = DT_TOP | DT_LEFT; + HFONT font, old_font = NULL; + RECT text_bound = { 0 }; + SIZE img_size; + RECT margin; + WCHAR *text; + + /* Get the image size */ + if (infoPtr->u.image || infoPtr->imagelist.himl) + img_size = BUTTON_GetImageSize(infoPtr); + else + { + if (theme) + GetThemePartSize(theme, NULL, BP_COMMANDLINKGLYPH, CMDLS_NORMAL, NULL, TS_DRAW, &img_size); + else + img_size.cx = img_size.cy = command_link_defglyph_size; + } + + /* Get the content margins */ + if (theme) + { + RECT r = { 0, 0, 0xffff, 0xffff }; + GetThemeBackgroundContentRect(theme, hdc, BP_COMMANDLINK, CMDLS_NORMAL, &r, &margin); + margin.left -= r.left; + margin.top -= r.top; + margin.right = r.right - margin.right; + margin.bottom = r.bottom - margin.bottom; + } + else + { + margin.left = margin.right = command_link_margin; + margin.top = margin.bottom = command_link_margin; + } + + /* Account for the border margins and the margin between image and text */ + w = margin.left + margin.right + (img_size.cx ? (img_size.cx + command_link_margin) : 0); + + /* If a rectangle with a specific width was requested, bound the text to it */ + if (size->cx > w) + { + text_bound.right = size->cx - w; + flags |= DT_WORDBREAK; + } + + if (theme) + { + if (infoPtr->font) old_font = SelectObject(hdc, infoPtr->font); + + /* Find the text's rect */ + if ((text = get_button_text(infoPtr))) + { + RECT r; + GetThemeTextExtent(theme, hdc, BP_COMMANDLINK, CMDLS_NORMAL, + text, -1, flags, &text_bound, &r); + heap_free(text); + text_w = r.right - r.left; + text_h = r.bottom - r.top; + } + + /* Find the note's rect */ + if (infoPtr->note) + { + DTTOPTS opts; + + opts.dwSize = sizeof(opts); + opts.dwFlags = DTT_FONTPROP | DTT_CALCRECT; + opts.iFontPropId = TMT_BODYFONT; + DrawThemeTextEx(theme, hdc, BP_COMMANDLINK, CMDLS_NORMAL, + infoPtr->note, infoPtr->note_length, + flags | DT_NOPREFIX | DT_CALCRECT, &text_bound, &opts); + text_w = max(text_w, text_bound.right - text_bound.left); + text_h += text_bound.bottom - text_bound.top; + } + } + else + { + NONCLIENTMETRICSW ncm; + + ncm.cbSize = sizeof(ncm); + if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) + { + LONG note_weight = ncm.lfMessageFont.lfWeight; + + /* Find the text's rect */ + ncm.lfMessageFont.lfWeight = FW_BOLD; + if ((font = CreateFontIndirectW(&ncm.lfMessageFont))) + { + if ((text = get_button_text(infoPtr))) + { + RECT r = text_bound; + old_font = SelectObject(hdc, font); + DrawTextW(hdc, text, -1, &r, flags | DT_CALCRECT); + heap_free(text); + + text_w = r.right - r.left; + text_h = r.bottom - r.top; + } + DeleteObject(font); + } + + /* Find the note's rect */ + ncm.lfMessageFont.lfWeight = note_weight; + if (infoPtr->note && (font = CreateFontIndirectW(&ncm.lfMessageFont))) + { + HFONT tmp = SelectObject(hdc, font); + if (!old_font) old_font = tmp; + + DrawTextW(hdc, infoPtr->note, infoPtr->note_length, &text_bound, + flags | DT_NOPREFIX | DT_CALCRECT); + DeleteObject(font); + + text_w = max(text_w, text_bound.right - text_bound.left); + text_h += text_bound.bottom - text_bound.top + 2; + } + } + } + w += text_w; + + size->cx = min(size->cx, w); + size->cy = max(text_h, img_size.cy) + margin.top + margin.bottom; + + if (old_font) SelectObject(hdc, old_font); + ReleaseDC(infoPtr->hwnd, hdc); + return TRUE; +} + /********************************************************************** * BUTTON_CalcLayoutRects * diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index e0c4736..c31603f 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2162,8 +2162,8 @@ static void test_bcm_get_ideal_size(void) if (type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK) { - todo_wine ok((size.cx == 0 && size.cy > 0), "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", - style, size.cx, 0, size.cy, 0); + ok((size.cx == 0 && size.cy > 0), "Style 0x%08x expect ideal cx %d == %d and ideal cy %d > %d\n", + style, size.cx, 0, size.cy, 0); } else { @@ -2199,9 +2199,9 @@ static void test_bcm_get_ideal_size(void) } else if (type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK) { - todo_wine ok((size.cx == 0 && size.cy > 0), - "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, 0, - size.cy, 0); + ok((size.cx == 0 && size.cy > 0), + "Style 0x%08x expect ideal cx %d == %d and ideal cy %d > %d\n", style, size.cx, 0, + size.cy, 0); } else {

1 0