December 2013 - Wine-commits

Bruno Jesus : ws2_32: Add a missing release_sock_fd.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: b26ffddc8fc734d637681035a9b4b4d45d61f367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26ffddc8fc734d637681035a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Dec 30 22:24:43 2013 -0200 ws2_32: Add a missing release_sock_fd. --- dlls/ws2_32/socket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 36f2ac4..0d6838e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3302,6 +3302,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; res = getsockopt( fd, SOL_IRLMP, IRLMP_ENUMDEVICES, buf, &len ); + release_sock_fd( s, fd ); if (res < 0) { SetLastError(wsaErrno());

1 0

Alexandre Julliard : makedep: Keep track of object files in separate arrays .
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 8d6e9161683d9be818412ef35cd775c13930acd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6e9161683d9be818412ef35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 20:07:02 2013 +0100 makedep: Keep track of object files in separate arrays. --- tools/makedep.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 3c35a8a..c8a3a6f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1367,6 +1367,9 @@ static struct strarray output_sources(void) struct incl_file *source; int i; int is_test = find_src_file( "testlist.o" ) != NULL; + struct strarray object_files = empty_strarray; + struct strarray crossobj_files = empty_strarray; + struct strarray res_files = empty_strarray; struct strarray clean_files = empty_strarray; struct strarray po_files = empty_strarray; struct strarray mc_files = empty_strarray; @@ -1457,13 +1460,13 @@ static struct strarray output_sources(void) output( "\n" ); output( "%s.res:", obj ); } - strarray_add( &clean_files, strmake( "%s.res", obj )); + strarray_add( &res_files, strmake( "%s.res", obj )); } else if (!strcmp( ext, "mc" )) /* message file */ { output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); output( "\t$(WMC) -U -O res $(PORCFLAGS) -o $@ %s\n", source->filename ); - strarray_add( &clean_files, strmake( "%s.res", obj )); + strarray_add( &res_files, strmake( "%s.res", obj )); strarray_add( &mc_files, source->filename ); output( "msg.pot %s.res:", obj ); } @@ -1551,7 +1554,7 @@ static struct strarray output_sources(void) } else if (!strcmp( ext, "res" )) { - strarray_add( &clean_files, source->name ); + strarray_add( &res_files, source->name ); continue; /* no dependencies */ } else @@ -1559,10 +1562,10 @@ static struct strarray output_sources(void) if (source->flags & FLAG_GENERATED) strarray_add( &clean_files, source->filename ); for (i = 0; i < object_extensions.count; i++) { - strarray_add( &clean_files, strmake( "%s.%s", obj, object_extensions.str[i] )); output( "%s.%s: %s\n", obj, object_extensions.str[i], sourcedep ); if (strstr( object_extensions.str[i], "cross" )) { + strarray_add( &crossobj_files, strmake( "%s.%s", obj, object_extensions.str[i] )); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filename( "$(ALLCROSSCFLAGS)" ); @@ -1570,6 +1573,7 @@ static struct strarray output_sources(void) } else { + strarray_add( &object_files, strmake( "%s.%s", obj, object_extensions.str[i] )); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filename( "$(ALLCFLAGS)" ); @@ -1578,7 +1582,7 @@ static struct strarray output_sources(void) } if (source->flags & FLAG_C_IMPLIB) { - strarray_add( &clean_files, strmake( "%s.cross.o", obj )); + strarray_add( &crossobj_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj, sourcedep ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( includes ); @@ -1658,6 +1662,10 @@ static struct strarray output_sources(void) strarray_add( &phony_targets, "testclean" ); } + strarray_addall( &clean_files, object_files ); + strarray_addall( &clean_files, crossobj_files ); + strarray_addall( &clean_files, res_files ); + if (clean_files.count) { output( "clean::\n" );

1 0

Alexandre Julliard : makedep: Generate rules for the main module.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: f6479c051313e68946f31bb3bfa623e6940f84bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6479c051313e68946f31bb3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 20:08:13 2013 +0100 makedep: Generate rules for the main module. --- Make.rules.in | 7 +----- configure | 14 ----------- configure.ac | 14 ----------- tools/makedep.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 66 insertions(+), 36 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 08b790d..004e5f1 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -19,7 +19,7 @@ RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS) IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) -CLEAN_TARGETS = $(MODULE) $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) \ +CLEAN_TARGETS = $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) \ $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ @@ -28,11 +28,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ CROSSOBJS = $(OBJS:.o=.cross.o) ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -# Rules for main module - -$(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) - $(WINEGCC) $(APPMODE) $(MODULEFLAGS) $(OBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) -lwine $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS) - # Rules for static libraries all: $(STATICLIB) diff --git a/configure b/configure index a3c36ce..6fb5933 100755 --- a/configure +++ b/configure @@ -16556,20 +16556,9 @@ all: \$(STATICLIB:.a=.cross.a) fi -if test -n "$DLLEXT" -then - deps="\$(MODULE)$DLLEXT \$(MODULE).fake" -else - deps="\$(MODULE)" -fi - MAKE_DLL_RULES=" DLLFLAGS = $DLLFLAGS MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec -IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) -MODULEFLAGS = -shared \$(MAINSPEC) \$(EXTRADLLFLAGS) - -all: $deps manpages:: dummy \$(C2MAN) -o \$(top_builddir)/documentation/man\$(api_manext) -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include \$(MAINSPEC:%=-w %) \$(C_SRCS) @@ -16585,8 +16574,6 @@ xmlpages:: dummy MAKE_PROG_RULES=" DLLFLAGS = $DLLFLAGS - -all: $deps " @@ -17428,7 +17415,6 @@ zh_TW" wine_fn_ignore_file "*.a" wine_fn_ignore_file "*.exe" test -n "$DLLEXT" && wine_fn_ignore_file "*$DLLEXT" -test -n "$DLLEXT" && wine_fn_ignore_file "*.fake" wine_fn_ignore_file ".gitignore" wine_fn_ignore_file "Makefile" wine_fn_ignore_file "TAGS" diff --git a/configure.ac b/configure.ac index 964c068..9d9078c 100644 --- a/configure.ac +++ b/configure.ac @@ -2613,20 +2613,9 @@ fi dnl Dll and program rules -if test -n "$DLLEXT" -then - deps="\$(MODULE)$DLLEXT \$(MODULE).fake" -else - deps="\$(MODULE)" -fi - AC_SUBST(MAKE_DLL_RULES," DLLFLAGS = $DLLFLAGS MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec -IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) -MODULEFLAGS = -shared \$(MAINSPEC) \$(EXTRADLLFLAGS) - -all: $deps manpages:: dummy \$(C2MAN) -o \$(top_builddir)/documentation/man\$(api_manext) -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include \$(MAINSPEC:%=-w %) \$(C_SRCS) @@ -2641,8 +2630,6 @@ xmlpages:: dummy AC_SUBST(MAKE_PROG_RULES," DLLFLAGS = $DLLFLAGS - -all: $deps ") dnl Test rules @@ -3472,7 +3459,6 @@ dnl Main ignore file WINE_IGNORE_FILE("*.a") WINE_IGNORE_FILE("*.exe") test -n "$DLLEXT" && WINE_IGNORE_FILE("*$DLLEXT") -test -n "$DLLEXT" && WINE_IGNORE_FILE("*.fake") WINE_IGNORE_FILE(".gitignore") WINE_IGNORE_FILE("Makefile") WINE_IGNORE_FILE("TAGS") diff --git a/tools/makedep.c b/tools/makedep.c index c8a3a6f..0516cbb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1366,6 +1366,7 @@ static struct strarray output_sources(void) { struct incl_file *source; int i; + const char *dllext = ".so"; int is_test = find_src_file( "testlist.o" ) != NULL; struct strarray object_files = empty_strarray; struct strarray crossobj_files = empty_strarray; @@ -1377,7 +1378,15 @@ static struct strarray output_sources(void) struct strarray dlldata_files = empty_strarray; struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; + struct strarray all_targets = empty_strarray; struct strarray phony_targets = empty_strarray; + struct strarray imports = get_expanded_make_var_array( "IMPORTS" ); + struct strarray delayimports = get_expanded_make_var_array( "DELAYIMPORTS" ); + char *module = get_expanded_make_variable( "MODULE" ); + char *exeext = get_expanded_make_variable( "EXEEXT" ); + char *appmode = get_expanded_make_variable( "APPMODE" ); + + if (exeext && !strcmp( exeext, ".exe" )) dllext = ""; strarray_add( &includes, "-I." ); if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir )); @@ -1642,6 +1651,52 @@ static struct strarray output_sources(void) output( "\n" ); } + if (module) + { + struct strarray all_libs = empty_strarray; + char *spec_file = appmode ? NULL : replace_extension( module, ".dll", ".spec" ); + + if (spec_file && src_dir) spec_file = strmake( "%s/%s", src_dir, spec_file ); + for (i = 0; i < delayimports.count; i++) + strarray_add( &all_libs, strmake( "-l%s", delayimports.str[i] )); + for (i = 0; i < imports.count; i++) + strarray_add( &all_libs, strmake( "-l%s", imports.str[i] )); + for (i = 0; i < delayimports.count; i++) + strarray_add( &all_libs, strmake( "-Wb,-d%s", delayimports.str[i] )); + strarray_add( &all_libs, "-lwine" ); + strarray_addall( &all_libs, get_expanded_make_var_array( "LIBPORT" )); + strarray_addall( &all_libs, get_expanded_make_var_array( "EXTRALIBS" )); + strarray_addall( &all_libs, get_expanded_make_var_array( "LIBS" )); + + if (*dllext) + { + strarray_add( &all_targets, strmake( "%s%s", module, dllext )); + strarray_add( &all_targets, strmake( "%s.fake", module )); + output( "%s%s %s.fake:", module, dllext, module ); + } + else + { + strarray_add( &all_targets, module ); + output( "%s:", module ); + } + if (spec_file) output_filename( spec_file ); + output_filenames( object_files ); + output_filenames( res_files ); + output( "\n" ); + output( "\t$(WINEGCC) -o $@" ); + if (spec_file) + { + output( " -shared %s", spec_file ); + output_filenames( get_expanded_make_var_array( "EXTRADLLFLAGS" )); + } + else output_filename( appmode ); + output_filenames( object_files ); + output_filenames( res_files ); + output_filenames( all_libs ); + output_filename( "$(LDFLAGS)" ); + output( "\n" ); + } + if (is_test) { struct strarray ok_files = strarray_replace_extension( &test_files, ".c", ".ok" ); @@ -1662,9 +1717,17 @@ static struct strarray output_sources(void) strarray_add( &phony_targets, "testclean" ); } + if (all_targets.count) + { + output( "all:" ); + output_filenames( all_targets ); + output( "\n" ); + } + strarray_addall( &clean_files, object_files ); strarray_addall( &clean_files, crossobj_files ); strarray_addall( &clean_files, res_files ); + strarray_addall( &clean_files, all_targets ); if (clean_files.count) { @@ -1780,7 +1843,7 @@ static void output_dependencies( const char *path ) } if (fclose( output_file )) fatal_perror( "write" ); output_file = tmp_file; - if (!found && !list_empty(&sources)) output( "\n%s\n", Separator ); + if (!found) output( "\n%s\n", Separator ); } else { @@ -1788,7 +1851,7 @@ static void output_dependencies( const char *path ) fatal_perror( "%s", path ); } - if (!list_empty( &sources )) targets = output_sources(); + targets = output_sources(); fclose( output_file ); output_file = NULL;

