February 2016 - Wine-commits

Vincent Povirk : mscoree/tests: Check if the runtime is usable before loading it.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: b99c35c0e84bbfb4c37fa49aa391758845cb7921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b99c35c0e84bbfb4c37fa49aa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 22 15:04:02 2016 -0600 mscoree/tests: Check if the runtime is usable before loading it. Unfortunately, Mono calls exit(1) if it can't load its class libraries, which is the way Wine fails on x86_64, meaning we have to spawn another process to check if the runtime works. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 110 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 106577e..6923f2a 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> + #define COBJMACROS #include "corerror.h" @@ -72,6 +74,97 @@ static BOOL init_functionpointers(void) return TRUE; } +static int check_runtime(void) +{ + ICLRMetaHost *metahost; + ICLRRuntimeInfo *runtimeinfo; + ICorRuntimeHost *runtimehost; + HRESULT hr; + + if (!pCLRCreateInstance) + { + win_skip("Function CLRCreateInstance not found.\n"); + return 1; + } + + hr = pCLRCreateInstance(&CLSID_CLRMetaHost, &IID_ICLRMetaHost, (void **)&metahost); + if (hr == E_NOTIMPL) + { + win_skip("CLRCreateInstance not implemented\n"); + return 1; + } + ok(SUCCEEDED(hr), "CLRCreateInstance failed, hr=%#.8x\n", hr); + if (FAILED(hr)) + return 1; + + hr = ICLRMetaHost_GetRuntime(metahost, v4_0, &IID_ICLRRuntimeInfo, (void **)&runtimeinfo); + ok(SUCCEEDED(hr), "ICLRMetaHost::GetRuntime failed, hr=%#.8x\n", hr); + if (FAILED(hr)) + return 1; + + hr = ICLRRuntimeInfo_GetInterface(runtimeinfo, &CLSID_CorRuntimeHost, &IID_ICorRuntimeHost, + (void **)&runtimehost); + ok(SUCCEEDED(hr), "ICLRRuntimeInfo::GetInterface failed, hr=%#.8x\n", hr); + if (FAILED(hr)) + return 1; + + hr = ICorRuntimeHost_Start(runtimehost); + ok(SUCCEEDED(hr), "ICorRuntimeHost::Start failed, hr=%#.8x\n", hr); + if (FAILED(hr)) + return 1; + + ICorRuntimeHost_Release(runtimehost); + + ICLRRuntimeInfo_Release(runtimeinfo); + + ICLRMetaHost_ExitProcess(metahost, 0); + + ok(0, "ICLRMetaHost_ExitProcess is not supposed to return\n"); + return 1; +} + +static BOOL runtime_is_usable(void) +{ + static const char cmdline_format[] = "\"%s\" mscoree check_runtime"; + char** argv; + char cmdline[MAX_PATH + sizeof(cmdline_format)]; + STARTUPINFOA si = {0}; + PROCESS_INFORMATION pi; + BOOL ret; + DWORD exitcode; + + winetest_get_mainargs(&argv); + + sprintf(cmdline, cmdline_format, argv[0]); + + si.cb = sizeof(si); + + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcessA failed\n"); + if (!ret) + return FALSE; + + CloseHandle(pi.hThread); + + WaitForSingleObject(pi.hProcess, INFINITE); + + ret = GetExitCodeProcess(pi.hProcess, &exitcode); + CloseHandle(pi.hProcess); + + ok(ret, "GetExitCodeProcess failed\n"); + + if (!ret || exitcode != 0) + { +#ifndef __i386__ + todo_wine +#endif + win_skip(".NET 4.0 runtime is not usable\n"); + return FALSE; + } + + return TRUE; +} + static void test_versioninfo(void) { const WCHAR v9_0[] = {'v','9','.','0','.','3','0','3','1','9',0}; @@ -520,14 +613,29 @@ static void test_createdomain(void) START_TEST(mscoree) { + int argc; + char** argv; + if (!init_functionpointers()) return; + argc = winetest_get_mainargs(&argv); + if (argc >= 3 && !strcmp(argv[2], "check_runtime")) + { + int result = check_runtime(); + FreeLibrary(hmscoree); + exit(result); + } + test_versioninfo(); test_loadlibraryshim(); test_createconfigstream(); test_createinstance(); - test_createdomain(); + + if (runtime_is_usable()) + { + test_createdomain(); + } FreeLibrary(hmscoree); }

