November 2013 - Wine-Commits

Frédéric Delanoy : kernel32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: a10dfea044c37d99a9359457bce35afb3c027e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10dfea044c37d99a9359457b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 19 01:05:54 2013 +0100 kernel32/tests: Use BOOL type where appropriate. --- dlls/kernel32/tests/heap.c | 4 ++-- dlls/kernel32/tests/pipe.c | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 4a730c7..111e1f7 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -56,7 +56,7 @@ static SIZE_T resize_9x(SIZE_T size) static void test_sized_HeapAlloc(int nbytes) { - int success; + BOOL success; char *buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nbytes); ok(buf != NULL, "allocate failed\n"); ok(buf[0] == 0, "buffer not zeroed\n"); @@ -66,7 +66,7 @@ static void test_sized_HeapAlloc(int nbytes) static void test_sized_HeapReAlloc(int nbytes1, int nbytes2) { - int success; + BOOL success; char *buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nbytes1); ok(buf != NULL, "allocate failed\n"); ok(buf[0] == 0, "buffer not zeroed\n"); diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 30dcc8e..b192f96 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -452,7 +452,7 @@ static DWORD CALLBACK serverThreadMain1(LPVOID arg) char buf[512]; DWORD written; DWORD readden; - DWORD success; + BOOL success; /* Wait for client to connect */ trace("Server calling ConnectNamedPipe...\n"); @@ -504,13 +504,15 @@ static DWORD CALLBACK serverThreadMain2(LPVOID arg) char buf[512]; DWORD written; DWORD readden; - DWORD success; + DWORD ret; + BOOL success; + user_apc_ran = FALSE; if (i == 0 && pQueueUserAPC) { trace("Queueing an user APC\n"); /* verify the pipe is non alerable */ - success = pQueueUserAPC(&user_apc, GetCurrentThread(), 0); - ok(success, "QueueUserAPC failed: %d\n", GetLastError()); + ret = pQueueUserAPC(&user_apc, GetCurrentThread(), 0); + ok(ret, "QueueUserAPC failed: %d\n", GetLastError()); } /* Wait for client to connect */ @@ -587,7 +589,7 @@ static DWORD CALLBACK serverThreadMain3(LPVOID arg) DWORD written; DWORD readden; DWORD dummy; - DWORD success; + BOOL success; OVERLAPPED oOverlap; int letWFSOEwait = (i & 2); int letGORwait = (i & 1); @@ -713,7 +715,7 @@ static DWORD CALLBACK serverThreadMain4(LPVOID arg) DWORD written; DWORD readden; DWORD dummy; - DWORD success; + BOOL success; OVERLAPPED oConnect; OVERLAPPED oRead; OVERLAPPED oWrite; @@ -837,7 +839,7 @@ static DWORD CALLBACK serverThreadMain5(LPVOID arg) for (i = 0; i < NB_SERVER_LOOPS; i++) { char buf[512]; DWORD readden; - DWORD success; + BOOL success; OVERLAPPED oOverlap; DWORD err;

1 0

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

Nov. 19, 2013

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: Only generate auto-documentation rules for dlls.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

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

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

Nov. 19, 2013

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 Nov. 19, 2013

Nov. 19, 2013

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 Nov. 19, 2013

Nov. 19, 2013

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 Nov. 19, 2013

Nov. 19, 2013

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 Nov. 19, 2013

Nov. 19, 2013

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

Andrew Eikum : winmm: Also try MSACM conversions with WAVE_FORMAT_QUERY.
by Alexandre Julliard Nov. 19, 2013

Nov. 19, 2013

Module: wine Branch: master Commit: 06c95af45726674847d12440d904568f59f627bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c95af45726674847d12440d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 18 14:23:02 2013 -0600 winmm: Also try MSACM conversions with WAVE_FORMAT_QUERY. --- dlls/winmm/tests/wave.c | 15 ++++++++++- dlls/winmm/waveform.c | 66 +++++++++++++++++++++++++--------------------- 2 files changed, 50 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06c95af45726674847d12…

1 0

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

Nov. 19, 2013

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