wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

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

10 Oct '12

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

Francois Gouget : testbot/build: Tweak $PATH to make use of ccache if present.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: tools Branch: master Commit: cce423b4e075b12c10fc26fffe60cf9f5e28f736 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cce423b4e075b12c10fc26ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 10 01:13:42 2012 +0200 testbot/build: Tweak $PATH to make use of ccache if present. Remove /usr/local/mingw, it's unneeded. --- testbot/bin/BuildSingleTest.pl | 2 +- testbot/bin/Reconfig.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/BuildSingleTest.pl b/testbot/bin/BuildSingleTest.pl index 52ff8ba..a8adc4e 100755 --- a/testbot/bin/BuildSingleTest.pl +++ b/testbot/bin/BuildSingleTest.pl @@ -253,7 +253,7 @@ sub BuildTestExecutable return 1; } -$ENV{PATH} = "/usr/bin:/bin:/usr/local/mingw/bin:/usr/local/mingw64/bin"; +$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; # Start with clean logfile diff --git a/testbot/bin/Reconfig.pl b/testbot/bin/Reconfig.pl index 2a75e6f..f2e07a3 100755 --- a/testbot/bin/Reconfig.pl +++ b/testbot/bin/Reconfig.pl @@ -103,7 +103,7 @@ sub BuildCross return 1; } -$ENV{PATH} = "/usr/bin:/bin:/usr/local/mingw/bin:/usr/local/mingw64/bin"; +$ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; delete $ENV{ENV}; # Start with clean logfile

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@DU?$char_traits@D@std@@@std@@QEAA@XZ(ptr long) basic_fstream_char_ctor @ thiscall -arch=win32 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QAE@PAU_iobuf@@@Z(ptr ptr long) basic_fstream_short_ctor_file @ cdecl -arch=win64 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@PEAU_iobuf@@@Z(ptr ptr long) basic_fstream_short_ctor_file -@ thiscall -arch=win32 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QAE@PBDHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar -@ cdecl -arch=win64 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar +@ thiscall -arch=win32 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QAE@PBDHH@Z(ptr str long long long) basic_fstream_short_ctor_name +@ cdecl -arch=win64 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDHH@Z(ptr str long long long) basic_fstream_short_ctor_name @ thiscall -arch=win32 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QAE@PBGHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar @ cdecl -arch=win64 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@PEBGHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar -@ thiscall -arch=win32 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QAE@PB_WHH@Z(ptr str long long long) basic_fstream_short_ctor_name -@ cdecl -arch=win64 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@PEB_WHH@Z(ptr str long long long) basic_fstream_short_ctor_name +@ thiscall -arch=win32 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QAE@PB_WHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar +@ cdecl -arch=win64 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@PEB_WHH@Z(ptr wstr long long long) basic_fstream_short_ctor_name_wchar @ thiscall -arch=win32 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QAE@XZ(ptr long) basic_fstream_short_ctor @ cdecl -arch=win64 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@XZ(ptr long) basic_fstream_short_ctor @ thiscall -arch=win32 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@PAU_iobuf@@@Z(ptr ptr long) basic_fstream_wchar_ctor_file @ cdecl -arch=win64 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEAU_iobuf@@@Z(ptr ptr long) basic_fstream_wchar_ctor_file -@ thiscall -arch=win32 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar -@ cdecl -arch=win64 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBDHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar +@ thiscall -arch=win32 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDHH@Z(ptr str long long long) basic_fstream_wchar_ctor_name +@ cdecl -arch=win64 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBDHH@Z(ptr str long long long) basic_fstream_wchar_ctor_name @ thiscall -arch=win32 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@PBGHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar @ cdecl -arch=win64 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBGHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar -@ thiscall -arch=win32 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@PB_WHH@Z(ptr str long long long) basic_fstream_wchar_ctor_name -@ cdecl -arch=win64 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEB_WHH@Z(ptr str long long long) basic_fstream_wchar_ctor_name +@ thiscall -arch=win32 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@PB_WHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar +@ cdecl -arch=win64 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEB_WHH@Z(ptr wstr long long long) basic_fstream_wchar_ctor_name_wchar @ thiscall -arch=win32 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@XZ(ptr long) basic_fstream_wchar_ctor @ cdecl -arch=win64 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QEAA@XZ(ptr long) basic_fstream_wchar_ctor @ thiscall -arch=win32 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PAU_iobuf@@@Z(ptr ptr long) basic_ifstream_char_ctor_file

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: 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: 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@_WU?$char_traits@_W@std@@@std@@QBED_WD@Z */

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