1 0

Alexandre Julliard : makedep: Generate rules for import libraries.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: a37ef65ea83d5b1e9d257ed81fda7ab2be75d5bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37ef65ea83d5b1e9d257ed81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 20:14:45 2013 +0100 makedep: Generate rules for import libraries. --- Make.rules.in | 16 +--------------- Make.vars.in | 1 - configure | 5 +---- configure.ac | 3 +-- tools/makedep.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 56 insertions(+), 23 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 004e5f1..c368f9a 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -19,8 +19,7 @@ RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(DEFS) $(EXTRARCFLAGS) IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) -CLEAN_TARGETS = $(IMPORTLIB:%=lib%.(a)IMPLIBEXT@) \ - $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) +CLEAN_TARGETS = $(TESTMODULE) $(TESTMODULE_STRIPPED) $(CROSSTESTMODULE) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(OBJC_SRCS:.m=.o) \ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) @@ -42,19 +41,6 @@ $(STATICLIB:.a=.cross.a): $(CROSSOBJS) $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) $(CROSSRANLIB) $@ -# Rules for import libraries - -$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_SRCS:.c=.o) - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(IMPLIB_SRCS:.c=.o) - $(RANLIB) $@ - -$(IMPORTLIB:%=lib%.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.o) - $(WINEBUILD) $(TARGETFLAGS) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.o) - -$(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) - $(WINEBUILD) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) - # Rules for dependencies depend: dummy diff --git a/Make.vars.in b/Make.vars.in index 7b6e265..5246f89 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -30,7 +30,6 @@ FLEX = @FLEX@ EXEEXT = @EXEEXT@ DLLPREFIX = @DLLPREFIX@ TOOLSEXT = @TOOLSEXT@ -IMPLIBEXT = @IMPLIBEXT@ DLLTOOL = @DLLTOOL@ AR = @AR@ ARFLAGS = @ARFLAGS@ diff --git a/configure b/configure index 6fb5933..8a254ad 100755 --- a/configure +++ b/configure @@ -711,7 +711,6 @@ READELF LDD LDRPATH_LOCAL LDRPATH_INSTALL -IMPLIBEXT DLLFLAGS DLLPREFIX dlldir @@ -6908,14 +6907,13 @@ DLLPREFIX="" DLLFLAGS="-D_REENTRANT" -IMPLIBEXT="def" - LDRPATH_INSTALL="" LDRPATH_LOCAL="" LIBEXT="so" DLLEXT=".so" +IMPLIBEXT="def" STATIC_IMPLIBEXT="def.a" # Extract the first word of "ldd", so it can be a program name with args. set dummy ldd; ac_word=$2 @@ -17426,7 +17424,6 @@ wine_fn_ignore_file "config.status" wine_fn_ignore_file "configure.lineno" wine_fn_ignore_file "include/config.h" wine_fn_ignore_file "include/stamp-h" -wine_fn_ignore_file "dlls/*/*.def" test "x$enable_fonts" = xno || wine_fn_ignore_file "fonts/*.fon" test "x$enable_winetest" = xno || wine_fn_ignore_file "programs/winetest/build.nfo" test "x$enable_winetest" = xno || wine_fn_ignore_file "programs/winetest/build.rc" diff --git a/configure.ac b/configure.ac index 9d9078c..a8a7da4 100644 --- a/configure.ac +++ b/configure.ac @@ -675,11 +675,11 @@ dnl **** Check for working dll **** AC_SUBST(dlldir,"\${libdir}/wine") AC_SUBST(DLLPREFIX,"") AC_SUBST(DLLFLAGS,"-D_REENTRANT") -AC_SUBST(IMPLIBEXT,"def") AC_SUBST(LDRPATH_INSTALL,"") AC_SUBST(LDRPATH_LOCAL,"") LIBEXT="so" DLLEXT=".so" +IMPLIBEXT="def" STATIC_IMPLIBEXT="def.a" WINE_PATH_SONAME_TOOLS @@ -3470,7 +3470,6 @@ WINE_IGNORE_FILE("config.status") WINE_IGNORE_FILE("configure.lineno") WINE_IGNORE_FILE("include/config.h") WINE_IGNORE_FILE("include/stamp-h") -WINE_IGNORE_FILE("dlls/*/*.def") WINE_IGNORE_FILE("fonts/*.fon",enable_fonts) WINE_IGNORE_FILE("programs/winetest/build.nfo",enable_winetest) WINE_IGNORE_FILE("programs/winetest/build.rc",enable_winetest) diff --git a/tools/makedep.c b/tools/makedep.c index 0516cbb..f7bba41 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1376,6 +1376,7 @@ static struct strarray output_sources(void) struct strarray mc_files = empty_strarray; struct strarray test_files = empty_strarray; struct strarray dlldata_files = empty_strarray; + struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; struct strarray all_targets = empty_strarray; @@ -1385,6 +1386,7 @@ static struct strarray output_sources(void) char *module = get_expanded_make_variable( "MODULE" ); char *exeext = get_expanded_make_variable( "EXEEXT" ); char *appmode = get_expanded_make_variable( "APPMODE" ); + char *crosstarget = get_expanded_make_variable( "CROSSTARGET" ); if (exeext && !strcmp( exeext, ".exe" )) dllext = ""; @@ -1569,6 +1571,7 @@ static struct strarray output_sources(void) else { if (source->flags & FLAG_GENERATED) strarray_add( &clean_files, source->filename ); + if (source->flags & FLAG_C_IMPLIB) strarray_add( &implib_objs, strmake( "%s.o", obj )); for (i = 0; i < object_extensions.count; i++) { output( "%s.%s: %s\n", obj, object_extensions.str[i], sourcedep ); @@ -1589,7 +1592,7 @@ static struct strarray output_sources(void) output( "\n" ); } } - if (source->flags & FLAG_C_IMPLIB) + if (crosstarget && (source->flags & FLAG_C_IMPLIB)) { strarray_add( &crossobj_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj, sourcedep ); @@ -1653,6 +1656,8 @@ static struct strarray output_sources(void) if (module) { + int is_win16 = strendswith( module, "16" ); + char *importlib = get_expanded_make_variable( "IMPORTLIB" ); struct strarray all_libs = empty_strarray; char *spec_file = appmode ? NULL : replace_extension( module, ".dll", ".spec" ); @@ -1695,6 +1700,53 @@ static struct strarray output_sources(void) output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); + + if (spec_file && importlib) + { + if (*dllext) + { + strarray_add( &clean_files, strmake( "lib%s.def", importlib )); + output( "lib%s.def: %s\n", importlib, spec_file ); + output( "\t$(WINEBUILD) -w --def -o $@ --export %s", spec_file ); + output_filenames( get_expanded_make_var_array( "TARGETFLAGS" )); + if (is_win16) output_filename( "-m16" ); + output( "\n" ); + if (implib_objs.count) + { + strarray_add( &clean_files, strmake( "lib%s.def.a", importlib )); + output( "lib%s.def.a:", importlib ); + output_filenames( implib_objs ); + output( "\n" ); + output( "\t$(RM) $@\n" ); + output( "\t$(AR) $(ARFLAGS) $@" ); + output_filenames( implib_objs ); + output( "\n" ); + output( "\t$(RANLIB) $@\n" ); + } + } + else + { + strarray_add( &clean_files, strmake( "lib%s.a", importlib )); + output( "lib%s.a: %s", importlib, spec_file ); + output_filenames( implib_objs ); + output( "\n" ); + output( "\t$(WINEBUILD) -w --implib -o $@ --export %s", spec_file ); + output_filenames( get_expanded_make_var_array( "TARGETFLAGS" )); + output_filenames( implib_objs ); + output( "\n" ); + } + if (crosstarget && !is_win16) + { + struct strarray cross_files = strarray_replace_extension( &implib_objs, ".o", ".cross.o" ); + strarray_add( &clean_files, strmake( "lib%s.cross.a", importlib )); + output( "lib%s.cross.a: %s", importlib, spec_file ); + output_filenames( cross_files ); + output( "\n" ); + output( "\t$(WINEBUILD) -b %s -w --implib -o $@ --export %s", crosstarget, spec_file ); + output_filenames( cross_files ); + output( "\n" ); + } + } } if (is_test)

