October 2013 - Wine-Commits

Frédéric Delanoy : win87em.dll16: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 34ad2d20a22e5f983b911feed10d811a3aa4f8e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ad2d20a22e5f983b911feed… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 15 00:27:17 2013 +0200 win87em.dll16: Use BOOL type where appropriate. --- dlls/win87em.dll16/win87em.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/win87em.dll16/win87em.c b/dlls/win87em.dll16/win87em.c index 6154ac6..c8d4545 100644 --- a/dlls/win87em.dll16/win87em.c +++ b/dlls/win87em.dll16/win87em.c @@ -45,7 +45,7 @@ struct Win87EmInfoStruct */ /* FIXME: Still rather skeletal implementation only */ -static BOOL Installed = 1; /* 8087 is installed */ +static BOOL Installed = TRUE; /* 8087 is installed */ static WORD RefCount = 0; static WORD CtrlWord_1 = 0; static WORD CtrlWord_2 = 0;

1 0

Frédéric Delanoy : attrib: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 70205f583c30b4946a6a137953f275336d2788e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70205f583c30b4946a6a13795… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 15 00:27:14 2013 +0200 attrib: Use BOOL type where appropriate. --- programs/attrib/attrib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 4342779..28172b0 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -253,7 +253,7 @@ int wmain(int argc, WCHAR *argv[]) WCHAR originalname[MAX_PATH]; DWORD attrib_set = 0; DWORD attrib_clear = 0; - BOOL attrib_recurse = 0; + BOOL attrib_recurse = FALSE; BOOL attrib_includedirs = FALSE; static const WCHAR help_option[] = {'/','?','\0'}; static const WCHAR wildcardsW[] = {'*','?','\0'};

1 0

Michael Stefaniuc : dsound/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 4dd5893ad773833000d39058ce90e7207a8e805e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd5893ad773833000d39058c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 14 23:19:31 2013 +0200 dsound/tests: Compile with -D__WINESRC__. --- dlls/dsound/tests/Makefile.in | 1 - dlls/dsound/tests/capture.c | 4 ++-- dlls/dsound/tests/ds3d.c | 2 +- dlls/dsound/tests/ds3d8.c | 2 +- dlls/dsound/tests/dsound.c | 4 ++-- dlls/dsound/tests/dsound8.c | 2 +- dlls/dsound/tests/duplex.c | 2 +- dlls/dsound/tests/propset.c | 1 + 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in index 7302458..f97f716 100644 --- a/dlls/dsound/tests/Makefile.in +++ b/dlls/dsound/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = dsound.dll IMPORTS = ole32 version user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ capture.c \ diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 74889d6..3e717f5 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -24,8 +24,8 @@ #include "initguid.h" #include "windows.h" #include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" -#include "mmreg.h" #include "dsconf.h" #include "dsound_test.h" @@ -373,7 +373,7 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, state.wfx=&wfx; state.buffer_size = dscbcaps.dwBufferBytes; for (i = 0; i < NOTIFICATIONS; i++) - state.event[i] = CreateEvent( NULL, FALSE, FALSE, NULL ); + state.event[i] = CreateEventW(NULL, FALSE, FALSE, NULL); state.size = dscbcaps.dwBufferBytes / NOTIFICATIONS; rc=IDirectSoundCaptureBuffer_QueryInterface(dscbo,&IID_IDirectSoundNotify, diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 7682851..8cf46a8 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -28,8 +28,8 @@ #include <math.h> #include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" -#include "mmreg.h" #include "ks.h" #include "ksmedia.h" #include "dsound_test.h" diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 77f6f88..1c8b285 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -28,8 +28,8 @@ #include <math.h> #include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" -#include "mmreg.h" #include "ks.h" #include "ksmedia.h" #include "dsound_test.h" diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 4be91fb..92262ce 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -29,9 +29,9 @@ #include <windows.h> #include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" #include "dsconf.h" -#include "mmreg.h" #include "initguid.h" #include "ks.h" #include "ksmedia.h" @@ -1135,7 +1135,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) /* Prepare notify events */ for (i=0;i<sizeof(event)/sizeof(event[0]);i++) { - event[i] = CreateEvent(NULL,FALSE,FALSE,NULL); + event[i] = CreateEventW(NULL, FALSE, FALSE, NULL); } /* Make silent buffer */ diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index fe5bbe0..dc7af3d 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -31,9 +31,9 @@ #include <stdio.h> #include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" #include "dsconf.h" -#include "mmreg.h" #include "ks.h" #include "ksmedia.h" diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index d30cc25..739811d 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -23,8 +23,8 @@ #include <stdio.h> #include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" -#include "mmreg.h" #include "dsconf.h" #include "dsound_test.h" diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index c62c02a..222120d 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -23,6 +23,7 @@ #include <windows.h> #include "wine/test.h" +#include "mmsystem.h" #include "dsound.h" #include "dsconf.h"

