October 2012 - Wine-Commits

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

Oct. 10, 2012

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

Francois Gouget : testbot/build: Automatically use all the CPUs for builds.
by Alexandre Julliard Oct. 10, 2012

Oct. 10, 2012

Module: tools Branch: master Commit: 64f949e902377278c6882c2b356eb66368b87d02 URL: http://source.winehq.org/git/tools.git/?a=commit;h=64f949e902377278c6882c2b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 01:14:43 2012 +0200 testbot/build: Automatically use all the CPUs for builds. --- testbot/bin/BuildSingleTest.pl | 22 ++++++++++++++++++---- testbot/bin/Reconfig.pl | 26 ++++++++++++++++++++------ 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/BuildSingleTest.pl index a8adc4e..af28f88 100755 --- a/testbot/bin/BuildSingleTest.pl +++ b/testbot/bin/BuildSingleTest.pl @@ -148,6 +148,18 @@ sub ApplyPatch $NeedConfigure); } +my $ncpus; +sub CountCPUs() +{ + if (open(my $fh, "<", "/proc/cpuinfo")) + { + # Linux + map { $ncpus++ if (/^processor/); } <$fh>; + close($fh); + } + $ncpus ||= 1; +} + sub BuildTestExecutable { my ($BaseName, $PatchType, $Bits, $NeedConfigure, $NeedMakefile, @@ -178,7 +190,7 @@ sub BuildTestExecutable return !1; } - system("make -C $DataDir/build-mingw${Bits}/include " . + system("make -j$ncpus -C $DataDir/build-mingw${Bits}/include " . ">> $LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { @@ -197,7 +209,7 @@ sub BuildTestExecutable } else { - system("make -C $DataDir/build-mingw${Bits}/$PatchType/$BaseName " . + system("make -j$ncpus -C $DataDir/build-mingw${Bits}/$PatchType/$BaseName " . "lib$BaseName.a >> $LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { @@ -220,7 +232,7 @@ sub BuildTestExecutable if ($NeedBuildDeps) { InfoMsg "Making build dependencies\n"; - system("cd $DataDir/build-mingw${Bits}; make __builddeps__ >> $LogDir/BuildSingleTest.log 2>&1"); + system("cd $DataDir/build-mingw${Bits}; make -j$ncpus __builddeps__ >> $LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Making build dependencies failed\n"; @@ -238,7 +250,7 @@ sub BuildTestExecutable unlink($TestExecutable); InfoMsg "Making test executable\n"; - system("make -C $TestsDir >> $LogDir/BuildSingleTest.log 2>&1"); + system("make -j$ncpus -C $TestsDir >> $LogDir/BuildSingleTest.log 2>&1"); if ($? != 0) { LogMsg "Make failed\n"; @@ -334,6 +346,8 @@ if ($NeedMakefile < 0) exit(1); } +CountCPUs(); + if ($Run32 && ! BuildTestExecutable($BaseName, $PatchType, 32, $NeedConfigure, 0 < $NeedMakefile, $NeedMakeInclude, $NeedBuildDeps, diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index f2e07a3..fe789f0 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -63,15 +63,27 @@ sub GitPull return 1; } +my $ncpus; +sub CountCPUs() +{ + if (open(my $fh, "<", "/proc/cpuinfo")) + { + # Linux + map { $ncpus++ if (/^processor/); } <$fh>; + close($fh); + } + $ncpus ||= 1; +} + 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 depend >> $LogDir/Reconfig.log 2>&1 &&" . - "make __tooldeps__ >> $LogDir/Reconfig.log 2>&1"); + ">> $LogDir/Reconfig.log 2>&1 && " . + "make -j$ncpus depend >> $LogDir/Reconfig.log 2>&1 && " . + "make -j$ncpus __tooldeps__ >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) { @@ -91,9 +103,9 @@ sub BuildCross 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 depend >> $LogDir/Reconfig.log 2>&1 &&" . - "make programs/winetest >> $LogDir/Reconfig.log 2>&1"); + "--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"); if ($? != 0) { LogMsg "Build cross ($Bits bits) failed\n"; @@ -114,6 +126,8 @@ if (! GitPull()) exit(1); } +CountCPUs(); + if (! BuildNative()) { exit(1);

1 0

Daniel Lehman : msvcp90: Flip fclose result check in filebuf<>::close.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

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 Oct. 9, 2012

