February 2014 - Wine-commits

Francois Gouget : winetest: Don't show the year on the index page.
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: tools Branch: master Commit: ad3d0db32e89294b009310096ad56daa9b4c0bc9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ad3d0db32e89294b00931009… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 6 19:22:43 2014 +0100 winetest: Don't show the year on the index page. The site only keeps results for a couple of weeks so showing the year is not particularly useful and wastes horizontal space. --- winetest/build-index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/build-index b/winetest/build-index index 393e132..c4b9ecc 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -228,7 +228,7 @@ foreach my $build (@builds) { printf OUT " <tr><td class=\"build\"><a href=\"%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); my @date = gmtime($build->{date}); - printf OUT " <td class=\"date\">%02d %s %04d</td>", $date[3], $months[$date[4]], $date[5] + 1900, $date[2]; + printf OUT " <td class=\"date\">%02d %s</td>", $date[3], $months[$date[4]]; my ($total_runs, $total_tests, $total_errors, $total_todos); foreach my $ver (@groups) {

1 0

Francois Gouget : winetest: Avoid a deprecated form of checking for empty arrays.
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: tools Branch: master Commit: 7c25c114a99f49fa92c20ed690aafb986faf920b URL: http://source.winehq.org/git/tools.git/?a=commit;h=7c25c114a99f49fa92c20ed6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 6 19:23:08 2014 +0100 winetest: Avoid a deprecated form of checking for empty arrays. --- winetest/build-index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/build-index b/winetest/build-index index c4b9ecc..8e12c01 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -234,7 +234,7 @@ foreach my $build (@builds) { next unless defined($versions{$ver->{name}}); my $counts = $build->{versions}->{$ver->{name}}; - if (!defined @{$counts}) + if (!$counts || !@{$counts}) { printf OUT "<td class=\"note\"> </td>"; }

1 0

Alexandre Julliard : winetest: Reject test runs with more than 50 failures.
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: tools Branch: master Commit: 7be4bccf181b94536173998648f22ae25229b308 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7be4bccf181b945361739986… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 18:32:28 2014 +0100 winetest: Reject test runs with more than 50 failures. That's usually a sign of a broken setup, and it pollutes the legitimate results. --- winetest/dissect | 5 ++++- winetest/winetest.conf | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 9081a94..5187cf0 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -33,7 +33,7 @@ use open ':utf8'; use CGI qw(:standard); charset("utf-8"); -use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxuserskips $maxfilesize $acceptprediluvianwin/; +use vars qw/$gitdir $gitweb $queuedir $datadir $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; require "winetest.conf"; my $name0=$0; @@ -237,6 +237,7 @@ if ($wine_build) { } my $user_skips = 0; +my $failed_tests = 0; my %dllinfo; /^Dll info:\r?$/ or mydie "no Dll info header: $_"; $box->{data} .= "<h2>DLL version</h2>\n"; @@ -302,8 +303,10 @@ while (<IN>) { if ($1 == 258) { $reason = "test failed: timed out"; } elsif ($1 < 0) { $reason = "test failed: crash"; } $testbox->{data} .= "<div class=\"test end\">$reason</div>\n"; + mydie "too many test failures\n" if ++$failed_tests > $maxfailedtests; } else { $result = "$total $todo $failed $skipped"; + if ($failed) { mydie "too many test failures\n" if ++$failed_tests > $maxfailedtests; } } print SUM "- $dll $unit $result $source $rev\n"; $dll = undef; diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 40b3e50..d229c0a 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -14,6 +14,9 @@ $maxmult = 10; # Maximum allowed number of explicit user skips $maxuserskips = 10; +# Maximum allowed number of tests with failures +$maxfailedtests = 50; + # Whether to accept test results from Win9x / NT4 versions $acceptprediluvianwin = 0;

1 0