1 0

Alexandre Julliard : makefiles: Also use dll flags when building a shared library.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 624c344e90090f75c2207ce22bee301ae69f6bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=624c344e90090f75c2207ce22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 13:01:53 2016 +0900 makefiles: Also use dll flags when building a shared library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9fd704b..c9bfb15 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2386,7 +2386,7 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames( includes ); output_filenames( make->define_args ); output_filenames( extradefs ); - if (make->module || make->staticlib || make->testdll) + if (make->module || make->staticlib || make->sharedlib || make->testdll) { output_filenames( dll_flags ); if (make->use_msvcrt) output_filenames( msvcrt_flags );

1 0

Alexandre Julliard : makefiles: Get rid of libwine_static.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 2afa8f0c4c9bcc09584d7e21376eaaf5b5f9878e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afa8f0c4c9bcc09584d7e213… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 13:03:37 2016 +0900 makefiles: Get rid of libwine_static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 -- libs/wine/Makefile.in | 1 - 2 files changed, 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 65ef0c7..7486ba6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -79,8 +79,6 @@ WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) LIBPORT = $(top_builddir)/libs/port/libwine_port.a LIBWPP = $(top_builddir)/libs/wpp/libwpp.a -LIBWINE = -L$(top_builddir)/libs/wine -lwine -LIBWINE_STATIC = $(top_builddir)/libs/wine/libwine_static.a PACKAGE_VERSION = @PACKAGE_VERSION@ SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 4e96b12..161a6c1 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,6 +1,5 @@ EXTRALIBS = $(LIBPORT) $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) EXTRADEFS = -DWINE_UNICODE_API="" -STATICLIB = libwine_static.a C_SRCS = \ casemap.c \

1 0