1 0

Alexandre Julliard : makedep: Generate rules for static libraries.
by Alexandre Julliard 31 Dec '13

31 Dec '13

Module: wine Branch: master Commit: 908dada6620ce84df6044b786d348671d26a72d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908dada6620ce84df6044b786… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 20:17:36 2013 +0100 makedep: Generate rules for static libraries. --- Make.rules.in | 14 -------------- Make.vars.in | 2 -- configure | 2 -- configure.ac | 2 -- tools/makedep.c | 24 ++++++++++++++++++++++++ 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index c368f9a..0a40ff4 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -27,20 +27,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ CROSSOBJS = $(OBJS:.o=.cross.o) ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -# Rules for static libraries - -all: $(STATICLIB) - -$(STATICLIB): $(OBJS) - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@ - -$(STATICLIB:.a=.cross.a): $(CROSSOBJS) - $(RM) $@ - $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) - $(CROSSRANLIB) $@ - # Rules for dependencies depend: dummy diff --git a/Make.vars.in b/Make.vars.in index 5246f89..bc19456 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -49,8 +49,6 @@ CROSSTARGET = @CROSSTARGET@ LINGUAS = @LINGUAS@ ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo) PORCFLAGS = @PORCFLAGS@ -CROSSAR = $(CROSSTARGET)-ar -CROSSRANLIB = $(CROSSTARGET)-ranlib BUILDIMAGE = $(top_srcdir)/tools/buildimage C2MAN = $(top_srcdir)/tools/c2man.pl RUNTEST = $(top_srcdir)/tools/runtest diff --git a/configure b/configure index 8a254ad..91bb070 100755 --- a/configure +++ b/configure @@ -16549,7 +16549,6 @@ MAKE_IMPLIB_RULES="DLLFLAGS = $DLLFLAGS if test -n "$CROSSTARGET" then as_fn_append MAKE_IMPLIB_RULES "MAKEDEPFLAGS = -xo -xcross.o -all: \$(STATICLIB:.a=.cross.a) " fi @@ -17410,7 +17409,6 @@ zh_TW" -wine_fn_ignore_file "*.a" wine_fn_ignore_file "*.exe" test -n "$DLLEXT" && wine_fn_ignore_file "*$DLLEXT" wine_fn_ignore_file ".gitignore" diff --git a/configure.ac b/configure.ac index a8a7da4..9d1948c 100644 --- a/configure.ac +++ b/configure.ac @@ -2607,7 +2607,6 @@ AC_SUBST(MAKE_IMPLIB_RULES,"DLLFLAGS = $DLLFLAGS if test -n "$CROSSTARGET" then AS_VAR_APPEND([MAKE_IMPLIB_RULES],"MAKEDEPFLAGS = -xo -xcross.o -all: \$(STATICLIB:.a=.cross.a) ") fi @@ -3456,7 +3455,6 @@ dnl End of auto-generated output commands dnl Main ignore file -WINE_IGNORE_FILE("*.a") WINE_IGNORE_FILE("*.exe") test -n "$DLLEXT" && WINE_IGNORE_FILE("*$DLLEXT") WINE_IGNORE_FILE(".gitignore") diff --git a/tools/makedep.c b/tools/makedep.c index f7bba41..ee24bba 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1386,6 +1386,7 @@ static struct strarray output_sources(void) char *module = get_expanded_make_variable( "MODULE" ); char *exeext = get_expanded_make_variable( "EXEEXT" ); char *appmode = get_expanded_make_variable( "APPMODE" ); + char *staticlib = get_expanded_make_variable( "STATICLIB" ); char *crosstarget = get_expanded_make_variable( "CROSSTARGET" ); if (exeext && !strcmp( exeext, ".exe" )) dllext = ""; @@ -1749,6 +1750,29 @@ static struct strarray output_sources(void) } } + if (staticlib) + { + strarray_add( &all_targets, staticlib ); + output( "%s:", staticlib ); + output_filenames( object_files ); + output( "\n\t$(RM) $@\n" ); + output( "\t$(AR) $(ARFLAGS) $@" ); + output_filenames( object_files ); + output( "\n\t$(RANLIB) $@\n" ); + if (crosstarget && object_extensions.count > 1) + { + char *name = replace_extension( staticlib, ".a", ".cross.a" ); + + strarray_add( &all_targets, name ); + output( "%s:", name ); + output_filenames( crossobj_files ); + output( "\n\t$(RM) $@\n" ); + output( "\t%s-ar $(ARFLAGS) $@", crosstarget ); + output_filenames( crossobj_files ); + output( "\n\t%s-ranlib $@\n", crosstarget ); + } + } + if (is_test) { struct strarray ok_files = strarray_replace_extension( &test_files, ".c", ".ok" );

