March 2010 - Wine-commits - list.winehq.org

Eric Pouech : dbghelp: In dwarf parsing, correctly handle the DW_OP_regx option.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: a5293895a34c0cbf4f6db0585a1c48a025ddaee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5293895a34c0cbf4f6db0585… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:08:55 2010 +0100 dbghelp: In dwarf parsing, correctly handle the DW_OP_regx option. --- dlls/dbghelp/dwarf.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1652f46..78860d7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -690,7 +690,6 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, } stack[++stk] = dwarf2_leb128_as_signed(ctx); loc->kind = loc_regrel; - break; } else switch (op) { @@ -736,18 +735,22 @@ compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, case DW_OP_skip: tmp = dwarf2_parse_u2(ctx); ctx->data += tmp; break; case DW_OP_bra: tmp = dwarf2_parse_u2(ctx); if (!stack[stk--]) ctx->data += tmp; break; case DW_OP_regx: - if (loc->reg != Wine_DW_no_register) - FIXME("Only supporting one regx\n"); - loc->reg = dwarf2_map_register(dwarf2_leb128_as_unsigned(ctx)); + tmp = dwarf2_leb128_as_unsigned(ctx); + if (!piece_found) + { + if (loc->reg != Wine_DW_no_register) + FIXME("Only supporting one reg\n"); + loc->reg = dwarf2_map_register(tmp); + } loc->kind = loc_register; break; case DW_OP_bregx: tmp = dwarf2_leb128_as_unsigned(ctx); - ctx->data++; if (loc->reg != Wine_DW_no_register) FIXME("Only supporting one regx\n"); - loc->reg = dwarf2_map_register(tmp) + dwarf2_leb128_as_signed(ctx); - loc->kind = loc_register; + loc->reg = dwarf2_map_register(tmp); + stack[++stk] = dwarf2_leb128_as_signed(ctx); + loc->kind = loc_regrel; break; case DW_OP_fbreg: if (loc->reg != Wine_DW_no_register)

1 0

Eric Pouech : dbghelp: Rewrite SymGetModuleBase so that it relies on 64 bit version.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 0c2401369c20ebe7e69cc3c9f1ff419ee249a3e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2401369c20ebe7e69cc3c9f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:09:02 2010 +0100 dbghelp: Rewrite SymGetModuleBase so that it relies on 64 bit version. --- dlls/dbghelp/module.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index eadc67a..8f12fef 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1034,13 +1034,10 @@ BOOL WINAPI SymGetModuleInfoW64(HANDLE hProcess, DWORD64 dwAddr, */ DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) { - struct process* pcs = process_find_by_handle(hProcess); - struct module* module; + DWORD64 ret; - if (!pcs) return 0; - module = module_find_by_addr(pcs, dwAddr, DMT_UNKNOWN); - if (!module) return 0; - return module->module.BaseOfImage; + ret = SymGetModuleBase64(hProcess, dwAddr); + return validate_addr64(ret) ? ret : 0; } /*********************************************************************** @@ -1048,8 +1045,13 @@ DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) */ DWORD64 WINAPI SymGetModuleBase64(HANDLE hProcess, DWORD64 dwAddr) { - if (!validate_addr64(dwAddr)) return 0; - return SymGetModuleBase(hProcess, (DWORD)dwAddr); + struct process* pcs = process_find_by_handle(hProcess); + struct module* module; + + if (!pcs) return 0; + module = module_find_by_addr(pcs, dwAddr, DMT_UNKNOWN); + if (!module) return 0; + return module->module.BaseOfImage; } /******************************************************************

1 0

Eric Pouech : dbghelp: When unwinding the stack, stop if the current address isn't in a known module.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 060ccb123a04f9ce34e8ec6235c46e1720fa7392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060ccb123a04f9ce34e8ec623… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 27 09:09:08 2010 +0100 dbghelp: When unwinding the stack, stop if the current address isn't in a known module. --- dlls/dbghelp/cpu_x86_64.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index c664fd9..f07d8e4 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -516,10 +516,8 @@ static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, deltapc = 1; } - if (frame->AddrPC.Offset && (base = sw_module_base(csw, frame->AddrPC.Offset))) - frame->FuncTableEntry = sw_table_access(csw, frame->AddrPC.Offset); - else - frame->FuncTableEntry = NULL; + if (!frame->AddrPC.Offset || !(base = sw_module_base(csw, frame->AddrPC.Offset))) goto done_err; + frame->FuncTableEntry = sw_table_access(csw, frame->AddrPC.Offset); frame->AddrStack.Mode = frame->AddrFrame.Mode = frame->AddrReturn.Mode = AddrModeFlat; if (frame->FuncTableEntry) {

1 0

Francois Gouget : gdiplus/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 5aca2dd9642eb698bce560978223af4b5457f29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aca2dd9642eb698bce560978… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 27 16:54:22 2010 +0100 gdiplus/tests: Fix compilation on systems that don't support nameless unions. --- dlls/gdiplus/tests/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index f0dc681..262f9a2 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -913,7 +913,7 @@ static void test_loadwmf(void) expect(0, header.Y); todo_wine expect(320, header.Width); todo_wine expect(320, header.Height); - todo_wine expect(1, header.WmfHeader.mtType); + todo_wine expect(1, U(header).WmfHeader.mtType); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); expect(0, header.LogicalDpiY); @@ -971,7 +971,7 @@ static void test_createfromwmf(void) expect(0, header.Y); todo_wine expect(320, header.Width); todo_wine expect(320, header.Height); - todo_wine expect(1, header.WmfHeader.mtType); + todo_wine expect(1, U(header).WmfHeader.mtType); expect(0, header.EmfPlusHeaderSize); expect(0, header.LogicalDpiX); expect(0, header.LogicalDpiY);

1 0

Alexandre Julliard : makefiles: Install bindir programs from the top-level makefile.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 2fb302188dae3c0c35ab27c39d46bfde89c4da5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb302188dae3c0c35ab27c39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 09:24:33 2010 +0100 makefiles: Install bindir programs from the top-level makefile. --- Makefile.in | 3 +++ aclocal.m4 | 14 +++++++++----- configure | 18 +++++++++--------- configure.ac | 3 --- programs/Makefile.in | 21 --------------------- 5 files changed, 21 insertions(+), 38 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2697d2b..62ac1f6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,6 +26,9 @@ VPATH = @srcdir@ # Sub-directories that don't have a makefile EXTRASUBDIRS = dlls libs +# Destination directories for make install +INSTALLDIRS = $(DESTDIR)$(bindir) + all: wine @echo "Wine build complete." diff --git a/aclocal.m4 b/aclocal.m4 index 08f0bcd..1735fd0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -151,7 +151,6 @@ Makefile: Makefile.in Make.rules config.status AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"]) AC_SUBST(ALL_TEST_BINARIES,"") -AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") wine_fn_append_file () { @@ -291,14 +290,19 @@ wine_fn_config_program () programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy @cd programs/$ac_dir && \$(MAKE)" - if test -n "$ac_install" - then - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + test -n "$ac_install" || return + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "install install-lib:: programs/$ac_dir/Makefile __builddeps__ @cd programs/$ac_dir && \$(MAKE) install uninstall:: programs/$ac_dir/Makefile @cd programs/$ac_dir && \$(MAKE) uninstall" - test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir + if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install install-lib:: programs \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir +uninstall:: + \$(RM) \$(DESTDIR)\$(bindir)/$ac_dir" fi]) } diff --git a/configure b/configure index 7461096..74a51a8 100755 --- a/configure +++ b/configure @@ -596,7 +596,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS -ALL_PROGRAM_BIN_INSTALL_DIRS ALL_TEST_BINARIES ALL_WINETEST_DEPENDS LDAPLIBS @@ -13854,8 +13853,6 @@ ALL_WINETEST_DEPENDS="# Test binaries" ALL_TEST_BINARIES="" -ALL_PROGRAM_BIN_INSTALL_DIRS="" - wine_fn_append_file () { @@ -14006,14 +14003,19 @@ else programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy @cd programs/$ac_dir && \$(MAKE)" - if test -n "$ac_install" - then - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + test -n "$ac_install" || return + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "install install-lib:: programs/$ac_dir/Makefile __builddeps__ @cd programs/$ac_dir && \$(MAKE) install uninstall:: programs/$ac_dir/Makefile @cd programs/$ac_dir && \$(MAKE) uninstall" - test "$ac_install" != installbin || wine_fn_append_file ALL_PROGRAM_BIN_INSTALL_DIRS programs/$ac_dir + if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"install install-lib:: programs \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir +uninstall:: + \$(RM) \$(DESTDIR)\$(bindir)/$ac_dir" fi fi } @@ -14704,8 +14706,6 @@ ac_config_commands="$ac_config_commands Makefile" ac_config_files="$ac_config_files Make.tmp:Makefile.in" -test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" - wine_fn_append_rule ALL_MAKEFILE_DEPENDS "uninstall:: -rmdir \$(DESTDIR)\$(datadir)/wine \$(DESTDIR)\$(fakedlldir) \$(DESTDIR)\$(dlldir)" diff --git a/configure.ac b/configure.ac index 142d32a..68d6f45 100644 --- a/configure.ac +++ b/configure.ac @@ -2713,9 +2713,6 @@ _WINE_EOF AC_CONFIG_FILES([Make.tmp:Makefile.in]) -dnl Don't install in bin dir for Windows build -test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS="" - dnl Some final makefile rules WINE_APPEND_RULE([ALL_MAKEFILE_DEPENDS], [uninstall:: diff --git a/programs/Makefile.in b/programs/Makefile.in index 9946998..ebb7547 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -3,11 +3,6 @@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ -ALL_INSTALLS = @ALL_PROGRAM_BIN_INSTALL_DIRS@ -INSTALLPROGS = $(ALL_INSTALLS:programs/%=%) - -INSTALLDIRS = $(DESTDIR)$(bindir) - PROGRAMS = wineapploader @MAKE_RULES@ @@ -16,19 +11,3 @@ all: $(PROGRAMS) wineapploader: wineapploader.in sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) - -# Rules for installation - -.PHONY: install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) - -$(INSTALLPROGS:%=%/__installprog__): wineapploader $(INSTALLDIRS) dummy - $(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/`dirname $@` - -install-progs.so: $(INSTALLPROGS:%=%/__installprog__) -install-progs: # nothing to do here - -(a)WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS) - -uninstall:: - -cd $(DESTDIR)$(bindir) && $(RM) $(INSTALLPROGS) - -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)

1 0

Alexandre Julliard : makefiles: Move wineapploader to the tools directory and get rid of the programs makefile .
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 718ea42fe4065e0f4a88c78270ddae0fe5e6a210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718ea42fe4065e0f4a88c7827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 09:29:10 2010 +0100 makefiles: Move wineapploader to the tools directory and get rid of the programs makefile. --- .gitignore | 2 +- Makefile.in | 2 +- aclocal.m4 | 6 +++--- configure | 7 +++---- configure.ac | 1 - programs/Makefile.in | 13 ------------- tools/Makefile.in | 4 ++++ {programs => tools}/wineapploader.in | 0 8 files changed, 12 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index d0cf776..bb19dad 100644 --- a/.gitignore +++ b/.gitignore @@ -235,7 +235,6 @@ programs/rpcss/irot.h programs/rpcss/irot_s.c programs/services/svcctl.h programs/services/svcctl_s.c -programs/wineapploader programs/winedbg/dbg.tab.c programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c @@ -260,6 +259,7 @@ tools/widl/parser.yy.c tools/widl/widl tools/widl/widl.man tools/wine.inf +tools/wineapploader tools/winebuild/winebuild tools/winebuild/winebuild.man tools/winedump/winedump diff --git a/Makefile.in b/Makefile.in index 62ac1f6..67507a1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,7 +24,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ # Sub-directories that don't have a makefile -EXTRASUBDIRS = dlls libs +EXTRASUBDIRS = dlls libs programs # Destination directories for make install INSTALLDIRS = $(DESTDIR)$(bindir) diff --git a/aclocal.m4 b/aclocal.m4 index 1735fd0..3a7765f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -296,11 +296,11 @@ programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy @cd programs/$ac_dir && \$(MAKE) install uninstall:: programs/$ac_dir/Makefile @cd programs/$ac_dir && \$(MAKE) uninstall" - if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE" + if test "$ac_install" = installbin -a -n "$DLLEXT" -a "x$enable_tools" != xno then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install install-lib:: programs \$(DESTDIR)\$(bindir) - \$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir +"install install-lib:: tools \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir uninstall:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_dir" fi]) diff --git a/configure b/configure index 74a51a8..3186e81 100755 --- a/configure +++ b/configure @@ -14009,11 +14009,11 @@ programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy @cd programs/$ac_dir && \$(MAKE) install uninstall:: programs/$ac_dir/Makefile @cd programs/$ac_dir && \$(MAKE) uninstall" - if test "$ac_install" = installbin -a -n "$DLLEXT" -a -z "$WOW64_DISABLE" + if test "$ac_install" = installbin -a -n "$DLLEXT" -a "x$enable_tools" != xno then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"install install-lib:: programs \$(DESTDIR)\$(bindir) - \$(INSTALL_SCRIPT) programs/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir +"install install-lib:: tools \$(DESTDIR)\$(bindir) + \$(INSTALL_SCRIPT) tools/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir uninstall:: \$(RM) \$(DESTDIR)\$(bindir)/$ac_dir" fi @@ -14633,7 +14633,6 @@ wine_fn_config_makefile libs/port enable_libs_port wine_fn_config_makefile libs/wine enable_libs_wine wine_fn_config_makefile libs/wpp enable_libs_wpp wine_fn_config_makefile loader enable_loader -wine_fn_config_makefile programs enable_programs wine_fn_config_program attrib enable_attrib install wine_fn_config_program cacls enable_cacls install wine_fn_config_program clock enable_clock install diff --git a/configure.ac b/configure.ac index 68d6f45..fc05f10 100644 --- a/configure.ac +++ b/configure.ac @@ -2634,7 +2634,6 @@ WINE_CONFIG_MAKEFILE([libs/port]) WINE_CONFIG_MAKEFILE([libs/wine]) WINE_CONFIG_MAKEFILE([libs/wpp]) WINE_CONFIG_MAKEFILE([loader]) -WINE_CONFIG_MAKEFILE([programs]) WINE_CONFIG_PROGRAM(attrib,install) WINE_CONFIG_PROGRAM(cacls,install) WINE_CONFIG_PROGRAM(clock,install) diff --git a/programs/Makefile.in b/programs/Makefile.in deleted file mode 100644 index ebb7547..0000000 --- a/programs/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. -SRCDIR = @srcdir@ -VPATH = @srcdir@ - -PROGRAMS = wineapploader - -(a)MAKE_RULES@ - -all: $(PROGRAMS) - -wineapploader: wineapploader.in - sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) diff --git a/tools/Makefile.in b/tools/Makefile.in index 2dd6f8a..5e005e0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -15,6 +15,7 @@ PROGRAMS = \ relpath$(EXEEXT) \ sfnt2fnt$(EXEEXT) \ wine.inf \ + wineapploader \ wineprefixcreate MANPAGES = \ @@ -64,6 +65,9 @@ sfnt2fnt$(EXEEXT): sfnt2fnt.o relpath$(EXEEXT) wine.inf: wine.inf.in LC_ALL=C sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.inf.in >$@ || ($(RM) $@ && false) +wineapploader: wineapploader.in + sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) + wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT) sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) chmod +x wineprefixcreate diff --git a/programs/wineapploader.in b/tools/wineapploader.in similarity index 100% rename from programs/wineapploader.in rename to tools/wineapploader.in

1 0

Alexandre Julliard : makefiles: Don' t create font symlinks when fonts are disabled.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 0ef63e16d6d5ae3a006ee7e4375d75067ba6dbb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef63e16d6d5ae3a006ee7e43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 27 11:44:13 2010 +0100 makefiles: Don't create font symlinks when fonts are disabled. --- aclocal.m4 | 8 +++++--- configure | 8 ++++++++ configure.ac | 8 ++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 3a7765f..cc1d083 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -407,11 +407,13 @@ AC_DEFUN([WINE_CONFIG_EXTRA_DIR], dnl **** Create symlinks from config.status **** dnl -dnl Usage: WINE_CONFIG_SYMLINK(name,target) +dnl Usage: WINE_CONFIG_SYMLINK(name,target,enable) dnl AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl -AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl -m4_if([$2],,[test "$srcdir" = "." || ])wine_fn_config_symlink $1]) +m4_ifval([$3],[if test "x$[$3]" != xno; then +])AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl +m4_if([$2],,[test "$srcdir" = "." || ])wine_fn_config_symlink $1[]m4_ifval([$3],[ +fi])]) dnl **** Create a make rules file from config.status **** dnl diff --git a/configure b/configure index 3186e81..b02fe65 100755 --- a/configure +++ b/configure @@ -14107,14 +14107,22 @@ distclean:: } ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd +if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf +fi +if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/symbol.ttf +fi +if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/tahoma.ttf +fi +if test "x$enable_fonts" != xno; then ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" test "$srcdir" = "." || wine_fn_config_symlink fonts/tahomabd.ttf +fi ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine diff --git a/configure.ac b/configure.ac index fc05f10..25a1313 100644 --- a/configure.ac +++ b/configure.ac @@ -2134,10 +2134,10 @@ AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) WINE_CONFIG_SYMLINK(dlls/wineps.drv/generic.ppd) -WINE_CONFIG_SYMLINK(fonts/marlett.ttf) -WINE_CONFIG_SYMLINK(fonts/symbol.ttf) -WINE_CONFIG_SYMLINK(fonts/tahoma.ttf) -WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf) +WINE_CONFIG_SYMLINK(fonts/marlett.ttf,,enable_fonts) +WINE_CONFIG_SYMLINK(fonts/symbol.ttf,,enable_fonts) +WINE_CONFIG_SYMLINK(fonts/tahoma.ttf,,enable_fonts) +WINE_CONFIG_SYMLINK(fonts/tahomabd.ttf,,enable_fonts) WINE_CONFIG_SYMLINK(wine,tools/winewrapper) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)

1 0

Alexandre Julliard : setupapi: Only cleanup fake dlls once the whole section has been executed.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 6836990e0b1143cad40d6f9cf54d85483e353cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6836990e0b1143cad40d6f9cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 27 11:50:01 2010 +0100 setupapi: Only cleanup fake dlls once the whole section has been executed. --- dlls/setupapi/fakedll.c | 1 + dlls/setupapi/install.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 3b5a47c..ade6754 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -630,5 +630,6 @@ void cleanup_fake_dlls(void) HeapFree( GetProcessHeap(), 0, file_buffer ); file_buffer = NULL; HeapFree( GetProcessHeap(), 0, handled_dlls ); + handled_dlls = NULL; handled_count = handled_total = 0; } diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index cb476af..354f105 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -713,7 +713,6 @@ static BOOL fake_dlls_callback( HINF hinf, PCWSTR field, void *arg ) HeapFree( GetProcessHeap(), 0, path ); if (!ret) break; } - cleanup_fake_dlls(); return ret; } @@ -1095,7 +1094,9 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, } else info.callback = NULL; - if (!iterate_section_fields( hinf, section, WineFakeDlls, fake_dlls_callback, NULL )) + if (iterate_section_fields( hinf, section, WineFakeDlls, fake_dlls_callback, NULL )) + cleanup_fake_dlls(); + else return FALSE; if (!iterate_section_fields( hinf, section, RegisterDlls, register_dlls_callback, &info ))

1 0

Alexandre Julliard : setupapi: Create proper AMD64 fake dlls on 64-bit.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 0566db7b897231272d0321d5d9eceeca9010698d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0566db7b897231272d0321d5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 27 11:50:23 2010 +0100 setupapi: Create proper AMD64 fake dlls on 64-bit. --- dlls/setupapi/fakedll.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index ade6754..4090fa1 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -272,7 +272,11 @@ static BOOL build_fake_dll( HANDLE file ) nt = info.nt = (IMAGE_NT_HEADERS *)(buffer + lfanew); /* some fields are copied from the source dll */ +#ifdef _WIN64 + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; +#else nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; +#endif nt->FileHeader.TimeDateStamp = 0; nt->FileHeader.Characteristics = IMAGE_FILE_DLL; nt->OptionalHeader.MajorLinkerVersion = 1;

1 0

Juan Lang : iphlpapi: Remove an unused define.
by Alexandre Julliard 26 Mar '10

26 Mar '10

Module: wine Branch: master Commit: 88c4210b4a83ce41d8852be659e53a52f0c9e132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c4210b4a83ce41d8852be65… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 23 14:57:22 2010 -0700 iphlpapi: Remove an unused define. --- dlls/iphlpapi/ifenum.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 5a3db75..4628b21 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -115,8 +115,6 @@ #define INITIAL_INTERFACES_ASSUMED 4 -#define INDEX_IS_LOOPBACK 0x00800000 - /* Functions */ static int isLoopbackInterface(int fd, const char *name)

1 0