October 2012 - Wine-commits

Francois Gouget : testbot/build: Trace the build commands to help developers analyze the logs.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: tools Branch: master Commit: 122787dad633ab6023eeab15113906177b7b011d URL: http://source.winehq.org/git/tools.git/?a=commit;h=122787dad633ab6023eeab15… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 01:15:04 2012 +0200 testbot/build: Trace the build commands to help developers analyze the logs. --- testbot/bin/BuildSingleTest.pl | 48 +++++++++++++++++++++++++--------------- testbot/bin/Reconfig.pl | 24 ++++++++++---------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/BuildSingleTest.pl index af28f88..07787d4 100755 --- a/testbot/bin/BuildSingleTest.pl +++ b/testbot/bin/BuildSingleTest.pl @@ -119,8 +119,9 @@ sub ApplyPatch if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; - system("cd $DataDir/wine-git; autoconf --output configure configure.ac" . - ">> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/wine-git && set -x && " . + " autoconf --output configure configure.ac " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Autoconf failed\n"; @@ -169,10 +170,9 @@ sub BuildTestExecutable { InfoMsg "Reconfigure $Bits-bit crossbuild\n"; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); - system("cd $DataDir/build-mingw$Bits && " . - "../wine-git/configure --host=$Host " . - "--with-wine-tools=../build-native --without-x --without-freetype " . - ">> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Reconfigure of $Bits-bit crossbuild failed\n"; @@ -183,15 +183,18 @@ sub BuildTestExecutable if ($NeedMakeInclude || $NeedConfigure) { InfoMsg "Recreating include/Makefile\n"; - system("cd $DataDir/build-mingw${Bits}; ./config.status --file include/Makefile:Make.vars.in:include/Makefile.in >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ./config.status --file include/Makefile:Make.vars.in:include/Makefile.in " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Recreation of include/Makefile failed\n"; return !1; } - system("make -j$ncpus -C $DataDir/build-mingw${Bits}/include " . - ">> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus include " . + ") >> $LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Make in include dir failed\n"; @@ -202,15 +205,18 @@ sub BuildTestExecutable if ($NeedImplib || $NeedConfigure) { InfoMsg "Rebuilding $BaseName import lib\n"; - system("cd $DataDir/build-mingw${Bits}; ./config.status --file $PatchType/$BaseName/Makefile:Make.vars.in:$PatchType/$BaseName/Makefile.in >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ./config.status --file $PatchType/$BaseName/Makefile:Make.vars.in:$PatchType/$BaseName/Makefile.in " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Unable to regenerate $PatchType/$BaseName/Makefile\n"; } else { - system("make -j$ncpus -C $DataDir/build-mingw${Bits}/$PatchType/$BaseName " . - "lib$BaseName.a >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { InfoMsg "Make of import library failed\n"; @@ -221,7 +227,9 @@ sub BuildTestExecutable if ($NeedMakefile || $NeedConfigure) { InfoMsg "Recreating tests/Makefile\n"; - system("cd $DataDir/build-mingw${Bits}; ./config.status --file $PatchType/$BaseName/tests/Makefile:Make.vars.in:$PatchType/$BaseName/tests/Makefile.in >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " ./config.status --file $PatchType/$BaseName/tests/Makefile:Make.vars.in:$PatchType/$BaseName/tests/Makefile.in " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Recreation of tests/Makefile failed\n"; @@ -232,7 +240,9 @@ sub BuildTestExecutable if ($NeedBuildDeps) { InfoMsg "Making build dependencies\n"; - system("cd $DataDir/build-mingw${Bits}; make -j$ncpus __builddeps__ >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus __builddeps__ " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Making build dependencies failed\n"; @@ -240,23 +250,25 @@ sub BuildTestExecutable } } - my $TestsDir = "$DataDir/build-mingw${Bits}/$PatchType/$BaseName/tests"; + my $TestsDir = "$PatchType/$BaseName/tests"; my $TestExecutable = "$TestsDir/$BaseName"; if ($PatchType eq "programs") { $TestExecutable .= ".exe"; } $TestExecutable .= "_test.exe"; - unlink($TestExecutable); + unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); InfoMsg "Making test executable\n"; - system("make -j$ncpus -C $TestsDir >> $LogDir/BuildSingleTest.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " make -j$ncpus -C $TestsDir " . + ") >>$LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Make failed\n"; return !1; } - if (! -f $TestExecutable) + if (! -f "$DataDir/build-mingw${Bits}/$TestExecutable") { LogMsg "Make didn't produce a $TestExecutable file\n"; return !1; diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index fe789f0..3b60abd 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -78,12 +78,12 @@ sub CountCPUs() sub BuildNative { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); - system("cd $DataDir/build-native && " . - "rm -rf * && " . - "../wine-git/configure --enable-win64 --without-x --without-freetype " . - ">> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus depend >> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus __tooldeps__ >> $LogDir/Reconfig.log 2>&1"); + system("( cd $DataDir/build-native && set -x && " . + " rm -rf * && " . + " ../wine-git/configure --enable-win64 --without-x --without-freetype && " . + " make -j$ncpus depend && " . + " make -j$ncpus __tooldeps__ " . + ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) { @@ -100,12 +100,12 @@ sub BuildCross my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); - system("cd $DataDir/build-mingw$Bits && " . - "rm -rf * && " . - "../wine-git/configure --host=$Host --with-wine-tools=../build-native " . - "--without-x --without-freetype >> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus depend >> $LogDir/Reconfig.log 2>&1 && " . - "make -j$ncpus programs/winetest >> $LogDir/Reconfig.log 2>&1"); + system("( cd $DataDir/build-mingw$Bits && set -x && " . + " rm -rf * && " . + " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . + " make -j$ncpus depend && " . + " make -j$ncpus programs/winetest " . + ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) { LogMsg "Build cross ($Bits bits) failed\n";

