wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Alexandre Julliard : makefiles: Install source directory files from the top-level makefile.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 9b71b3669e3065eefe7a6e1c4559fe44ad728415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b71b3669e3065eefe7a6e1c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 16:07:49 2015 +0900 makefiles: Install source directory files from the top-level makefile. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 ++++++++++--------------- configure.ac | 27 ++++++++++++--------------- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 0aa17fc..8b0b2c9 100755 --- a/configure +++ b/configure @@ -8763,15 +8763,6 @@ libwine_DEPS = wine.map ${wine_binary}_OBJS = main.o ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) " - if test -z "$with_wine64" - then - as_fn_append LOADER_RULES " -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop -" - fi ;; esac @@ -18319,13 +18310,17 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else loader_install="$loader_install wine.inf" - as_fn_append LOADER_RULES " -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls - + wine_fn_append_rule "install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -" + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls" + case $host_os in + cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; + *) wine_fn_append_rule "install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop +uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop" ;; + esac fi as_fn_append LOADER_RULES " diff --git a/configure.ac b/configure.ac index 685b346..f86fd2b 100644 --- a/configure.ac +++ b/configure.ac @@ -962,15 +962,6 @@ libwine_DEPS = wine.map ${wine_binary}_OBJS = main.o ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) "]) - if test -z "$with_wine64" - then - AS_VAR_APPEND([LOADER_RULES],[" -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop -"]) - fi ;; esac @@ -3692,13 +3683,19 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else loader_install="$loader_install wine.inf" - AS_VAR_APPEND([LOADER_RULES],[" -install install-lib:: - \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls - + WINE_APPEND_RULE( +[install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -"]) + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls]) + case $host_os in + cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; + *) WINE_APPEND_RULE( +[install install-lib:: + \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop +uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop]) ;; + esac fi AS_VAR_APPEND([LOADER_RULES],["

1 0

Alexandre Julliard : makefiles: Generate rules for installing wine.inf.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: b8d138d633b63040880be6ca97cadc95c036703c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d138d633b63040880be6ca9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 15:16:16 2015 +0900 makefiles: Generate rules for installing wine.inf. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 +++++++++------- configure.ac | 16 +++++++++------- tools/makedep.c | 2 ++ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 51a6913..0aa17fc 100755 --- a/configure +++ b/configure @@ -7865,6 +7865,7 @@ distclean:: wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" +loader_install="" libwine_soversion=`expr $libwine_version : '$[0-9]*$\..*'` case $host_os in @@ -14979,10 +14980,6 @@ ${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Tte esac ;; esac -as_fn_append LOADER_RULES " -PROGRAMS = $loader_programs -INSTALL_LIB = $loader_programs -" ac_save_CFLAGS="$CFLAGS" @@ -18321,16 +18318,21 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else + loader_install="$loader_install wine.inf" as_fn_append LOADER_RULES " -install install-lib:: wine.inf - \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf +install install-lib:: \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls " fi +as_fn_append LOADER_RULES " +PROGRAMS = $loader_programs +INSTALL_LIB = $loader_programs$loader_install +" + if test "$srcdir" = . then ac_config_commands="$ac_config_commands .gitignore" diff --git a/configure.ac b/configure.ac index 4e9ca89..685b346 100644 --- a/configure.ac +++ b/configure.ac @@ -688,6 +688,7 @@ WINE_CONFIG_HELPERS wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" loader_programs="$wine_binary" +loader_install="" libwine_soversion=`expr $libwine_version : '$[[0-9]]*$\..*'` case $host_os in @@ -1981,10 +1982,6 @@ ${wine_binary}_preloader_LDFLAGS = -static -nostartfiles -nodefaultlibs -Wl,-Tte esac ;; esac -AS_VAR_APPEND([LOADER_RULES],[" -PROGRAMS = $loader_programs -INSTALL_LIB = $loader_programs -"]) dnl **** Check for functions **** @@ -3694,16 +3691,21 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else + loader_install="$loader_install wine.inf" AS_VAR_APPEND([LOADER_RULES],[" -install install-lib:: wine.inf - \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf +install install-lib:: \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/wine.inf \$(DESTDIR)\$(datadir)/wine/l_intl.nls + \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls "]) fi +AS_VAR_APPEND([LOADER_RULES],[" +PROGRAMS = $loader_programs +INSTALL_LIB = $loader_programs$loader_install +"]) + if test "$srcdir" = . then AC_CONFIG_COMMANDS([.gitignore], [wine_fn_output_gitignore .gitignore], diff --git a/tools/makedep.c b/tools/makedep.c index 75c7d91..469b833 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2254,6 +2254,8 @@ static struct strarray output_sources( const struct makefile *make, struct strar output( "%s:", obj_dir_path( make, obj )); output_filenames( dependencies ); output( "\n" ); + add_install_rule( make, install_rules, obj, xstrdup( obj ), + strmake( "d$(datadir)/wine/%s", obj )); } else if (!strcmp( ext, "sfd" )) /* font file */ {

1 0

Alexandre Julliard : makefiles: Add support for specifying extra dependencies in libraries and programs.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: d1578a61abf41c639be76e5a28ba9cf9de97da91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1578a61abf41c639be76e5a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 14:17:18 2015 +0900 makefiles: Add support for specifying extra dependencies in libraries and programs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 8 +++----- configure.ac | 8 +++----- tools/makedep.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 43f6b04..51a6913 100755 --- a/configure +++ b/configure @@ -7989,8 +7989,7 @@ IMPORTLIB = libwine.a INSTALL_LIB = libwine.dll INSTALL_DEV = libwine.a libwine_LDFLAGS = -shared \$(srcdir)/wine.def - -libwine.dll: \$(srcdir)/wine.def +libwine_DEPS = wine.def " ;; @@ -8239,7 +8238,7 @@ libwine_LDFLAGS = -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dy as_fn_append LOADER_RULES " ${wine_binary}_OBJS = main.o ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) -$wine_binary $wine_binary-installed: wine_info.plist +${wine_binary}_DEPS = wine_info.plist " ;; @@ -8755,8 +8754,7 @@ SHAREDLIB = libwine.so.$libwine_version INSTALL_LIB = libwine.so.$libwine_version libwine.so.$libwine_soversion INSTALL_DEV = libwine.so libwine_LDFLAGS = $shared_ldflags - -libwine.so.$libwine_version: \$(srcdir)/wine.map +libwine_DEPS = wine.map " diff --git a/configure.ac b/configure.ac index 48268b0..4e9ca89 100644 --- a/configure.ac +++ b/configure.ac @@ -723,8 +723,7 @@ IMPORTLIB = libwine.a INSTALL_LIB = libwine.dll INSTALL_DEV = libwine.a libwine_LDFLAGS = -shared \$(srcdir)/wine.def - -libwine.dll: \$(srcdir)/wine.def +libwine_DEPS = wine.def "]) ;; @@ -853,7 +852,7 @@ libwine_LDFLAGS = -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dy AS_VAR_APPEND([LOADER_RULES],[" ${wine_binary}_OBJS = main.o ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS) -$wine_binary $wine_binary-installed: wine_info.plist +${wine_binary}_DEPS = wine_info.plist "]) ;; @@ -955,8 +954,7 @@ SHAREDLIB = libwine.so.$libwine_version INSTALL_LIB = libwine.so.$libwine_version libwine.so.$libwine_soversion INSTALL_DEV = libwine.so libwine_LDFLAGS = $shared_ldflags - -libwine.so.$libwine_version: \$(srcdir)/wine.map +libwine_DEPS = wine.map "]) AS_VAR_APPEND([LOADER_RULES],[" diff --git a/tools/makedep.c b/tools/makedep.c index 023c0ec..75c7d91 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1866,6 +1866,28 @@ static void get_dependencies( struct strarray *deps, struct incl_file *file, str /******************************************************************* + * get_local_dependencies + * + * Get the local dependencies of a given target. + */ +static struct strarray get_local_dependencies( const struct makefile *make, const char *name, + struct strarray targets ) +{ + unsigned int i; + struct strarray deps = get_expanded_make_var_array( make, file_local_var( name, "DEPS" )); + + for (i = 0; i < deps.count; i++) + { + if (strarray_exists( &targets, deps.str[i] )) + deps.str[i] = obj_dir_path( make, deps.str[i] ); + else + deps.str[i] = src_dir_path( make, deps.str[i] ); + } + return deps; +} + + +/******************************************************************* * add_install_rule */ static void add_install_rule( const struct makefile *make, struct strarray *install_rules, @@ -2018,6 +2040,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar struct strarray mo_files = empty_strarray; struct strarray mc_files = empty_strarray; struct strarray ok_files = empty_strarray; + struct strarray in_files = empty_strarray; struct strarray dlldata_files = empty_strarray; struct strarray c2man_files = empty_strarray; struct strarray implib_objs = empty_strarray; @@ -2224,6 +2247,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar free( dest ); free( dir ); } + strarray_add( &in_files, xstrdup(obj) ); strarray_add( &all_targets, xstrdup(obj) ); output( "%s: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t$(SED_CMD) %s >$@ || (rm -f $@ && false)\n", source->filename ); @@ -2595,6 +2619,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar output( "%s:", obj_dir_path( make, make->sharedlib )); output_filenames_obj_dir( make, object_files ); + output_filenames( get_local_dependencies( make, basename, in_files )); output( "\n" ); output( "\t$(CC) -o $@" ); output_filenames_obj_dir( make, object_files ); @@ -2719,6 +2744,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar char *program_installed = NULL; char *program = strmake( "%s%s", make->programs.str[i], exe_ext ); struct strarray all_libs = empty_strarray; + struct strarray deps = get_local_dependencies( make, make->programs.str[i], in_files ); struct strarray objs = get_expanded_make_var_array( make, file_local_var( make->programs.str[i], "OBJS" )); struct strarray symlinks = get_expanded_make_var_array( make, @@ -2727,6 +2753,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar if (!objs.count) objs = object_files; output( "%s:", obj_dir_path( make, program ) ); output_filenames_obj_dir( make, objs ); + output_filenames( deps ); output( "\n" ); output( "\t$(CC) -o $@" ); output_filenames_obj_dir( make, objs ); @@ -2748,6 +2775,7 @@ static struct strarray output_sources( const struct makefile *make, struct strar output( "\n" ); output( "%s:", obj_dir_path( make, program_installed ) ); output_filenames_obj_dir( make, objs ); + output_filenames( deps ); output( "\n" ); output( "\t$(CC) -o $@" ); output_filenames_obj_dir( make, objs );

1 0

Alexandre Julliard : makefiles: Generate makefiles and po rules also for disabled modules.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 3042f720d87bd0590a21163f46e9ffa02595c298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3042f720d87bd0590a21163f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 13:32:24 2015 +0900 makefiles: Generate makefiles and po rules also for disabled modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 9 ++++----- configure | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 774377d..8e047b5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -341,11 +341,9 @@ wine_fn_disabled_rules () ac_extraclean="$ac_dir/Makefile" test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - wine_fn_append_rule \ -"__clean__: $ac_dir/clean -.PHONY: $ac_dir/clean -$ac_dir/clean: dummy - \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" + wine_fn_depend_rules + wine_fn_clean_rules $ac_clean + wine_fn_pot_rules } wine_fn_config_makefile () @@ -414,6 +412,7 @@ wine_fn_config_dll () then wine_fn_depend_rules wine_fn_clean_rules $ac_clean + wine_fn_pot_rules else wine_fn_disabled_rules $ac_clean return diff --git a/configure b/configure index 4fecf62..43f6b04 100755 --- a/configure +++ b/configure @@ -7523,11 +7523,9 @@ wine_fn_disabled_rules () ac_extraclean="$ac_dir/Makefile" test "$srcdir" = . && ac_extraclean="$ac_extraclean $ac_dir/.gitignore" - wine_fn_append_rule \ -"__clean__: $ac_dir/clean -.PHONY: $ac_dir/clean -$ac_dir/clean: dummy - \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_extraclean" + wine_fn_depend_rules + wine_fn_clean_rules $ac_clean + wine_fn_pot_rules } wine_fn_config_makefile () @@ -7605,6 +7603,7 @@ fi then wine_fn_depend_rules wine_fn_clean_rules $ac_clean + wine_fn_pot_rules else wine_fn_disabled_rules $ac_clean return