1 0

Alexandre Julliard : makefiles: Generate explicit build rules for resource files from makedep.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 25b08106550508edfb8c471d7fc84f7543d7f401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b08106550508edfb8c471d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 00:14:51 2013 +0200 makefiles: Generate explicit build rules for resource files from makedep. --- Make.rules.in | 15 +---------- programs/winetest/Makefile.in | 3 +- tools/makedep.c | 52 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 53 insertions(+), 17 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 06dea78..ee51208 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -36,7 +36,7 @@ CROSSOBJS = $(OBJS:.o=.cross.o) # Implicit rules -.SUFFIXES: .rc .res .idl .tlb .h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .idl .tlb .h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -47,9 +47,6 @@ CROSSOBJS = $(OBJS:.o=.cross.o) .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< -.rc.res: - $(WRC) $(RCFLAGS) -o $@ $< - .idl.h: $(WIDL) $(IDLFLAGS) -h -o $@ $< @@ -131,7 +128,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) # Rules for dependencies -DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \ +DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) $(PO_SRCS:.rc=.pot) \ $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) \ $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) @@ -210,14 +207,6 @@ install install-lib install-dev uninstall:: .PHONY: install install-lib install-dev uninstall -# Rules for resources - -rsrc.pot: $(WRC) - $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS) - -$(RC_SRCS:.rc=.res): $(WRC) -$(PO_SRCS:.rc=.res): $(ALL_MO_FILES) - # Misc. rules $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_TLB_RES) $(IDL_R_SRCS:.idl=_r.res): $(WIDL) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 898e995..6865e93 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -25,6 +25,7 @@ build.rc: dummy build.nfo: -$(CC) -v 2>$@ -build.res: build.nfo +build.res: build.rc build.nfo + $(WRC) $(RCFLAGS) -o $@ build.rc @MAKE_PROG_RULES@ diff --git a/tools/makedep.c b/tools/makedep.c index db92d53..dcf7414 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -96,6 +96,7 @@ static const char Usage[] = static void fatal_error( const char *msg, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); static void fatal_perror( const char *msg, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); static int output( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); +static char *strmake( const char* fmt, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); /******************************************************************* * fatal_error @@ -341,6 +342,24 @@ static struct incl_file *find_include_file( const char *name ) } /******************************************************************* + * find_target_src_file + * + * Check if we have a source file as a target for the specified source with a different extension. + */ +static struct incl_file *find_target_src_file( const char *name, const char *ext ) +{ + struct incl_file *ret; + char *p, *match = xmalloc( strlen( name ) + strlen( ext ) + 1 ); + + strcpy( match, name ); + if ((p = get_extension( match ))) strcpy( p, ext ); + else strcat( match, ext ); + ret = find_src_file( match ); + free( match ); + return ret; +} + +/******************************************************************* * add_include * * Add an include file if it doesn't already exists. @@ -858,6 +877,7 @@ static void parse_file( struct incl_file *source, int src ) /* don't try to open certain types of files */ if (strendswith( source->name, ".tlb" ) || strendswith( source->name, ".res" ) || + strendswith( source->name, ".pot" ) || strendswith( source->name, ".x" )) { source->filename = xstrdup( source->name ); @@ -926,7 +946,7 @@ static void output_include( struct incl_file *pFile, struct incl_file *owner, in static void output_sources(void) { struct incl_file *source; - int i, column, mc_srcs = 0; + int i, column, po_srcs = 0, mc_srcs = 0; LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { @@ -962,7 +982,19 @@ static void output_sources(void) } else if (!strcmp( ext, "rc" )) /* resource file */ { - column += output( "rsrc.pot %s.res: %s", obj, source->filename ); + if (find_target_src_file( source->name, ".pot" )) + { + output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, source->filename ); + output( "\t$(WRC) $(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 ); + column += output( "%s.res:", obj ); + } } else if (!strcmp( ext, "mc" )) /* message file */ { @@ -1004,7 +1036,7 @@ static void output_sources(void) column += output( ": %s", source->filename ); } - else if (!strcmp( ext, "tlb" ) || !strcmp( ext, "res" )) + else if (!strcmp( ext, "tlb" ) || !strcmp( ext, "res" ) || !strcmp( ext, "pot" )) { continue; /* nothing to do for typelib files */ } @@ -1024,6 +1056,20 @@ static void output_sources(void) /* rules for files that depend on multiple sources */ + if (po_srcs) + { + column = output( "rsrc.pot: $(WRC)" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + if (strendswith( source->name, ".rc" ) && find_target_src_file( source->name, ".pot" )) + output_filename( source->filename, &column ); + output( "\n" ); + column = output( "\t$(WRC) $(RCFLAGS) -O pot -o $@" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + if (strendswith( source->name, ".rc" ) && find_target_src_file( source->name, ".pot" )) + output_filename( source->filename, &column ); + output( "\n" ); + } + if (mc_srcs) { column = output( "msg.pot: $(WMC)" );