1 0

Ken Thomases : winemac: Extract some duplicated code to a new perform_window_command() function.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 2d1396af32f8897c11dec2771b9a912b5348dfda URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1396af32f8897c11dec2771… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:14 2013 -0600 winemac: Extract some duplicated code to a new perform_window_command() function. This also changes to posting rather than sending WM_SYSCOMMAND/SC_MINIMIZE. --- dlls/winemac.drv/event.c | 2 +- dlls/winemac.drv/window.c | 127 +++++++++++++++++++++------------------------ 2 files changed, 61 insertions(+), 68 deletions(-) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 13f55f5..7caff22 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -104,7 +104,6 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(IM_SET_TEXT); event_mask |= event_mask_for_type(STATUS_ITEM_MOUSE_BUTTON); event_mask |= event_mask_for_type(STATUS_ITEM_MOUSE_MOVE); - event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_DID_UNMINIMIZE); event_mask |= event_mask_for_type(WINDOW_FRAME_CHANGED); event_mask |= event_mask_for_type(WINDOW_GOT_FOCUS); @@ -116,6 +115,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(QUERY_EVENT); event_mask |= event_mask_for_type(RELEASE_CAPTURE); event_mask |= event_mask_for_type(WINDOW_BROUGHT_FORWARD); + event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_DRAG_BEGIN); event_mask |= event_mask_for_type(WINDOW_DRAG_END); event_mask |= event_mask_for_type(WINDOW_MINIMIZE_REQUESTED); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 91a1d4d..715d5a3 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1164,6 +1164,50 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) } +/*********************************************************************** + * perform_window_command + */ +static void perform_window_command(HWND hwnd, DWORD style_any, DWORD style_none, WORD command, WORD hittest) +{ + DWORD style; + + TRACE("win %p style_any 0x%08x style_none 0x%08x command 0x%04x hittest 0x%04x\n", + hwnd, style_any, style_none, command, hittest); + + style = GetWindowLongW(hwnd, GWL_STYLE); + if ((style_any && !(style & style_any)) || (style & (WS_DISABLED | style_none))) + { + TRACE("not changing win %p style 0x%08x\n", hwnd, style); + return; + } + + if (GetActiveWindow() != hwnd) + { + LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), + MAKELPARAM(hittest, WM_NCLBUTTONDOWN)); + switch (ma) + { + case MA_NOACTIVATEANDEAT: + case MA_ACTIVATEANDEAT: + TRACE("not changing win %p mouse-activate result %ld\n", hwnd, ma); + return; + case MA_NOACTIVATE: + break; + case MA_ACTIVATE: + case 0: + SetActiveWindow(hwnd); + break; + default: + WARN("unknown WM_MOUSEACTIVATE code %ld\n", ma); + break; + } + } + + TRACE("changing win %p\n", hwnd); + PostMessageW(hwnd, WM_SYSCOMMAND, command, 0); +} + + /********************************************************************** * CreateDesktopWindow (MACDRV.@) */ @@ -1850,45 +1894,26 @@ done: */ void macdrv_window_close_requested(HWND hwnd) { - /* Ignore the delete window request if the window has been disabled. This - * is to disallow applications from being closed while in a modal state. - */ - if (IsWindowEnabled(hwnd)) + HMENU sysmenu; + + if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) { - HMENU hSysMenu; + TRACE("not closing win %p class style CS_NOCLOSE\n", hwnd); + return; + } - if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return; - hSysMenu = GetSystemMenu(hwnd, FALSE); - if (hSysMenu) - { - UINT state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); - if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) - return; - } - if (GetActiveWindow() != hwnd) + sysmenu = GetSystemMenu(hwnd, FALSE); + if (sysmenu) + { + UINT state = GetMenuState(sysmenu, SC_CLOSE, MF_BYCOMMAND); + if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) { - LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, - (WPARAM)GetAncestor(hwnd, GA_ROOT), - MAKELPARAM(HTCLOSE, WM_NCLBUTTONDOWN)); - switch(ma) - { - case MA_NOACTIVATEANDEAT: - case MA_ACTIVATEANDEAT: - return; - case MA_NOACTIVATE: - break; - case MA_ACTIVATE: - case 0: - SetActiveWindow(hwnd); - break; - default: - WARN("unknown WM_MOUSEACTIVATE code %d\n", (int) ma); - break; - } + TRACE("not closing win %p menu state 0x%08x\n", hwnd, state); + return; } - - PostMessageW(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); } + + perform_window_command(hwnd, 0, 0, SC_CLOSE, HTCLOSE); } @@ -2036,39 +2061,7 @@ void macdrv_app_deactivated(void) */ void macdrv_window_minimize_requested(HWND hwnd) { - DWORD style; - - style = GetWindowLongW(hwnd, GWL_STYLE); - if (!(style & WS_MINIMIZEBOX) || (style & (WS_DISABLED | WS_MINIMIZE))) - { - TRACE("not minimizing win %p style 0x%08x\n", hwnd, style); - return; - } - - if (GetActiveWindow() != hwnd) - { - LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), - MAKELPARAM(HTMINBUTTON, WM_NCLBUTTONDOWN)); - switch (ma) - { - case MA_NOACTIVATEANDEAT: - case MA_ACTIVATEANDEAT: - TRACE("not minimizing win %p mouse-activate result %ld\n", hwnd, ma); - return; - case MA_NOACTIVATE: - break; - case MA_ACTIVATE: - case 0: - SetActiveWindow(hwnd); - break; - default: - WARN("unknown WM_MOUSEACTIVATE code %ld\n", ma); - break; - } - } - - TRACE("minimizing win %p\n", hwnd); - SendMessageW(hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); + perform_window_command(hwnd, WS_MINIMIZEBOX, WS_MINIMIZE, SC_MINIMIZE, HTMINBUTTON); }