Oct. 9, 2012

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 Oct. 9, 2012

Oct. 9, 2012

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

Erich Hoover : setupapi: Close the target file before issuing SPFILENOTIFY_FILEEXTRACTED.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

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 Oct. 9, 2012

Oct. 9, 2012

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

Piotr Caban : msvcp60: Added missing 64-bit exports.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: e920be279f850f96cf00693b632540992c20b4a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e920be279f850f96cf00693b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 9 13:06:34 2012 +0200 msvcp60: Added missing 64-bit exports. --- dlls/msvcp60/msvcp60.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 22a3da8..561fc64 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2280,7 +2280,7 @@ @ cdecl -arch=win32 ?_Init(a)locale@std@@CAPAV_Locimp(a)12@XZ() locale__Init @ cdecl -arch=win64 ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@XZ() locale__Init @ thiscall -arch=win32 ?_Init(a)strstreambuf@std@@IAEXHPAD0H(a)Z(ptr long ptr ptr long) strstreambuf__Init -@ stub -arch=win64 ?_Init(a)strstreambuf@std@@IEAAXHPEAD0H(a)Z +@ cdecl -arch=win64 ?_Init(a)strstreambuf@std@@IEAAXHPEAD0H(a)Z(ptr long ptr ptr long) strstreambuf__Init @ extern ?_Init_cnt(a)Init@ios_base(a)std@@0HA ios_base_Init__Init_cnt @ extern ?_Init_cnt(a)_Winit@std@@0HA _Winit__Init_cnt @ stub -arch=win32 ?_Initcvt@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@IAEXXZ @@ -3638,7 +3638,7 @@ @ thiscall -arch=win32 ?pptr@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IBEPAGXZ(ptr) basic_streambuf_wchar_pptr @ cdecl -arch=win64 ?pptr@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEBAPEAGXZ(ptr) basic_streambuf_wchar_pptr @ thiscall -arch=win32 ?precision(a)ios_base@std@@QAEHH(a)Z(ptr long) ios_base_precision_set -@ stub -arch=win64 ?precision(a)ios_base@std@@QEAA_JH(a)Z +@ cdecl -arch=win64 ?precision(a)ios_base@std@@QEAA_JH(a)Z(ptr long) ios_base_precision_set @ thiscall -arch=win32 ?precision(a)ios_base@std@@QBEHXZ(ptr) ios_base_precision_get @ cdecl -arch=win64 ?precision(a)ios_base@std@@QEBA_JXZ(ptr) ios_base_precision_get @ thiscall -arch=win32 ?pubimbue@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AVlocale(a)2@ABV32@@Z(ptr ptr ptr) basic_streambuf_char_pubimbue @@ -4003,9 +4003,9 @@ @ thiscall -arch=win32 ?sgetn@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAEHPAGH(a)Z(ptr ptr long) basic_streambuf_wchar_sgetn @ cdecl -arch=win64 ?sgetn@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA_JPEAG_J(a)Z(ptr ptr long) basic_streambuf_wchar_sgetn @ thiscall -arch=win32 ?showmanyc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_showmanyc -@ stub -arch=win64 ?showmanyc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ +@ cdecl -arch=win64 ?showmanyc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_showmanyc @ thiscall -arch=win32 ?showmanyc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MAEHXZ(ptr) basic_streambuf_wchar_showmanyc -@ stub -arch=win64 ?showmanyc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAHXZ +@ cdecl -arch=win64 ?showmanyc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@MEAAHXZ(ptr) basic_streambuf_wchar_showmanyc @ cdecl ?signaling_NaN@?$numeric_limits(a)C@std@@SACXZ() msvcp90.?signaling_NaN@?$numeric_limits(a)C@std@@SACXZ @ cdecl ?signaling_NaN@?$numeric_limits(a)D@std@@SADXZ() msvcp90.?signaling_NaN@?$numeric_limits(a)D@std@@SADXZ @ cdecl ?signaling_NaN@?$numeric_limits(a)E@std@@SAEXZ() msvcp90.?signaling_NaN@?$numeric_limits(a)E@std@@SAEXZ

1 0