Alexandre Julliard : msvcp70: Export some already implemented Getcat functions.
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: wine Branch: master Commit: 7898205afd87bdb87541f5314187bf0a179878fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7898205afd87bdb87541f5314… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 7 11:45:37 2014 +0100 msvcp70: Export some already implemented Getcat functions. --- dlls/msvcp70/msvcp70.spec | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 88c6328..8ff6620 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -1862,18 +1862,18 @@ @ stub -arch=win64 ?_Getcat@?$moneypunct(a)_W$00(a)std@@SA_KPEAPEBVfacet(a)locale@2@@Z @ stub -arch=win32 ?_Getcat@?$moneypunct(a)_W$0A@@std@@SAIPAPBVfacet(a)locale@2@@Z @ stub -arch=win64 ?_Getcat@?$moneypunct(a)_W$0A@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_get_char__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_get_char__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_get_short__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_get_short__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_get_wchar__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_get_wchar__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_put_char__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_put_char__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_put_short__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_put_short__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) num_put_wchar__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) num_put_wchar__Getcat_old @ cdecl -arch=win32 ?_Getcat@?$numpunct(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) numpunct_char__Getcat_old @ cdecl -arch=win64 ?_Getcat@?$numpunct(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) numpunct_char__Getcat_old @ cdecl -arch=win32 ?_Getcat@?$numpunct(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) numpunct_short__Getcat_old @@ -1886,12 +1886,12 @@ @ stub -arch=win64 ?_Getcat@?$time_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z @ stub -arch=win32 ?_Getcat@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z @ stub -arch=win64 ?_Getcat@?$time_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ stub -arch=win32 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z -@ stub -arch=win64 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) time_put_char__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_char__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) time_put_short__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_short__Getcat_old +@ cdecl -arch=win32 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) time_put_wchar__Getcat_old +@ cdecl -arch=win64 ?_Getcat@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) time_put_wchar__Getcat_old @ stub -arch=win32 ?_Getcat(a)facet@locale(a)std@@SAIPAPBV123@@Z @ stub -arch=win64 ?_Getcat(a)facet@locale(a)std@@SA_KPEAPEBV123@@Z @ thiscall -arch=i386 ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll

1 0

Frédéric Delanoy : oleaut32: Use BOOL type where appropriate.
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: wine Branch: master Commit: ca1a1d54c0d2bee13926a1edca789c09e0c35512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1a1d54c0d2bee13926a1edc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 6 22:33:37 2014 +0100 oleaut32: Use BOOL type where appropriate. --- dlls/oleaut32/vartype.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index d492e7d..672fbcb 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4494,19 +4494,19 @@ static ULONG VARIANT_Add(ULONG ulLeft, ULONG ulRight, ULONG* pulHigh) /* Subtract two unsigned 32 bit values with underflow */ static ULONG VARIANT_Sub(ULONG ulLeft, ULONG ulRight, ULONG* pulHigh) { - int invert = 0; + BOOL invert = FALSE; ULARGE_INTEGER ul64; ul64.QuadPart = (LONG64)ulLeft - (ULONG64)ulRight; if (ulLeft < ulRight) - invert = 1; + invert = TRUE; if (ul64.QuadPart > (ULONG64)*pulHigh) ul64.QuadPart -= (ULONG64)*pulHigh; else { ul64.QuadPart -= (ULONG64)*pulHigh; - invert = 1; + invert = TRUE; } if (invert) ul64.u.HighPart = -ul64.u.HighPart ; @@ -5227,7 +5227,7 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di into the VARIANT_DI and is therefore no longer necessary. Returns S_OK if successful, or DISP_E_OVERFLOW if the represented value is too big to fit into a DECIMAL. */ -static HRESULT VARIANT_DI_normalize(VARIANT_DI * val, int exponent2, int isDouble) +static HRESULT VARIANT_DI_normalize(VARIANT_DI * val, int exponent2, BOOL isDouble) { HRESULT hres = S_OK; int exponent5, exponent10; @@ -5431,7 +5431,7 @@ static HRESULT VARIANT_DI_FromR4(float source, VARIANT_DI * dest) compensate. */ exponent2 -= 23; - hres = VARIANT_DI_normalize(dest, exponent2, 0); + hres = VARIANT_DI_normalize(dest, exponent2, FALSE); } return hres; @@ -5492,7 +5492,7 @@ static HRESULT VARIANT_DI_FromR8(double source, VARIANT_DI * dest) compensate. */ exponent2 -= 52; - hres = VARIANT_DI_normalize(dest, exponent2, 1); + hres = VARIANT_DI_normalize(dest, exponent2, TRUE); } return hres;

1 0

Aric Stewart : kernel32: Add system message for ERROR_NOT_CONNECTED.
by Alexandre Julliard 07 Feb '14

07 Feb '14

1 0