1 0

Ken Thomases : winemac: Move some state-based feature adjustment into the -adjustFeaturesForState method .
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 5f7b30aee28e70463311ed7f24fe8a58f600cbcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7b30aee28e70463311ed7f2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:20 2013 -0600 winemac: Move some state-based feature adjustment into the -adjustFeaturesForState method. --- dlls/winemac.drv/cocoa_window.m | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 06647d9..bb2da55 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -630,6 +630,18 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if ([self collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary) [[self standardWindowButton:NSWindowFullScreenButton] setEnabled:!self.disabled]; } + + if (disabled) + { + NSSize size = [self contentRectForFrameRect:[self frame]].size; + [self setContentMinSize:size]; + [self setContentMaxSize:size]; + } + else + { + [self setContentMaxSize:savedContentMaxSize]; + [self setContentMinSize:savedContentMinSize]; + } } - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior @@ -1275,18 +1287,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { disabled = newValue; [self adjustFeaturesForState]; - - if (disabled) - { - NSSize size = [self contentRectForFrameRect:[self frame]].size; - [self setContentMinSize:size]; - [self setContentMaxSize:size]; - } - else - { - [self setContentMaxSize:savedContentMaxSize]; - [self setContentMinSize:savedContentMinSize]; - } } }

1 0

