February 2016 - Wine-Commits

Alexandre Julliard : makefiles: Generate dependencies for static libraries.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

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: Also use dll flags when building a shared library.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

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

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

Feb. 23, 2016

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

Charles Davis : winecoreaudio.drv: Don' t use pointer constants with an integer type (Clang).
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: c8e87bd87831bed62fb01d68def5dd568bcaeb89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e87bd87831bed62fb01d68d… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Fri Feb 19 15:48:08 2016 -0700 winecoreaudio.drv: Don't use pointer constants with an integer type (Clang). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 1733418..5ec5646 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -29,10 +29,10 @@ MIDIClientRef CoreMIDI_CreateClient(CFStringRef name) { - MIDIClientRef client = NULL; + MIDIClientRef client = 0; if (MIDIClientCreate(name, NULL /* FIXME use notify proc */, NULL, &client) != noErr) - return NULL; + return 0; return client; }

1 0

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

Feb. 23, 2016

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: Get rid of libwine_static.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

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

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

Feb. 23, 2016

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 Feb. 22, 2016

Feb. 22, 2016

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

André Hentschel : ndis.sys: Add NdisRegisterProtocol stub.
by Alexandre Julliard Feb. 22, 2016

Feb. 22, 2016

Module: wine Branch: master Commit: f71f7db63caeffdc92ede12bf15e8f7d184addd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71f7db63caeffdc92ede12bf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:43:44 2016 +0100 ndis.sys: Add NdisRegisterProtocol stub. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 8 ++ dlls/ndis.sys/ndis.sys.spec | 2 +- include/ddk/ndis.h | 183 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 191 insertions(+), 2 deletions(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 6e1bb9b..90c8c3c 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -2,6 +2,7 @@ * ndis.sys * * Copyright 2014 Austin English + * Copyright 2016 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -49,6 +50,13 @@ void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *lock) FIXME("(%p): stub\n", lock); } +void WINAPI NdisRegisterProtocol(NDIS_STATUS *status, NDIS_HANDLE *handle, + NDIS_PROTOCOL_CHARACTERISTICS *prot, UINT len) +{ + FIXME("(%p, %p, %p, %u): stub\n", status, handle, prot, len); + *status = NDIS_STATUS_FAILURE; +} + CCHAR WINAPI NdisSystemProcessorCount(void) { SYSTEM_INFO si; diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index 8957d8f..b478c39 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -238,7 +238,7 @@ @ stub NdisReadNetworkAddress @ stub NdisReadPciSlotInformation @ stub NdisReadPcmciaAttributeMemory -@ stub NdisRegisterProtocol +@ stdcall NdisRegisterProtocol(ptr ptr ptr long) @ stub NdisRegisterTdiCallBack @ stub NdisReleaseReadWriteLock @ stub NdisReleaseSpinLock diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index ffa1396..a4b0e54 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -2,6 +2,7 @@ * ndis.h * * Copyright 2015 Austin English + * Copyright 2016 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,8 +21,97 @@ #ifndef _NDIS_ #define _NDIS_ -typedef void *NDIS_HANDLE, *PNDIS_HANDLE; +typedef ULONG NDIS_AF, *PNDIS_AF; +typedef MDL NDIS_BUFFER, *PNDIS_BUFFER; +typedef void *NDIS_HANDLE, *PNDIS_HANDLE, *PNDIS_PACKET_POOL; +typedef ULONG NDIS_OID, *PNDIS_OID; typedef int NDIS_STATUS, *PNDIS_STATUS; +typedef UNICODE_STRING NDIS_STRING, *PNDIS_STRING; + +typedef enum _NDIS_REQUEST_TYPE +{ + NdisRequestQueryInformation, + NdisRequestSetInformation, + NdisRequestQueryStatistics, + NdisRequestOpen, + NdisRequestClose, + NdisRequestSend, + NdisRequestTransferData, + NdisRequestReset, + NdisRequestGeneric1, + NdisRequestGeneric2, + NdisRequestGeneric3, + NdisRequestGeneric4, + NdisRequestMethod, +} NDIS_REQUEST_TYPE, *PNDIS_REQUEST_TYPE; + +typedef enum _NET_PNP_EVENT_CODE +{ + NetEventSetPower, + NetEventQueryPower, + NetEventQueryRemoveDevice, + NetEventCancelRemoveDevice, + NetEventReconfigure, + NetEventBindList, + NetEventBindsComplete, + NetEventPnPCapabilities, + NetEventPause, + NetEventRestart, + NetEventPortActivation, + NetEventPortDeactivation, + NetEventIMReEnableDevice, + NetEventMaximum, +} NET_PNP_EVENT_CODE, *PNET_PNP_EVENT_CODE; + + +typedef struct _NET_PNP_EVENT +{ + NET_PNP_EVENT_CODE NetEvent; + PVOID Buffer; + ULONG BufferLength; + ULONG_PTR NdisReserved[4]; + ULONG_PTR TransportReserved[4]; + ULONG_PTR TdiReserved[4]; + ULONG_PTR TdiClientReserved[4]; +} NET_PNP_EVENT, *PNET_PNP_EVENT; + +typedef struct _NDIS_PACKET_PRIVATE +{ + UINT PhysicalCount; + UINT TotalLength; + PNDIS_BUFFER Head; + PNDIS_BUFFER Tail; + PNDIS_PACKET_POOL Pool; + UINT Count; + ULONG Flags; + BOOLEAN ValidCounts; + UCHAR NdisPacketFlags; + USHORT NdisPacketOobOffset; +} NDIS_PACKET_PRIVATE, *PNDIS_PACKET_PRIVATE; + +typedef struct _NDIS_PACKET +{ + NDIS_PACKET_PRIVATE Private; + union + { + struct + { + UCHAR MiniportReserved[2 * sizeof(void*)]; + UCHAR WrapperReserved[2 * sizeof(void*)]; + } DUMMYSTRUCTNAME; + struct + { + UCHAR MiniportReservedEx[3 * sizeof(void*)]; + UCHAR WrapperReservedEx[sizeof(void*)]; + } DUMMYSTRUCTNAME1; + struct + { + UCHAR MacReserved[4 * sizeof(void*)]; + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME; + ULONG_PTR Reserved[2]; + UCHAR ProtocolReserved[1]; +} NDIS_PACKET, *PNDIS_PACKET, **PPNDIS_PACKET; typedef struct _NDIS_SPIN_LOCK { @@ -29,10 +119,101 @@ typedef struct _NDIS_SPIN_LOCK KIRQL OldIrql; } NDIS_SPIN_LOCK, *PNDIS_SPIN_LOCK; + +typedef struct _NDIS_REQUEST +{ + UCHAR MacReserved[4 * sizeof(void*)]; + NDIS_REQUEST_TYPE RequestType; + union _DATA + { + struct QUERY_INFORMATION + { + NDIS_OID Oid; + PVOID InformationBuffer; + UINT InformationBufferLength; + UINT BytesWritten; + UINT BytesNeeded; + } QUERY_INFORMATION; + struct SET_INFORMATION + { + NDIS_OID Oid; + PVOID InformationBuffer; + UINT InformationBufferLength; + UINT BytesRead; + UINT BytesNeeded; + } SET_INFORMATION; + } DATA; + UCHAR NdisReserved[9 * sizeof(void*)]; + union + { + UCHAR CallMgrReserved[2 * sizeof(void*)]; + UCHAR ProtocolReserved[2 * sizeof(void*)]; + } DUMMYUNIONNAME; + UCHAR MiniportReserved[2 * sizeof(void*)]; +} NDIS_REQUEST, *PNDIS_REQUEST; + +typedef struct _CO_ADDRESS_FAMILY +{ + NDIS_AF AddressFamily; + ULONG MajorVersion; + ULONG MinorVersion; +} CO_ADDRESS_FAMILY, *PCO_ADDRESS_FAMILY; + + +typedef void (NTAPI *CO_AF_REGISTER_NOTIFY_HANDLER)(NDIS_HANDLE, PCO_ADDRESS_FAMILY); +typedef void (NTAPI *CO_SEND_COMPLETE_HANDLER)(NDIS_STATUS, NDIS_HANDLE, PNDIS_PACKET); +typedef void (NTAPI *CO_STATUS_HANDLER)(NDIS_HANDLE, NDIS_HANDLE, NDIS_STATUS, PVOID, UINT); +typedef UINT (NTAPI *CO_RECEIVE_PACKET_HANDLER)(NDIS_HANDLE, NDIS_HANDLE, PNDIS_PACKET); +typedef void (NTAPI *OPEN_ADAPTER_COMPLETE_HANDLER)(NDIS_HANDLE, NDIS_STATUS, NDIS_STATUS); +typedef void (NTAPI *CLOSE_ADAPTER_COMPLETE_HANDLER)(NDIS_HANDLE, NDIS_STATUS); +typedef void (NTAPI *RESET_COMPLETE_HANDLER)(NDIS_HANDLE, NDIS_STATUS); +typedef void (NTAPI *REQUEST_COMPLETE_HANDLER)(NDIS_HANDLE, PNDIS_REQUEST, NDIS_STATUS); +typedef void (NTAPI *STATUS_HANDLER)(NDIS_HANDLE, NDIS_STATUS, PVOID, UINT); +typedef void (NTAPI *STATUS_COMPLETE_HANDLER)(NDIS_HANDLE); +typedef void (NTAPI *SEND_COMPLETE_HANDLER)(NDIS_HANDLE, PNDIS_PACKET, NDIS_STATUS); +typedef void (NTAPI *TRANSFER_DATA_COMPLETE_HANDLER)(NDIS_HANDLE, PNDIS_PACKET, NDIS_STATUS, UINT); +typedef NDIS_STATUS (NTAPI *RECEIVE_HANDLER)(NDIS_HANDLE, NDIS_HANDLE, PVOID, UINT, PVOID, UINT, UINT); +typedef void (NTAPI *RECEIVE_COMPLETE_HANDLER)(NDIS_HANDLE); +typedef INT (NTAPI *RECEIVE_PACKET_HANDLER)(NDIS_HANDLE, PNDIS_PACKET); +typedef void (NTAPI *BIND_HANDLER)(PNDIS_STATUS, NDIS_HANDLE, PNDIS_STRING, PVOID, PVOID); +typedef void (NTAPI *UNBIND_HANDLER)(PNDIS_STATUS, NDIS_HANDLE, NDIS_HANDLE); +typedef NDIS_STATUS (NTAPI *PNP_EVENT_HANDLER)(NDIS_HANDLE, PNET_PNP_EVENT); +typedef void (NTAPI *UNLOAD_PROTOCOL_HANDLER)(void); + + +typedef struct _NDIS_PROTOCOL_CHARACTERISTICS +{ + UCHAR MajorNdisVersion; + UCHAR MinorNdisVersion; + USHORT Filler; + UINT Reserved; + OPEN_ADAPTER_COMPLETE_HANDLER OpenAdapterCompleteHandler; + CLOSE_ADAPTER_COMPLETE_HANDLER CloseAdapterCompleteHandler; + SEND_COMPLETE_HANDLER SendCompleteHandler; + TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler; + RESET_COMPLETE_HANDLER ResetCompleteHandler; + REQUEST_COMPLETE_HANDLER RequestCompleteHandler; + RECEIVE_HANDLER ReceiveHandler; + RECEIVE_COMPLETE_HANDLER ReceiveCompleteHandler; + STATUS_HANDLER StatusHandler; + STATUS_COMPLETE_HANDLER StatusCompleteHandler; + NDIS_STRING Name; + RECEIVE_PACKET_HANDLER ReceivePacketHandler; + BIND_HANDLER BindAdapterHandler; + UNBIND_HANDLER UnbindAdapterHandler; + PNP_EVENT_HANDLER PnPEventHandler; + UNLOAD_PROTOCOL_HANDLER UnloadHandler; + CO_SEND_COMPLETE_HANDLER CoSendCompleteHandler; + CO_STATUS_HANDLER CoStatusHandler; + CO_RECEIVE_PACKET_HANDLER CoReceivePacketHandler; + CO_AF_REGISTER_NOTIFY_HANDLER CoAfRegisterNotifyHandler; +} NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS; + #define NDIS_STATUS_FAILURE ((NDIS_STATUS) STATUS_UNSUCCESSFUL) NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **, UINT, ULONG); void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *); +void WINAPI NdisRegisterProtocol(NDIS_STATUS *, NDIS_HANDLE *, NDIS_PROTOCOL_CHARACTERISTICS *, UINT); CCHAR WINAPI NdisSystemProcessorCount(void); #endif /* _NDIS_ */

1 0

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

Feb. 22, 2016

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