1 0

André Hentschel : maintainers: Update winemaker section.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: d4645291eff1d48e736db26369ae0e8c8331ac4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4645291eff1d48e736db2636… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 12 22:56:46 2015 +0100 maintainers: Update winemaker section. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index bb55d55..a5ed66e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -225,7 +225,7 @@ F: server/ Winemaker M: André Hentschel <nerv(a)dawncrow.de> -F: tools/winemaker +F: tools/winemaker/ WinHTTP M: Hans Leidekker <hans(a)codeweavers.com>

1 0

Andrew Eikum : xaudio2_7: Update current buffer position after flushing buffers.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: d672ebfeb858e5283ce359bc1b7ced89f8f1582d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d672ebfeb858e5283ce359bc1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Nov 12 14:27:47 2015 -0600 xaudio2_7: Update current buffer position after flushing buffers. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 9cf6ba6..15b3ab9 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -633,6 +633,7 @@ static HRESULT WINAPI XA2SRC_FlushSourceBuffers(IXAudio2SourceVoice *iface) } This->nbufs -= to_flush; + This->cur_buf = (This->first_buf + This->nbufs) % XAUDIO2_MAX_QUEUED_BUFFERS; LeaveCriticalSection(&This->lock);

1 0

Piotr Caban : wininet: Create file with correct file name in test_trailing_slash tests.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 493d414cadd504992944b1139fba4118202deca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493d414cadd504992944b1139… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 12 18:22:27 2015 +0100 wininet: Create file with correct file name in test_trailing_slash tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/urlcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 37ee412..310054b 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -1086,7 +1086,7 @@ static void test_trailing_slash(void) ret = CreateUrlCacheEntryA(url_with_slash, 0, "html", filename, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); - create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); + create_and_write_file(filename, &zero_byte, sizeof(zero_byte)); ret = CommitUrlCacheEntryA("Visited: http://testing.cache.com/", NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL);

