December 2013 - Wine-commits

Bruno Jesus : ws2_32/tests: Fix some test message typos.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: b8e9bbd4d0b1fde7fbc27857b8453adb33c7e99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e9bbd4d0b1fde7fbc27857b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 27 13:49:27 2013 -0200 ws2_32/tests: Fix some test message typos. --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 341b7e7..7bb39f7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2141,7 +2141,7 @@ static void test_WSADuplicateSocket(void) IPPROTO_TCP, info.iProtocol); ok(info.iAddressFamily == AF_INET, "expected family %d, received %d\n", AF_INET, info.iProtocol); - ok(info.iSocketType == SOCK_STREAM, "expected protocol %d, received %d\n", + ok(info.iSocketType == SOCK_STREAM, "expected type %d, received %d\n", SOCK_STREAM, info.iSocketType); dupsock = WSASocketA(0, 0, 0, &info, 0, 0); @@ -2163,7 +2163,7 @@ static void test_WSADuplicateSocket(void) IPPROTO_UDP, info.iProtocol); ok(info.iAddressFamily == AF_INET, "expected family %d, received %d\n", AF_INET, info.iProtocol); - ok(info.iSocketType == SOCK_DGRAM, "expected protocol %d, received %d\n", + ok(info.iSocketType == SOCK_DGRAM, "expected type %d, received %d\n", SOCK_DGRAM, info.iSocketType); memset(&addr, 0, sizeof(addr));

1 0

Alexandre Julliard : makedep: Use a string array to manage include directories.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: a8862d5d3cc51eaf62a55f9b95d36f8bf9dc0fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8862d5d3cc51eaf62a55f9b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 21:51:38 2013 +0100 makedep: Use a string array to manage include directories. --- tools/makedep.c | 62 +++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 44 insertions(+), 18 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 099eff6..2a7a4a6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1358,18 +1358,18 @@ static struct strarray output_sources(void) struct strarray po_files = empty_strarray; struct strarray mc_files = empty_strarray; struct strarray test_files = empty_strarray; + struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; - column = output( "includes = -I." ); - if (src_dir) output_filename( strmake( "-I%s", src_dir ), &column ); + strarray_add( &includes, "-I." ); + if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir )); if (parent_dir) { - if (src_dir) output_filename( strmake( "-I%s/%s", src_dir, parent_dir ), &column ); - else output_filename( strmake( "-I%s", parent_dir ), &column ); + if (src_dir) strarray_add( &includes, strmake( "-I%s/%s", src_dir, parent_dir )); + else strarray_add( &includes, strmake( "-I%s", parent_dir )); } - if (top_src_dir && top_obj_dir) output_filename( strmake( "-I%s/include", top_obj_dir ), &column ); - output_filenames( &include_args, &column ); - output( "\n" ); + if (top_src_dir && top_obj_dir) strarray_add( &includes, strmake( "-I%s/include", top_obj_dir )); + strarray_addall( &includes, &include_args ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { @@ -1435,15 +1435,21 @@ static struct strarray output_sources(void) if (source->flags & FLAG_RC_PO) { output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); - output( "\t$(WRC) $(includes) $(RCFLAGS) -o $@ %s\n", source->filename ); - column += output( "%s.res rsrc.pot:", obj ); + column = output( "\t$(WRC) -o $@ %s", source->filename ); + output_filenames( &includes, &column ); + output_filename( "$(RCFLAGS)", &column ); + output( "\n" ); + column = output( "%s.res rsrc.pot:", obj ); strarray_add( &po_files, source->filename ); } else { output( "%s.res: $(WRC) %s\n", obj, sourcedep ); - output( "\t$(WRC) $(includes) $(RCFLAGS) -o $@ %s\n", source->filename ); - column += output( "%s.res:", obj ); + column = output( "\t$(WRC) -o $@ %s", source->filename ); + output_filenames( &includes, &column ); + output_filename( "$(RCFLAGS)", &column ); + output( "\n" ); + column = output( "%s.res:", obj ); } strarray_add( &clean_files, strmake( "%s.res", obj )); } @@ -1474,7 +1480,11 @@ static struct strarray output_sources(void) column = 0; output_filenames( &targets, &column ); output( ": $(WIDL)\n" ); - output( "\t$(WIDL) $(includes) $(TARGETFLAGS) $(IDLFLAGS) -o $@ %s\n", source->filename ); + column = output( "\t$(WIDL) -o $@ %s", source->filename ); + output_filenames( &includes, &column ); + output_filename( "$(TARGETFLAGS)", &column ); + output_filename( "$(IDLFLAGS)", &column ); + output( "\n" ); column = 0; output_filenames( &targets, &column ); column += output( ": %s", sourcedep ); @@ -1517,15 +1527,28 @@ static struct strarray output_sources(void) 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" )) - output( "\t$(CROSSCC) -c $(includes) $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); + { + column = output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); + output_filenames( &includes, &column ); + output_filename( "$(ALLCROSSCFLAGS)", &column ); + output( "\n" ); + } else - output( "\t$(CC) -c $(includes) $(ALLCFLAGS) -o $@ %s\n", source->filename ); + { + column = output( "\t$(CC) -c -o $@ %s", source->filename ); + output_filenames( &includes, &column ); + output_filename( "$(ALLCFLAGS)", &column ); + output( "\n" ); + } } if (source->flags & FLAG_C_IMPLIB) { strarray_add( &clean_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj, sourcedep ); - output( "\t$(CROSSCC) -c $(includes) $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); + column = output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); + output_filenames( &includes, &column ); + output_filename( "$(ALLCROSSCFLAGS)", &column ); + output( "\n" ); } if (is_test && !strcmp( ext, "c" ) && !is_generated_idl( source )) { @@ -1533,6 +1556,7 @@ static struct strarray output_sources(void) output( "%s.ok:\n", obj ); output( "\t$(RUNTEST) $(RUNTESTFLAGS) %s && touch $@\n", obj ); } + column = 0; for (i = 0; i < object_extensions.count; i++) column += output( "%s.%s ", obj, object_extensions.str[i] ); if (source->flags & FLAG_C_IMPLIB) column += output( "%s.cross.o", obj ); @@ -1553,7 +1577,9 @@ static struct strarray output_sources(void) column = output( "rsrc.pot: $(WRC)" ); output_filenames( &po_files, &column ); output( "\n" ); - column = output( "\t$(WRC) $(includes) $(RCFLAGS) -O pot -o $@" ); + column = output( "\t$(WRC) -O pot -o $@" ); + output_filenames( &includes, &column ); + output_filename( "$(RCFLAGS)", &column ); output_filenames( &po_files, &column ); output( "\n" ); strarray_add( &clean_files, "rsrc.pot" ); @@ -1785,7 +1811,7 @@ static void update_makefile( const char *path ) value = get_expanded_make_var_array( "EXTRAINCL" ); for (i = 0; i < value.count; i++) if (!strncmp( value.str[i], "-I", 2 )) - strarray_add( &include_args, value.str[i] ); + strarray_add_uniq( &include_args, value.str[i] ); init_paths(); @@ -1812,7 +1838,7 @@ static void parse_option( const char *opt ) switch(opt[1]) { case 'I': - if (opt[2]) strarray_add( &include_args, opt ); + if (opt[2]) strarray_add_uniq( &include_args, opt ); break; case 'C': src_dir = opt + 2;

1 0

Alexandre Julliard : makedep: Use a string array to manage dlldata source files.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 708d6d3ae884e8559bea1d1a65cb2406797df980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708d6d3ae884e8559bea1d1a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 27 14:26:37 2013 +0100 makedep: Use a string array to manage dlldata source files. --- tools/makedep.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2a7a4a6..fc9b1b5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1358,6 +1358,7 @@ static struct strarray output_sources(void) struct strarray po_files = empty_strarray; struct strarray mc_files = empty_strarray; struct strarray test_files = empty_strarray; + struct strarray dlldata_files = empty_strarray; struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; @@ -1477,6 +1478,7 @@ static struct strarray output_sources(void) strarray_add( &clean_files, dest ); strarray_add( &targets, dest ); } + if (source->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); column = 0; output_filenames( &targets, &column ); output( ": $(WIDL)\n" ); @@ -1596,12 +1598,11 @@ static struct strarray output_sources(void) strarray_add( &clean_files, "msg.pot" ); } - if (find_src_file( "dlldata.o" )) + if (dlldata_files.count) { output( "dlldata.c: $(WIDL) %s\n", src_dir ? strmake("%s/Makefile.in", src_dir ) : "Makefile.in" ); column = output( "\t$(WIDL) --dlldata-only -o $@" ); - LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) - if (source->flags & FLAG_IDL_PROXY) output_filename( source->filename, &column ); + output_filenames( &dlldata_files, &column ); output( "\n" ); strarray_add( &clean_files, "dlldata.c" ); }