1 0

Frédéric Delanoy : net: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 06a66688a3a794c3e0e6bf72ab9f464981c49836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a66688a3a794c3e0e6bf72a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 15 00:27:15 2013 +0200 net: Use BOOL type where appropriate. --- programs/net/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 06c8aac..0d5de52 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -235,7 +235,7 @@ static BOOL StopService(SC_HANDLE SCManager, SC_HANDLE serviceHandle) static BOOL net_service(int operation, const WCHAR* service_name) { SC_HANDLE SCManager, serviceHandle; - BOOL result = 0; + BOOL result = FALSE; WCHAR service_display_name[4096]; DWORD buffer_size; @@ -288,7 +288,7 @@ static BOOL net_service(int operation, const WCHAR* service_name) return result; } -static int arg_is(const WCHAR* str1, const WCHAR* str2) +static BOOL arg_is(const WCHAR* str1, const WCHAR* str2) { return CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, str1, -1, str2, -1) == CSTR_EQUAL; }

1 0

Alexandre Julliard : makefiles: Generate explicit build rules for message files from makedep.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: da4c49c744b21bb5d15c49a8308f1300b57bd07c URL: http://source.winehq.org/git/wine.git/?a=commit;h=da4c49c744b21bb5d15c49a83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 20:18:18 2013 +0200 makefiles: Generate explicit build rules for message files from makedep. --- Make.rules.in | 9 +-------- tools/makedep.c | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index a7da5ef..06dea78 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -36,7 +36,7 @@ CROSSOBJS = $(OBJS:.o=.cross.o) # Implicit rules -.SUFFIXES: .mc .rc .res .idl .tlb .h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .rc .res .idl .tlb .h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -47,9 +47,6 @@ CROSSOBJS = $(OBJS:.o=.cross.o) .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< -.mc.res: - $(WMC) -U -O res $(PORCFLAGS) -o $@ $< - .rc.res: $(WRC) $(RCFLAGS) -o $@ $< @@ -218,10 +215,6 @@ install install-lib install-dev uninstall:: rsrc.pot: $(WRC) $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS) -msg.pot: $(WMC) - $(WMC) -O pot -o $@ $(MC_SRCS) - -$(MC_SRCS:.mc=.res): $(WMC) $(ALL_MO_FILES) $(RC_SRCS:.rc=.res): $(WRC) $(PO_SRCS:.rc=.res): $(ALL_MO_FILES) diff --git a/tools/makedep.c b/tools/makedep.c index b7c70d2..db92d53 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -926,7 +926,7 @@ static void output_include( struct incl_file *pFile, struct incl_file *owner, in static void output_sources(void) { struct incl_file *source; - int i, column; + int i, column, mc_srcs = 0; LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { @@ -966,7 +966,10 @@ static void output_sources(void) } else if (!strcmp( ext, "mc" )) /* message file */ { - column += output( "msg.pot %s.res: %s", obj, source->filename ); + output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, source->filename ); + output( "\t$(WMC) -U -O res $(PORCFLAGS) -o $@ %s\n", source->filename ); + mc_srcs++; + column += output( "msg.pot %s.res:", obj ); } else if (!strcmp( ext, "idl" )) /* IDL file */ { @@ -1018,6 +1021,20 @@ static void output_sources(void) if (source->files[i]) output_include( source->files[i], source, &column ); output( "\n" ); } + + /* rules for files that depend on multiple sources */ + + if (mc_srcs) + { + column = output( "msg.pot: $(WMC)" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + if (strendswith( source->name, ".mc" )) output_filename( source->filename, &column ); + output( "\n" ); + column = output( "\t$(WMC) -O pot -o $@" ); + LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + if (strendswith( source->name, ".mc" )) output_filename( source->filename, &column ); + output( "\n" ); + } }