Erich Hoover : setupapi: Report the correct target file with SPFILENOTIFY_FILEEXTRACTED.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 2ee8cd5a6c15af5890145d9c05c31cbeca592eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee8cd5a6c15af5890145d9c0… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Oct 4 12:49:14 2012 -0600 setupapi: Report the correct target file with SPFILENOTIFY_FILEEXTRACTED. --- dlls/setupapi/setupcab.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index ea1bc99..d92ca6a 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -82,6 +82,7 @@ typedef struct { PSP_FILE_CALLBACK_A msghandler; PVOID context; CHAR most_recent_cabinet_name[MAX_PATH]; + CHAR most_recent_target[MAX_PATH]; } SC_HSC_A, *PSC_HSC_A; #define SC_HSC_W_MAGIC 0x0CABFEED @@ -91,6 +92,7 @@ typedef struct { PSP_FILE_CALLBACK_W msghandler; PVOID context; WCHAR most_recent_cabinet_name[MAX_PATH]; + WCHAR most_recent_target[MAX_PATH]; } SC_HSC_W, *PSC_HSC_W; WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -337,6 +339,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p SetLastError(ERROR_PATH_NOT_FOUND); return -1; } + strcpy( phsc->most_recent_target, fici.FullTargetName ); return sc_cb_open(fici.FullTargetName, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); } else { TRACE(" Callback skipped file.\n"); @@ -348,7 +351,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No"); TRACE(" File hndl: %d\n", pfdin->hf); */ fp.Source = phsc->most_recent_cabinet_name; - fp.Target = pfdin->psz1; + fp.Target = phsc->most_recent_target; fp.Win32Error = 0; fp.Flags = 0; /* the following should be a fixme -- but it occurs too many times */ @@ -477,6 +480,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p SetLastError(ERROR_PATH_NOT_FOUND); return -1; } + strcpyW( phsc->most_recent_target, fici.FullTargetName ); return sc_cb_open(charbuf, _O_BINARY | _O_CREAT | _O_WRONLY, _S_IREAD | _S_IWRITE); } else { TRACE(" Callback skipped file.\n"); @@ -488,10 +492,7 @@ static INT_PTR CDECL sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p TRACE(" Exec file? %s\n", (pfdin->cb) ? "Yes" : "No"); TRACE(" File hndl: %d\n", pfdin->hf); */ fp.Source = phsc->most_recent_cabinet_name; - len = 1 + MultiByteToWideChar(CP_ACP, 0, pfdin->psz1, -1, buf, MAX_PATH); - if ((len > MAX_PATH) || (len <= 1)) - buf[0] = '\0'; - fp.Target = buf; + fp.Target = phsc->most_recent_target; fp.Win32Error = 0; fp.Flags = 0; /* a valid fixme -- but occurs too many times */

1 0

Christian Costa : ntoskrnl.exe: Add MDL flags definitions.
by Alexandre Julliard 09 Oct '12

09 Oct '12

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

André Hentschel : winetest: Report actual number of failures in the statusbar.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: f5375256d0e0510ceca16ff6985773edc32114a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5375256d0e0510ceca16ff69… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 7 18:36:21 2012 +0200 winetest: Report actual number of failures in the statusbar. --- programs/winetest/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 2a74455..45c8602 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -729,6 +729,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch xprintf ("%s:%s done (%d)\n", test->name, subtest, status); if (status) failures++; } + if (failures) report (R_STATUS, "Running tests - %u failures", failures); } static BOOL CALLBACK

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012