1 0

Alexandre Julliard : makedep: Use a string array to store makefile variables.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: c29ea61087677c459b7e76eec362d3e5ec3d412a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29ea61087677c459b7e76eec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 19:25:57 2013 +0100 makedep: Use a string array to store makefile variables. --- tools/makedep.c | 95 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 48 insertions(+), 47 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index fc9b1b5..59c13dd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -92,15 +92,7 @@ static const struct strarray empty_strarray; static struct strarray include_args; static struct strarray object_extensions; - -struct make_var -{ - char *name; - char *value; -}; - -static struct make_var *make_vars; -static unsigned int nb_make_vars; +static struct strarray make_vars; static const char *base_dir = "."; static const char *src_dir; @@ -1212,9 +1204,9 @@ static char *get_make_variable( const char *name ) { unsigned int i; - for (i = 0; i < nb_make_vars; i++) - if (!strcmp( make_vars[i].name, name )) - return xstrdup( make_vars[i].value ); + for (i = 0; i < make_vars.count; i += 2) + if (!strcmp( make_vars.str[i], name )) + return xstrdup( make_vars.str[i + 1] ); return NULL; } @@ -1252,7 +1244,13 @@ static char *get_expanded_make_variable( const char *name ) free( expand ); expand = tmp; } - return expand; + + /* consider empty variables undefined */ + p = expand; + while (*p && isspace(*p)) p++; + if (*p) return expand; + free( expand ); + return NULL; } @@ -1272,12 +1270,44 @@ static struct strarray get_expanded_make_var_array( const char *name ) /******************************************************************* + * set_make_variable + */ +static int set_make_variable( struct strarray *array, const char *assignment ) +{ + unsigned int i; + char *p, *name; + + p = name = xstrdup( assignment ); + while (isalnum(*p) || *p == '_') p++; + if (name == p) return 0; /* not a variable */ + if (isspace(*p)) + { + *p++ = 0; + while (isspace(*p)) p++; + } + if (*p != '=') return 0; /* not an assignment */ + *p++ = 0; + while (isspace(*p)) p++; + + /* redefining a variable replaces the previous value */ + for (i = 0; i < array->count; i += 2) + { + if (strcmp( array->str[i], name )) continue; + array->str[i + 1] = p; + return 1; + } + strarray_add( array, name ); + strarray_add( array, p ); + return 1; +} + + +/******************************************************************* * parse_makefile */ static void parse_makefile(void) { char *buffer; - unsigned int i, vars_size = 0; FILE *file; input_file_name = strmake( "%s/%s", base_dir, makefile_name ); @@ -1287,43 +1317,14 @@ static void parse_makefile(void) exit( 1 ); } - nb_make_vars = 0; input_line = 0; while ((buffer = get_line( file ))) { - char *name, *p = buffer; - if (Separator && !strncmp( buffer, Separator, strlen(Separator) )) break; - while (isspace(*p)) p++; - if (*p == '#') continue; /* comment */ - name = p; - while (isalnum(*p) || *p == '_') p++; - if (name == p) continue; /* not a variable */ - if (isspace(*p)) - { - *p++ = 0; - while (isspace(*p)) p++; - } - if (*p != '=') continue; /* not an assignment */ - *p++ = 0; - while (isspace(*p)) p++; - - /* redefining a variable replaces the previous value */ - for (i = 0; i < nb_make_vars; i++) - if (!strcmp( make_vars[i].name, name )) break; - if (i == nb_make_vars) - { - if (nb_make_vars == vars_size) - { - vars_size *= 2; - if (!vars_size) vars_size = 32; - make_vars = xrealloc( make_vars, vars_size * sizeof(*make_vars) ); - } - make_vars[nb_make_vars++].name = xstrdup( name ); - } - else free( make_vars[i].value ); - - make_vars[i].value = xstrdup( p ); + if (*buffer == '\t') continue; /* command */ + while (isspace( *buffer )) buffer++; + if (*buffer == '#') continue; /* comment */ + set_make_variable( &make_vars, buffer ); } fclose( file ); input_file_name = NULL;