Ken Thomases : winemac: Prevent disabled windows from being moved.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 8876751e9356f0852eb3bd397c22dee3f1b6611b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8876751e9356f0852eb3bd397… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:30 2013 -0600 winemac: Prevent disabled windows from being moved. This won't be enforced if AllowImmovableWindows=n is set in the registry. --- dlls/winemac.drv/cocoa_window.m | 3 +++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bb2da55..c8c1e90 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -642,6 +642,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self setContentMaxSize:savedContentMaxSize]; [self setContentMinSize:savedContentMinSize]; } + + if (allow_immovable_windows) + [self setMovable:!disabled]; } - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 5073db8..743757e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -146,6 +146,7 @@ extern int topmost_float_inactive DECLSPEC_HIDDEN; extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN; extern int left_option_is_alt DECLSPEC_HIDDEN; extern int right_option_is_alt DECLSPEC_HIDDEN; +extern int allow_immovable_windows DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2c3ec23..1aab785 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -54,6 +54,7 @@ int left_option_is_alt = 0; int right_option_is_alt = 0; BOOL allow_software_rendering = FALSE; BOOL disable_window_decorations = FALSE; +int allow_immovable_windows = TRUE; HMODULE macdrv_module = 0; @@ -171,6 +172,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "Decorated", buffer, sizeof(buffer))) disable_window_decorations = !IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowImmovableWindows", buffer, sizeof(buffer))) + allow_immovable_windows = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); }

