February 2010 - Wine-commits

Hans Leidekker : msi: Add tests for installing and removing ODBC drivers.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: bbfaf6af75afe41d16e24dcc49a0c7881a598be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfaf6af75afe41d16e24dcc4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 11 13:14:06 2010 +0100 msi: Add tests for installing and removing ODBC drivers. --- dlls/msi/tests/install.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0f7dd45..96b5117 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1260,6 +1260,66 @@ static const CHAR vp_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "InstallFiles\t\t4000\n" "InstallFinalize\t\t6000\n"; +static const CHAR odbc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "ODBCdriver.dll\todbc\tODBCdriver.dll\t1000\t\t\t8192\t1\n" + "ODBCdriver2.dll\todbc\tODBCdriver2.dll\t1000\t\t\t8192\t2\n" + "ODBCtranslator.dll\todbc\tODBCtranslator.dll\t1000\t\t\t8192\t3\n" + "ODBCtranslator2.dll\todbc\tODBCtranslator2.dll\t1000\t\t\t8192\t4\n" + "ODBCsetup.dll\todbc\tODBCsetup.dll\t1000\t\t\t8192\t5\n"; + +static const CHAR odbc_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "odbc\t\t\todbc feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR odbc_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "odbc\todbc\n"; + +static const CHAR odbc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "odbc\t{B6F3E4AE-35D1-4B72-9044-989F03E20A43}\tMSITESTDIR\t0\t\tODBCdriver.dll\n"; + +static const CHAR odbc_driver_dat[] = "Driver\tComponent_\tDescription\tFile_\tFile_Setup\n" + "s72\ts72\ts255\ts72\tS72\n" + "ODBCDriver\tDriver\n" + "ODBC test driver\todbc\tODBC test driver\tODBCdriver.dll\t\n" + "ODBC test driver2\todbc\tODBC test driver2\tODBCdriver2.dll\tODBCsetup.dll\n"; + +static const CHAR odbc_translator_dat[] = "Translator\tComponent_\tDescription\tFile_\tFile_Setup\n" + "s72\ts72\ts255\ts72\tS72\n" + "ODBCTranslator\tTranslator\n" + "ODBC test translator\todbc\tODBC test translator\tODBCtranslator.dll\t\n" + "ODBC test translator2\todbc\tODBC test translator2\tODBCtranslator2.dll\tODBCsetup.dll\n"; + +static const CHAR odbc_datasource_dat[] = "DataSource\tComponent_\tDescription\tDriverDescription\tRegistration\n" + "s72\ts72\ts255\ts255\ti2\n" + "ODBCDataSource\tDataSource\n" + "ODBC data source\todbc\tODBC data source\tODBC driver\t0\n"; + +static const CHAR odbc_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "InstallODBC\t\t3000\n" + "RemoveODBC\t\t3100\n" + "InstallFiles\t\t4000\n" + "InstallFinalize\t\t6000\n"; + +static const CHAR odbc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t5\t\t\tDISK1\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2056,6 +2116,21 @@ static const msi_table vp_tables[] = ADD_TABLE(vp_property) }; +static const msi_table odbc_tables[] = +{ + ADD_TABLE(odbc_component), + ADD_TABLE(directory), + ADD_TABLE(odbc_feature), + ADD_TABLE(odbc_feature_comp), + ADD_TABLE(odbc_file), + ADD_TABLE(odbc_driver), + ADD_TABLE(odbc_translator), + ADD_TABLE(odbc_datasource), + ADD_TABLE(odbc_install_exec_seq), + ADD_TABLE(odbc_media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -7920,6 +7995,33 @@ static void test_validate_product_id(void) delete_test_files(); } +static void test_install_remove_odbc(void) +{ + UINT r; + + create_test_files(); + create_file("msitest\\ODBCdriver.dll", 1000); + create_file("msitest\\ODBCdriver2.dll", 1000); + create_file("msitest\\ODBCtranslator.dll", 1000); + create_file("msitest\\ODBCtranslator2.dll", 1000); + create_file("msitest\\ODBCsetup.dll", 1000); + create_database(msifile, odbc_tables, sizeof(odbc_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\ODBCdriver.dll", TRUE), "file not created\n"); + ok(delete_pf("msitest\\ODBCdriver2.dll", TRUE), "file not created\n"); + ok(delete_pf("msitest\\ODBCtranslator.dll", TRUE), "file not created\n"); + ok(delete_pf("msitest\\ODBCtranslator2.dll", TRUE), "file not created\n"); + ok(delete_pf("msitest\\ODBCsetup.dll", TRUE), "file not created\n"); + ok(delete_pf("msitest", FALSE), "directory not created\n"); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8018,6 +8120,7 @@ START_TEST(install) test_self_registration(); test_register_font(); test_validate_product_id(); + test_install_remove_odbc(); DeleteFileA(log_file);