1 0

Alexandre Julliard : makedep: Allow overriding makefile variables through the command line.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: ab8d61d29bc58426b850e7f70ab9945253a3fd92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8d61d29bc58426b850e7f70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 19:26:29 2013 +0100 makedep: Allow overriding makefile variables through the command line. --- tools/makedep.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 59c13dd..f347d90 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -93,6 +93,7 @@ static const struct strarray empty_strarray; static struct strarray include_args; static struct strarray object_extensions; static struct strarray make_vars; +static struct strarray cmdline_vars; static const char *base_dir = "."; static const char *src_dir; @@ -1204,6 +1205,10 @@ static char *get_make_variable( const char *name ) { unsigned int i; + for (i = 0; i < cmdline_vars.count; i += 2) + if (!strcmp( cmdline_vars.str[i], name )) + return xstrdup( cmdline_vars.str[i + 1] ); + for (i = 0; i < make_vars.count; i += 2) if (!strcmp( make_vars.str[i], name )) return xstrdup( make_vars.str[i + 1] ); @@ -1835,8 +1840,13 @@ static void update_makefile( const char *path ) /******************************************************************* * parse_option */ -static void parse_option( const char *opt ) +static int parse_option( const char *opt ) { + if (opt[0] != '-') + { + if (strchr( opt, '=' )) return set_make_variable( &cmdline_vars, opt ); + return 0; + } switch(opt[1]) { case 'I': @@ -1874,6 +1884,7 @@ static void parse_option( const char *opt ) fprintf( stderr, "Unknown option '%s'\n%s", opt, Usage ); exit(1); } + return 1; } @@ -1888,9 +1899,8 @@ int main( int argc, char *argv[] ) i = 1; while (i < argc) { - if (argv[i][0] == '-') + if (parse_option( argv[i] )) { - parse_option( argv[i] ); for (j = i; j < argc; j++) argv[j] = argv[j+1]; argc--; }

1 0

Alexandre Julliard : makedep: Allow overriding makefile variables through the MAKEFLAGS environment variable .
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: cab558b4bd0cad658dd14ec53fda076851a5e16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab558b4bd0cad658dd14ec53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 19:26:37 2013 +0100 makedep: Allow overriding makefile variables through the MAKEFLAGS environment variable. --- tools/makedep.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f347d90..2cb32b9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1838,6 +1838,29 @@ static void update_makefile( const char *path ) /******************************************************************* + * parse_makeflags + */ +static void parse_makeflags( const char *flags ) +{ + const char *p = flags; + char *var, *buffer = xmalloc( strlen(flags) + 1 ); + + while (*p) + { + while (isspace(*p)) p++; + var = buffer; + while (*p && !isspace(*p)) + { + if (*p == '\\' && p[1]) p++; + *var++ = *p++; + } + *var = 0; + if (var > buffer) set_make_variable( &cmdline_vars, buffer ); + } +} + + +/******************************************************************* * parse_option */ static int parse_option( const char *opt ) @@ -1893,9 +1916,12 @@ static int parse_option( const char *opt ) */ int main( int argc, char *argv[] ) { + const char *makeflags = getenv( "MAKEFLAGS" ); struct incl_file *pFile; int i, j; + if (makeflags) parse_makeflags( makeflags ); + i = 1; while (i < argc) {

1 0

Alexandre Julliard : makedep: Manage generated source files explicitly instead of relying on name comparisons .
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 47c0f64fdd6caac10ac210e47d56c0238c5b01ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c0f64fdd6caac10ac210e47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 19:27:59 2013 +0100 makedep: Manage generated source files explicitly instead of relying on name comparisons. --- configure | 9 +- configure.ac | 9 +- tools/makedep.c | 246 ++++++++++++++++++++++++++----------------------------- 3 files changed, 123 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47c0f64fdd6caac10ac21…

1 0

Alexandre Julliard : makedep: Generate rules for svg files in maintainer mode.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 2535a3b8f67c9c48d4311f31131c160d7374f4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=2535a3b8f67c9c48d4311f311… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 19:56:16 2013 +0100 makedep: Generate rules for svg files in maintainer mode. --- Make.rules.in | 8 +-- configure | 208 ++++++++++++++++++++++++++++--------------------------- configure.ac | 17 +++-- tools/makedep.c | 17 +++++ 4 files changed, 134 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2535a3b8f67c9c48d4311…

1 0

Alexandre Julliard : makedep: Generate rules for TrueType fonts in maintainer mode.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: 64b21eee94fb52fd3b595f7bb77314112d783d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b21eee94fb52fd3b595f7bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 20:02:42 2013 +0100 makedep: Generate rules for TrueType fonts in maintainer mode. --- Make.rules.in | 7 ------- configure | 3 --- configure.ac | 1 - dlls/gdi32/tests/Makefile.in | 5 +++++ fonts/Makefile.in | 14 ++++++++++++++ tools/make_makefiles | 4 +++- tools/makedep.c | 13 +++++++++++++ 7 files changed, 35 insertions(+), 12 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 69abe7f..7e50787 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -28,13 +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) -# Implicit rules - -(a)MAINTAINER_MODE@.SUFFIXES: .sfd .ttf - -.sfd.ttf: - $(FONTFORGE) -script $(top_srcdir)/fonts/genttf.ff $< $@ - # Rules for main module $(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS) diff --git a/configure b/configure index ccd78d6..de73ca9 100755 --- a/configure +++ b/configure @@ -722,7 +722,6 @@ ICOTOOL CONVERT RSVG FONTFORGE -MAINTAINER_MODE PKG_CONFIG MSGFMT INSTALL_DATA @@ -5584,8 +5583,6 @@ fi if test "x$enable_maintainer_mode" != "xyes" then - MAINTAINER_MODE=\# - FONTFORGE="" RSVG="" CONVERT="" diff --git a/configure.ac b/configure.ac index 21de44a..e0455a2 100644 --- a/configure.ac +++ b/configure.ac @@ -276,7 +276,6 @@ WINE_PATH_PKG_CONFIG if test "x$enable_maintainer_mode" != "xyes" then - AC_SUBST([MAINTAINER_MODE],[\#]) FONTFORGE="" RSVG="" CONVERT="" diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index dee2fa4..19b63a9 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -17,6 +17,11 @@ C_SRCS = \ path.c \ pen.c +FONT_SRCS = \ + vertical.sfd \ + wine_test.sfd \ + wine_vdmx.sfd + RC_SRCS = resource.rc @MAKE_TEST_RULES@ diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 1354dc0..6650af5 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -1,3 +1,17 @@ +FONT_SRCS = \ + courier.sfd \ + fixedsys.sfd \ + fixedsys_jp.sfd \ + marlett.sfd \ + ms_sans_serif.sfd \ + small_fonts.sfd \ + small_fonts_jp.sfd \ + symbol.sfd \ + system.sfd \ + tahoma.sfd \ + tahomabd.sfd \ + wingding.sfd + BITMAP_FONTS = \ coue1255.fon \ coue1256.fon \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 9ebc476..ef26aaf 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -276,7 +276,7 @@ sub parse_makefile($) ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB"; next; } - if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/) + if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/) { my $var = $1; my @list = split(/\s+/, $2); @@ -408,6 +408,7 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } + elsif ($name =~ /\.sfd$/) { push @{${$make}{"=FONT_SRCS"}}, $name; } elsif ($name =~ /\.c$/) { my %flags = get_makedep_flags( $file ); @@ -563,6 +564,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "BISON_SRCS" ); replace_makefile_variable( $file, "MC_SRCS" ); replace_makefile_variable( $file, "SVG_SRCS" ); + replace_makefile_variable( $file, "FONT_SRCS" ); replace_makefile_variable( $file, "C_SRCS" ); replace_makefile_variable( $file, "OBJC_SRCS" ); replace_makefile_variable( $file, "RC_SRCS" ); diff --git a/tools/makedep.c b/tools/makedep.c index 3b4ffcd..041ef2e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1498,6 +1498,18 @@ static struct strarray output_sources(void) output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); column += output( "%s:", obj ); } + else if (!strcmp( ext, "sfd" )) /* font file */ + { + char *fontforge = get_expanded_make_variable( "FONTFORGE" ); + if (fontforge && !src_dir) + { + output( "%s.ttf: %s\n", obj, source->filename ); + output( "\t%s -script %s/fonts/genttf.ff %s $@\n", + fontforge, top_src_dir ? top_src_dir : top_obj_dir, source->filename ); + } + free( fontforge ); + continue; /* no dependencies */ + } else if (!strcmp( ext, "svg" )) /* svg file */ { char *convert = get_expanded_make_variable( "CONVERT" ); @@ -1781,6 +1793,7 @@ static void update_makefile( const char *path ) "LEX_SRCS", "XTEMPLATE_SRCS", "SVG_SRCS", + "FONT_SRCS", "IN_SRCS", "MANPAGES", NULL

1 0

Alexandre Julliard : msvcp: Don't forward __uncaught_exception to msvcrt.
by Alexandre Julliard 27 Dec '13

27 Dec '13

Module: wine Branch: master Commit: b2d030a9caeaf14a058c876830c1104073ff9516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d030a9caeaf14a058c87683… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 26 23:42:03 2013 +0100 msvcp: Don't forward __uncaught_exception to msvcrt. --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/exception.c | 6 ++++++ dlls/msvcp90/msvcp90.spec | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 12463af..e949b98 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2795,7 +2795,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=win32 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_underflow diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index d31f301..db0117d 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3615,7 +3615,7 @@ @ cdecl -arch=arm ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAAGXZ @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcp90.?uncaught_exception(a)std@@YA_NXZ @ cdecl -arch=arm ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAAHXZ(ptr) msvcp90.?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAAHXZ @ thiscall -arch=i386 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) msvcp90.?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ @ cdecl -arch=win64 ?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) msvcp90.?underflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 40b959e..648be15 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4192,7 +4192,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_uflow @ thiscall -arch=win32 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcp90.?uncaught_exception(a)std@@YA_NXZ @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index af1b1a0..17e9602 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -4950,7 +4950,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) msvcp90.?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcp90.?uncaught_exception(a)std@@YA_NXZ @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) msvcp90.?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ @ cdecl -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) msvcp90.?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) msvcp90.?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 850b112..5acc18b 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5003,7 +5003,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=win32 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 96bd8c57..1550cc6 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5610,7 +5610,7 @@ @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index f0c17e3..dfd35d9 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -493,6 +493,12 @@ void __cdecl _Xruntime_error(const char *str) throw_exception(EXCEPTION_RUNTIME_ERROR, str); } +/* ?uncaught_exception(a)std@@YA_NXZ */ +MSVCP_bool __cdecl MSVCP__uncaught_exception(void) +{ + return __uncaught_exception(); +} + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 935b47a..8017819 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6367,7 +6367,7 @@ @ cdecl -arch=arm ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAAGXZ(ptr) basic_streambuf_wchar_uflow @ thiscall -arch=i386 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAAGXZ(ptr) basic_streambuf_wchar_uflow -@ cdecl ?uncaught_exception(a)std@@YA_NXZ() msvcrt.__uncaught_exception +@ cdecl ?uncaught_exception(a)std@@YA_NXZ() MSVCP__uncaught_exception @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow @ cdecl -arch=win64 ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow @ thiscall -arch=win32 ?underflow@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow

1 0