1 0

Jacek Caban : advapi32: Use absolute registry paths to create special root keys.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: ba081cab56846d458b554e92fcb1f9078269ba78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba081cab56846d458b554e92f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 17:19:32 2015 +0100 advapi32: Use absolute registry paths to create special root keys. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 0f23f4c..798f93d 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -48,23 +48,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); #define HKEY_SPECIAL_ROOT_LAST HKEY_DYN_DATA static const WCHAR name_CLASSES_ROOT[] = - {'M','a','c','h','i','n','e','\\', + {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', 'C','l','a','s','s','e','s',0}; static const WCHAR name_LOCAL_MACHINE[] = - {'M','a','c','h','i','n','e',0}; + {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e',0}; static const WCHAR name_USERS[] = - {'U','s','e','r',0}; + {'\\','R','e','g','i','s','t','r','y','\\', + 'U','s','e','r',0}; static const WCHAR name_PERFORMANCE_DATA[] = - {'P','e','r','f','D','a','t','a',0}; + {'\\','R','e','g','i','s','t','r','y','\\', + 'P','e','r','f','D','a','t','a',0}; static const WCHAR name_CURRENT_CONFIG[] = - {'M','a','c','h','i','n','e','\\', + {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s','\\', 'C','u','r','r','e','n','t',0}; static const WCHAR name_DYN_DATA[] = - {'D','y','n','D','a','t','a',0}; + {'\\','R','e','g','i','s','t','r','y','\\', + 'D','y','n','D','a','t','a',0}; static const WCHAR * const root_key_names[] = {