Alexandre Julliard : makefiles: Generate dependencies for static libraries.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 3602962275be6f4eb5173f28b6d7fa25c55e3648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3602962275be6f4eb5173f28b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 14:57:11 2016 +0900 makefiles: Generate dependencies for static libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 -- dlls/d3dcompiler_43/Makefile.in | 2 +- dlls/d3dcompiler_46/Makefile.in | 2 +- dlls/d3dcompiler_47/Makefile.in | 2 +- libs/wine/Makefile.in | 2 +- tools/makedep.c | 80 ++++++++++++++++++++++++++++++++--------- tools/widl/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 8 files changed, 70 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7486ba6..b78f43b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,8 +77,6 @@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) -LIBPORT = $(top_builddir)/libs/port/libwine_port.a -LIBWPP = $(top_builddir)/libs/wpp/libwpp.a PACKAGE_VERSION = @PACKAGE_VERSION@ SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index e9a927e..99c1f62 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,7 +1,7 @@ MODULE = d3dcompiler_43.dll IMPORTLIB = d3dcompiler IMPORTS = dxguid uuid -EXTRALIBS = $(LIBWPP) +EXTRALIBS = -lwpp C_SRCS = \ asmparser.c \ diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index e13cbd0..0be92b1 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_46.dll IMPORTS = dxguid uuid -EXTRALIBS = $(LIBWPP) +EXTRALIBS = -lwpp EXTRADEFS = -DD3D_COMPILER_VERSION=46 PARENTSRC = ../d3dcompiler_43 diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index cb7f557..48b343a 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3dcompiler_47.dll IMPORTS = dxguid uuid -EXTRALIBS = $(LIBWPP) +EXTRALIBS = -lwpp EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../d3dcompiler_43 diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 161a6c1..02f266c 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,4 +1,4 @@ -EXTRALIBS = $(LIBPORT) $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) +EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) EXTRADEFS = -DWINE_UNICODE_API="" C_SRCS = \ diff --git a/tools/makedep.c b/tools/makedep.c index c9bfb15..d18018b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1892,6 +1892,60 @@ static struct strarray get_local_dependencies( const struct makefile *make, cons /******************************************************************* + * has_static_lib + * + * Check if makefile builds the named static library. + */ +static int has_static_lib( const struct makefile *make, const char *name ) +{ + if (!make->staticlib) return 0; + if (strncmp( make->staticlib, "lib", 3 )) return 0; + if (strncmp( make->staticlib + 3, name, strlen(name) )) return 0; + return !strcmp( make->staticlib + 3 + strlen(name), ".a" ); +} + + +/******************************************************************* + * add_default_libraries + */ +static struct strarray add_default_libraries( const struct makefile *make, struct strarray *deps ) +{ + struct strarray ret = empty_strarray; + struct strarray all_libs = empty_strarray; + unsigned int i, j; + + strarray_add( &all_libs, "-lwine_port" ); + strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); + strarray_addall( &all_libs, libs ); + + for (i = 0; i < all_libs.count; i++) + { + int found = 0; + if (!strncmp( all_libs.str[i], "-l", 2 )) + { + const char *name = all_libs.str[i] + 2; + + for (j = 0; j < top_makefile->subdirs.count; j++) + { + const struct makefile *submake = top_makefile->submakes[j]; + + if ((found = has_static_lib( submake, name ))) + { + const char *lib = strmake( "%s/lib%s.a", + top_obj_dir_path( make, submake->base_dir ), name ); + strarray_add( deps, lib ); + strarray_add( &ret, lib ); + break; + } + } + } + if (!found) strarray_add( &ret, all_libs.str[i] ); + } + return ret; +} + + +/******************************************************************* * add_import_libs */ static struct strarray add_import_libs( const struct makefile *make, struct strarray *deps, @@ -1919,10 +1973,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra break; } - if (submake->staticlib && - !strncmp( submake->staticlib, "lib", 3 ) && - !strncmp( submake->staticlib + 3, name, strlen(name) ) && - !strcmp( submake->staticlib + 3 + strlen(name), ".a" )) + if (has_static_lib( submake, name )) { const char *dir = top_obj_dir_path( make, submake->base_dir ); @@ -2479,9 +2530,7 @@ static struct strarray output_sources( const struct makefile *make ) for (i = 0; i < make->delayimports.count; i++) strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] )); strarray_add( &all_libs, "-lwine" ); - strarray_add( &all_libs, top_obj_dir_path( make, "libs/port/libwine_port.a" )); - strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); - strarray_addall( &all_libs, libs ); + strarray_addall( &all_libs, add_default_libraries( make, &dep_libs )); if (*dll_ext) { @@ -2659,18 +2708,19 @@ static struct strarray output_sources( const struct makefile *make ) char *basename, *p; struct strarray names = get_shared_lib_names( make->sharedlib ); struct strarray all_libs = empty_strarray; + struct strarray dep_libs = empty_strarray; basename = xstrdup( make->sharedlib ); if ((p = strchr( basename, '.' ))) *p = 0; + strarray_addall( &dep_libs, get_local_dependencies( make, basename, in_files )); strarray_addall( &all_libs, get_expanded_make_var_array( make, file_local_var( basename, "LDFLAGS" ))); - strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); - strarray_addall( &all_libs, libs ); + strarray_addall( &all_libs, add_default_libraries( make, &dep_libs )); 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_filenames( dep_libs ); output( "\n" ); output( "\t$(CC) -o $@" ); output_filenames_obj_dir( make, object_files ); @@ -2796,25 +2846,23 @@ static struct strarray output_sources( const struct makefile *make ) { 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 all_libs = get_expanded_make_var_array( make, + file_local_var( make->programs.str[i], "LDFLAGS" )); 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, file_local_var( make->programs.str[i], "SYMLINKS" )); if (!objs.count) objs = object_files; + strarray_addall( &all_libs, add_default_libraries( make, &deps )); + 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 ); - strarray_add( &all_libs, top_obj_dir_path( make, "libs/port/libwine_port.a" )); - strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); - strarray_addall( &all_libs, libs ); - strarray_addall( &all_libs, get_expanded_make_var_array( make, - file_local_var( make->programs.str[i], "LDFLAGS" ))); if (strarray_exists( &all_libs, "-lwine" )) { diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index f8111f3..b47a170 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -21,6 +21,6 @@ BISON_SRCS = parser.y widl_EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/windows/\" -EXTRALIBS = $(LIBWPP) +EXTRALIBS = -lwpp INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 8c94ead..d502e4b 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -17,6 +17,6 @@ BISON_SRCS = parser.y wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" -EXTRALIBS = $(GETTEXTPO_LIBS) $(LIBWPP) +EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp INSTALL_DEV = $(PROGRAMS)

1 0

Alexandre Julliard : makefiles: Directly return an array from the local variable helper function.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 90e7a735954309ea392cf3b1d9e2b6788a456fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e7a735954309ea392cf3b1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 15:03:50 2016 +0900 makefiles: Directly return an array from the local variable helper function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d18018b..8ef8f16 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1646,15 +1646,15 @@ static struct strarray get_expanded_make_var_array( const struct makefile *make, /******************************************************************* - * file_local_var + * get_expanded_file_local_var */ -static char *file_local_var( const char *file, const char *name ) +static struct strarray get_expanded_file_local_var( const struct makefile *make, const char *file, + const char *name ) { - char *p, *var; + char *p, *var = strmake( "%s_%s", file, name ); - var = strmake( "%s_%s", file, name ); for (p = var; *p; p++) if (!isalnum( *p )) *p = '_'; - return var; + return get_expanded_make_var_array( make, var ); } @@ -1878,7 +1878,7 @@ static struct strarray get_local_dependencies( const struct makefile *make, cons struct strarray targets ) { unsigned int i; - struct strarray deps = get_expanded_make_var_array( make, file_local_var( name, "DEPS" )); + struct strarray deps = get_expanded_file_local_var( make, name, "DEPS" ); for (i = 0; i < deps.count; i++) { @@ -2184,7 +2184,7 @@ static struct strarray output_sources( const struct makefile *make ) strarray_add_uniq( &subdirs, subdir ); } - extradefs = get_expanded_make_var_array( make, file_local_var( obj, "EXTRADEFS" )); + extradefs = get_expanded_file_local_var( make, obj, "EXTRADEFS" ); get_dependencies( &dependencies, source, source ); if (!strcmp( ext, "y" )) /* yacc file */ @@ -2339,7 +2339,7 @@ static struct strarray output_sources( const struct makefile *make ) else dir = strmake( "$(mandir)/man%s", section ); add_install_rule( make, install_rules, dest, xstrdup(obj), strmake( "d%s/%s.%s", dir, dest, section )); - symlinks = get_expanded_make_var_array( make, file_local_var( dest, "SYMLINKS" )); + symlinks = get_expanded_file_local_var( make, dest, "SYMLINKS" ); for (i = 0; i < symlinks.count; i++) add_install_rule( make, install_rules, symlinks.str[i], strmake( "%s.%s", dest, section ), @@ -2714,8 +2714,7 @@ static struct strarray output_sources( const struct makefile *make ) if ((p = strchr( basename, '.' ))) *p = 0; strarray_addall( &dep_libs, get_local_dependencies( make, basename, in_files )); - strarray_addall( &all_libs, get_expanded_make_var_array( make, - file_local_var( basename, "LDFLAGS" ))); + strarray_addall( &all_libs, get_expanded_file_local_var( make, basename, "LDFLAGS" )); strarray_addall( &all_libs, add_default_libraries( make, &dep_libs )); output( "%s:", obj_dir_path( make, make->sharedlib )); @@ -2847,12 +2846,9 @@ static struct strarray output_sources( const struct makefile *make ) char *program_installed = NULL; char *program = strmake( "%s%s", make->programs.str[i], exe_ext ); struct strarray deps = get_local_dependencies( make, make->programs.str[i], in_files ); - struct strarray all_libs = get_expanded_make_var_array( make, - file_local_var( make->programs.str[i], "LDFLAGS" )); - 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, - file_local_var( make->programs.str[i], "SYMLINKS" )); + struct strarray all_libs = get_expanded_file_local_var( make, make->programs.str[i], "LDFLAGS" ); + struct strarray objs = get_expanded_file_local_var( make, make->programs.str[i], "OBJS" ); + struct strarray symlinks = get_expanded_file_local_var( make, make->programs.str[i], "SYMLINKS" ); if (!objs.count) objs = object_files; strarray_addall( &all_libs, add_default_libraries( make, &deps ));

1 0

Alexandre Julliard : makefiles: Generate dependencies for default import libraries.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: wine Branch: master Commit: 96376059efb3e54e661da7f6c2d209e57f96175d URL: http://source.winehq.org/git/wine.git/?a=commit;h=96376059efb3e54e661da7f6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 20:21:47 2016 +0900 makefiles: Generate dependencies for default import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 8ef8f16..e1897bc 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1988,6 +1988,23 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra /******************************************************************* + * get_default_imports + */ +static struct strarray get_default_imports( const struct makefile *make ) +{ + struct strarray ret = empty_strarray; + + if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) return ret; + if (strarray_exists( &make->appmode, "-mno-cygwin" )) strarray_add( &ret, "msvcrt" ); + if (make->is_win16) strarray_add( &ret, "kernel" ); + strarray_add( &ret, "kernel32" ); + strarray_add( &ret, "ntdll" ); + strarray_add( &ret, "winecrt0" ); + return ret; +} + + +/******************************************************************* * add_install_rule */ static void add_install_rule( const struct makefile *make, struct strarray *install_rules, @@ -2527,6 +2544,7 @@ static struct strarray output_sources( const struct makefile *make ) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 0 )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0 )); + add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ for (i = 0; i < make->delayimports.count; i++) strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] )); strarray_add( &all_libs, "-lwine" ); @@ -2758,6 +2776,7 @@ static struct strarray output_sources( const struct makefile *make ) struct strarray dep_libs = empty_strarray; struct strarray all_libs = add_import_libs( make, &dep_libs, make->imports, 0 ); + add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ strarray_addall( &all_libs, libs ); strarray_add( &all_targets, strmake( "%s%s", testmodule, dll_ext )); strarray_add( &clean_files, strmake( "%s%s", stripped, dll_ext )); @@ -2805,6 +2824,7 @@ static struct strarray output_sources( const struct makefile *make ) dep_libs = empty_strarray; all_libs = add_import_libs( make, &dep_libs, make->imports, 1 ); + add_import_libs( make, &dep_libs, get_default_imports( make ), 1 ); /* dependencies only */ strarray_addall( &all_libs, libs ); strarray_add( &clean_files, crosstest ); output( "%s: %s\n", obj_dir_path( make, "crosstest" ), obj_dir_path( make, crosstest ));

1 0

Francois Gouget : testbot/lib: Fix an operator precedence issue.
by Alexandre Julliard 23 Feb '16

23 Feb '16

Module: tools Branch: master Commit: 7c5e39c25b88046f363136d3094a770a141c6e37 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7c5e39c25b88046f363136d3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 22 02:26:14 2016 +0100 testbot/lib: Fix an operator precedence issue. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 7c3fd4d..2400efc 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -486,19 +486,19 @@ sub HasPoweredOnStatus($) { my ($self) = @_; my $Status = $self->Status; - return $Status eq "reverting" or - $Status eq "sleeping" or - $Status eq "idle" or - $Status eq "running"; + return ($Status eq "reverting" or + $Status eq "sleeping" or + $Status eq "idle" or + $Status eq "running"); } sub HasEnabledRole($) { my ($self) = @_; my $Role = $self->Role; - return $Role eq "extra" or - $Role eq "base" or - $Role eq "winetest"; + return ($Role eq "extra" or + $Role eq "base" or + $Role eq "winetest"); } sub Validate($)

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.4
by Jeremy Newman 22 Feb '16

22 Feb '16

Module: website Branch: master Commit: 22c38438998df75a5ef08ffeacd20236499ac504 URL: http://source.winehq.org/git/website.git/?a=commit;h=22c38438998df75a5ef08f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Feb 20 12:15:30 2016 +0100 Polish translation for release 1.9.4 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016021901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2016021901.xml b/news/pl/2016021901.xml new file mode 100644 index 0000000..c52b111 --- /dev/null +++ b/news/pl/2016021901.xml @@ -0,0 +1,16 @@ +<news> +<date>Luty 19, 2016</date> +<title>Wydano Wine 1.9.4</title> +<body> + Wydanie rozwojowe Wine 1.9.4 jest już dostępne. + <a href="{$root}/announce/1.9.4">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla kolorowych glifów i zapasowych czcionek w DirectWrite.</li> + <li>Ulepszenia w czytniku Usług Sieciowych.</li> + <li>Wsparcie dla większej liczby formatów z Direct3D 11.</li> + <li>Uproszczono składnię i uporządkowano testy oznaczone jako do-zrobienia.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.4.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

YongHao Hu : msvcp110: Add tr2_sys__Unlink implementation and test.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: dabadc8eaf42d94b0ceb3fa22caa06fba891c364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabadc8eaf42d94b0ceb3fa22… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Feb 20 00:40:34 2016 +0800 msvcp110: Add tr2_sys__Unlink implementation and test. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120/tests/msvcp120.c | 60 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/ios.c | 11 +++++++ 5 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 3d89924..1d9525c 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1805,8 +1805,8 @@ @ cdecl -arch=win32 ?_Tidy(a)ios_base@std@@AAAXXZ(ptr) ios_base_Tidy @ stub -arch=i386 ?_Tidy(a)ios_base@std@@AAEXXZ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) ios_base_Tidy -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Unlink +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Unlink @ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z @ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) basic_streambuf_char__Unlock diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 1bb487e..e5daa62 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1766,8 +1766,8 @@ @ cdecl -arch=win32 ?_Tidy(a)ios_base@std@@AAAXXZ(ptr) ios_base_Tidy @ stub -arch=i386 ?_Tidy(a)ios_base@std@@AAEXXZ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) ios_base_Tidy -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Unlink +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Unlink @ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z @ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) basic_streambuf_char__Unlock diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index f884d0c..17a41d1 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -134,6 +134,7 @@ static char* (__cdecl *p_tr2_sys__Read_dir)(char*, void*, enum file_type*); static void (__cdecl *p_tr2_sys__Close_dir)(void*); static int (__cdecl *p_tr2_sys__Link)(char const*, char const*); static int (__cdecl *p_tr2_sys__Symlink)(char const*, char const*); +static int (__cdecl *p_tr2_sys__Unlink)(char const*); /* thrd */ typedef struct @@ -271,6 +272,8 @@ static BOOL init(void) "?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); SET(p_tr2_sys__Symlink, "?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z"); + SET(p_tr2_sys__Unlink, + "?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z"); SET(p__Thrd_current, "_Thrd_current"); } else { @@ -328,6 +331,8 @@ static BOOL init(void) "?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z"); SET(p_tr2_sys__Symlink, "?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z"); + SET(p_tr2_sys__Unlink, + "?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z"); #ifdef __i386__ SET(p_i386_Thrd_current, "_Thrd_current"); @@ -1460,6 +1465,60 @@ static void test_tr2_sys__Symlink(void) ok(ret == 1, "tr2_sys__Remove_dir(): expect 1 got %d\n", ret); } +static void test_tr2_sys__Unlink(void) +{ + int ret, i; + HANDLE file; + LARGE_INTEGER file_size; + struct { + char const *path; + int last_error; + MSVCP_bool is_todo; + } tests[] = { + { "tr2_test_dir\\f1_symlink", ERROR_SUCCESS, TRUE }, + { "tr2_test_dir\\f1_link", ERROR_SUCCESS, FALSE }, + { "tr2_test_dir\\f1", ERROR_SUCCESS, FALSE }, + { "tr2_test_dir", ERROR_ACCESS_DENIED, FALSE }, + { "not_exist", ERROR_FILE_NOT_FOUND, FALSE }, + { "not_exist_dir\\not_exist_file", ERROR_PATH_NOT_FOUND, FALSE }, + { NULL, ERROR_PATH_NOT_FOUND, FALSE } + }; + + ret = p_tr2_sys__Make_dir("tr2_test_dir"); + ok(ret == 1, "tr2_sys__Make_dir(): expect 1 got %d\n", ret); + file = CreateFileA("tr2_test_dir/f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + file_size.QuadPart = 7; + ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); + ok(SetEndOfFile(file), "SetEndOfFile failed\n"); + CloseHandle(file); + + ret = p_tr2_sys__Symlink("tr2_test_dir/f1", "tr2_test_dir/f1_symlink"); + if(ret==ERROR_PRIVILEGE_NOT_HELD || ret==ERROR_INVALID_FUNCTION) { + tests[0].last_error = ERROR_FILE_NOT_FOUND; + win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); + }else { + ok(ret == ERROR_SUCCESS, "tr2_sys__Symlink(): expect: ERROR_SUCCESS, got %d\n", ret); + } + ret = p_tr2_sys__Link("tr2_test_dir/f1", "tr2_test_dir/f1_link"); + ok(ret == ERROR_SUCCESS, "tr2_sys__Link(): expect: ERROR_SUCCESS, got %d\n", ret); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + errno = 0xdeadbeef; + ret = p_tr2_sys__Unlink(tests[i].path); + todo_wine_if(tests[i].is_todo) + ok(ret == tests[i].last_error, "tr2_sys__Unlink(): test %d expect: %d, got %d\n", + i+1, tests[i].last_error, ret); + ok(errno == 0xdeadbeef, "tr2_sys__Unlink(): test %d errno expect: 0xdeadbeef, got %d\n", i+1, ret); + } + + ok(!DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 not to exist\n"); + ok(!DeleteFileA("tr2_test_dir/f1_link"), "expect tr2_test_dir/f1_link not to exist\n"); + ok(!DeleteFileA("tr2_test_dir/f1_symlink"), "expect tr2_test_dir/f1_symlink not to exist\n"); + ret = p_tr2_sys__Remove_dir("tr2_test_dir"); + ok(ret == 1, "tr2_sys__Remove_dir(): expect 1 got %d\n", ret); +} + static int __cdecl thrd_thread(void *arg) { _Thrd_t *thr = arg; @@ -1751,6 +1810,7 @@ START_TEST(msvcp120) test_tr2_sys__dir_operation(); test_tr2_sys__Link(); test_tr2_sys__Symlink(); + test_tr2_sys__Unlink(); test_thrd(); test_cnd(); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 2d0a95b..5da4e05 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1766,8 +1766,8 @@ @ cdecl -arch=win32 ?_Tidy(a)ios_base@std@@AAAXXZ(ptr) msvcp120.?_Tidy(a)ios_base@std@@AAAXXZ @ stub -arch=i386 ?_Tidy(a)ios_base@std@@AAEXXZ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) msvcp120.?_Tidy(a)ios_base@std@@AEAAXXZ -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) msvcp120.?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z @ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z @ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) msvcp120.?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index d9ff610..1613402 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14782,6 +14782,17 @@ int __cdecl tr2_sys__Symlink(char const* existing_file_name, char const* file_na return GetLastError(); } +/* ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z */ +/* ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z */ +int __cdecl tr2_sys__Unlink(char const* path) +{ + TRACE("(%s)\n", debugstr_a(path)); + + if(DeleteFileA(path)) + return ERROR_SUCCESS; + return GetLastError(); +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

YongHao Hu : msvcp110: Add tr2_sys__Stat_wchar and tr2_sys__Lstat_wchar implementation and test.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 613b2454e5c7658e431d9235447d8e0971bde627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613b2454e5c7658e431d92354… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Feb 20 00:41:43 2016 +0800 msvcp110: Add tr2_sys__Stat_wchar and tr2_sys__Lstat_wchar implementation and test. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 8 ++++---- dlls/msvcp120/msvcp120.spec | 8 ++++---- dlls/msvcp120/tests/msvcp120.c | 21 +++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 8 ++++---- dlls/msvcp90/ios.c | 41 +++++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=613b2454e5c7658e431d9…

1 0