January 2014 - Wine-commits

Huw Davies : riched20: Add uniscribe support.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 7a0a4ce7abaa36a10ac97b74b39b582c2fc7665c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0a4ce7abaa36a10ac97b74b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 15 13:06:43 2014 +0000 riched20: Add uniscribe support. --- dlls/riched20/Makefile.in | 2 +- dlls/riched20/editstr.h | 12 +++ dlls/riched20/list.c | 2 + dlls/riched20/paint.c | 7 +- dlls/riched20/run.c | 36 ++++++- dlls/riched20/style.c | 2 + dlls/riched20/wrap.c | 239 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 296 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a0a4ce7abaa36a10ac97…

1 0

Stefan Dösinger : wined3d: Add INDIB and INUSERMEM to resource_access_from_location.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 42927d0e9d60db7139eb55dde1ffa47092623637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42927d0e9d60db7139eb55dde… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:08 2014 +0100 wined3d: Add INDIB and INUSERMEM to resource_access_from_location. --- dlls/wined3d/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d70f605..92750cb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4885,6 +4885,8 @@ static DWORD resource_access_from_location(DWORD location) switch (location) { case SFLAG_INSYSMEM: + case SFLAG_INUSERMEM: + case SFLAG_INDIB: return WINED3D_RESOURCE_ACCESS_CPU; case SFLAG_INDRAWABLE:

1 0

Stefan Dösinger : wined3d: Load textures from dib without copying to sysmem first.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 035012d5aac797077edd62b1a87ce903aa6bbc36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035012d5aac797077edd62b1a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:09 2014 +0100 wined3d: Load textures from dib without copying to sysmem first. --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 92750cb..74cab37 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,6 +36,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy. */ +static const DWORD surface_simple_locations = + SFLAG_INDIB | SFLAG_INUSERMEM | SFLAG_INSYSMEM; + static void surface_cleanup(struct wined3d_surface *surface) { struct wined3d_surface *overlay, *cur; @@ -4941,10 +4944,7 @@ static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD static void surface_load_sysmem(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { - static const DWORD simple_locations = - SFLAG_INDIB | SFLAG_INUSERMEM | SFLAG_INSYSMEM; - - if (surface->flags & simple_locations) + if (surface->flags & surface_simple_locations) { surface_copy_simple_location(surface, dst_location); return; @@ -5079,9 +5079,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } } - if (!(surface->flags & SFLAG_INSYSMEM)) + if (!(surface->flags & surface_simple_locations)) { - WARN("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set.\n"); + WARN("Trying to load a texture from sysmem, but no simple location is valid.\n"); /* Lets hope we get it from somewhere... */ surface_prepare_system_memory(surface); surface_load_location(surface, SFLAG_INSYSMEM);

1 0

Stefan Dösinger : wined3d: Remove SFLAG_PBO.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 7c052171d638f9d43911981e75da367350831b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c052171d638f9d43911981e7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:10 2014 +0100 wined3d: Remove SFLAG_PBO. --- dlls/wined3d/surface.c | 29 ++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 21 +++++++++------------ 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 74cab37..0d8de0f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -45,7 +45,7 @@ static void surface_cleanup(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if ((surface->flags & SFLAG_PBO) || surface->rb_multisample + if (surface->pbo || surface->rb_multisample || surface->rb_resolved || !list_empty(&surface->renderbuffers)) { struct wined3d_renderbuffer_entry *entry, *entry2; @@ -55,7 +55,7 @@ static void surface_cleanup(struct wined3d_surface *surface) context = context_acquire(surface->resource.device, NULL); gl_info = context->gl_info; - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { TRACE("Deleting PBO %u.\n", surface->pbo); GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo)); @@ -522,7 +522,7 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win } if (location & SFLAG_INSYSMEM) { - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { data->addr = NULL; data->buffer_object = surface->pbo; @@ -581,7 +581,6 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win /* We don't need the system memory anymore and we can't even use it for PBOs. */ if (!(surface->flags & SFLAG_CLIENT)) wined3d_resource_free_sysmem(&surface->resource); - surface->flags |= SFLAG_PBO; surface->map_binding = SFLAG_INSYSMEM; context_release(context); } @@ -592,9 +591,9 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) + if (!surface->pbo && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); - else if (!(surface->resource.heap_memory || surface->flags & SFLAG_PBO)) + else if (!(surface->resource.heap_memory || surface->pbo)) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ @@ -631,7 +630,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE) - || surface->user_memory) + || surface->user_memory || surface->pbo) return; wined3d_resource_free_sysmem(&surface->resource); @@ -828,7 +827,7 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR return surface->dib.bitmap_data; case SFLAG_INSYSMEM: - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { BYTE *ret; const struct wined3d_gl_info *gl_info; @@ -877,7 +876,7 @@ static void surface_unmap(struct wined3d_surface *surface) break; case SFLAG_INSYSMEM: - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -1339,7 +1338,6 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win checkGLcall("glDeleteBuffersARB"); surface->pbo = 0; - surface->flags &= ~SFLAG_PBO; } static BOOL surface_init_sysmem(struct wined3d_surface *surface) @@ -1382,7 +1380,7 @@ static void surface_unload(struct wined3d_resource *resource) * or the depth stencil into an FBO the texture or render buffer will be removed * and all flags get lost */ - if (!(surface->flags & SFLAG_PBO)) + if (!surface->pbo) { surface_init_sysmem(surface); surface_validate_location(surface, surface->map_binding); @@ -1405,7 +1403,7 @@ static void surface_unload(struct wined3d_resource *resource) gl_info = context->gl_info; /* Destroy PBOs, but load them into real sysmem before */ - if (surface->flags & SFLAG_PBO) + if (surface->pbo) surface_remove_pbo(surface, gl_info); /* Destroy fbo render buffers. This is needed for implicit render targets, for @@ -3274,7 +3272,8 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) if (FAILED(hr)) return WINED3DERR_INVALIDCALL; if (!(surface->map_binding == SFLAG_INUSERMEM - || surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) + || surface->flags & SFLAG_PIN_SYSMEM + || surface->pbo)) surface->map_binding = SFLAG_INDIB; } @@ -5106,7 +5105,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* Don't use PBOs for converted surfaces. During PBO conversion we look at * SFLAG_CONVERTED but it isn't set (yet) in all cases it is getting * called. */ - if ((convert != WINED3D_CT_NONE || format.convert) && (surface->flags & SFLAG_PBO)) + if ((convert != WINED3D_CT_NONE || format.convert) && surface->pbo) { TRACE("Removing the pbo attached to surface %p.\n", surface); surface_remove_pbo(surface, gl_info); @@ -5210,7 +5209,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) { TRACE("Location already up to date.\n"); - if (location == SFLAG_INSYSMEM && !(surface->flags & SFLAG_PBO) + if (location == SFLAG_INSYSMEM && !surface->pbo && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e795623..d8bdc9c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2296,27 +2296,24 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ #define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ #define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ -#define SFLAG_PBO 0x00002000 /* The surface has a PBO. */ -#define SFLAG_INSYSMEM 0x00004000 /* The system memory copy is current. */ -#define SFLAG_INUSERMEM 0x00008000 /* The user memory copy is current. */ -#define SFLAG_INDIB 0x00010000 /* The DIB copy is current. */ -#define SFLAG_INTEXTURE 0x00020000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00040000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00080000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00100000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00200000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00400000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_INSYSMEM 0x00002000 /* The system memory copy is current. */ +#define SFLAG_INUSERMEM 0x00004000 /* The user memory copy is current. */ +#define SFLAG_INDIB 0x00008000 /* The DIB copy is current. */ +#define SFLAG_INTEXTURE 0x00010000 /* The GL texture is current. */ +#define SFLAG_INSRGBTEX 0x00020000 /* The GL sRGB texture is current. */ +#define SFLAG_INDRAWABLE 0x00040000 /* The GL drawable is current. */ +#define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ +#define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ +#define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long * SFLAG_DYNLOCK: Avoid freeing the data for performance - * SFLAG_PBO: PBOs don't use 'normal' memory. It is either allocated by the driver or must be NULL. * SFLAG_CLIENT: OpenGL uses our memory as backup */ #define SFLAG_DONOTFREE (SFLAG_CONVERTED | \ SFLAG_DYNLOCK | \ SFLAG_CLIENT | \ - SFLAG_PBO | \ SFLAG_PIN_SYSMEM) #define SFLAG_LOCATIONS (SFLAG_INSYSMEM | \

1 0

Stefan Dösinger : wined3d: Decide about PBO use at surface creation time.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 321cd8e825c4382cdb4b0c4b4371c7362b237eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=321cd8e825c4382cdb4b0c4b4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:11 2014 +0100 wined3d: Decide about PBO use at surface creation time. --- dlls/wined3d/surface.c | 41 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0d8de0f..ab7bbd6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -538,20 +538,6 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win data->buffer_object = 0; } -static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) -{ - if (surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) - return FALSE; - if (!(surface->flags & SFLAG_DYNLOCK)) - return FALSE; - if (surface->flags & (SFLAG_CONVERTED | SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)) - return FALSE; - if (!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) - return FALSE; - - return TRUE; -} - static void surface_create_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { struct wined3d_context *context; @@ -591,7 +577,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (!surface->pbo && surface_need_pbo(surface, gl_info)) + if (!surface->pbo && surface->flags & SFLAG_PBO) surface_create_pbo(surface, gl_info); else if (!(surface->resource.heap_memory || surface->pbo)) { @@ -666,6 +652,17 @@ static void surface_release_client_storage(struct wined3d_surface *surface) surface_force_reload(surface); } +static BOOL surface_use_pbo(const struct wined3d_surface *surface) +{ + const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + + return surface->resource.pool == WINED3D_POOL_DEFAULT + && surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU + && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] + && !surface->resource.format->convert + && !(surface->flags & (SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)); +} + static HRESULT surface_private_setup(struct wined3d_surface *surface) { /* TODO: Check against the maximum texture sizes supported by the video card. */ @@ -753,6 +750,9 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) surface->flags |= SFLAG_DISCARDED; + if (surface_use_pbo(surface)) + surface->flags |= SFLAG_PBO; + return WINED3D_OK; } @@ -2791,6 +2791,13 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, else surface->resource.size = resource_size; + /* The format might be changed to a format that needs conversion. + * If the surface didn't use PBOs previously but could now, don't + * change it - whatever made us not use PBOs might come back, e.g. + * color keys. */ + if (!surface_use_pbo(surface)) + surface->flags &= ~SFLAG_PBO; + if (create_dib) { if (FAILED(hr = surface_create_dib_section(surface))) @@ -5109,6 +5116,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { TRACE("Removing the pbo attached to surface %p.\n", surface); surface_remove_pbo(surface, gl_info); + surface->flags &= ~SFLAG_PBO; } surface_get_memory(surface, &data, surface->flags); @@ -5209,8 +5217,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) { TRACE("Location already up to date.\n"); - if (location == SFLAG_INSYSMEM && !surface->pbo - && surface_need_pbo(surface, gl_info)) + if (location == SFLAG_INSYSMEM && !surface->pbo && surface->flags & SFLAG_PBO) surface_create_pbo(surface, gl_info); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8bdc9c..9d4c39c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2305,6 +2305,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ #define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ #define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_PBO 0x00400000 /* Use a PBO for mapping. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long

1 0

Stefan Dösinger : wined3d: Give buffers their own location.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 2b8e900ac4f1cfce6b3234967b4931a524114ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8e900ac4f1cfce6b3234967… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:12 2014 +0100 wined3d: Give buffers their own location. --- dlls/wined3d/surface.c | 192 ++++++++++++++++------------------------ dlls/wined3d/utils.c | 3 +- dlls/wined3d/wined3d_private.h | 15 ++-- 3 files changed, 87 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b8e900ac4f1cfce6b323…

1 0

Alexandre Julliard : makedep: Make the makefile mode the default behavior and remove obsolete options.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 2da6fc368f29071f7fb7f1eb2b9ffbe38be1a0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da6fc368f29071f7fb7f1eb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 21:16:40 2014 +0100 makedep: Make the makefile mode the default behavior and remove obsolete options. --- aclocal.m4 | 4 +-- configure | 4 +-- tools/makedep.c | 89 ++++++++++--------------------------------------------- 3 files changed, 20 insertions(+), 77 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index bb48320..c582890 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -227,11 +227,11 @@ wine_fn_depend_rules () { wine_fn_append_rule \ "$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir depend: $ac_dir/depend .PHONY: $ac_dir/depend $ac_dir/depend: \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir" + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir" } wine_fn_pot_rules () diff --git a/configure b/configure index 27251d0..2612bdc 100755 --- a/configure +++ b/configure @@ -7075,11 +7075,11 @@ wine_fn_depend_rules () { wine_fn_append_rule \ "$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir depend: $ac_dir/depend .PHONY: $ac_dir/depend $ac_dir/depend: \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir" + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir" } wine_fn_pot_rules () diff --git a/tools/makedep.c b/tools/makedep.c index 108cdb0..3a656e5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -111,24 +111,17 @@ static const char *Separator = "### Dependencies"; static const char *input_file_name; static const char *output_file_name; static const char *temp_file_name; -static int parse_makefile_mode; static int relative_dir_mode; static int input_line; static int output_column; static FILE *output_file; static const char Usage[] = - "Usage: makedep [options] [files]\n" + "Usage: makedep [options] directories\n" "Options:\n" - " -Idir Search for include files in directory 'dir'\n" - " -Cdir Search for source files in directory 'dir'\n" - " -Sdir Set the top source directory\n" - " -Tdir Set the top object directory\n" - " -Pdir Set the parent source directory\n" - " -M dirs Parse the makefiles from the specified directories\n" - " -R from to Compute the relative path between two directories\n" - " -fxxx Store output in file 'xxx' (default: Makefile)\n" - " -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n"; + " -R from to Compute the relative path between two directories\n" + " -fxxx Store output in file 'xxx' (default: Makefile)\n" + " -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n"; #ifndef __GNUC__ @@ -314,19 +307,6 @@ static void strarray_addall( struct strarray *array, struct strarray added ) /******************************************************************* - * 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; -} - - -/******************************************************************* * strarray_add_uniq */ static void strarray_add_uniq( struct strarray *array, const char *str ) @@ -521,20 +501,6 @@ static char *tools_path( const char *name ) /******************************************************************* - * init_paths - */ -static void init_paths(void) -{ - /* ignore redundant source paths */ - 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; - if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL; - - strarray_insert( &include_args, 0, strmake( "-I%s", top_dir_path( "include" ))); -} - - -/******************************************************************* * get_line */ static char *get_line( FILE *file ) @@ -2156,6 +2122,11 @@ static void update_makefile( const char *path ) tools_dir = get_expanded_make_variable( "TOOLSDIR" ); tools_ext = get_expanded_make_variable( "TOOLSEXT" ); + /* ignore redundant source paths */ + 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; + if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL; + appmode = get_expanded_make_var_array( "APPMODE" ); dllflags = get_expanded_make_var_array( "DLLFLAGS" ); imports = get_expanded_make_var_array( "IMPORTS" ); @@ -2168,6 +2139,7 @@ static void update_makefile( const char *path ) include_args = empty_strarray; define_args = empty_strarray; strarray_add( &define_args, "-D__WINESRC__" ); + strarray_add( &include_args, strmake( "-I%s", top_dir_path( "include" ))); if (!tools_ext) tools_ext = ""; @@ -2179,8 +2151,6 @@ static void update_makefile( const char *path ) strarray_add_uniq( &define_args, value.str[i] ); strarray_addall( &define_args, get_expanded_make_var_array( "EXTRADEFS" )); - init_paths(); - if (use_msvcrt) { strarray_add( &dllflags, get_expanded_make_variable( "MSVCRTFLAGS" )); @@ -2249,27 +2219,9 @@ static int parse_option( const char *opt ) } switch(opt[1]) { - case 'I': - if (opt[2]) strarray_add_uniq( &include_args, opt ); - break; - case 'C': - src_dir = opt + 2; - break; - case 'S': - top_src_dir = opt + 2; - break; - case 'T': - top_obj_dir = opt + 2; - break; - case 'P': - parent_dir = opt + 2; - break; case 'f': if (opt[2]) makefile_name = opt + 2; break; - case 'M': - parse_makefile_mode = 1; - break; case 'R': relative_dir_mode = 1; break; @@ -2277,8 +2229,6 @@ static int parse_option( const char *opt ) if (opt[2]) Separator = opt + 2; else Separator = NULL; break; - case 'x': - break; /* ignored */ default: fprintf( stderr, "Unknown option '%s'\n%s", opt, Usage ); exit(1); @@ -2293,7 +2243,6 @@ 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 ); @@ -2323,6 +2272,11 @@ int main( int argc, char *argv[] ) exit( 0 ); } + if (argc <= 1) + { + fprintf( stderr, "%s", Usage ); + exit( 1 ); + } atexit( cleanup_files ); signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); @@ -2330,17 +2284,6 @@ int main( int argc, char *argv[] ) signal( SIGHUP, exit_on_signal ); #endif - if (parse_makefile_mode) - { - for (i = 1; i < argc; i++) update_makefile( argv[i] ); - exit( 0 ); - } - - init_paths(); - for (i = 1; i < argc; i++) add_src_file( argv[i] ); - add_generated_sources(); - - LIST_FOR_EACH_ENTRY( pFile, &includes, struct incl_file, entry ) parse_file( pFile, 0 ); - output_dependencies( makefile_name ); + for (i = 1; i < argc; i++) update_makefile( argv[i] ); return 0; }

1 0

Alexandre Julliard : makedep: Create target subdirectories at make depend time.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 16286e45c4447d23067cd22840c51146e39f6bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=16286e45c4447d23067cd2284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 21:20:25 2014 +0100 makedep: Create target subdirectories at make depend time. --- Make.vars.in | 1 - configure | 50 -------------------------------------------------- configure.ac | 1 - tools/makedep.c | 37 +++++++++++++++++++++++++------------ 4 files changed, 25 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16286e45c4447d23067cd…

1 0

Frédéric Delanoy : odbc32: Use BOOL type where appropriate.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: bb356e23fab7b536b2b5eef431108939553ba955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb356e23fab7b536b2b5eef43… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 14 23:32:55 2014 +0100 odbc32: Use BOOL type where appropriate. --- dlls/odbc32/proxyodbc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 58d76aa..89cf154 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -322,7 +322,7 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) * that this will add a requirement that this function be called after * ODBC_ReplicateODBCInstToRegistry) */ -static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv) +static void ODBC_ReplicateODBCToRegistry (BOOL is_user, SQLHENV hEnv) { HKEY hODBC; LONG reg_ret; @@ -447,8 +447,8 @@ static void ODBC_ReplicateToRegistry (void) if ((sql_ret = SQLAllocEnv (&hEnv)) == SQL_SUCCESS) { ODBC_ReplicateODBCInstToRegistry (hEnv); - ODBC_ReplicateODBCToRegistry (0 /* system dsns */, hEnv); - ODBC_ReplicateODBCToRegistry (1 /* user dsns */, hEnv); + ODBC_ReplicateODBCToRegistry (FALSE /* system dsns */, hEnv); + ODBC_ReplicateODBCToRegistry (TRUE /* user dsns */, hEnv); if ((sql_ret = SQLFreeEnv (hEnv)) != SQL_SUCCESS) {

1 0

Michael Stefaniuc : dmstyle: None of the COM classes support aggregation.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 65942c1786fe10609f1a6e22f33abebf85893ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65942c1786fe10609f1a6e22f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 15 01:08:41 2014 +0100 dmstyle: None of the COM classes support aggregation. --- dlls/dmstyle/auditiontrack.c | 3 ++- dlls/dmstyle/chordtrack.c | 3 ++- dlls/dmstyle/commandtrack.c | 3 ++- dlls/dmstyle/dmstyle_main.c | 29 ++++++++++++++++------------- dlls/dmstyle/dmstyle_private.h | 14 +++++++------- dlls/dmstyle/motiftrack.c | 3 ++- dlls/dmstyle/mutetrack.c | 3 ++- dlls/dmstyle/style.c | 3 ++- dlls/dmstyle/styletrack.c | 3 ++- 9 files changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 3d6afc1..4e14db0 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -270,7 +270,8 @@ static const IPersistStreamVtbl DirectMusicAuditionTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicAuditionTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmauditiontrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicAuditionTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicAuditionTrack)); diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index d85fbdb..5ce3eb1 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -399,7 +399,8 @@ static const IPersistStreamVtbl DirectMusicChordTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicChordTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmchordtrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicChordTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordTrack)); diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 9fe0057..4cf208b 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -333,7 +333,8 @@ static const IPersistStreamVtbl DirectMusicCommandTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicCommandTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmcommandtrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicCommandTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCommandTrack)); diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index 677fc1c..996fc9b 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -27,12 +27,12 @@ LONG DMSTYLE_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface); } IClassFactoryImpl; -static HRESULT WINAPI create_direct_music_section(REFIID riid, void **ppv, IUnknown *pUnkOuter) +static HRESULT WINAPI create_direct_music_section(REFIID riid, void **ret_iface) { - FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); + FIXME("(%s, %p) stub\n", debugstr_dmguid(riid), ret_iface); return E_NOINTERFACE; } @@ -86,7 +86,12 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return This->fnCreateInstance(riid, ppv, pUnkOuter); + if (pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + return This->fnCreateInstance(riid, ppv); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) @@ -110,15 +115,13 @@ static const IClassFactoryVtbl classfactory_vtbl = { }; static IClassFactoryImpl Section_CF = {{&classfactory_vtbl}, create_direct_music_section}; -static IClassFactoryImpl Style_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicStyleImpl}; -static IClassFactoryImpl ChordTrack_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicChordTrack}; -static IClassFactoryImpl CommandTrack_CF = {{&classfactory_vtbl}, - DMUSIC_CreateDirectMusicCommandTrack}; -static IClassFactoryImpl StyleTrack_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicStyleTrack}; -static IClassFactoryImpl MotifTrack_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicMotifTrack}; -static IClassFactoryImpl AuditionTrack_CF = {{&classfactory_vtbl}, - DMUSIC_CreateDirectMusicAuditionTrack}; -static IClassFactoryImpl MuteTrack_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicMuteTrack}; +static IClassFactoryImpl Style_CF = {{&classfactory_vtbl}, create_dmstyle}; +static IClassFactoryImpl ChordTrack_CF = {{&classfactory_vtbl}, create_dmchordtrack}; +static IClassFactoryImpl CommandTrack_CF = {{&classfactory_vtbl}, create_dmcommandtrack}; +static IClassFactoryImpl StyleTrack_CF = {{&classfactory_vtbl}, create_dmstyletrack}; +static IClassFactoryImpl MotifTrack_CF = {{&classfactory_vtbl}, create_dmmotiftrack}; +static IClassFactoryImpl AuditionTrack_CF = {{&classfactory_vtbl}, create_dmauditiontrack}; +static IClassFactoryImpl MuteTrack_CF = {{&classfactory_vtbl}, create_dmmutetrack}; /****************************************************************** * DllMain diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index e1c8e9a..7ac9fac 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -58,7 +58,13 @@ typedef struct IDirectMusicStyleTrack IDirectMusicStyleTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicStyleImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmstyle(REFIID lpcGUID, LPVOID* ppobj) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmauditiontrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmchordtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmcommandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmmotiftrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmmutetrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /***************************************************************************** * Auxiliary definitions @@ -92,12 +98,6 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { IDirectMusicStyle8* pObject; } DMUS_PRIVATE_STYLE_ITEM, *LPDMUS_PRIVATE_STYLE_ITEM; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicAuditionTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicCommandTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicMotifTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicMuteTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicStyleTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicStyle8Impl implementation structure diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 06fdb63..9a25a05 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -276,7 +276,8 @@ static const IPersistStreamVtbl DirectMusicMotifTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicMotifTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmmotiftrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicMotifTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMotifTrack)); diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index a4d92fa..64390f1 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -273,7 +273,8 @@ static const IPersistStreamVtbl DirectMusicMuteTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicMuteTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmmutetrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicMuteTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMuteTrack)); diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 36ce9bf..077ed06 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -1086,7 +1086,8 @@ static const IPersistStreamVtbl DirectMusicStyle8_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicStyleImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) +{ IDirectMusicStyle8Impl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyle8Impl)); diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index fd100e4..39e5a70 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -462,7 +462,8 @@ static const IPersistStreamVtbl DirectMusicStyleTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicStyleTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmstyletrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicStyleTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyleTrack));

1 0