1 0

Ken Thomases : winemac: Allow programmatic changes of the window frame even if a window is disabled (prevented from resizing).
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 0137b07973d86d288265a25a1f55956c6b0cbe3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0137b07973d86d288265a25a1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:36 2013 -0600 winemac: Allow programmatic changes of the window frame even if a window is disabled (prevented from resizing). --- dlls/winemac.drv/cocoa_window.m | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index c8c1e90..f051934 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1231,6 +1231,16 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif BOOL equalSizes = NSEqualSizes(frame.size, oldFrame.size); BOOL needEnableScreenUpdates = FALSE; + if (disabled) + { + // Allow the following calls to -setFrame:display: to work even + // if they would violate the content size constraints. This + // shouldn't be necessary since the content size constraints are + // documented to not constrain that method, but it seems to be. + [self setContentMinSize:NSZeroSize]; + [self setContentMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)]; + } + if (equalSizes && [[self childWindows] count]) { // If we change the window frame such that the origin moves @@ -1249,6 +1259,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } [self setFrame:frame display:YES]; + if (disabled) + { + [self setContentMinSize:contentRect.size]; + [self setContentMaxSize:contentRect.size]; + } if (needEnableScreenUpdates) NSEnableScreenUpdates();

1 0

Ken Thomases : winemac: Implement support for maximizing windows.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 66736b4ab31d5a6ba7163876e3a5ae2de8cba327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66736b4ab31d5a6ba7163876e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:34:48 2013 -0600 winemac: Implement support for maximizing windows. The user is prevented from moving or resizing a maximized window. The zoom button is still present and enabled for a maximized window but requests that it be restored rather than simply resizing it, which is what it does for normal windows. If a window is not resizable (lacks WS_THICKFRAME) but has a maximize box (WS_MAXIMIZEBOX), then the zoom button requests that it be maximized rather than resizing it. --- dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 47 +++++++++++++++++++++++++++++++++----- dlls/winemac.drv/event.c | 10 ++++++++ dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 4 +++ dlls/winemac.drv/window.c | 26 ++++++++++++++++++++- 6 files changed, 83 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66736b4ab31d5a6ba7163…

1 0