wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Frédéric Delanoy : gdiplus: Use BOOL type where appropriate.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 4cc3705f667e0ee130c06fd7f31d502cd8d24806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc3705f667e0ee130c06fd7f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 19 01:05:53 2013 +0100 gdiplus: Use BOOL type where appropriate. --- dlls/gdiplus/image.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b9e5b84..0ad2308 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1122,12 +1122,12 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if (flags & ImageLockModeRead) { - static int fixme=0; + static BOOL fixme = FALSE; if (!fixme && (PIXELFORMATBPP(bitmap->format) * act_rect.X) % 8 != 0) { FIXME("Cannot copy rows that don't start at a whole byte.\n"); - fixme = 1; + fixme = TRUE; } stat = convert_pixels(act_rect.Width, act_rect.Height, @@ -1169,7 +1169,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, BitmapData* lockeddata) { GpStatus stat; - static int fixme=0; + static BOOL fixme = FALSE; TRACE("(%p,%p)\n", bitmap, lockeddata); @@ -1199,7 +1199,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, if (!fixme && (PIXELFORMATBPP(bitmap->format) * bitmap->lockx) % 8 != 0) { FIXME("Cannot copy rows that don't start at a whole byte.\n"); - fixme = 1; + fixme = TRUE; } stat = convert_pixels(lockeddata->Width, lockeddata->Height,

1 0

Alexandre Julliard : makefiles: Generate include path options from makedep.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: c8a42b4735a9f2183960680c8020a49e56850789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a42b4735a9f2183960680c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 13:03:55 2013 +0100 makefiles: Generate include path options from makedep. --- Make.rules.in | 9 ++++----- configure | 2 +- configure.ac | 2 +- tools/makedep.c | 30 ++++++++++++++++++++---------- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 00fe0bb..7409e06 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -11,11 +11,10 @@ # First some useful definitions -INCLUDES = -I$(srcdir) $(PARENTSRC:%=-I@srcdir@/%) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL) DEFS = -D__WINESRC__ $(EXTRADEFS) -ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) -IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) -RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTRARCFLAGS) +ALLCFLAGS = $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) +IDLFLAGS = $(DEFS) $(EXTRAIDLFLAGS) +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) @@ -28,7 +27,7 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_ $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) -ALLCROSSCFLAGS = $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) +ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) # Implicit rules diff --git a/configure b/configure index 89fde02..3d88128 100755 --- a/configure +++ b/configure @@ -17521,7 +17521,7 @@ then ac_config_commands="$ac_config_commands tools" wine_fn_append_rule "tools/makedep$ac_exeext: tools/makedep.c include/config.h - \$(CC) \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) + \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext" fi diff --git a/configure.ac b/configure.ac index 9dbfabc..98a73f2 100644 --- a/configure.ac +++ b/configure.ac @@ -3522,7 +3522,7 @@ then AC_CONFIG_COMMANDS([tools],[AS_MKDIR_P(tools)]) WINE_APPEND_RULE( [tools/makedep$ac_exeext: tools/makedep.c include/config.h - \$(CC) \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) + \$(CC) -Iinclude -I$srcdir/include \$(ALLCFLAGS) -o \$@ $srcdir/tools/makedep.c \$(LDFLAGS) clean:: __clean__ \$(RM) tools/makedep$ac_exeext]) fi diff --git a/tools/makedep.c b/tools/makedep.c index 29e78d0..692ee58 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1148,6 +1148,16 @@ static void output_sources(void) strarray_init( &clean_files ); strarray_init( &subdirs ); + column = output( "includes = -I." ); + if (src_dir) output_filename( strmake( "-I%s", src_dir ), &column ); + 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 ); + } + for (i = 0; i < paths.count; i++) output_filename( strmake( "-I%s", paths.str[i] ), &column ); + output( "\n" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { char *obj = xstrdup( source->name ); @@ -1174,7 +1184,7 @@ static void output_sources(void) output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o $@ %s\n", obj, source->filename ); output( "%s.tab.o: %s.tab.c\n", obj, obj ); - output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s.tab.c\n", obj ); + output( "\t$(CC) -c $(includes) $(ALLCFLAGS) -o $@ %s.tab.c\n", obj ); strarray_add( &clean_files, strmake( "%s.tab.c", obj )); strarray_add( &clean_files, strmake( "%s.tab.o", obj )); column += output( "%s.tab.o:", obj ); @@ -1185,7 +1195,7 @@ static void output_sources(void) output( "%s.yy.c: %s\n", obj, source->filename ); output( "\t$(FLEX) $(LEXFLAGS) -o$@ %s\n", source->filename ); output( "%s.yy.o: %s.yy.c\n", obj, obj ); - output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s.yy.c\n", obj ); + output( "\t$(CC) -c $(includes) $(ALLCFLAGS) -o $@ %s.yy.c\n", obj ); strarray_add( &clean_files, strmake( "%s.yy.c", obj )); strarray_add( &clean_files, strmake( "%s.yy.o", obj )); column += output( "%s.yy.o:", obj ); @@ -1195,14 +1205,14 @@ static void output_sources(void) if (source->flags & FLAG_RC_PO) { output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, source->filename ); - output( "\t$(WRC) $(RCFLAGS) -o $@ %s\n", source->filename ); + output( "\t$(WRC) $(includes) $(RCFLAGS) -o $@ %s\n", source->filename ); column += output( "%s.res rsrc.pot:", obj ); po_srcs++; } else { output( "%s.res: $(WRC) %s\n", obj, source->filename ); - output( "\t$(WRC) $(RCFLAGS) -o $@ %s\n", source->filename ); + output( "\t$(WRC) $(includes) $(RCFLAGS) -o $@ %s\n", source->filename ); column += output( "%s.res:", obj ); } strarray_add( &clean_files, strmake( "%s.res", obj )); @@ -1227,7 +1237,7 @@ static void output_sources(void) { if (!(source->flags & idl_outputs[i].flag)) continue; output( "%s%s: $(WIDL)\n", obj, idl_outputs[i].ext ); - output( "\t$(WIDL) %s -o $@ %s\n", idl_outputs[i].widl_arg, source->filename ); + output( "\t$(WIDL) $(includes) %s -o $@ %s\n", idl_outputs[i].widl_arg, source->filename ); targets[nb_targets++] = strmake( "%s%s", obj, idl_outputs[i].ext ); } for (i = 0; i < nb_targets; i++) @@ -1274,15 +1284,15 @@ static void 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], source->filename ); if (strstr( object_extensions.str[i], "cross" )) - output( "\t$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); + output( "\t$(CROSSCC) -c $(includes) $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); else - output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s\n", source->filename ); + output( "\t$(CC) -c $(includes) $(ALLCFLAGS) -o $@ %s\n", source->filename ); } if (source->flags & FLAG_C_IMPLIB) { strarray_add( &clean_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj, source->filename ); - output( "\t$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); + output( "\t$(CROSSCC) -c $(includes) $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); } if (is_test && !strcmp( ext, "c" ) && !is_generated_idl( source )) { @@ -1309,7 +1319,7 @@ static void output_sources(void) LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (source->flags & FLAG_RC_PO) output_filename( source->filename, &column ); output( "\n" ); - column = output( "\t$(WRC) $(RCFLAGS) -O pot -o $@" ); + column = output( "\t$(WRC) $(includes) $(RCFLAGS) -O pot -o $@" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (source->flags & FLAG_RC_PO) output_filename( source->filename, &column ); output( "\n" ); @@ -1332,7 +1342,7 @@ static void output_sources(void) if (find_src_file( "dlldata.o" )) { output( "dlldata.c: $(WIDL) Makefile.in\n" ); - column = output( "\t$(WIDL) $(IDLFLAGS) --dlldata-only -o $@" ); + 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( "\n" );

1 0

Alexandre Julliard : makedep: Use string arrays for include paths and object extensions.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: a072dbc1806375c0e5445e4285689bb5843e5703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a072dbc1806375c0e5445e428… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 11:36:25 2013 +0100 makedep: Use string arrays for include paths and object extensions. --- tools/makedep.c | 120 +++++++++++++++++------------------------------------- 1 files changed, 38 insertions(+), 82 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index eb69bec..29e78d0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -81,22 +81,6 @@ static const struct static struct list sources = LIST_INIT(sources); static struct list includes = LIST_INIT(includes); -struct object_extension -{ - struct list entry; - const char *extension; -}; - -static struct list object_extensions = LIST_INIT(object_extensions); - -struct incl_path -{ - struct list entry; - const char *name; -}; - -static struct list paths = LIST_INIT(paths); - struct strarray { unsigned int count; /* strings in use */ @@ -104,6 +88,9 @@ struct strarray const char **str; }; +static struct strarray paths; +static struct strarray object_extensions; + static const char *src_dir; static const char *top_src_dir; static const char *top_obj_dir; @@ -291,6 +278,19 @@ static void strarray_add( struct strarray *array, const char *str ) /******************************************************************* + * strarray_insert + */ +static void strarray_insert( struct strarray *array, unsigned int pos, const char *str ) +{ + unsigned int i; + + strarray_add( array, NULL ); + for (i = array->count - 1; i > pos; i--) array->str[i] = array->str[i - 1]; + array->str[pos] = str; +} + + +/******************************************************************* * output_filename */ static void output_filename( const char *name, int *column ) @@ -418,30 +418,6 @@ static char *get_line( FILE *file ) } /******************************************************************* - * add_object_extension - * - * Add an extension for object files. - */ -static void add_object_extension( const char *ext ) -{ - struct object_extension *object_extension = xmalloc( sizeof(*object_extension) ); - list_add_tail( &object_extensions, &object_extension->entry ); - object_extension->extension = ext; -} - -/******************************************************************* - * add_include_path - * - * Add a directory to the include path. - */ -static void add_include_path( const char *name ) -{ - struct incl_path *path = xmalloc( sizeof(*path) ); - list_add_tail( &paths, &path->entry ); - path->name = name; -} - -/******************************************************************* * find_src_file */ static struct incl_file *find_src_file( const char *name ) @@ -560,7 +536,7 @@ static FILE *open_include_file( struct incl_file *pFile ) { FILE *file = NULL; char *filename, *p; - struct incl_path *path; + unsigned int i; errno = ENOENT; @@ -666,24 +642,17 @@ static FILE *open_include_file( struct incl_file *pFile ) free( filename ); } - /* now try in global includes */ - if (top_obj_dir) - { - filename = strmake( "%s/include/%s", top_obj_dir, pFile->name ); - if ((file = fopen( filename, "r" ))) goto found; - free( filename ); - } - if (top_src_dir) - { - filename = strmake( "%s/include/%s", top_src_dir, pFile->name ); - if ((file = fopen( filename, "r" ))) goto found; - free( filename ); - } - /* now search in include paths */ - LIST_FOR_EACH_ENTRY( path, &paths, struct incl_path, entry ) + for (i = 0; i < paths.count; i++) { - filename = strmake( "%s/%s", path->name, pFile->name ); + if (paths.str[i][0] == '/') + { + /* ignore absolute paths that don't point into the source dir */ + if (!top_src_dir) continue; + if (strncmp( paths.str[i], top_src_dir, strlen(top_src_dir) )) continue; + if (paths.str[i][strlen(top_src_dir)] != '/') continue; + } + filename = strmake( "%s/%s", paths.str[i], pFile->name ); if ((file = fopen( filename, "r" ))) goto found; free( filename ); } @@ -1300,12 +1269,11 @@ static void output_sources(void) } else { - struct object_extension *obj_ext; - LIST_FOR_EACH_ENTRY( obj_ext, &object_extensions, struct object_extension, entry ) + for (i = 0; i < object_extensions.count; i++) { - strarray_add( &clean_files, strmake( "%s.%s", obj, obj_ext->extension )); - output( "%s.%s: %s\n", obj, obj_ext->extension, source->filename ); - if (strstr( obj_ext->extension, "cross" )) + strarray_add( &clean_files, strmake( "%s.%s", obj, object_extensions.str[i] )); + output( "%s.%s: %s\n", obj, object_extensions.str[i], source->filename ); + if (strstr( object_extensions.str[i], "cross" )) output( "\t$(CROSSCC) -c $(ALLCROSSCFLAGS) -o $@ %s\n", source->filename ); else output( "\t$(CC) -c $(ALLCFLAGS) -o $@ %s\n", source->filename ); @@ -1321,8 +1289,8 @@ static void output_sources(void) output( "%s.ok:\n", obj ); output( "\t$(RUNTEST) $(RUNTESTFLAGS) %s && touch $@\n", obj ); } - LIST_FOR_EACH_ENTRY( obj_ext, &object_extensions, struct object_extension, entry ) - column += output( "%s.%s ", obj, obj_ext->extension ); + 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 ); column += output( ":" ); } @@ -1498,7 +1466,7 @@ static void parse_option( const char *opt ) switch(opt[1]) { case 'I': - if (opt[2]) add_include_path( opt + 2 ); + if (opt[2]) strarray_add( &paths, xstrdup( opt + 2 )); break; case 'C': src_dir = opt + 2; @@ -1523,7 +1491,7 @@ static void parse_option( const char *opt ) else Separator = NULL; break; case 'x': - if (opt[2]) add_object_extension( opt + 2 ); + if (opt[2]) strarray_add( &object_extensions, xstrdup( opt + 2 )); break; default: fprintf( stderr, "Unknown option '%s'\n%s", opt, Usage ); @@ -1538,7 +1506,6 @@ static void parse_option( const char *opt ) int main( int argc, char *argv[] ) { struct incl_file *pFile; - struct incl_path *path, *next; int i, j; i = 1; @@ -1571,22 +1538,11 @@ int main( int argc, char *argv[] ) if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; - /* set the default extension list for object files */ - if (list_empty( &object_extensions )) - add_object_extension( "o" ); + if (top_src_dir) strarray_insert( &paths, 0, strmake( "%s/include", top_src_dir )); + if (top_obj_dir) strarray_insert( &paths, 0, strmake( "%s/include", top_obj_dir )); - /* get rid of absolute paths that don't point into the source dir */ - LIST_FOR_EACH_ENTRY_SAFE( path, next, &paths, struct incl_path, entry ) - { - if (path->name[0] != '/') continue; - if (top_src_dir) - { - if (!strncmp( path->name, top_src_dir, strlen(top_src_dir) ) && - path->name[strlen(top_src_dir)] == '/') continue; - } - list_remove( &path->entry ); - free( path ); - } + /* set the default extension list for object files */ + if (!object_extensions.count) strarray_add( &object_extensions, "o" ); for (i = 1; i < argc; i++) add_src_file( argv[i] ); add_generated_sources();

1 0

Alexandre Julliard : makefiles: Only generate auto-documentation rules for dlls.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 3bc839f12e6fd2c5cf77fb4f82283d9b04d046d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc839f12e6fd2c5cf77fb4f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 13:02:36 2013 +0100 makefiles: Only generate auto-documentation rules for dlls. --- Make.rules.in | 14 -------------- configure | 10 ++++++++++ configure.ac | 10 ++++++++++ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index a0a4ece..00fe0bb 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -106,20 +106,6 @@ all: $(MANPAGES:.man.in=.man) .PHONY: install-man-pages -# Rules for auto documentation - -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) - -htmlpages:: dummy - $(C2MAN) -o $(top_builddir)/documentation/html -R$(top_builddir) -C$(srcdir) $(PARENTSRC:%=-P%) -I$(top_srcdir)/include -Th $(MAINSPEC:%=-w %) $(C_SRCS) - -sgmlpages:: dummy - $(C2MAN) -o $(top_builddir)/documentation/api-guide -R$(top_builddir) -C$(srcdir) $(PARENTSRC:%=-P%) -I$(top_srcdir)/include -Ts $(MAINSPEC:%=-w %) $(C_SRCS) - -xmlpages:: dummy - $(C2MAN) -o $(top_builddir)/documentation/api-guide-xml -R$(top_builddir) -C$(srcdir) $(PARENTSRC:%=-P%) -I$(top_srcdir)/include -Tx $(MAINSPEC:%=-w %) $(C_SRCS) - # Rules for cleaning clean:: diff --git a/configure b/configure index a66ba62..89fde02 100755 --- a/configure +++ b/configure @@ -16138,6 +16138,16 @@ IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) MODULEFLAGS = -shared \$(srcdir)/\$(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) +htmlpages:: dummy + \$(C2MAN) -o \$(top_builddir)/documentation/html -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Th \$(MAINSPEC:%=-w %) \$(C_SRCS) +sgmlpages:: dummy + \$(C2MAN) -o \$(top_builddir)/documentation/api-guide -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Ts \$(MAINSPEC:%=-w %) \$(C_SRCS) +xmlpages:: dummy + \$(C2MAN) -o \$(top_builddir)/documentation/api-guide-xml -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Tx \$(MAINSPEC:%=-w %) \$(C_SRCS) +.PHONY: manpages htmlpages sgmlpages xmlpages " diff --git a/configure.ac b/configure.ac index 35accb2..9dbfabc 100644 --- a/configure.ac +++ b/configure.ac @@ -2625,6 +2625,16 @@ IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) MODULEFLAGS = -shared \$(srcdir)/\$(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) +htmlpages:: dummy + \$(C2MAN) -o \$(top_builddir)/documentation/html -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Th \$(MAINSPEC:%=-w %) \$(C_SRCS) +sgmlpages:: dummy + \$(C2MAN) -o \$(top_builddir)/documentation/api-guide -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Ts \$(MAINSPEC:%=-w %) \$(C_SRCS) +xmlpages:: dummy + \$(C2MAN) -o \$(top_builddir)/documentation/api-guide-xml -R\$(top_builddir) -C\$(srcdir) \$(PARENTSRC:%=-P%) -I\$(top_srcdir)/include -Tx \$(MAINSPEC:%=-w %) \$(C_SRCS) +.PHONY: manpages htmlpages sgmlpages xmlpages ") AC_SUBST(MAKE_PROG_RULES,"

1 0

Alexandre Julliard : makefiles: Add support for parent source directory in c2man.
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: abc62981590bf69fd581961a13a8fd5d0b6e176f URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc62981590bf69fd581961a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 19 12:48:30 2013 +0100 makefiles: Add support for parent source directory in c2man. --- Make.rules.in | 16 ++++++++-------- tools/c2man.pl | 14 +++++++++++--- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index b895c8a..a0a4ece 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -108,17 +108,17 @@ all: $(MANPAGES:.man.in=.man) # Rules for auto documentation -manpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/man$(api_manext) -R$(top_builddir) -C$(srcdir) $(INCLUDES) -S$(api_manext) $(MAINSPEC:%=-w %) $(C_SRCS) +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) -htmlpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/html -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(C_SRCS) +htmlpages:: dummy + $(C2MAN) -o $(top_builddir)/documentation/html -R$(top_builddir) -C$(srcdir) $(PARENTSRC:%=-P%) -I$(top_srcdir)/include -Th $(MAINSPEC:%=-w %) $(C_SRCS) -sgmlpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/api-guide -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(C_SRCS) +sgmlpages:: dummy + $(C2MAN) -o $(top_builddir)/documentation/api-guide -R$(top_builddir) -C$(srcdir) $(PARENTSRC:%=-P%) -I$(top_srcdir)/include -Ts $(MAINSPEC:%=-w %) $(C_SRCS) -xmlpages:: $(C_SRCS) dummy - $(C2MAN) -o $(top_builddir)/documentation/api-guide-xml -R$(top_builddir) -C$(srcdir) $(INCLUDES) -Tx $(MAINSPEC:%=-w %) $(C_SRCS) +xmlpages:: dummy + $(C2MAN) -o $(top_builddir)/documentation/api-guide-xml -R$(top_builddir) -C$(srcdir) $(PARENTSRC:%=-P%) -I$(top_srcdir)/include -Tx $(MAINSPEC:%=-w %) $(C_SRCS) # Rules for cleaning diff --git a/tools/c2man.pl b/tools/c2man.pl index 0668ee2..a9c4150 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -48,7 +48,8 @@ my $EXPORT_FLAGS = 4; # Flags - see above. # Options my $opt_output_directory = "man3w"; # All default options are for nroff (man pages) my $opt_manual_section = "3w"; -my $opt_source_dir = ""; +my $opt_source_dir = "."; +my $opt_parent_dir = ""; my $opt_wine_root_dir = ""; my $opt_output_format = ""; # '' = nroff, 'h' = html, 's' = sgml, 'x' = xml my $opt_output_empty = 0; # Non-zero = Create 'empty' comments (for every implemented function) @@ -251,8 +252,10 @@ sub process_source_file($) print "Processing ".$source_file."\n"; } open(SOURCE_FILE,"<$source_file") - || (($opt_source_dir ne "") + || (($opt_source_dir ne ".") && open(SOURCE_FILE,"<$opt_source_dir/$source_file")) + || (($opt_parent_dir ne "") + && open(SOURCE_FILE,"<$opt_source_dir/$opt_parent_dir/$source_file")) || die "couldn't open ".$source_file."\n"; # Add this source file to the list of source files @@ -2241,7 +2244,8 @@ sub usage() " -Ts : Output SGML (DocBook source) instead of a man page\n", " -C <dir> : Source directory, to find source files if they are not found in the\n", " current directory. Default is \"",$opt_source_dir,"\"\n", - " -R <dir> : Root of build directory, default is \"",$opt_wine_root_dir,"\"\n", + " -P <dir> : Parent source directory.\n", + " -R <dir> : Root of build directory.\n", " -o <dir> : Create output in <dir>, default is \"",$opt_output_directory,"\"\n", " -s <sect>: Set manual section to <sect>, default is ",$opt_manual_section,"\n", " -e : Output \"FIXME\" documentation from empty comments.\n", @@ -2291,6 +2295,10 @@ while(defined($_ = shift @ARGV)) if ($_ ne "") { $opt_source_dir = $_; } last; }; + s/^P// && do { + if ($_ ne "") { $opt_parent_dir = $_; } + last; + }; s/^R// && do { if ($_ =~ /^\//) { $opt_wine_root_dir = $_; } else { $opt_wine_root_dir = `cd $pwd/$_ && pwd`; } $opt_wine_root_dir =~ s/\n//;

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_modify_ds_location().
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 0fba32f139a4215b412adbdbc19bf33bfa206e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fba32f139a4215b412adbdbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 19 10:28:50 2013 +0100 wined3d: Surfaces always have a container in surface_modify_ds_location(). --- dlls/wined3d/surface.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a0ca8ba..60348ab 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5028,13 +5028,7 @@ void surface_modify_ds_location(struct wined3d_surface *surface, if (((surface->flags & SFLAG_INTEXTURE) && !(location & SFLAG_INTEXTURE)) || (!(surface->flags & SFLAG_INTEXTURE) && (location & SFLAG_INTEXTURE))) - { - if (surface->container) - { - TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container); - } - } + wined3d_texture_set_dirty(surface->container); surface->ds_current_size.cx = w; surface->ds_current_size.cy = h;

1 0

Henri Verbeet : wined3d: Surfaces always have a container in fb_copy_to_texture_direct().
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: f020251d2b51b099870ca37a283a2c4744cf4e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f020251d2b51b099870ca37a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 19 10:28:49 2013 +0100 wined3d: Surfaces always have a container in fb_copy_to_texture_direct(). --- dlls/wined3d/surface.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f054b43..a0ca8ba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4289,12 +4289,6 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; - GLenum dst_target; - - if (dst_surface->container) - dst_target = dst_surface->container->target; - else - dst_target = dst_surface->texture_target; /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag * glCopyTexSubImage is a bit picky about the parameters we pass to it @@ -4312,7 +4306,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc surface_internal_preload(dst_surface, context, SRGB_RGB); /* Bind the target texture */ - context_bind_texture(context, dst_target, dst_surface->texture_name); + context_bind_texture(context, dst_surface->container->target, dst_surface->texture_name); if (surface_is_offscreen(src_surface)) { TRACE("Reading from an offscreen target\n");

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_prepare_texture().
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 2d262b3c9718a8a1ba522e8bd37c685905dbeb7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d262b3c9718a8a1ba522e8bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 19 10:28:48 2013 +0100 wined3d: Surfaces always have a container in surface_prepare_texture(). --- dlls/wined3d/surface.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 20b5c5f..f054b43 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3940,24 +3940,19 @@ static void surface_prepare_texture_internal(struct wined3d_surface *surface, /* Context activation is done by the caller. */ void surface_prepare_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - if (surface->container) - { - struct wined3d_texture *texture = surface->container; - UINT sub_count = texture->level_count * texture->layer_count; - UINT i; - - TRACE("surface %p is a subresource of texture %p.\n", surface, texture); + struct wined3d_texture *texture = surface->container; + UINT sub_count = texture->level_count * texture->layer_count; + UINT i; - for (i = 0; i < sub_count; ++i) - { - struct wined3d_surface *s = surface_from_resource(texture->sub_resources[i]); - surface_prepare_texture_internal(s, context, srgb); - } + TRACE("surface %p is a subresource of texture %p.\n", surface, texture); - return; + for (i = 0; i < sub_count; ++i) + { + struct wined3d_surface *s = surface_from_resource(texture->sub_resources[i]); + surface_prepare_texture_internal(s, context, srgb); } - surface_prepare_texture_internal(surface, context, srgb); + return; } void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample)

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_internal_preload().
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: 57292f94987e5dacad0d1458731b41e12e1d58a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57292f94987e5dacad0d14587… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 19 10:28:47 2013 +0100 wined3d: Surfaces always have a container in surface_internal_preload(). --- dlls/wined3d/surface.c | 24 +++--------------------- 1 files changed, 3 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2999e62..20b5c5f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3635,29 +3635,11 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined void surface_internal_preload(struct wined3d_surface *surface, struct wined3d_context *context, enum WINED3DSRGB srgb) { - TRACE("iface %p, srgb %#x.\n", surface, srgb); - - if (surface->container) - { - struct wined3d_texture *texture = surface->container; - - TRACE("Passing to container (%p).\n", texture); - texture->texture_ops->texture_preload(texture, context, srgb); - } - else - { - TRACE("(%p) : About to load surface\n", surface); + struct wined3d_texture *texture = surface->container; - surface_load(surface, srgb == SRGB_SRGB); + TRACE("iface %p, srgb %#x.\n", surface, srgb); - if (surface->resource.pool == WINED3D_POOL_DEFAULT) - { - /* Tell opengl to try and keep this texture in video ram (well mostly) */ - GLclampf tmp; - tmp = 0.9f; - context->gl_info->gl_ops.gl.p_glPrioritizeTextures(1, &surface->texture_name, &tmp); - } - } + texture->texture_ops->texture_preload(texture, context, srgb); } /* Read the framebuffer back into the surface */

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_add_dirty_rect().
by Alexandre Julliard 19 Nov '13

19 Nov '13

Module: wine Branch: master Commit: aa48321ccd5af82b074764524531d4db140928d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa48321ccd5af82b074764524… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 19 10:28:46 2013 +0100 wined3d: Surfaces always have a container in surface_add_dirty_rect(). --- dlls/wined3d/surface.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7718186..2999e62 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2421,12 +2421,7 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3 surface->dirtyRect.bottom = surface->resource.height; } - /* if the container is a texture then mark it dirty. */ - if (surface->container) - { - TRACE("Passing to container.\n"); - wined3d_texture_set_dirty(surface->container); - } + wined3d_texture_set_dirty(surface->container); } HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb)

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2013