1 0

Jacek Caban : oleaut32: Added DECLSPEC_HOTPATCHABLE to a few functions.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 9398c9f98fc975def41addc4c1147b313148daa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9398c9f98fc975def41addc4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 16:07:55 2015 +0100 oleaut32: Added DECLSPEC_HOTPATCHABLE to a few functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 4cd5135..0352215 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include <string.h> #include <limits.h> @@ -499,7 +501,7 @@ static const WCHAR *pdelimiter = &_delimiter[0]; * Success: S_OK. * Failure: HRESULT code. */ -HRESULT WINAPI RegisterActiveObject( +HRESULT WINAPI DECLSPEC_HOTPATCH RegisterActiveObject( LPUNKNOWN punk,REFCLSID rcid,DWORD dwFlags,LPDWORD pdwRegister ) { WCHAR guidbuf[80]; @@ -538,7 +540,7 @@ HRESULT WINAPI RegisterActiveObject( * Success: S_OK. * Failure: HRESULT code. */ -HRESULT WINAPI RevokeActiveObject(DWORD xregister,LPVOID reserved) +HRESULT WINAPI DECLSPEC_HOTPATCH RevokeActiveObject(DWORD xregister,LPVOID reserved) { LPRUNNINGOBJECTTABLE runobtable; HRESULT ret; @@ -565,7 +567,7 @@ HRESULT WINAPI RevokeActiveObject(DWORD xregister,LPVOID reserved) * Success: S_OK. * Failure: HRESULT code. */ -HRESULT WINAPI GetActiveObject(REFCLSID rcid,LPVOID preserved,LPUNKNOWN *ppunk) +HRESULT WINAPI DECLSPEC_HOTPATCH GetActiveObject(REFCLSID rcid,LPVOID preserved,LPUNKNOWN *ppunk) { WCHAR guidbuf[80]; HRESULT ret;

1 0

Jacek Caban : kernel32: Added DECLSPEC_HOTPATCHABLE to WinExec function.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 1130a11ccedfb6692f384f13a131c1ed85b97882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1130a11ccedfb6692f384f13a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 16:05:01 2015 +0100 kernel32: Added DECLSPEC_HOTPATCHABLE to WinExec function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5e6ab10..17ae16d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2556,7 +2556,7 @@ static DWORD wait_input_idle( HANDLE process, DWORD timeout ) /*********************************************************************** * WinExec (KERNEL32.@) */ -UINT WINAPI WinExec( LPCSTR lpCmdLine, UINT nCmdShow ) +UINT WINAPI DECLSPEC_HOTPATCH WinExec( LPCSTR lpCmdLine, UINT nCmdShow ) { PROCESS_INFORMATION info; STARTUPINFOA startup;

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015