November 2015 - Wine-commits

Bruno Jesus : msvfw32: Make it clear why a DrawDibBegin call is required.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 560b13c273e456757bd18380085b126a0d292883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=560b13c273e456757bd183800… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Nov 1 01:22:54 2015 +0800 msvfw32: Make it clear why a DrawDibBegin call is required. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/drawdib.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index e96b0f2..27ac3b5 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -313,7 +313,8 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, UINT wFlags) { WINE_HDD *whdd; - BOOL ret = TRUE; + BOOL ret; + int reopen = 0; TRACE("(%p,%p,%d,%d,%d,%d,%p,%p,%d,%d,%d,%d,0x%08x)\n", hdd, hdc, xDst, yDst, dxDst, dyDst, lpbi, lpBits, xSrc, ySrc, dxSrc, dySrc, wFlags); @@ -335,11 +336,25 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, #define CHANGED(x) (whdd->x != x) - if ((!whdd->begun) || - (!(wFlags & DDF_SAME_HDC) && CHANGED(hdc)) || - (!(wFlags & DDF_SAME_DRAW) && (CHANGED(lpbi) || CHANGED(dxSrc) || CHANGED(dySrc) || CHANGED(dxDst) || CHANGED(dyDst)))) + /* Check if anything changed from the parameters passed and our struct. + * If anything changed we need to run DrawDibBegin again to ensure we + * can support the changes. + */ + if (!whdd->begun) + reopen = 1; + else if (!(wFlags & DDF_SAME_HDC) && CHANGED(hdc)) + reopen = 2; + else if (!(wFlags & DDF_SAME_DRAW)) { - TRACE("Something changed!\n"); + if (CHANGED(lpbi) && memcmp(lpbi, whdd->lpbi, sizeof(*lpbi))) reopen = 3; + else if (CHANGED(dxSrc)) reopen = 4; + else if (CHANGED(dySrc)) reopen = 5; + else if (CHANGED(dxDst)) reopen = 6; + else if (CHANGED(dyDst)) reopen = 7; + } + if (reopen) + { + TRACE("Something changed (reason %d)!\n", reopen); ret = DrawDibBegin(hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, 0); if (!ret) return ret; @@ -388,9 +403,10 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, SelectPalette(hdc, whdd->hpal, FALSE); } - if (!(StretchBlt(whdd->hdc, xDst, yDst, dxDst, dyDst, whdd->hMemDC, xSrc, ySrc, dxSrc, dySrc, SRCCOPY))) - ret = FALSE; - + ret = StretchBlt(whdd->hdc, xDst, yDst, dxDst, dyDst, whdd->hMemDC, xSrc, ySrc, dxSrc, dySrc, SRCCOPY); + TRACE("Painting %dx%d at %d,%d from %dx%d at %d,%d -> %d\n", + dxDst, dyDst, xDst, yDst, dxSrc, dySrc, xSrc, ySrc, ret); + return ret; }

1 0

Bruno Jesus : mcicda: Improve CD drive IOCTL tracing.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 755991162aff75d0f1e76d0b99a17a9155a7c321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755991162aff75d0f1e76d0b9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 2 00:32:34 2015 +0800 mcicda: Improve CD drive IOCTL tracing. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mcicda/mcicda.c | 71 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=755991162aff75d0f1e76…

1 0

Thomas Faller : kernel32: Fix invalid write.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 9178d037d71e823f5d5eaa5008a3cdd574377bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9178d037d71e823f5d5eaa500… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Sun Nov 1 19:54:34 2015 +0100 kernel32: Fix invalid write. Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index bc417bd..d8977f9 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -506,6 +506,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl { tmpshortpath[sp++] = *p++; tmpshortpath[sp++] = *p++; + lp += 2; } for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (longpath + lp);

1 0

Bruno Jesus : iccvid: Implement inverted frame decompressing.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: e75f2282ba209c15a0183ac44676ae36ccbf3dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e75f2282ba209c15a0183ac44… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Nov 2 03:02:46 2015 +0800 iccvid: Implement inverted frame decompressing. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iccvid/iccvid.c | 183 +++++++++++++++++++++++++-------------------- dlls/msvfw32/tests/msvfw.c | 6 +- 2 files changed, 105 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e75f2282ba209c15a0183…

1 0

Alex Henrie : opengl32: Check the minor version when determining extension support.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: b4eb8e846b7e9f06e76c8c9edfe1a5cdc774321c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4eb8e846b7e9f06e76c8c9ed… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 29 21:30:19 2015 -0600 opengl32: Check the minor version when determining extension support. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9482c75..acfb243 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -827,7 +827,7 @@ static BOOL is_extension_supported(const char* extension) /* Compare the major/minor version numbers of the native OpenGL library and what is required by the function. * The gl_version string is guaranteed to have at least a major/minor and sometimes it has a release number as well. */ - if( (gl_version[0] >= version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { + if( (gl_version[0] > version[0]) || ((gl_version[0] == version[0]) && (gl_version[2] >= version[2])) ) { return TRUE; } WARN("The function requires OpenGL version '%c.%c' while your drivers only provide '%c.%c'\n", version[0], version[2], gl_version[0], gl_version[2]);

1 0

Alex Henrie : winex11: Initialize the length of each side of the color cube to 1.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: fb90e1b673e3a8056c7e259c1d02f05c9e5b386f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb90e1b673e3a8056c7e259c1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 29 21:30:21 2015 -0600 winex11: Initialize the length of each side of the color cube to 1. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/palette.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 460615c..953c9ea 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -587,7 +587,7 @@ static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_templa * cube - based on Greg Kreider's code. */ - int i = 0, idx = 0; + int i = 1, idx = 0; int red, no_r, inc_r; int green, no_g, inc_g; int blue, no_b, inc_b;

1 0

Alex Henrie : winex11: Make color cubes as big as possible.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: e5d4d91871cbf80ecece669e2ba7b9ded00176aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d4d91871cbf80ecece669e2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 29 21:30:22 2015 -0600 winex11: Make color cubes as big as possible. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/palette.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 953c9ea..f950334 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -594,10 +594,10 @@ static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_templa if (palette_size <= NB_RESERVED_COLORS) return; - while (i*i*i < (palette_size - NB_RESERVED_COLORS)) i++; + while (i*i*i <= (palette_size - NB_RESERVED_COLORS)) i++; no_r = no_g = no_b = --i; - if ((no_r * (no_g+1) * no_b) < (palette_size - NB_RESERVED_COLORS)) no_g++; - if ((no_r * no_g * (no_b+1)) < (palette_size - NB_RESERVED_COLORS)) no_b++; + if ((no_r * (no_g+1) * no_b) <= (palette_size - NB_RESERVED_COLORS)) no_g++; + if ((no_r * no_g * (no_b+1)) <= (palette_size - NB_RESERVED_COLORS)) no_b++; inc_r = (255 - NB_COLORCUBE_START_INDEX)/no_r; inc_g = (255 - NB_COLORCUBE_START_INDEX)/no_g; inc_b = (255 - NB_COLORCUBE_START_INDEX)/no_b;

1 0

Alexandre Julliard : makefiles: Generate rules for installing headers.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 432338497579bba178f50a5cb8145ca3e73c0915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=432338497579bba178f50a5cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 2 15:53:42 2015 +0900 makefiles: Generate rules for installing headers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 82 +++++++++++++++++++++++++++------------------------- tools/make_makefiles | 7 +++-- tools/makedep.c | 71 ++++++++++++++++++++++++++++++++++++--------- 3 files changed, 104 insertions(+), 56 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 3836af2..8f5373c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -154,15 +154,8 @@ PUBLIC_IDL_H_SRCS = \ IDL_TLB_SRCS = \ stdole2.idl -XTEMPLATE_SRCS = \ - rmxftmpl.x - -SRCDIR_INCLUDES = \ - $(IDL_TLB_SRCS) \ - $(PUBLIC_IDL_H_SRCS) \ - $(XTEMPLATE_SRCS) \ +HEADER_SRCS = \ accctrl.h \ - access.idl \ aclapi.h \ aclui.h \ adshlp.h \ @@ -171,8 +164,6 @@ SRCDIR_INCLUDES = \ amaudio.h \ appcompatapi.h \ appmgmt.h \ - asynot.idl \ - asysta.idl \ atlbase.h \ atlcom.h \ atlwin.h \ @@ -180,23 +171,17 @@ SRCDIR_INCLUDES = \ audiosessiontypes.h \ aviriff.h \ avrt.h \ - axcore.idl \ - axextend.idl \ basetsd.h \ basetyps.h \ bcrypt.h \ bdaiface_enums.h \ bdatypes.h \ - binres.idl \ bitsmsg.h \ cderr.h \ cfgmgr32.h \ cguid.h \ - chprst.idl \ cierror.h \ clusapi.h \ - cmdbas.idl \ - cmdtxt.idl \ commctrl.h \ commctrl.rh \ commdlg.h \ @@ -204,7 +189,6 @@ SRCDIR_INCLUDES = \ corerror.h \ corhdr.h \ cpl.h \ - crtrow.idl \ cryptdlg.h \ cryptuiapi.h \ custcntl.h \ @@ -244,13 +228,7 @@ SRCDIR_INCLUDES = \ d3dx9tex.h \ d3dx9xof.h \ davclnt.h \ - dbccmd.idl \ - dbcses.idl \ - dbdsad.idl \ dbghelp.h \ - dbinit.idl \ - dbprop.idl \ - dbs.idl \ dbt.h \ dciddi.h \ dciman.h \ @@ -285,7 +263,6 @@ SRCDIR_INCLUDES = \ ddrawgdi.h \ ddrawi.h \ delayloadhandler.h \ - devenum.idl \ devguid.h \ devpkey.h \ devpropdef.h \ @@ -329,10 +306,8 @@ SRCDIR_INCLUDES = \ dxfile.h \ dxgiformat.h \ dxgitype.h \ - dyngraph.idl \ errorrep.h \ errors.h \ - errrec.idl \ evcode.h \ evntprov.h \ evntrace.h \ @@ -506,7 +481,6 @@ SRCDIR_INCLUDES = \ olectl.h \ oledberr.h \ oledlg.h \ - opnrst.idl \ patchapi.h \ pdh.h \ pdhmsg.h \ @@ -534,10 +508,6 @@ SRCDIR_INCLUDES = \ richedit.h \ rmxfguid.h \ roapi.h \ - row.idl \ - rowchg.idl \ - rowpos.idl \ - rowpsc.idl \ rpc.h \ rpcasync.h \ rpcdce.h \ @@ -546,10 +516,6 @@ SRCDIR_INCLUDES = \ rpcnterr.h \ rpcproxy.h \ rpcsal.h \ - rstbas.idl \ - rstinf.idl \ - rstloc.idl \ - rstnot.idl \ rtutils.h \ scarderr.h \ schannel.h \ @@ -559,7 +525,6 @@ SRCDIR_INCLUDES = \ secext.h \ security.h \ sensapi.h \ - sesprp.idl \ setupapi.h \ sfc.h \ shdispid.h \ @@ -575,7 +540,6 @@ SRCDIR_INCLUDES = \ sql.h \ sqlext.h \ sqltypes.h \ - srcrst.idl \ srrestoreptapi.h \ sspi.h \ sti.h \ @@ -604,7 +568,6 @@ SRCDIR_INCLUDES = \ verrsrc.h \ vfw.h \ vfwmsgs.h \ - vmrender.idl \ vsstyle.h \ vssym32.h \ vswriter.h \ @@ -674,12 +637,51 @@ SRCDIR_INCLUDES = \ xcmc.h \ xinput.h \ xmldom.h \ - xmldom.idl \ xmldomdid.h \ - xmldso.idl \ xmldsodid.h \ zmouse.h +XTEMPLATE_SRCS = \ + rmxftmpl.x + +SRCDIR_INCLUDES = \ + $(IDL_TLB_SRCS) \ + $(PUBLIC_IDL_H_SRCS) \ + $(XTEMPLATE_SRCS) \ + access.idl \ + asynot.idl \ + asysta.idl \ + axcore.idl \ + axextend.idl \ + binres.idl \ + chprst.idl \ + cmdbas.idl \ + cmdtxt.idl \ + crtrow.idl \ + dbccmd.idl \ + dbcses.idl \ + dbdsad.idl \ + dbinit.idl \ + dbprop.idl \ + dbs.idl \ + devenum.idl \ + dyngraph.idl \ + errrec.idl \ + opnrst.idl \ + row.idl \ + rowchg.idl \ + rowpos.idl \ + rowpsc.idl \ + rstbas.idl \ + rstinf.idl \ + rstloc.idl \ + rstnot.idl \ + sesprp.idl \ + srcrst.idl \ + vmrender.idl \ + xmldom.idl \ + xmldso.idl + IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS) IDL_SRCS = $(IDL_H_SRCS) $(IDL_TLB_SRCS) diff --git a/tools/make_makefiles b/tools/make_makefiles index 96d8c01..5d88e65 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -378,10 +378,10 @@ sub assign_sources_to_makefiles(@) } if ($name =~ /stdole2\.idl$/) { push @{${$make}{"=IDL_TLB_SRCS"}}, $name; } elsif ($private_idl_headers{$name}) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } - elsif ($name =~ /\.h$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } + elsif ($name =~ /\.h$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.x$/) { push @{${$make}{"=XTEMPLATE_SRCS"}}, $name; } - elsif ($name =~ /\.rh$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } - elsif ($name =~ /\.inl$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } + elsif ($name =~ /\.rh$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } + elsif ($name =~ /\.inl$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.idl$/) { push @{${$make}{"=PUBLIC_IDL_H_SRCS"}}, $name; } else { die "unknown file $name in include dir"; } } @@ -549,6 +549,7 @@ sub update_makefiles(@) replace_makefile_variable( $file, "OBJC_SRCS" ); replace_makefile_variable( $file, "RC_SRCS" ); replace_makefile_variable( $file, "IDL_SRCS" ); + replace_makefile_variable( $file, "HEADER_SRCS" ); replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); replace_makefile_variable( $file, "IN_SRCS" ); replace_makefile_variable( $file, "IMPLIB_SRCS" ); diff --git a/tools/makedep.c b/tools/makedep.c index 2a1b8d4..542741a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1121,6 +1121,26 @@ static void parse_sfd_file( struct file *source, FILE *file ) } +static const struct +{ + const char *ext; + void (*parse)( struct file *file, FILE *f ); +} parse_functions[] = +{ + { ".c", parse_c_file }, + { ".h", parse_c_file }, + { ".inl", parse_c_file }, + { ".l", parse_c_file }, + { ".m", parse_c_file }, + { ".rh", parse_c_file }, + { ".x", parse_c_file }, + { ".y", parse_c_file }, + { ".idl", parse_idl_file }, + { ".rc", parse_rc_file }, + { ".in", parse_in_file }, + { ".sfd", parse_sfd_file } +}; + /******************************************************************* * load_file */ @@ -1128,7 +1148,7 @@ static struct file *load_file( const char *name ) { struct file *file; FILE *f; - unsigned int hash = hash_filename( name ); + unsigned int i, hash = hash_filename( name ); LIST_FOR_EACH_ENTRY( file, &files[hash], struct file, entry ) if (!strcmp( name, file->name )) return file; @@ -1139,15 +1159,12 @@ static struct file *load_file( const char *name ) input_file_name = file->name; input_line = 0; - if (strendswith( name, ".idl" )) parse_idl_file( file, f ); - else if (strendswith( name, ".rc" )) parse_rc_file( file, f ); - else if (strendswith( name, ".in" )) parse_in_file( file, f ); - else if (strendswith( name, ".sfd" )) parse_sfd_file( file, f ); - else if (strendswith( name, ".c" ) || - strendswith( name, ".m" ) || - strendswith( name, ".h" ) || - strendswith( name, ".l" ) || - strendswith( name, ".y" )) parse_c_file( file, f ); + for (i = 0; i < sizeof(parse_functions) / sizeof(parse_functions[0]); i++) + { + if (!strendswith( name, parse_functions[i].ext )) continue; + parse_functions[i].parse( file, f ); + break; + } fclose( f ); input_file_name = NULL; @@ -1781,6 +1798,19 @@ static void add_install_rule( struct makefile *make, const char *target, /******************************************************************* + * get_include_install_path + * + * Determine the installation path for a given include file. + */ +static const char *get_include_install_path( const char *name ) +{ + if (!strncmp( name, "wine/", 5 )) return name + 5; + if (!strncmp( name, "msvcrt/", 7 )) return name; + return strmake( "windows/%s", name ); +} + + +/******************************************************************* * output_install_rules * * Rules are stored as a (file,dest) pair of values. @@ -2033,9 +2063,9 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t else dir = strmake( "$(mandir)/man%s", section ); add_install_rule( make, dest, xstrdup(obj), strmake( "d%s/%s.%s", dir, dest, section )); symlinks = get_expanded_make_var_array( make, file_local_var( dest, "SYMLINKS" )); - for (j = 0; j < symlinks.count; j++) - add_install_rule( make, symlinks.str[j], strmake( "%s.%s", dest, section ), - strmake( "y%s/%s.%s", dir, symlinks.str[j], section )); + for (i = 0; i < symlinks.count; i++) + add_install_rule( make, symlinks.str[i], strmake( "%s.%s", dest, section ), + strmake( "y%s/%s.%s", dir, symlinks.str[i], section )); free( dest ); free( dir ); strarray_add( &all_targets, xstrdup(obj) ); @@ -2095,6 +2125,20 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t strarray_add( &res_files, source->name ); continue; /* no dependencies */ } + else if (!strcmp( ext, "h" ) || !strcmp( ext, "rh" ) || !strcmp( ext, "inl" )) /* header file */ + { + if (source->file->flags & FLAG_GENERATED) + { + strarray_add( &all_targets, source->name ); + } + else + { + strarray_add( &make->install_dev_rules, source->name ); + strarray_add( &make->install_dev_rules, + strmake( "D$(includedir)/%s", get_include_install_path( source->name ) )); + } + continue; /* no dependencies */ + } else { int need_cross = make->testdll || @@ -2788,6 +2832,7 @@ static void update_makefile( const char *path ) "IDL_SRCS", "BISON_SRCS", "LEX_SRCS", + "HEADER_SRCS", "XTEMPLATE_SRCS", "SVG_SRCS", "FONT_SRCS",

1 0

Alexandre Julliard : makefiles: Generate rules for installing X template files.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 9b9b0dce1f83a2886b0582e3e1eed20b0903de30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9b0dce1f83a2886b0582e3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 2 16:03:16 2015 +0900 makefiles: Generate rules for installing X template files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 5 ++--- include/rmxftmpl.x | 1 + tools/make_makefiles | 1 - tools/makedep.c | 14 +++++++++++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 8f5373c..682072c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -647,7 +647,6 @@ XTEMPLATE_SRCS = \ SRCDIR_INCLUDES = \ $(IDL_TLB_SRCS) \ $(PUBLIC_IDL_H_SRCS) \ - $(XTEMPLATE_SRCS) \ access.idl \ asynot.idl \ asysta.idl \ @@ -685,9 +684,9 @@ SRCDIR_INCLUDES = \ IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS) IDL_SRCS = $(IDL_H_SRCS) $(IDL_TLB_SRCS) -OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) $(XTEMPLATE_SRCS:.x=.h) +OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) -all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) $(XTEMPLATE_SRCS:.x=.h) +all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) .PHONY: install install-dev uninstall diff --git a/include/rmxftmpl.x b/include/rmxftmpl.x index 61b9516..9bc08e2 100644 --- a/include/rmxftmpl.x +++ b/include/rmxftmpl.x @@ -17,6 +17,7 @@ xof 0302txt 0064 #pragma xftmpl name D3DRM_XTEMPLATES #pragma xftmpl size D3DRM_XTEMPLATE_BYTES +#pragma makedep install template Header { diff --git a/tools/make_makefiles b/tools/make_makefiles index 5d88e65..e3cc722 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -432,7 +432,6 @@ sub assign_sources_to_makefiles(@) # add extra variables to include source list my $make = $makefiles{"include/Makefile"}; - unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(XTEMPLATE_SRCS)"; unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(PUBLIC_IDL_H_SRCS)"; unshift @{${$make}{"=SRCDIR_INCLUDES"}}, "\$(IDL_TLB_SRCS)"; unshift @{${$make}{"=IDL_SRCS"}}, "\$(IDL_H_SRCS) \$(IDL_TLB_SRCS)"; diff --git a/tools/makedep.c b/tools/makedep.c index 542741a..d2d39a6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1702,6 +1702,10 @@ static void add_generated_sources( struct makefile *make ) { add_generated_source( make, replace_extension( source->name, ".idl", "_r.res" ), NULL ); } + if (strendswith( source->name, ".x" )) + { + add_generated_source( make, replace_extension( source->name, ".x", ".h" ), NULL ); + } if (strendswith( source->name, ".y" )) { file = add_generated_source( make, replace_extension( source->name, ".y", ".tab.c" ), NULL ); @@ -1960,7 +1964,15 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t tools_dir_path( make, "make_xftmpl" ), tools_ext, source->filename ); output( "\t%s%s -H -o $@ %s\n", tools_dir_path( make, "make_xftmpl" ), tools_ext, source->filename ); - strarray_add( &clean_files, strmake( "%s.h", obj )); + if (source->file->flags & FLAG_INSTALL) + { + strarray_add( &make->install_dev_rules, source->name ); + strarray_add( &make->install_dev_rules, + strmake( "D$(includedir)/%s", get_include_install_path( source->name ) )); + strarray_add( &make->install_dev_rules, strmake( "%s.h", obj )); + strarray_add( &make->install_dev_rules, + strmake( "d$(includedir)/%s.h", get_include_install_path( obj ) )); + } continue; /* no dependencies */ } else if (!strcmp( ext, "l" )) /* lex file */

