October 2013 - Wine-commits

Hans Leidekker : msi/tests: Prepare action. c for the switch to -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 0e8b5ac54afcd662da6d4d6901fc3e046e5a5c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8b5ac54afcd662da6d4d690… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 13:04:45 2013 +0200 msi/tests: Prepare action.c for the switch to -D__WINESRC__. --- dlls/msi/tests/action.c | 383 ++++++++++++++++++++++++----------------------- 1 files changed, 192 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e8b5ac54afcd662da6d4…

1 0

Hans Leidekker : msi/tests: Prepare automation. c for the switch to -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: ae5c7c2a1831af9d4f40b257c296746898da1f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5c7c2a1831af9d4f40b257c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:27:50 2013 +0200 msi/tests: Prepare automation.c for the switch to -D__WINESRC__. --- dlls/msi/tests/automation.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index c1c1d4a..c27031e 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -29,6 +29,7 @@ #include <msidefs.h> #include <msi.h> #include <fci.h> +#include <oaidl.h> #include "wine/test.h" @@ -237,9 +238,8 @@ static void write_file(const CHAR *filename, const char *data, int data_size) { DWORD size; - HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - + HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); WriteFile(hf, data, data_size, &size, NULL); CloseHandle(hf); } @@ -333,13 +333,12 @@ static BOOL get_program_files_dir(LPSTR buf) HKEY hkey; DWORD type = REG_EXPAND_SZ, size; - if (RegOpenKey(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) + if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) return FALSE; size = MAX_PATH; - if (RegQueryValueEx(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)buf, &size) && - RegQueryValueEx(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size)) + if (RegQueryValueExA(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)buf, &size) && + RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size)) return FALSE; RegCloseKey(hkey); @@ -356,7 +355,7 @@ static void create_file(const CHAR *name, DWORD size) WriteFile(file, name, strlen(name), &written, NULL); WriteFile(file, "\n", strlen("\n"), &written, NULL); - left = size - lstrlen(name) - 1; + left = size - lstrlenA(name) - 1; SetFilePointer(file, left, NULL, FILE_CURRENT); SetEndOfFile(file); @@ -2321,7 +2320,7 @@ static UINT delete_registry_key(HKEY hkeyParent, LPCSTR subkey, REGSAM access) HKEY hkey; DWORD dwSize; - ret = RegOpenKeyEx(hkeyParent, subkey, 0, access, &hkey); + ret = RegOpenKeyExA(hkeyParent, subkey, 0, access, &hkey); if (ret != ERROR_SUCCESS) return ret; ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &dwSize, NULL, NULL, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) return ret; @@ -2348,7 +2347,7 @@ static UINT find_registry_key(HKEY hkeyParent, LPCSTR subkey, LPCSTR findkey, RE *phkey = 0; - ret = RegOpenKeyEx(hkeyParent, subkey, 0, access, &hkey); + ret = RegOpenKeyExA(hkeyParent, subkey, 0, access, &hkey); if (ret != ERROR_SUCCESS) return ret; ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &dwSize, NULL, NULL, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) return ret; @@ -2525,7 +2524,7 @@ static void test_Installer_InstallProduct(void) ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); /* Remove registry keys written by PublishProduct standard action */ - res = RegOpenKey(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Installer", &hkey); + res = RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Installer", &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = delete_registry_key(hkey, "Products\\af054738b93a8cb43b12803b397f483b", KEY_ALL_ACCESS); @@ -2685,7 +2684,7 @@ START_TEST(automation) GetSystemTimeAsFileTime(&systemtime); GetCurrentDirectoryA(MAX_PATH, prev_path); - GetTempPath(MAX_PATH, temp_path); + GetTempPathA(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path); lstrcpyA(CURR_DIR, temp_path);

1 0

Hans Leidekker : msi/tests: Prepare db.c for the switch to -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: f1498d77366918a3e8d91c4ca0f0ad78d4a5fd80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1498d77366918a3e8d91c4ca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:28:19 2013 +0200 msi/tests: Prepare db.c for the switch to -D__WINESRC__. --- dlls/msi/tests/db.c | 1234 +++++++++++++++++++++++++-------------------------- 1 files changed, 614 insertions(+), 620 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1498d77366918a3e8d91…

1 0

Hans Leidekker : msi/tests: Prepare format. c for the switch to -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 569d04cd7b1da0a3dae9367bd5d3fa1c6309a11f URL: http://source.winehq.org/git/wine.git/?a=commit;h=569d04cd7b1da0a3dae9367bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:29:02 2013 +0200 msi/tests: Prepare format.c for the switch to -D__WINESRC__. --- dlls/msi/tests/format.c | 1445 ++++++++++++++++++++++++----------------------- 1 files changed, 723 insertions(+), 722 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=569d04cd7b1da0a3dae93…

1 0

Hans Leidekker : msi/tests: Prepare install. c for the switch to -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: e243979c4f824c0e8227094ef0657af606f4f44c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e243979c4f824c0e8227094ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:29:32 2013 +0200 msi/tests: Prepare install.c for the switch to -D__WINESRC__. --- dlls/msi/tests/install.c | 439 +++++++++++++++++++++++----------------------- 1 files changed, 221 insertions(+), 218 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e243979c4f824c0e82270…

1 0

Hans Leidekker : msi/tests: Prepare package. c for the switch to -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 4d236f19426dd2b938b7ab4354dcfdd9776be460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d236f19426dd2b938b7ab435… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:30:14 2013 +0200 msi/tests: Prepare package.c for the switch to -D__WINESRC__. --- dlls/msi/tests/package.c | 1560 +++++++++++++++++++++++----------------------- 1 files changed, 781 insertions(+), 779 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d236f19426dd2b938b7a…

1 0

Hans Leidekker : msi/tests: Prepare patch.c for the switch to -D__WINESRC__ .
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: 8a97d08759a3aa56d29d8bc9da571bbea7838125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a97d08759a3aa56d29d8bc9d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:30:57 2013 +0200 msi/tests: Prepare patch.c for the switch to -D__WINESRC__. --- dlls/msi/tests/patch.c | 73 +++++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a97d08759a3aa56d29d8…

1 0

Hans Leidekker : msi/tests: Prepare record. c for the switch to -D__WINESRC__.
by Alexandre Julliard 15 Oct '13

15 Oct '13

Module: wine Branch: master Commit: c3764ff014863cc9ce924ed7e58a8132ae239274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3764ff014863cc9ce924ed7e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 15 10:31:54 2013 +0200 msi/tests: Prepare record.c for the switch to -D__WINESRC__. --- dlls/msi/tests/record.c | 132 ++++++++++++++++++++++++----------------------- 1 files changed, 67 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3764ff014863cc9ce924…

1 0

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

15 Oct '13

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

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

15 Oct '13

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