1 0

Alexandre Julliard : makefiles: Generate explicit build rules for idl files from makedep.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: d9a75184c77b292e5ac028cb0bb6158a89630162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a75184c77b292e5ac028cb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 15 12:30:54 2013 +0200 makefiles: Generate explicit build rules for idl files from makedep. --- Make.rules.in | 32 +---------------------------- tools/makedep.c | 59 ++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 39 insertions(+), 52 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index ee51208..83797ba 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -36,7 +36,7 @@ CROSSOBJS = $(OBJS:.o=.cross.o) # Implicit rules -.SUFFIXES: .idl .tlb .h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .ok .man.in .man .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -47,30 +47,6 @@ CROSSOBJS = $(OBJS:.o=.cross.o) .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< -.idl.h: - $(WIDL) $(IDLFLAGS) -h -o $@ $< - -.idl_c.c: - $(WIDL) $(IDLFLAGS) -c -o $@ $< - -.idl_i.c: - $(WIDL) $(IDLFLAGS) -u -o $@ $< - -.idl_p.c: - $(WIDL) $(IDLFLAGS) -p -o $@ $< - -.idl_r.res: - $(WIDL) $(IDLFLAGS) -r -o $@ $< - -.idl_s.c: - $(WIDL) $(IDLFLAGS) -s -o $@ $< - -.idl.tlb: - $(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ $< - -.idl_t.res: - $(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ $< - .c.ok: $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ @@ -129,7 +105,7 @@ $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) # Rules for dependencies DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) $(PO_SRCS:.rc=.pot) \ - $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) \ + $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_R_SRCS) $(IDL_S_SRCS) \ $(IDL_GEN_C_SRCS) $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_OBJS) @@ -207,8 +183,4 @@ install install-lib install-dev uninstall:: .PHONY: install install-lib install-dev uninstall -# Misc. rules - -$(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_TLB_RES) $(IDL_R_SRCS:.idl=_r.res): $(WIDL) - # End of global rules diff --git a/tools/makedep.c b/tools/makedep.c index dcf7414..384a1a2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1005,36 +1005,51 @@ static void output_sources(void) } else if (!strcmp( ext, "idl" )) /* IDL file */ { - char *name; - int got_header = 0; - const char *suffix = "cips"; + char *targets[8]; + int nb_targets = 0; + char ending[] = "_?.c"; + const char *suffix; + char *header = strmake( "%s.h", obj ); - name = strmake( "%s.tlb", obj ); - if (find_src_file( name )) column += output( "%s %s_t.res", name, obj ); - else + if (find_target_src_file( source->name, ".tlb" )) { - got_header = 1; - column += output( "%s.h", obj ); + output( "%s.tlb %s_t.res: $(WIDL)\n", obj, obj ); + output( "\t$(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ %s\n", source->filename ); + targets[nb_targets++] = strmake( "%s.tlb", obj ); + targets[nb_targets++] = strmake( "%s_t.res", obj ); } - free( name ); - while (*suffix) + for (suffix = "cips"; *suffix; suffix++) { - name = strmake( "%s_%c.c", obj, *suffix ); - if (find_src_file( name )) - { - if (!got_header++) column += output( " %s.h", obj ); - column += output( " %s", name ); - } - free( name ); - suffix++; + ending[1] = *suffix; + if (!find_target_src_file( source->name, ending )) continue; + output( "%s%s: $(WIDL)\n", obj, ending ); + output( "\t$(WIDL) $(IDLFLAGS) -%c -o $@ %s\n", + *suffix == 'i' ? 'u' : *suffix, source->filename ); + targets[nb_targets++] = strmake( "%s%s", obj, ending ); } - name = strmake( "%s_r.res", obj ); - if (find_src_file( name )) column += output( " %s", name ); - free( name ); + if (find_target_src_file( source->name, "_r.res" )) + { + output( "%s_r.res: $(WIDL)\n", obj ); + output( "\t$(WIDL) $(IDLFLAGS) -r -o $@ %s\n", source->filename ); + targets[nb_targets++] = strmake( "%s_r.res", obj ); + } - column += output( ": %s", source->filename ); + if (!nb_targets || find_include_file( header )) + { + output( "%s.h: $(WIDL)\n", obj ); + output( "\t$(WIDL) $(IDLFLAGS) -h -o $@ %s\n", source->filename ); + targets[nb_targets++] = header; + } + else free( header ); + + for (i = 0; i < nb_targets; i++) + { + column += output( "%s%c", targets[i], i < nb_targets - 1 ? ' ' : ':' ); + free( targets[i] ); + } + column += output( " %s", source->filename ); } else if (!strcmp( ext, "tlb" ) || !strcmp( ext, "res" ) || !strcmp( ext, "pot" )) {