1 0

Alexandre Julliard : makefiles: Build the dlls directly from the top-level makefile.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 5acb431511727317f0274bba82b21a74967e9750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5acb431511727317f0274bba8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 19:32:31 2010 +0100 makefiles: Build the dlls directly from the top-level makefile. --- Makefile.in | 19 +- aclocal.m4 | 10 +- configure | 1920 +++++++++++++++++++++++++++++++++------------ configure.ac | 1 - dlls/Makefile.in | 23 - documentation/Makefile.in | 8 +- 6 files changed, 1435 insertions(+), 546 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5acb431511727317f0274…

1 0

Alexandre Julliard : makefiles: Build the programs directly from the top-level makefile.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 9463687f78977058e6f114fdbd56f8a2bd754a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9463687f78977058e6f114fdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 19:33:39 2010 +0100 makefiles: Build the programs directly from the top-level makefile. --- Makefile.in | 14 +- aclocal.m4 | 4 +- configure | 400 +++++++++++++++++++++++++++++++++++--------------- configure.ac | 104 +++++++------- programs/Makefile.in | 4 +- tools/make_makefiles | 2 +- 6 files changed, 345 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9463687f78977058e6f11…

1 0

Alexandre Julliard : makefiles: Simplify the WINE_CONFIG_MAKEFILE macro by removing the no longer needed prefix arg .
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: c6e62dda1c1d71ebcaf5a6fc347f0e26ef43bebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e62dda1c1d71ebcaf5a6fc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 19:37:48 2010 +0100 makefiles: Simplify the WINE_CONFIG_MAKEFILE macro by removing the no longer needed prefix arg. --- aclocal.m4 | 24 +++++++++++++----------- configure.ac | 26 +++++++++++++------------- tools/make_makefiles | 4 ++-- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 7e8e208..62f73da 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -165,21 +165,23 @@ AC_CONFIG_FILES([$1])]) dnl **** Create a makefile from config.status **** dnl -dnl Usage: WINE_CONFIG_MAKEFILE(file,deps,prefix,var,enable) +dnl Usage: WINE_CONFIG_MAKEFILE(file,deps,var,enable) dnl AC_DEFUN([WINE_CONFIG_MAKEFILE], -[m4_pushdef([ac_dir],m4_bpatsubst([$1],[^$$3/?\(.*$/\)?Makefile$],[\2]))dnl +[m4_pushdef([ac_dir],m4_bpatsubst([$1],[^$\(.*$/\)?Makefile$],[\2]))dnl +m4_pushdef([ac_name],m4_bpatsubst(ac_dir,[.*/$.*$$],[\1]))dnl m4_ifval(ac_dir,[ALL_MAKEFILES="$ALL_MAKEFILES \\ $1"]) -AS_VAR_PUSHDEF([ac_enable],m4_default([$5],[enable_]ac_dir))dnl -m4_ifval([$4],[test "x$ac_enable" != xno]m4_foreach([ac_var],[$4],[ && ac_var="$ac_var \\ +AS_VAR_PUSHDEF([ac_enable],m4_default([$4],[enable_]ac_name))dnl +m4_ifval([$3],[test "x$ac_enable" != xno]m4_foreach([ac_var],[$3],[ && ac_var="$ac_var \\ ac_dir"])) AS_VAR_POPDEF([ac_enable])dnl ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS -m4_ifval(ac_dir,m4_ifval([$3],,[\$(RECURSE_TARGETS:%=ac_dir/%) ac_dir: $1 \$(MAKEDEP) -]))[$1: ]m4_ifval([$2],[$1.in $2],[$1.in]) config.status" +m4_ifval(ac_dir,[\$(RECURSE_TARGETS:%=ac_dir/%) ac_dir: $1 \$(MAKEDEP) +])[$1: ]m4_ifval([$2],[$1.in $2],[$1.in]) config.status" AC_CONFIG_FILES([$1])dnl -m4_popdef([ac_dir])]) +m4_popdef([ac_dir])dnl +m4_popdef([ac_name])]) dnl **** Create a dll makefile from config.status **** dnl @@ -209,7 +211,7 @@ dlls/$1/lib$3.$STATIC_IMPLIBEXT dlls/$1/lib$3.cross.a: dlls/$1/Makefile dummy [dlls/$1/lib$3.$IMPLIBEXT dlls/$1/lib$3.cross.a: dlls/$1/$1.spec dlls/$1/Makefile @cd dlls/$1 && \$(MAKE) \`basename \$[@]\`]) ])dlls/$1 dlls/$1/__install__ dlls/$1/__install-lib__ dlls/$1/__install-dev__: __builddeps__" -WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makedll.rules],[],[ALL_DLL_DIRS],m4_default([$2],[enable_$1]))]) +WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makedll.rules],[ALL_DLL_DIRS],[$2])]) dnl **** Create a program makefile from config.status **** dnl @@ -218,7 +220,7 @@ dnl AC_DEFUN([WINE_CONFIG_PROGRAM], [ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/$1 programs/$1/__install__ programs/$1/__install-lib__: __builddeps__" -WINE_CONFIG_MAKEFILE([programs/$1/Makefile],[programs/Makeprog.rules],[],[$2],m4_default([$3],[enable_$1]))]) +WINE_CONFIG_MAKEFILE([programs/$1/Makefile],[programs/Makeprog.rules],[$2],[$3])]) dnl **** Create a test makefile from config.status **** dnl @@ -238,7 +240,7 @@ ac_name.exe: \$(TOPOBJDIR)/$1/ac_name.exe$DLLEXT ac_name.rc: echo \"ac_name.exe TESTRES \\\"ac_name.exe\\\"\" >\$[@] || (\$(RM) \$[@] && false) ac_name.res: ac_name.rc ac_name.exe" -WINE_CONFIG_MAKEFILE([$1/Makefile],[Maketest.rules],[],[ALL_TEST_DIRS],[enable_tests])dnl +WINE_CONFIG_MAKEFILE([$1/Makefile],[Maketest.rules],[ALL_TEST_DIRS],[enable_tests])dnl m4_popdef([ac_suffix])dnl m4_popdef([ac_name])]) @@ -254,7 +256,7 @@ dlls/$1: tools/widl tools/winebuild tools/winegcc include dlls/$1/__install__ dlls/$1/__install-dev__: dlls/$1 dlls/$1/lib$1.cross.a: dlls/$1/Makefile tools/widl tools/winebuild tools/winegcc include dummy @cd dlls/$1 && \$(MAKE) \`basename \$[@]\`" -WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makeimplib.rules],[],[ALL_STATICLIB_DIRS],[enable_$1])]) +WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makeimplib.rules],[ALL_STATICLIB_DIRS])]) dnl **** Add a message to the list displayed at the end **** dnl diff --git a/configure.ac b/configure.ac index 68954d5..ed0fa0a 100644 --- a/configure.ac +++ b/configure.ac @@ -2607,14 +2607,14 @@ WINE_CONFIG_TEST(dlls/xinput1_3/tests) WINE_CONFIG_DLL(xinput9_1_0) WINE_CONFIG_DLL(xmllite) WINE_CONFIG_TEST(dlls/xmllite/tests) -WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([include/Makefile],[Make.rules],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([libs/port/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules]) -WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules],[ALL_TOP_DIRS]) WINE_CONFIG_PROGRAM(cacls,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(clock,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(cmd,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) @@ -2670,14 +2670,14 @@ WINE_CONFIG_PROGRAM(winver,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(wordpad,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(write,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(xcopy,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) -WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) -WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) -WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) -WINE_CONFIG_MAKEFILE([tools/winebuild/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) -WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) -WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) -WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) -WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules],[],[ALL_TOOL_DIRS],[enable_tools]) +WINE_CONFIG_MAKEFILE([server/Makefile],[Make.rules],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([tools/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) +WINE_CONFIG_MAKEFILE([tools/widl/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) +WINE_CONFIG_MAKEFILE([tools/winebuild/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) +WINE_CONFIG_MAKEFILE([tools/winedump/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) +WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) +WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) +WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules],[ALL_TOOL_DIRS],enable_tools) dnl End of auto-generated output commands dnl Don't install in bin dir for Windows build diff --git a/tools/make_makefiles b/tools/make_makefiles index 5762b52..04a351c 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -391,11 +391,11 @@ sub update_makefiles(@) } elsif ($file =~ /^tools.*\/Makefile$/) { - push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[],[ALL_TOOL_DIRS],[enable_tools])\n"; + push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[ALL_TOOL_DIRS],enable_tools)\n"; } elsif ($file =~ /^[^\/]*\/Makefile$/) { - push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[],[ALL_TOP_DIRS])\n"; + push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules],[ALL_TOP_DIRS])\n"; } else {

1 0

Alexandre Julliard : makefiles: Simplify the WINE_CONFIG_DLL macro by defining some local variables.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 3be8b409ae360e87fed6795616a6c9904da17471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be8b409ae360e87fed679561… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 19:39:38 2010 +0100 makefiles: Simplify the WINE_CONFIG_DLL macro by defining some local variables. --- aclocal.m4 | 40 +++++++++++++++++++++++----------------- configure | 32 ++++++++++++-------------------- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 62f73da..d7b41c1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -188,30 +188,36 @@ dnl dnl Usage: WINE_CONFIG_DLL(name,enable,implib,implibsrc) dnl AC_DEFUN([WINE_CONFIG_DLL], -[m4_ifval([$3],[m4_ifval([$2],[test "x$[$2]" = xno || ])ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\ - dlls/$1/lib$3.$IMPLIBEXT[]dnl -m4_if($1,$3,,[ \\ - dlls/lib$3.$IMPLIBEXT])[]dnl -m4_ifval([$4],[ \\ - dlls/$1/lib$3.$STATIC_IMPLIBEXT])" +[m4_pushdef([ac_implib],m4_ifval([$3],[dlls/$1/lib$3.$IMPLIBEXT]))dnl +m4_pushdef([ac_crosslib],m4_ifval([$3],[dlls/$1/lib$3.cross.a]))dnl +m4_pushdef([ac_staticlib],m4_ifval([$4],[dlls/$1/lib$3.$STATIC_IMPLIBEXT]))dnl +m4_pushdef([ac_symlink],m4_if([$1],[$3],,[dlls/lib$3.$IMPLIBEXT]))dnl +m4_ifval(ac_implib,[m4_ifval([$2],[test "x$[$2]" = xno || ])ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\ + ac_implib[]dnl +m4_ifval(ac_symlink,[ \\ + ac_symlink])[]dnl +m4_ifval(ac_staticlib,[ \\ + ac_staticlib])" ])ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS -m4_ifval([$3],[dlls/$1/lib$3.$IMPLIBEXT m4_ifval([$4],[dlls/$1/lib$3.$STATIC_IMPLIBEXT ])dlls/$1/lib$3.cross.a: tools/widl tools/winebuild tools/winegcc include -m4_if($1,$3,,[dlls/lib$3.a: dlls/$1/lib$3.a - \$(RM) \$[@] && \$(LN_S) $1/lib$3.a \$[@] -dlls/lib$3.cross.a: dlls/$1/lib$3.cross.a +m4_ifval(ac_implib,[ac_implib m4_ifval(ac_staticlib,[ac_staticlib ])ac_crosslib: tools/widl tools/winebuild tools/winegcc include +m4_ifval(ac_symlink,[ac_symlink: ac_implib + \$(RM) \$[@] && \$(LN_S) $1/lib$3.$IMPLIBEXT \$[@] +dlls/lib$3.cross.a: ac_crosslib \$(RM) \$[@] && \$(LN_S) $1/lib$3.cross.a \$[@] -dlls/lib$3.def: dlls/$1/lib$3.def - \$(RM) \$[@] && \$(LN_S) $1/lib$3.def \$[@] clean:: - \$(RM) dlls/lib$3.def -])m4_ifval([$4],[dlls/$1/lib$3.def: dlls/$1/$1.spec dlls/$1/Makefile + \$(RM) ac_symlink +])m4_ifval(ac_staticlib,[dlls/$1/lib$3.def: dlls/$1/$1.spec dlls/$1/Makefile @cd dlls/$1 && \$(MAKE) \`basename \$[@]\` -dlls/$1/lib$3.$STATIC_IMPLIBEXT dlls/$1/lib$3.cross.a: dlls/$1/Makefile dummy +ac_staticlib ac_crosslib: dlls/$1/Makefile dummy @cd dlls/$1 && \$(MAKE) \`basename \$[@]\`], -[dlls/$1/lib$3.$IMPLIBEXT dlls/$1/lib$3.cross.a: dlls/$1/$1.spec dlls/$1/Makefile +[ac_implib ac_crosslib: dlls/$1/$1.spec dlls/$1/Makefile @cd dlls/$1 && \$(MAKE) \`basename \$[@]\`]) ])dlls/$1 dlls/$1/__install__ dlls/$1/__install-lib__ dlls/$1/__install-dev__: __builddeps__" -WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makedll.rules],[ALL_DLL_DIRS],[$2])]) +WINE_CONFIG_MAKEFILE([dlls/$1/Makefile],[dlls/Makedll.rules],[ALL_DLL_DIRS],[$2])dnl +m4_popdef([ac_implib])dnl +m4_popdef([ac_crosslib])dnl +m4_popdef([ac_staticlib])dnl +m4_popdef([ac_symlink])]) dnl **** Create a program makefile from config.status **** dnl diff --git a/configure b/configure index ac049b5..1062066 100755 --- a/configure +++ b/configure @@ -14919,14 +14919,12 @@ ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\ dlls/libd3dx9.$IMPLIBEXT" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/d3dx9_36/libd3dx9.$IMPLIBEXT dlls/d3dx9_36/libd3dx9.cross.a: tools/widl tools/winebuild tools/winegcc include -dlls/libd3dx9.a: dlls/d3dx9_36/libd3dx9.a - \$(RM) \$@ && \$(LN_S) d3dx9_36/libd3dx9.a \$@ +dlls/libd3dx9.$IMPLIBEXT: dlls/d3dx9_36/libd3dx9.$IMPLIBEXT + \$(RM) \$@ && \$(LN_S) d3dx9_36/libd3dx9.$IMPLIBEXT \$@ dlls/libd3dx9.cross.a: dlls/d3dx9_36/libd3dx9.cross.a \$(RM) \$@ && \$(LN_S) d3dx9_36/libd3dx9.cross.a \$@ -dlls/libd3dx9.def: dlls/d3dx9_36/libd3dx9.def - \$(RM) \$@ && \$(LN_S) d3dx9_36/libd3dx9.def \$@ clean:: - \$(RM) dlls/libd3dx9.def + \$(RM) dlls/libd3dx9.$IMPLIBEXT dlls/d3dx9_36/libd3dx9.$IMPLIBEXT dlls/d3dx9_36/libd3dx9.cross.a: dlls/d3dx9_36/d3dx9_36.spec dlls/d3dx9_36/Makefile @cd dlls/d3dx9_36 && \$(MAKE) \`basename \$@\` dlls/d3dx9_36 dlls/d3dx9_36/__install__ dlls/d3dx9_36/__install-lib__ dlls/d3dx9_36/__install-dev__: __builddeps__" @@ -16431,14 +16429,12 @@ test "x$enable_win16" = xno || ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\ dlls/libkernel.$IMPLIBEXT" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/krnl386.exe16/libkernel.$IMPLIBEXT dlls/krnl386.exe16/libkernel.cross.a: tools/widl tools/winebuild tools/winegcc include -dlls/libkernel.a: dlls/krnl386.exe16/libkernel.a - \$(RM) \$@ && \$(LN_S) krnl386.exe16/libkernel.a \$@ +dlls/libkernel.$IMPLIBEXT: dlls/krnl386.exe16/libkernel.$IMPLIBEXT + \$(RM) \$@ && \$(LN_S) krnl386.exe16/libkernel.$IMPLIBEXT \$@ dlls/libkernel.cross.a: dlls/krnl386.exe16/libkernel.cross.a \$(RM) \$@ && \$(LN_S) krnl386.exe16/libkernel.cross.a \$@ -dlls/libkernel.def: dlls/krnl386.exe16/libkernel.def - \$(RM) \$@ && \$(LN_S) krnl386.exe16/libkernel.def \$@ clean:: - \$(RM) dlls/libkernel.def + \$(RM) dlls/libkernel.$IMPLIBEXT dlls/krnl386.exe16/libkernel.$IMPLIBEXT dlls/krnl386.exe16/libkernel.cross.a: dlls/krnl386.exe16/krnl386.exe16.spec dlls/krnl386.exe16/Makefile @cd dlls/krnl386.exe16 && \$(MAKE) \`basename \$@\` dlls/krnl386.exe16 dlls/krnl386.exe16/__install__ dlls/krnl386.exe16/__install-lib__ dlls/krnl386.exe16/__install-dev__: __builddeps__" @@ -20229,14 +20225,12 @@ ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\ dlls/libwinspool.$IMPLIBEXT" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/winspool.drv/libwinspool.$IMPLIBEXT dlls/winspool.drv/libwinspool.cross.a: tools/widl tools/winebuild tools/winegcc include -dlls/libwinspool.a: dlls/winspool.drv/libwinspool.a - \$(RM) \$@ && \$(LN_S) winspool.drv/libwinspool.a \$@ +dlls/libwinspool.$IMPLIBEXT: dlls/winspool.drv/libwinspool.$IMPLIBEXT + \$(RM) \$@ && \$(LN_S) winspool.drv/libwinspool.$IMPLIBEXT \$@ dlls/libwinspool.cross.a: dlls/winspool.drv/libwinspool.cross.a \$(RM) \$@ && \$(LN_S) winspool.drv/libwinspool.cross.a \$@ -dlls/libwinspool.def: dlls/winspool.drv/libwinspool.def - \$(RM) \$@ && \$(LN_S) winspool.drv/libwinspool.def \$@ clean:: - \$(RM) dlls/libwinspool.def + \$(RM) dlls/libwinspool.$IMPLIBEXT dlls/winspool.drv/libwinspool.$IMPLIBEXT dlls/winspool.drv/libwinspool.cross.a: dlls/winspool.drv/winspool.drv.spec dlls/winspool.drv/Makefile @cd dlls/winspool.drv && \$(MAKE) \`basename \$@\` dlls/winspool.drv dlls/winspool.drv/__install__ dlls/winspool.drv/__install-lib__ dlls/winspool.drv/__install-dev__: __builddeps__" @@ -20559,14 +20553,12 @@ ALL_IMPORT_LIBS="$ALL_IMPORT_LIBS \\ dlls/libxinput.$IMPLIBEXT" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS dlls/xinput1_3/libxinput.$IMPLIBEXT dlls/xinput1_3/libxinput.cross.a: tools/widl tools/winebuild tools/winegcc include -dlls/libxinput.a: dlls/xinput1_3/libxinput.a - \$(RM) \$@ && \$(LN_S) xinput1_3/libxinput.a \$@ +dlls/libxinput.$IMPLIBEXT: dlls/xinput1_3/libxinput.$IMPLIBEXT + \$(RM) \$@ && \$(LN_S) xinput1_3/libxinput.$IMPLIBEXT \$@ dlls/libxinput.cross.a: dlls/xinput1_3/libxinput.cross.a \$(RM) \$@ && \$(LN_S) xinput1_3/libxinput.cross.a \$@ -dlls/libxinput.def: dlls/xinput1_3/libxinput.def - \$(RM) \$@ && \$(LN_S) xinput1_3/libxinput.def \$@ clean:: - \$(RM) dlls/libxinput.def + \$(RM) dlls/libxinput.$IMPLIBEXT dlls/xinput1_3/libxinput.$IMPLIBEXT dlls/xinput1_3/libxinput.cross.a: dlls/xinput1_3/xinput1_3.spec dlls/xinput1_3/Makefile @cd dlls/xinput1_3 && \$(MAKE) \`basename \$@\` dlls/xinput1_3 dlls/xinput1_3/__install__ dlls/xinput1_3/__install-lib__ dlls/xinput1_3/__install-dev__: __builddeps__"

1 0

Alexandre Julliard : makefiles: Auto-generate the list of all subdirectories too.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 52c400e97e031b8c7d0556e83119c67c2576e314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c400e97e031b8c7d0556e83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 19:57:02 2010 +0100 makefiles: Auto-generate the list of all subdirectories too. --- Makefile.in | 20 +- aclocal.m4 | 4 +- configure | 2158 +++++++++++++++++++++++++++++----------------------------- configure.ac | 2 +- 4 files changed, 1085 insertions(+), 1099 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52c400e97e031b8c7d055…

1 0

Alexandre Julliard : makefiles: Move all the recursion rules to the top-level makefile.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 93f03393875d241d339289ac559921684b76efc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f03393875d241d339289ac5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 20:27:52 2010 +0100 makefiles: Move all the recursion rules to the top-level makefile. --- Make.rules.in | 82 ++------------------------ Makefile.in | 135 ++++++++++++++++++++++++++++++++++---------- Maketest.rules.in | 2 + dlls/Makedll.rules.in | 14 +---- programs/Makeprog.rules.in | 7 -- 5 files changed, 116 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93f03393875d241d33928…

1 0

Alexandre Julliard : makefiles: Add a __tooldeps__ fake dependency to rebuild only the tools.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 1431e24feeb20dac8a2e791f63cb0a7d4c32c1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1431e24feeb20dac8a2e791f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 12:53:53 2010 +0100 makefiles: Add a __tooldeps__ fake dependency to rebuild only the tools. --- Makefile.in | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 059fb6c..8aa498f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -198,9 +198,10 @@ implib: $(ALL_STATICLIB_DIRS) $(IMPORT_LIBS) # Dependencies between directories # dependencies needed to build any dll or program -__builddeps__: libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) include $(ALL_STATICLIB_DIRS) $(IMPORT_LIBS) -__buildcrossdeps__: libs/port libs/wine $(ALL_TOOL_DIRS) include $(STATIC_LIBS:.a=.cross.a) $(IMPORT_LIBS:.def=.cross.a) -.PHONY: __builddeps__ __buildcrossdeps__ +__tooldeps__: libs/port libs/wine libs/wpp $(ALL_TOOL_DIRS) +__builddeps__: __tooldeps__ include $(ALL_STATICLIB_DIRS) $(IMPORT_LIBS) +__buildcrossdeps__: __tooldeps__ include $(STATIC_LIBS:.a=.cross.a) $(IMPORT_LIBS:.def=.cross.a) +.PHONY: __tooldeps__ __builddeps__ __buildcrossdeps__ loader server: libs/port libs/wine tools fonts: tools

1 0

Jacek Caban : mshtml: Added IHTMLStyle::get_border*Color implementation.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 6e116f521585331876f02df3ed8abdbc363cb3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e116f521585331876f02df3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 11 01:19:58 2010 +0100 mshtml: Added IHTMLStyle::get_border*Color implementation. --- dlls/mshtml/htmlstyle.c | 18 ++++++++++++------ dlls/mshtml/tests/dom.c | 12 ++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f96bee2..cb86b79 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1533,8 +1533,10 @@ static HRESULT WINAPI HTMLStyle_put_borderTopColor(IHTMLStyle *iface, VARIANT v) static HRESULT WINAPI HTMLStyle_get_borderTopColor(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_TOP_COLOR, p, 0); } static HRESULT WINAPI HTMLStyle_put_borderRightColor(IHTMLStyle *iface, VARIANT v) @@ -1563,8 +1565,10 @@ static HRESULT WINAPI HTMLStyle_put_borderBottomColor(IHTMLStyle *iface, VARIANT static HRESULT WINAPI HTMLStyle_get_borderBottomColor(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_BOTTOM_COLOR, p, 0); } static HRESULT WINAPI HTMLStyle_put_borderLeftColor(IHTMLStyle *iface, VARIANT v) @@ -1577,8 +1581,10 @@ static HRESULT WINAPI HTMLStyle_put_borderLeftColor(IHTMLStyle *iface, VARIANT v static HRESULT WINAPI HTMLStyle_get_borderLeftColor(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_LEFT_COLOR, p, 0); } static HRESULT WINAPI HTMLStyle_put_borderWidth(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dc37a5e..f4f673c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4522,8 +4522,8 @@ static void test_default_style(IHTMLStyle *style) */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderTopColor(style, &v); - todo_wine ok(hres == S_OK, "get_borderTopColor failed: %08x\n", hres); - todo_wine ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(hres == S_OK, "get_borderTopColor failed: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL; @@ -4556,8 +4556,8 @@ static void test_default_style(IHTMLStyle *style) */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderBottomColor(style, &v); - todo_wine ok(hres == S_OK, "get_borderBottomColor failed: %08x\n", hres); - todo_wine ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(hres == S_OK, "get_borderBottomColor failed: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL; @@ -4590,8 +4590,8 @@ static void test_default_style(IHTMLStyle *style) */ V_BSTR(&v) = NULL; hres = IHTMLStyle_get_borderLeftColor(style, &v); - todo_wine ok(hres == S_OK, "get_borderLeftColor failed: %08x\n", hres); - todo_wine ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(hres == S_OK, "get_borderLeftColor failed: %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); V_BSTR(&v) = NULL;

1 0

Michael Stefaniuc : kernel32: Avoid using HIWORD on types that are 64bit on Win64.
by Alexandre Julliard 10 Feb '10

10 Feb '10

Module: wine Branch: master Commit: 3f37e33497ab6f61cffee53a0f479516404c2dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f37e33497ab6f61cffee53a0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 10 11:43:37 2010 +0100 kernel32: Avoid using HIWORD on types that are 64bit on Win64. --- dlls/kernel32/atom.c | 3 ++- dlls/kernel32/except.c | 2 +- dlls/kernel32/module.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/atom.c b/dlls/kernel32/atom.c index d6caec2..a8deb5e 100644 --- a/dlls/kernel32/atom.c +++ b/dlls/kernel32/atom.c @@ -37,6 +37,7 @@ #include "kernel_private.h" #define MAX_ATOM_LEN 255 +#define IS_INTATOM(x) (((ULONG_PTR)(x) >> 16) == 0) /****************************************************************** * get_local_table @@ -88,7 +89,7 @@ BOOL WINAPI InitAtomTable( DWORD entries ) */ static inline BOOL check_integral_atom( const void* ptr, ATOM* patom) { - if (HIWORD( ptr )) return FALSE; + if (!IS_INTATOM( ptr )) return FALSE; if ((*patom = LOWORD( ptr )) >= MAXINTATOM) { SetLastError( ERROR_INVALID_PARAMETER ); diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index d6dea99..6ed88ad 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -133,7 +133,7 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in rec->ExceptionInformation[0]); break; case EXCEPTION_WINE_STUB: - if (HIWORD(rec->ExceptionInformation[1])) + if ((ULONG_PTR)rec->ExceptionInformation[1] >> 16) len = snprintf( buffer, size, "Unimplemented function %s.%s called", (char *)rec->ExceptionInformation[0], (char *)rec->ExceptionInformation[1] ); else diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 96a240e..2b8f11e 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1032,7 +1032,7 @@ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) if (!hModule) hModule = NtCurrentTeb()->Peb->ImageBaseAddress; - if (HIWORD(function)) + if ((ULONG_PTR)function >> 16) { ANSI_STRING str;

1 0