1 0

Francois Gouget : testbot/build: Time the Reconfig.pl operations.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: tools Branch: master Commit: cbb2ff89b7b0a17dfd53a47a8334b222d4c343cf URL: http://source.winehq.org/git/tools.git/?a=commit;h=cbb2ff89b7b0a17dfd53a47a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 01:15:24 2012 +0200 testbot/build: Time the Reconfig.pl operations. --- testbot/bin/Reconfig.pl | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index 3b60abd..f049e8a 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -80,9 +80,9 @@ sub BuildNative mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . - " ../wine-git/configure --enable-win64 --without-x --without-freetype && " . - " make -j$ncpus depend && " . - " make -j$ncpus __tooldeps__ " . + " time ../wine-git/configure --enable-win64 --without-x --without-freetype && " . + " time make -j$ncpus depend && " . + " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) @@ -102,9 +102,9 @@ sub BuildCross mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . - " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . - " make -j$ncpus depend && " . - " make -j$ncpus programs/winetest " . + " time ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . + " time make -j$ncpus depend && " . + " time make -j$ncpus programs/winetest " . ") >>$LogDir/Reconfig.log 2>&1"); if ($? != 0) {

1 0

Erich Hoover : setupapi: Close the target file before issuing SPFILENOTIFY_FILEEXTRACTED.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: f036f462174d047e960bded01bef48dd7e0c19c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f036f462174d047e960bded01… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Oct 4 12:49:52 2012 -0600 setupapi: Close the target file before issuing SPFILENOTIFY_FILEEXTRACTED. --- dlls/setupapi/setupcab.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index d92ca6a..8fcd989 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -356,9 +356,9 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p fp.Flags = 0; /* the following should be a fixme -- but it occurs too many times */ WARN("Should set file date/time/attribs (and execute files?)\n"); - err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0); if (sc_cb_close(pfdin->hf)) WARN("_close failed.\n"); + err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0); if (err) { SetLastError(err); return FALSE; @@ -497,9 +497,9 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p fp.Flags = 0; /* a valid fixme -- but occurs too many times */ /* FIXME("Should set file date/time/attribs (and execute files?)\n"); */ - err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0); if (sc_cb_close(pfdin->hf)) WARN("_close failed.\n"); + err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEEXTRACTED, (UINT_PTR)&fp, 0); if (err) { SetLastError(err); return FALSE;

1 0

Daniel Lehman : msvcp90: Change basic_ios<wchar_t>:: imbue to match char version.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: d67923575aa1f47a496ffda9fe6ca260ed2be968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67923575aa1f47a496ffda9f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Oct 1 23:06:02 2012 -0700 msvcp90: Change basic_ios<wchar_t>::imbue to match char version. --- dlls/msvcp90/ios.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 6dfb8f4..e497304 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5275,11 +5275,12 @@ locale *__thiscall basic_ios_wchar_imbue(basic_ios_wchar *this, locale *ret, con { TRACE("(%p %p %p)\n", this, ret, loc); - if(this->strbuf) - return basic_streambuf_wchar_pubimbue(this->strbuf, ret, loc); + if(this->strbuf) { + basic_streambuf_wchar_pubimbue(this->strbuf, ret, loc); + locale_dtor(ret); + } - locale_copy_ctor(ret, loc); - return ret; + return ios_base_imbue(&this->base, ret, loc); } /* ?narrow@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QBED_WD(a)Z */

1 0

Daniel Lehman : msvcp90: Flip fclose result check in filebuf<>::close.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: b1d9d16c7ea148770075936737ff436dc520f245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d9d16c7ea14877007593673… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 27 12:19:39 2012 -0700 msvcp90: Flip fclose result check in filebuf<>::close. --- dlls/msvcp90/ios.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index e497304..00a1b68 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2429,7 +2429,7 @@ basic_filebuf_char* __thiscall basic_filebuf_char_close(basic_filebuf_char *this /* TODO: handle exceptions */ if(!basic_filebuf_char__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_char__Init(this, NULL, INITFL_close); @@ -3000,7 +3000,7 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_close(basic_filebuf_wchar *t /* TODO: handle exceptions */ if(!basic_filebuf_wchar__Endwrite(this)) ret = NULL; - if(!fclose(this->file)) + if(fclose(this->file)) ret = NULL; basic_filebuf_wchar__Init(this, NULL, INITFL_close);

1 0

Daniel Lehman : msvcp90: Fix cxx exception information for 64-bit.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 1f324d543f912380339d9fba3a2841383f921767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f324d543f912380339d9fba3… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 4 14:54:51 2012 -0700 msvcp90: Fix cxx exception information for 64-bit. --- dlls/msvcp90/cxx.h | 119 +++++++++++++++++++++++ dlls/msvcp90/exception.c | 237 ++++------------------------------------------ 2 files changed, 136 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f324d543f912380339d9…

1 0

Daniel Lehman : msvcp90: Fix export for fstream<wchar_t> ctor.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 8780fa642a27b919501c761f78bff733018ca8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8780fa642a27b919501c761f7… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 3 16:15:35 2012 -0700 msvcp90: Fix export for fstream<wchar_t> ctor. --- dlls/msvcp90/msvcp90.spec | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index fa8c552..c544ff5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -570,22 +570,22 @@ @ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_char_ctor @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PAU_iobuf@@@Z(ptr ptr long) basic_fstream_short_ctor_file @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEAU_iobuf@@@Z(ptr ptr long) basic_fstream_short_ctor_file -@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar -@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar +@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDHH@Z(ptr str long long long) basic_fstream_short_ctor_name +@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDHH@Z(ptr str long long long) basic_fstream_short_ctor_name @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBGHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBGHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar -@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PB_WHH@Z(ptr str long long long) basic_fstream_short_ctor_name -@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEB_WHH@Z(ptr str long long long) basic_fstream_short_ctor_name +@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PB_WHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar +@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEB_WHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_short_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_short_ctor @ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PAU_iobuf@@@Z(ptr ptr long) basic_fstream_wchar_ctor_file @ cdecl -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEAU_iobuf@@@Z(ptr ptr long) basic_fstream_wchar_ctor_file -@ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar -@ cdecl -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBDHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar +@ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDHH@Z(ptr str long long long) basic_fstream_wchar_ctor_name +@ cdecl -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBDHH@Z(ptr str long long long) basic_fstream_wchar_ctor_name @ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBGHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar @ cdecl -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBGHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar -@ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PB_WHH@Z(ptr str long long long) basic_fstream_wchar_ctor_name -@ cdecl -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEB_WHH@Z(ptr str long long long) basic_fstream_wchar_ctor_name +@ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PB_WHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar +@ cdecl -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEB_WHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar @ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_wchar_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_wchar_ctor @ thiscall -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PAU_iobuf@@@Z(ptr ptr long) basic_ifstream_char_ctor_file

1 0

Jacek Caban : services: Fixed memory leak.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: cea783ddda62feeff8ea4197c7ce6c5997ce3a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea783ddda62feeff8ea4197c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 13:39:29 2012 +0200 services: Fixed memory leak. --- programs/services/rpc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 9031430..bf8ce80 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -456,8 +456,10 @@ DWORD __cdecl svcctl_CreateServiceW( return err; err = parse_dependencies((LPCWSTR)lpDependencies, entry); - if (err != ERROR_SUCCESS) + if (err != ERROR_SUCCESS) { + free_service_entry(entry); return err; + } entry->ref_count = 1; entry->config.dwServiceType = entry->status.dwServiceType = dwServiceType;

1 0

Jacek Caban : appwiz.cpl: Cache downloaded addon MSI files.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: d18465088705bfbb39e5ee50bd7660773c9de51f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18465088705bfbb39e5ee50b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 15:48:47 2012 +0200 appwiz.cpl: Cache downloaded addon MSI files. --- dlls/appwiz.cpl/addons.c | 126 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 111 insertions(+), 15 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 82a6797..efb6cf0 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -17,10 +17,12 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <fcntl.h> #include <stdio.h> +#include <errno.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -105,6 +107,10 @@ static const addon_info_t *addon; static HWND install_dialog = NULL; static LPWSTR url = NULL; +static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); +static const WCHAR kernel32_dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + + /* SHA definitions are copied from advapi32. They aren't available in headers. */ typedef struct { @@ -153,13 +159,7 @@ static BOOL sha_check(const WCHAR *file_name) sprintf(buf + i*2, "%02x", *((unsigned char*)sha+i)); if(strcmp(buf, addon->sha)) { - WCHAR message[256]; - WARN("Got %s, expected %s\n", buf, addon->sha); - - if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) - MessageBoxW(NULL, message, NULL, MB_ICONERROR); - return FALSE; } @@ -201,9 +201,6 @@ static enum install_res install_from_unix_file(const char *dir, const char *subd int fd, len; enum install_res ret; - static WCHAR * (CDECL *wine_get_dos_file_name)(const char*); - static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; - len = strlen(dir); file_path = heap_alloc(len+strlen(subdir)+strlen(file_name)+3); if(!file_path) @@ -228,11 +225,8 @@ static enum install_res install_from_unix_file(const char *dir, const char *subd close(fd); - if(!wine_get_dos_file_name) - wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32W), "wine_get_dos_file_name"); - - if(wine_get_dos_file_name) { /* Wine UNIX mode */ - dos_file_name = wine_get_dos_file_name(file_path); + if(p_wine_get_dos_file_name) { /* Wine UNIX mode */ + dos_file_name = p_wine_get_dos_file_name(file_path); if(!dos_file_name) { ERR("Could not get dos file name of %s\n", debugstr_a(file_path)); heap_free(file_path); @@ -334,6 +328,90 @@ static enum install_res install_from_default_dir(void) return ret; } +static WCHAR *get_cache_file_name(BOOL ensure_exists) +{ + const char *home_dir = NULL, *xdg_cache_dir; + size_t len, size = strlen(addon->file_name) + 7; /* strlen("/wine/"), '\0' */ + char *cache_file_name; + WCHAR *ret; + + /* non-Wine (eg. Windows) cache is currently not supported */ + if(!p_wine_get_dos_file_name) + return NULL; + + xdg_cache_dir = getenv("XDG_CACHE_HOME"); + if(xdg_cache_dir && *xdg_cache_dir) { + size += strlen(xdg_cache_dir); + }else { + home_dir = getenv("HOME"); + if(!home_dir) + return NULL; + + size += strlen(home_dir) + 8; /* strlen("/.cache/") */ + } + + cache_file_name = heap_alloc(size); + if(!cache_file_name) + return NULL; + + if(xdg_cache_dir && *xdg_cache_dir) { + len = strlen(xdg_cache_dir); + if(len > 1 && xdg_cache_dir[len-1] == '/') + len--; + memcpy(cache_file_name, xdg_cache_dir, len); + cache_file_name[len] = 0; + }else { + len = strlen(home_dir); + memcpy(cache_file_name, home_dir, len); + strcpy(cache_file_name+len, "/.cache"); + len += 7; + } + + if(ensure_exists && mkdir(cache_file_name, 0777) && errno != EEXIST) { + WARN("%s does not exist and could not be created: %s\n", cache_file_name, strerror(errno)); + heap_free(cache_file_name); + return NULL; + } + + strcpy(cache_file_name+len, "/wine"); + len += 5; + + if(ensure_exists && mkdir(cache_file_name, 0777) && errno != EEXIST) { + WARN("%s does not exist and could not be created: %s\n", cache_file_name, strerror(errno)); + return NULL; + } + + cache_file_name[len++] = '/'; + strcpy(cache_file_name+len, addon->file_name); + ret = p_wine_get_dos_file_name(cache_file_name); + + TRACE("%s -> %s\n", cache_file_name, debugstr_w(ret)); + + heap_free(cache_file_name); + return ret; +} + +static enum install_res install_from_cache(void) +{ + WCHAR *cache_file_name; + enum install_res res; + + cache_file_name = get_cache_file_name(FALSE); + if(!cache_file_name) + return INSTALL_NEXT; + + if(!sha_check(cache_file_name)) { + WARN("could not validate check sum\n"); + DeleteFileW(cache_file_name); + heap_free(cache_file_name); + return INSTALL_NEXT; + } + + res = install_file(cache_file_name); + heap_free(cache_file_name); + return res; +} + static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { @@ -501,8 +579,23 @@ static DWORD WINAPI download_proc(PVOID arg) return 0; } - if(sha_check(tmp_file)) + if(sha_check(tmp_file)) { + WCHAR *cache_file_name; + install_file(tmp_file); + + cache_file_name = get_cache_file_name(TRUE); + if(cache_file_name) { + MoveFileW(tmp_file, cache_file_name); + heap_free(cache_file_name); + } + }else { + WCHAR message[256]; + + if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) + MessageBoxW(NULL, message, NULL, MB_ICONERROR); + } + DeleteFileW(tmp_file); EndDialog(install_dialog, 0); return 0; @@ -589,6 +682,8 @@ BOOL install_addon(addon_t addon_type) addon = addons_info+addon_type; + p_wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32_dllW), "wine_get_dos_file_name"); + /* * Try to find addon .msi file in following order: * - directory stored in $dir_config_key value of HKCU/Wine/Software/$config_key key @@ -599,6 +694,7 @@ BOOL install_addon(addon_t addon_type) */ if (install_from_registered_dir() == INSTALL_NEXT && install_from_default_dir() == INSTALL_NEXT + && install_from_cache() == INSTALL_NEXT && (url = get_url())) DialogBoxW(hInst, addon->dialog_template, 0, installer_proc);

1 0

Jacek Caban : mshtml: Wine Gecko 1.8 release.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 0ae458cc94fec9cda7736faf7bd4a2c119c5f717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae458cc94fec9cda7736faf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 11:26:18 2012 +0200 mshtml: Wine Gecko 1.8 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsiface.idl | 175 ++++++++++++++++++++++++++++++----------- dlls/mshtml/script.c | 4 + 4 files changed, 136 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ae458cc94fec9cda7736…

1 0