1 0

Alexandre Julliard : makefiles: Add makedep pragmas in all IDL source files.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: d8cc1dccba88a01e3eaacf958f88a24b07bd869b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8cc1dccba88a01e3eaacf958… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 2 21:23:58 2015 +0900 makefiles: Add makedep pragmas in all IDL source files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/fil_data.idl | 2 ++ dlls/mshtml/nsiface.idl | 2 ++ dlls/msxml3/tests/xmlparser.idl | 2 ++ dlls/quartz/fil_data.idl | 2 ++ dlls/quartz/tests/fil_data.idl | 2 ++ dlls/scrrun/tests/scrrun.idl | 3 +++ dlls/vbscript/tests/vbsregexp55.idl | 2 ++ dlls/wshom.ocx/tests/wshom.idl | 2 ++ tools/make_makefiles | 2 ++ 9 files changed, 19 insertions(+) diff --git a/dlls/dxdiagn/fil_data.idl b/dlls/dxdiagn/fil_data.idl index 806c053..7e37a75 100644 --- a/dlls/dxdiagn/fil_data.idl +++ b/dlls/dxdiagn/fil_data.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep header + import "objidl.idl"; import "strmif.idl"; import "unknwn.idl"; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index c0b120c..943cdb4 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -23,6 +23,8 @@ * compatible with XPCOM, usable in C code. */ +#pragma makedep header + cpp_quote("#define GECKO_VERSION \"2.40\"") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") diff --git a/dlls/msxml3/tests/xmlparser.idl b/dlls/msxml3/tests/xmlparser.idl index a0ce97e..ba88afc 100644 --- a/dlls/msxml3/tests/xmlparser.idl +++ b/dlls/msxml3/tests/xmlparser.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep header + import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl"; diff --git a/dlls/quartz/fil_data.idl b/dlls/quartz/fil_data.idl index 93cdf1e..ab93499 100644 --- a/dlls/quartz/fil_data.idl +++ b/dlls/quartz/fil_data.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep header + import "objidl.idl"; import "strmif.idl"; import "unknwn.idl"; diff --git a/dlls/quartz/tests/fil_data.idl b/dlls/quartz/tests/fil_data.idl index 93cdf1e..ab93499 100644 --- a/dlls/quartz/tests/fil_data.idl +++ b/dlls/quartz/tests/fil_data.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep header + import "objidl.idl"; import "strmif.idl"; import "unknwn.idl"; diff --git a/dlls/scrrun/tests/scrrun.idl b/dlls/scrrun/tests/scrrun.idl index 91e0151..86ac9e3 100644 --- a/dlls/scrrun/tests/scrrun.idl +++ b/dlls/scrrun/tests/scrrun.idl @@ -15,6 +15,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep header + import "unknwn.idl"; import "objidl.idl"; import "oaidl.idl"; diff --git a/dlls/vbscript/tests/vbsregexp55.idl b/dlls/vbscript/tests/vbsregexp55.idl index c0cf683..37dcfd1 100644 --- a/dlls/vbscript/tests/vbsregexp55.idl +++ b/dlls/vbscript/tests/vbsregexp55.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep header + import "oaidl.idl"; #include "vbscript_defs.h" diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index 77d64ce..c2bc416 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep header + import "oaidl.idl"; cpp_quote("#undef ExpandEnvironmentStrings") diff --git a/tools/make_makefiles b/tools/make_makefiles index e3cc722..7229d06 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -415,6 +415,8 @@ sub assign_sources_to_makefiles(@) } elsif ($name =~ /\.idl$/) { + my %flags = get_makedep_flags( $file ); + die "no makedep flags specified in $file" unless %flags; push @{${$make}{"=IDL_SRCS"}}, $name; ${${$make}{"=flags"}}{"clean"} = 1; }

1 0