Henri Verbeet : wined3d: wined3d_surface_set_palette() never fails.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: 9d127a4d36939079c264ada932863d840b719b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d127a4d36939079c264ada93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:40 2012 +0200 wined3d: wined3d_surface_set_palette() never fails. --- dlls/ddraw/surface.c | 7 ++----- dlls/wined3d/surface.c | 6 ++---- include/wine/wined3d.h | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8f68425..1f64a18 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4712,11 +4712,8 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir /* Update the wined3d frontbuffer if this is the frontbuffer. */ if ((This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) && This->ddraw->wined3d_frontbuffer) - { - hr = wined3d_surface_set_palette(This->ddraw->wined3d_frontbuffer, palette_impl ? palette_impl->wineD3DPalette : NULL); - if (FAILED(hr)) - ERR("Failed to set frontbuffer palette, hr %#x.\n", hr); - } + wined3d_surface_set_palette(This->ddraw->wined3d_frontbuffer, + palette_impl ? palette_impl->wineD3DPalette : NULL); /* If this is a front buffer, also update the back buffers * TODO: How do things work for palettized cube textures? diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 71beb51..7dae771 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3150,14 +3150,14 @@ HRESULT CDECL wined3d_surface_restore(struct wined3d_surface *surface) return WINED3D_OK; } -HRESULT CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette) +void CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette) { TRACE("surface %p, palette %p.\n", surface, palette); if (surface->palette == palette) { TRACE("Nop palette change.\n"); - return WINED3D_OK; + return; } if (surface->palette && (surface->resource.usage & WINED3DUSAGE_RENDERTARGET)) @@ -3172,8 +3172,6 @@ HRESULT CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struc surface->surface_ops->surface_realize_palette(surface); } - - return WINED3D_OK; } HRESULT CDECL wined3d_surface_set_color_key(struct wined3d_surface *surface, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 42b21e6..c15b25b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2344,7 +2344,7 @@ HRESULT __cdecl wined3d_surface_set_color_key(struct wined3d_surface *surface, DWORD flags, const struct wined3d_color_key *color_key); HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); -HRESULT __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette); +void __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette); DWORD __cdecl wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD new_priority); HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_update_desc(struct wined3d_surface *surface,

1 0

Christian Costa : ntoskrnl.exe: Add MDL flags definitions.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: 068ff64e0a98f9c9bc44f4766cda6153b3af4450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=068ff64e0a98f9c9bc44f4766… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 7 22:00:34 2012 +0200 ntoskrnl.exe: Add MDL flags definitions. --- include/ddk/wdm.h | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index bf9c15e..35773a0 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -443,8 +443,6 @@ typedef struct _IRP { typedef struct _IRP *PIRP; #include <poppack.h> -/* MDL definitions */ - typedef VOID (WINAPI *PINTERFACE_REFERENCE)( PVOID Context); @@ -955,6 +953,33 @@ typedef struct _IO_STACK_LOCATION { } IO_STACK_LOCATION, *PIO_STACK_LOCATION; #include <poppack.h> +/* MDL definitions */ + +#define MDL_MAPPED_TO_SYSTEM_VA 0x0001 +#define MDL_PAGES_LOCKED 0x0002 +#define MDL_SOURCE_IS_NONPAGED_POOL 0x0004 +#define MDL_ALLOCATED_FIXED_SIZE 0x0008 +#define MDL_PARTIAL 0x0010 +#define MDL_PARTIAL_HAS_BEEN_MAPPED 0x0020 +#define MDL_IO_PAGE_READ 0x0040 +#define MDL_WRITE_OPERATION 0x0080 +#define MDL_PARENT_MAPPED_SYSTEM_VA 0x0100 +#define MDL_FREE_EXTRA_PTES 0x0200 +#define MDL_DESCRIBES_AWE 0x0400 +#define MDL_IO_SPACE 0x0800 +#define MDL_NETWORK_HEADER 0x1000 +#define MDL_MAPPING_CAN_FAIL 0x2000 +#define MDL_ALLOCATED_MUST_SUCCEED 0x4000 +#define MDL_INTERNAL 0x8000 + +#define MDL_MAPPING_FLAGS (MDL_MAPPED_TO_SYSTEM_VA | \ + MDL_PAGES_LOCKED | \ + MDL_SOURCE_IS_NONPAGED_POOL | \ + MDL_PARTIAL_HAS_BEEN_MAPPED | \ + MDL_PARENT_MAPPED_SYSTEM_VA | \ + MDL_SYSTEM_VA | \ + MDL_IO_SPACE ) + typedef struct _MDL { struct _MDL *Next; CSHORT Size;

1 0