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