Jacek Caban : atl110: Share sources with atl100.
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: wine Branch: master Commit: 5a311d693fb5e3fc6fb8e6f8fe003e2b380ab709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a311d693fb5e3fc6fb8e6f8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 7 12:32:05 2014 +0100 atl110: Share sources with atl100. --- dlls/atl110/Makefile.in | 7 +++--- dlls/atl110/atl110.c | 42 -------------------------------- dlls/atl110/atl110.spec | 62 +++++++++++++++++++++++------------------------ tools/make_specfiles | 2 -- 4 files changed, 35 insertions(+), 78 deletions(-) diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index e8d340f..3b6ccfe 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -1,8 +1,9 @@ MODULE = atl110.dll -IMPORTS = atl100 oleaut32 ole32 user32 uuid +IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_110 PARENTSRC = ../atl100 C_SRCS = \ - atl110.c \ - atl_ax.c + atl.c \ + atl_ax.c \ + registrar.c diff --git a/dlls/atl110/atl110.c b/dlls/atl110/atl110.c deleted file mode 100644 index 9386812..0000000 --- a/dlls/atl110/atl110.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2013 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" -#include "atlbase.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atl); - -/*********************************************************************** - * AtlGetVersion [atl110.@] - */ -DWORD WINAPI AtlGetVersion(void *pReserved) -{ - TRACE("version %04x (%p)\n", _ATL_VER, pReserved); - return _ATL_VER; -} diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec index 35facf8..0d41c1e 100644 --- a/dlls/atl110/atl110.spec +++ b/dlls/atl110/atl110.spec @@ -1,22 +1,22 @@ -10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise -11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise -12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream -13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc -14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr -15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject -17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects -20 stdcall AtlComModuleRevokeClassObjects(ptr) atl100.AtlComModuleRevokeClassObjects -22 stdcall AtlComModuleUnregisterServer(ptr long ptr) atl100.AtlComModuleUnregisterServer -23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD -24 stdcall AtlWaitWithMessageLoop(long) atl100.AtlWaitWithMessageLoop +10 stdcall AtlAdvise(ptr ptr ptr ptr) +11 stdcall AtlUnadvise(ptr ptr long) +12 stdcall AtlFreeMarshalStream(ptr) +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) +15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) +20 stdcall AtlComModuleRevokeClassObjects(ptr) +22 stdcall AtlComModuleUnregisterServer(ptr long ptr) +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) +24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo -26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC -27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel -28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric +26 stdcall AtlCreateTargetDC(long ptr) +27 stdcall AtlHiMetricToPixel(ptr ptr) +28 stdcall AtlPixelToHiMetric(ptr ptr) 29 stub AtlDevModeW2A -30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign -31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign -32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface +30 stdcall AtlComPtrAssign(ptr ptr) +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stdcall AtlGetVersion(ptr) 35 stdcall AtlAxDialogBoxW(long wstr long ptr long) 36 stdcall AtlAxDialogBoxA(long str long ptr long) @@ -26,27 +26,27 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) 41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() -43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData -44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) +44 stdcall AtlWinModuleExtractCreateWndData(ptr) 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper -50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load -51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) 53 stub AtlIPersistPropertyBag_Save -54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface -56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib -58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) +58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA -64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc -65 stdcall AtlWinModuleInit(ptr) atl100.AtlWinModuleInit +64 stdcall AtlCallTermFunc(ptr) +65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm -67 stdcall AtlSetPerUserRegistration(long) atl100.AtlSetPerUserRegistration -68 stdcall AtlGetPerUserRegistration(ptr) atl100.AtlGetPerUserRegistration +67 stdcall AtlSetPerUserRegistration(long) +68 stdcall AtlGetPerUserRegistration(ptr) diff --git a/tools/make_specfiles b/tools/make_specfiles index e88cc11..2ae321a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -120,9 +120,7 @@ my @dll_groups = ], [ "atl100", - "atl110", "atl", - "atl80", ], [ "advapi32",

1 0

Dmitry Timoshkov : kernel32/tests: Use PROCESS_ALL_ACCESS definition compatible with versions of Windows before Vista.
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: wine Branch: master Commit: 448d7770dc690a4e7fa1ebdbcb72913f69412f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=448d7770dc690a4e7fa1ebdbc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 7 23:08:48 2014 +0900 kernel32/tests: Use PROCESS_ALL_ACCESS definition compatible with versions of Windows before Vista. --- dlls/kernel32/tests/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8658ac4..218a0d3 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -35,6 +35,9 @@ #include "wine/test.h" +/* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ +#define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) + #define expect_eq_d(expected, actual) \ do { \ int value = (actual); \ @@ -1522,7 +1525,7 @@ static void test_OpenProcess(void) } /* without PROCESS_VM_OPERATION */ - hproc = OpenProcess(PROCESS_ALL_ACCESS & ~PROCESS_VM_OPERATION, FALSE, GetCurrentProcessId()); + hproc = OpenProcess(PROCESS_ALL_ACCESS_NT4 & ~PROCESS_VM_OPERATION, FALSE, GetCurrentProcessId()); ok(hproc != NULL, "OpenProcess error %d\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Dmitry Timoshkov : kernel32/tests: Use THREAD_ALL_ACCESS definition compatible with versions of Windows before Vista.
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: wine Branch: master Commit: cdc306651ce9c99e0c6fc9f19cd85ec527dc1982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc306651ce9c99e0c6fc9f19… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 7 23:08:53 2014 +0900 kernel32/tests: Use THREAD_ALL_ACCESS definition compatible with versions of Windows before Vista. --- dlls/kernel32/tests/thread.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 6cbf383..ae60d88 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -35,6 +35,9 @@ #include <winnls.h> #include "wine/test.h" +/* THREAD_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ +#define THREAD_ALL_ACCESS_NT4 (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff) + /* Specify the number of simultaneous threads to test */ #define NUM_THREADS 4 /* Specify whether to test the extended priorities for Win2k/XP */ @@ -565,7 +568,7 @@ static VOID test_SuspendThread(void) ok(error==1,"SuspendThread did not work\n"); /* check that access restrictions are obeyed */ if (pOpenThread) { - access_thread=pOpenThread(THREAD_ALL_ACCESS & (~THREAD_SUSPEND_RESUME), + access_thread=pOpenThread(THREAD_ALL_ACCESS_NT4 & (~THREAD_SUSPEND_RESUME), 0,threadId); ok(access_thread!=NULL,"OpenThread returned an invalid handle\n"); if (access_thread!=NULL) { @@ -610,7 +613,7 @@ static VOID test_TerminateThread(void) "TerminateThread didn't work\n"); /* check that access restrictions are obeyed */ if (pOpenThread) { - access_thread=pOpenThread(THREAD_ALL_ACCESS & (~THREAD_TERMINATE), + access_thread=pOpenThread(THREAD_ALL_ACCESS_NT4 & (~THREAD_TERMINATE), 0,threadId); ok(access_thread!=NULL,"OpenThread returned an invalid handle\n"); if (access_thread!=NULL) { @@ -679,7 +682,7 @@ static VOID test_thread_priority(void) if (pOpenThread) { /* check that access control is obeyed */ - access_thread=pOpenThread(THREAD_ALL_ACCESS & + access_thread=pOpenThread(THREAD_ALL_ACCESS_NT4 & (~THREAD_QUERY_INFORMATION) & (~THREAD_SET_INFORMATION), 0,curthreadId); ok(access_thread!=NULL,"OpenThread returned an invalid handle\n"); @@ -751,7 +754,7 @@ static VOID test_thread_priority(void) if (pOpenThread) { /* check that access control is obeyed */ - access_thread=pOpenThread(THREAD_ALL_ACCESS & + access_thread=pOpenThread(THREAD_ALL_ACCESS_NT4 & (~THREAD_QUERY_INFORMATION) & (~THREAD_SET_INFORMATION), 0,curthreadId); ok(access_thread!=NULL,"OpenThread returned an invalid handle\n"); @@ -791,7 +794,7 @@ static VOID test_GetThreadTimes(void) ok(thread!=NULL,"Create Thread failed\n"); /* check that access control is obeyed */ if (pOpenThread) { - access_thread=pOpenThread(THREAD_ALL_ACCESS & + access_thread=pOpenThread(THREAD_ALL_ACCESS_NT4 & (~THREAD_QUERY_INFORMATION), 0,threadId); ok(access_thread!=NULL, "OpenThread returned an invalid handle\n");

1 0

Dmitry Timoshkov : kernel32/tests: Use PROCESS_ALL_ACCESS definition compatible with versions of Windows before Vista.
by Alexandre Julliard 07 Feb '14

07 Feb '14

Module: wine Branch: master Commit: 52bc06af7bb322ce0918db9e699a201a70a6931d URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bc06af7bb322ce0918db9e6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 7 23:08:57 2014 +0900 kernel32/tests: Use PROCESS_ALL_ACCESS definition compatible with versions of Windows before Vista. --- dlls/kernel32/tests/loader.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 67d838a..5173e91 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -30,6 +30,9 @@ #include "wine/test.h" #include "delayloadhandler.h" +/* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ +#define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) + #define ALIGN_SIZE(size, alignment) (((size) + (alignment - 1)) & ~((alignment - 1))) struct PROCESS_BASIC_INFORMATION_PRIVATE @@ -1436,7 +1439,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) } SetLastError(0xdeadbeef); - process = OpenProcess(PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId()); + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, GetCurrentProcessId()); ok(process != NULL, "OpenProcess error %d\n", GetLastError()); noop_thread_started = 0; @@ -1659,7 +1662,7 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); SetLastError(0xdeadbeef); - process = OpenProcess(PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId()); + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, GetCurrentProcessId()); ok(process != NULL, "OpenProcess error %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -2186,7 +2189,7 @@ static void test_ExitProcess(void) ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed: %x\n", ret); SetLastError(0xdeadbeef); - process = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pi.dwProcessId); + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, pi.dwProcessId); ok(process != NULL, "OpenProcess error %d\n", GetLastError()); CloseHandle(process);

1 0