1 0

Alexandre Julliard : makefiles: Generate explicit build rules for bison files from makedep.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: c00cc015f827d255b6e239b63e45acff01e19525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c00cc015f827d255b6e239b63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 14 19:52:52 2013 +0200 makefiles: Generate explicit build rules for bison files from makedep. --- Make.rules.in | 8 +------- tools/makedep.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 430e91b..a7da5ef 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -36,7 +36,7 @@ CROSSOBJS = $(OBJS:.o=.cross.o) # Implicit rules -.SUFFIXES: .mc .rc .res .idl .tlb .h .y .tab.c .tab.h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .mc .rc .res .idl .tlb .h .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o .po .mo @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -47,12 +47,6 @@ CROSSOBJS = $(OBJS:.o=.cross.o) .c.cross.o: $(CROSSCC) -c $(INCLUDES) $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) -o $@ $< -.y.tab.c: - $(BISON) $(BISONFLAGS) -p $*_ -o $@ $< - -.y.tab.h: - $(BISON) $(BISONFLAGS) -p $*_ -o $*.tab.c -d $< - .mc.res: $(WMC) -U -O res $(PORCFLAGS) -o $@ $< diff --git a/tools/makedep.c b/tools/makedep.c index d49c90a..b7c70d2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -941,9 +941,18 @@ static void output_sources(void) { /* add source file dependency for parallel makes */ char *header = strmake( "%s.tab.h", obj ); - if (find_include_file( header )) output( "%s.tab.c: %s\n", obj, header ); - free( header ); + if (find_include_file( header )) + { + output( "%s.tab.h: %s\n", obj, source->filename ); + output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o %s.tab.c -d %s\n", + obj, obj, source->filename ); + output( "%s.tab.c: %s %s\n", obj, source->filename, header ); + } + else output( "%s.tab.c: %s\n", obj, source->filename ); + + output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o $@ %s\n", obj, source->filename ); column += output( "%s.tab.o: %s.tab.c", obj, obj ); + free( header ); } else if (!strcmp( ext, "l" )) /* lex file */ {

1 0

Nikolay Sivov : kernel32: Added support for GET_MODULE_HANDLE_EX_FLAG_PIN.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 9a6567d1a6161f331ae4e07f3bd2697875af3d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6567d1a6161f331ae4e07f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 10:20:31 2013 +0400 kernel32: Added support for GET_MODULE_HANDLE_EX_FLAG_PIN. --- dlls/kernel32/module.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 9913f1b..babc756 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -507,6 +507,7 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) NTSTATUS status = STATUS_SUCCESS; HMODULE ret; ULONG magic; + BOOL lock; if (!module) { @@ -515,8 +516,8 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) } /* if we are messing with the refcount, grab the loader lock */ - if ((flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || - !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + lock = (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT); + if (lock) LdrLockLoaderLock( 0, NULL, &magic ); if (!name) @@ -538,14 +539,13 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) if (status == STATUS_SUCCESS) { if (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) - FIXME( "should pin refcount for %p\n", ret ); + LdrAddRefDll( LDR_ADDREF_DLL_PIN, ret ); else if (!(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) LdrAddRefDll( 0, ret ); } else SetLastError( RtlNtStatusToDosError( status ) ); - if ((flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || - !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + if (lock) LdrUnlockLoaderLock( 0, magic ); if (status == STATUS_SUCCESS) *module = ret;

1 0

Frédéric Delanoy : ole32: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 15, 2013

Oct. 15, 2013

Module: wine Branch: master Commit: 4bb61ec0df4c1ec68a105011eca29f5b5770798c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb61ec0df4c1ec68a105011e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 15 00:27:16 2013 +0200 ole32: Use BOOL type where appropriate. --- dlls/ole32/bindctx.c | 7 +++---- dlls/ole32/filemoniker.c | 12 ++++++------ dlls/ole32/ifs.c | 32 ++++++++++++++++---------------- dlls/ole32/storage32.c | 20 ++++++++++---------- dlls/ole32/storage32.h | 6 +++--- dlls/ole32/stubmanager.c | 2 +- 6 files changed, 39 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4bb61ec0df4c1ec68a105…

1 0