October 2008 - Wine-commits

Alexandre Julliard : make_makefiles: Add support for .rh files.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 0d9078a96c5a0dbf6274038bd7ae11364e9e2047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9078a96c5a0dbf6274038bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 17 12:35:33 2008 +0200 make_makefiles: Add support for .rh files. --- tools/make_makefiles | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index 143805b..bd0f255 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -491,11 +491,14 @@ sub update_includes() { if ($incl =~ /(.*)\//) { $subdirs{$1} = 1; } next if ($incl =~ /^wine\// && !$exported_wine_headers{$incl}); + next if ($incl =~ /\.in$/); if ($incl =~ /stdole2\.idl$/) { push @tlb_srcs, $incl; } elsif ($private_idl_headers{$incl}) { push @h_srcs, $incl; } elsif ($incl =~ /\.h$/) { push @h_srcs, $incl; } + elsif ($incl =~ /\.rh$/) { push @h_srcs, $incl; } elsif ($incl =~ /\.inl$/) { push @h_srcs, $incl; } elsif ($incl =~ /\.idl$/) { push @idl_srcs, $incl; } + else { die "unknown file $incl in include dir"; } } replace_in_file( "include/Makefile.in", '^IDL_H_SRCS\s*=', '^INSTALLDIRS', "IDL_H_SRCS = \\\n\t",

1 0

Andrey Turkin : include: Include winuser.rh from winresrc.h.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 5c19a62f503ff8c84483a04dea36dd078e8354af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c19a62f503ff8c84483a04de… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Fri Oct 17 09:41:49 2008 +0400 include: Include winuser.rh from winresrc.h. --- include/Makefile.in | 1 + include/winresrc.h | 2 +- include/winuser.rh | 210 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 212 insertions(+), 1 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 9fc327a..453d528 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -447,6 +447,7 @@ SRCDIR_INCLUDES = \ winternl.h \ wintrust.h \ winuser.h \ + winuser.rh \ winver.h \ wmistr.h \ wnaspi32.h \ diff --git a/include/winresrc.h b/include/winresrc.h index 51ab5bc..380525c 100644 --- a/include/winresrc.h +++ b/include/winresrc.h @@ -35,7 +35,7 @@ #define _WIN32_WINNT 0x0500 #endif -/* FIXME: #include <winuser.rh> */ +#include <winuser.rh> /* FIXME: #include <commctrl.rh> */ /* FIXME: #include <dde.rh> */ /* FIXME: #include <winnt.rh> */ diff --git a/include/winuser.rh b/include/winuser.rh new file mode 100644 index 0000000..c4c8875 --- /dev/null +++ b/include/winuser.rh @@ -0,0 +1,210 @@ +/* + * Copyright (C) the Wine project + * + * 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 + */ + +/* Window Styles */ +#define WS_OVERLAPPED 0x00000000L +#define WS_POPUP 0x80000000L +#define WS_CHILD 0x40000000L +#define WS_MINIMIZE 0x20000000L +#define WS_VISIBLE 0x10000000L +#define WS_DISABLED 0x08000000L +#define WS_CLIPSIBLINGS 0x04000000L +#define WS_CLIPCHILDREN 0x02000000L +#define WS_MAXIMIZE 0x01000000L +#define WS_CAPTION 0x00C00000L +#define WS_BORDER 0x00800000L +#define WS_DLGFRAME 0x00400000L +#define WS_VSCROLL 0x00200000L +#define WS_HSCROLL 0x00100000L +#define WS_SYSMENU 0x00080000L +#define WS_THICKFRAME 0x00040000L +#define WS_GROUP 0x00020000L +#define WS_TABSTOP 0x00010000L +#define WS_MINIMIZEBOX 0x00020000L +#define WS_MAXIMIZEBOX 0x00010000L +#define WS_TILED WS_OVERLAPPED +#define WS_ICONIC WS_MINIMIZE +#define WS_SIZEBOX WS_THICKFRAME +#define WS_OVERLAPPEDWINDOW (WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME| WS_MINIMIZEBOX | WS_MAXIMIZEBOX) +#define WS_POPUPWINDOW (WS_POPUP | WS_BORDER | WS_SYSMENU) +#define WS_CHILDWINDOW (WS_CHILD) +#define WS_TILEDWINDOW (WS_OVERLAPPEDWINDOW) + +/* Window extended styles */ +#define WS_EX_DLGMODALFRAME 0x00000001L +#define WS_EX_DRAGDETECT 0x00000002L +#define WS_EX_NOPARENTNOTIFY 0x00000004L +#define WS_EX_TOPMOST 0x00000008L +#define WS_EX_ACCEPTFILES 0x00000010L +#define WS_EX_TRANSPARENT 0x00000020L +#define WS_EX_MDICHILD 0x00000040L +#define WS_EX_TOOLWINDOW 0x00000080L +#define WS_EX_WINDOWEDGE 0x00000100L +#define WS_EX_CLIENTEDGE 0x00000200L +#define WS_EX_CONTEXTHELP 0x00000400L +#define WS_EX_RIGHT 0x00001000L +#define WS_EX_LEFT 0x00000000L +#define WS_EX_RTLREADING 0x00002000L +#define WS_EX_LTRREADING 0x00000000L +#define WS_EX_LEFTSCROLLBAR 0x00004000L +#define WS_EX_RIGHTSCROLLBAR 0x00000000L +#define WS_EX_CONTROLPARENT 0x00010000L +#define WS_EX_STATICEDGE 0x00020000L +#define WS_EX_APPWINDOW 0x00040000L +#define WS_EX_LAYERED 0x00080000L +#define WS_EX_NOINHERITLAYOUT 0x00100000L +#define WS_EX_LAYOUTRTL 0x00400000L +#define WS_EX_COMPOSITED 0x02000000L +#define WS_EX_NOACTIVATE 0x08000000L + +#define WS_EX_OVERLAPPEDWINDOW (WS_EX_WINDOWEDGE|WS_EX_CLIENTEDGE) +#define WS_EX_PALETTEWINDOW (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW|WS_EX_TOPMOST) + +/* Button control styles */ +#define BS_PUSHBUTTON 0x00000000L +#define BS_DEFPUSHBUTTON 0x00000001L +#define BS_CHECKBOX 0x00000002L +#define BS_AUTOCHECKBOX 0x00000003L +#define BS_RADIOBUTTON 0x00000004L +#define BS_3STATE 0x00000005L +#define BS_AUTO3STATE 0x00000006L +#define BS_GROUPBOX 0x00000007L +#define BS_USERBUTTON 0x00000008L +#define BS_AUTORADIOBUTTON 0x00000009L +#define BS_OWNERDRAW 0x0000000BL +#define BS_LEFTTEXT 0x00000020L +#define BS_RIGHTBUTTON BS_LEFTTEXT + +#define BS_TEXT 0x00000000L +#define BS_ICON 0x00000040L +#define BS_BITMAP 0x00000080L +#define BS_LEFT 0x00000100L +#define BS_RIGHT 0x00000200L +#define BS_CENTER 0x00000300L +#define BS_TOP 0x00000400L +#define BS_BOTTOM 0x00000800L +#define BS_VCENTER 0x00000C00L +#define BS_PUSHLIKE 0x00001000L +#define BS_MULTILINE 0x00002000L +#define BS_NOTIFY 0x00004000L +#define BS_FLAT 0x00008000L + +/* Combo box styles */ +#define CBS_SIMPLE 0x0001L +#define CBS_DROPDOWN 0x0002L +#define CBS_DROPDOWNLIST 0x0003L +#define CBS_OWNERDRAWFIXED 0x0010L +#define CBS_OWNERDRAWVARIABLE 0x0020L +#define CBS_AUTOHSCROLL 0x0040L +#define CBS_OEMCONVERT 0x0080L +#define CBS_SORT 0x0100L +#define CBS_HASSTRINGS 0x0200L +#define CBS_NOINTEGRALHEIGHT 0x0400L +#define CBS_DISABLENOSCROLL 0x0800L + +#define CBS_UPPERCASE 0x2000L +#define CBS_LOWERCASE 0x4000L + +/* Dialog styles */ +#define DS_ABSALIGN 0x0001 +#define DS_SYSMODAL 0x0002 +#define DS_3DLOOK 0x0004 /* win95 */ +#define DS_FIXEDSYS 0x0008 /* win95 */ +#define DS_NOFAILCREATE 0x0010 /* win95 */ +#define DS_LOCALEDIT 0x0020 +#define DS_SETFONT 0x0040 +#define DS_MODALFRAME 0x0080 +#define DS_NOIDLEMSG 0x0100 +#define DS_SETFOREGROUND 0x0200 /* win95 */ +#define DS_CONTROL 0x0400 /* win95 */ +#define DS_CENTER 0x0800 /* win95 */ +#define DS_CENTERMOUSE 0x1000 /* win95 */ +#define DS_CONTEXTHELP 0x2000 /* win95 */ +#define DS_USEPIXELS 0x8000 +#define DS_SHELLFONT (DS_SETFONT | DS_FIXEDSYS) + +/* Edit control styles */ +#define ES_LEFT 0x00000000 +#define ES_CENTER 0x00000001 +#define ES_RIGHT 0x00000002 +#define ES_MULTILINE 0x00000004 +#define ES_UPPERCASE 0x00000008 +#define ES_LOWERCASE 0x00000010 +#define ES_PASSWORD 0x00000020 +#define ES_AUTOVSCROLL 0x00000040 +#define ES_AUTOHSCROLL 0x00000080 +#define ES_NOHIDESEL 0x00000100 +#define ES_COMBO 0x00000200 /* Undocumented. Parent is a combobox */ +#define ES_OEMCONVERT 0x00000400 +#define ES_READONLY 0x00000800 +#define ES_WANTRETURN 0x00001000 +#define ES_NUMBER 0x00002000 + +/* Listbox styles */ +#define LBS_NOTIFY 0x0001 +#define LBS_SORT 0x0002 +#define LBS_NOREDRAW 0x0004 +#define LBS_MULTIPLESEL 0x0008 +#define LBS_OWNERDRAWFIXED 0x0010 +#define LBS_OWNERDRAWVARIABLE 0x0020 +#define LBS_HASSTRINGS 0x0040 +#define LBS_USETABSTOPS 0x0080 +#define LBS_NOINTEGRALHEIGHT 0x0100 +#define LBS_MULTICOLUMN 0x0200 +#define LBS_WANTKEYBOARDINPUT 0x0400 +#define LBS_EXTENDEDSEL 0x0800 +#define LBS_DISABLENOSCROLL 0x1000 +#define LBS_NODATA 0x2000 +#define LBS_NOSEL 0x4000 +#define LBS_COMBOBOX 0x8000 +#define LBS_STANDARD (LBS_NOTIFY | LBS_SORT | WS_VSCROLL | WS_BORDER) + +/* Static Control Styles */ +#define SS_LEFT 0x00000000L +#define SS_CENTER 0x00000001L +#define SS_RIGHT 0x00000002L +#define SS_ICON 0x00000003L +#define SS_BLACKRECT 0x00000004L +#define SS_GRAYRECT 0x00000005L +#define SS_WHITERECT 0x00000006L +#define SS_BLACKFRAME 0x00000007L +#define SS_GRAYFRAME 0x00000008L +#define SS_WHITEFRAME 0x00000009L +#define SS_USERITEM 0x0000000AL +#define SS_SIMPLE 0x0000000BL +#define SS_LEFTNOWORDWRAP 0x0000000CL +#define SS_OWNERDRAW 0x0000000DL +#define SS_BITMAP 0x0000000EL +#define SS_ENHMETAFILE 0x0000000FL +#define SS_ETCHEDHORZ 0x00000010L +#define SS_ETCHEDVERT 0x00000011L +#define SS_ETCHEDFRAME 0x00000012L +#define SS_TYPEMASK 0x0000001FL + +#define SS_REALSIZECONTROL 0x00000040L +#define SS_NOPREFIX 0x00000080L +#define SS_NOTIFY 0x00000100L +#define SS_CENTERIMAGE 0x00000200L +#define SS_RIGHTJUST 0x00000400L +#define SS_REALSIZEIMAGE 0x00000800L +#define SS_SUNKEN 0x00001000L +#define SS_EDITCONTROL 0x00002000L +#define SS_ENDELLIPSIS 0x00004000L +#define SS_PATHELLIPSIS 0x00008000L +#define SS_WORDELLIPSIS 0x0000C000L +#define SS_ELLIPSISMASK 0x0000C000L

1 0

Jeff Zaroyko : winmm: Fix a failing mixer test on 98 and ME.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: bba54cd407f9bfc9dcd95fdfc8e87d474b51a9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba54cd407f9bfc9dcd95fdfc… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Oct 17 18:02:46 2008 +1100 winmm: Fix a failing mixer test on 98 and ME. --- dlls/winmm/tests/mixer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 25711b7..a31761a 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -379,8 +379,9 @@ static void mixer_test_deviceA(int device) "mixerOpen: MMSYSERR_NOERROR expected, got %s\n",mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { rc=mixerOpen(&mix, device, 0, 0, CALLBACK_FUNCTION); - ok(rc==MMSYSERR_INVALFLAG, - "mixerOpen: MMSYSERR_INVALFLAG expected, got %s\n", mmsys_error(rc)); + ok(rc==MMSYSERR_INVALFLAG + || rc==MMSYSERR_NOTSUPPORTED, /* 98/ME */ + "mixerOpen: MMSYSERR_INVALFLAG or MMSYSERR_NOTSUPPORTED expected, got %s\n", mmsys_error(rc)); for (d=0;d<capsA.cDestinations;d++) { MIXERLINEA mixerlineA;

1 0

Austin English : include/wingdi.h: Define R2_LAST.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 96edcde6a329aa1c15557ca4dcbb06443d8a55ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=96edcde6a329aa1c15557ca4d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 16 21:45:53 2008 -0500 include/wingdi.h: Define R2_LAST. --- include/wingdi.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index 14c307d..322a267 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -392,6 +392,7 @@ DECL_WINELIB_TYPE_AW(LOGCOLORSPACE) #define R2_MERGEPENNOT 14 #define R2_MERGEPEN 15 #define R2_WHITE 16 +#define R2_LAST 16 #define MAKEROP4(fore,back) (DWORD)((((back)<<8)&0xFF000000)|(fore))

1 0

Andrey Turkin : mpr: Fix NULL pointer dereference in WNetGetResourceInformationW.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 6b1256b2de67689d319c613e29ad957f2a2ad14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1256b2de67689d319c613e2… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Fri Oct 17 09:42:47 2008 +0400 mpr: Fix NULL pointer dereference in WNetGetResourceInformationW. --- dlls/mpr/wnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index bf4ddb8..959efb3 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1418,7 +1418,7 @@ DWORD WINAPI WNetGetResourceInformationW( LPNETRESOURCEW lpNetResource, if (!(lpBuffer)) ret = WN_OUT_OF_MEMORY; - else + else if (providerTable != NULL) { /* FIXME: For function value of a variable is indifferent, it does * search of all providers in a network.

1 0

Juan Lang : cryptnet: Fix test failures on Windows Vista/2008.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 6ef7dafa3908629363a753b0c1d4a0666e63cea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef7dafa3908629363a753b0c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 16 16:21:03 2008 -0700 cryptnet: Fix test failures on Windows Vista/2008. --- dlls/cryptnet/tests/cryptnet.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 0907a53..2a40ed6 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -285,6 +285,12 @@ static void test_retrieveObjectByUrl(void) pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray, NULL, NULL, NULL, NULL); + if (!ret && GetLastError() == ERROR_NOT_SUPPORTED) + { + /* File URL support was apparently removed in Vista/Windows 2008 */ + skip("File URLs not supported\n"); + return; + } ok(ret, "CryptRetrieveObjectByUrlA failed: %d\n", GetLastError()); ok(pBlobArray && pBlobArray != (CRYPT_BLOB_ARRAY *)0xdeadbeef, "Expected a valid pointer\n"); @@ -306,10 +312,8 @@ static void test_retrieveObjectByUrl(void) SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl, NULL, NULL, NULL, NULL); - /* vista: ERROR_NOT_SUPPORTED, w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, - 95: OSS_DATA_ERROR */ - ok(!ret && (GetLastError() == ERROR_NOT_SUPPORTED || - GetLastError() == CRYPT_E_NO_MATCH || + /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, 95: OSS_DATA_ERROR */ + ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH || GetLastError() == CRYPT_E_ASN1_BADTAG || GetLastError() == OSS_DATA_ERROR), "got 0x%x/%u (expected CRYPT_E_NO_MATCH or CRYPT_E_ASN1_BADTAG or "

1 0

Juan Lang : crypt32: Use helper function and broken() macro to make expected chain status results a little more clear.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 3454e94d948b11d0aa9fa9bed0a28b75a4b0d94c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3454e94d948b11d0aa9fa9bed… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 16 14:03:53 2008 -0700 crypt32: Use helper function and broken() macro to make expected chain status results a little more clear. --- dlls/crypt32/tests/chain.c | 70 ++++++++++++++++++++++---------------------- 1 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index ca6e6ca..b219aed 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1163,6 +1163,38 @@ typedef struct _SimpleChainStatusCheck const CERT_TRUST_STATUS *rgElementStatus; } SimpleChainStatusCheck; +static void checkElementStatus(const CERT_TRUST_STATUS *expected, + const CERT_TRUST_STATUS *got, const CERT_TRUST_STATUS *ignore, + DWORD todo, DWORD testIndex, DWORD chainIndex, DWORD elementIndex) +{ + if (todo & TODO_ERROR && got->dwErrorStatus != expected->dwErrorStatus) + todo_wine + ok(got->dwErrorStatus == expected->dwErrorStatus, + "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", + testIndex, chainIndex, elementIndex, expected->dwErrorStatus, + got->dwErrorStatus); + else + ok(got->dwErrorStatus == expected->dwErrorStatus || + broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == + expected->dwErrorStatus), + "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", + testIndex, chainIndex, elementIndex, expected->dwErrorStatus, + got->dwErrorStatus); + if (todo & TODO_INFO && got->dwInfoStatus != expected->dwInfoStatus) + todo_wine + ok(got->dwInfoStatus == expected->dwInfoStatus, + "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", + testIndex, chainIndex, elementIndex, expected->dwInfoStatus, + got->dwInfoStatus); + else + ok(got->dwInfoStatus == expected->dwInfoStatus || + broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == + expected->dwInfoStatus), + "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", + testIndex, chainIndex, elementIndex, expected->dwInfoStatus, + got->dwInfoStatus); +} + static void checkSimpleChainStatus(const CERT_SIMPLE_CHAIN *simpleChain, const SimpleChainStatusCheck *simpleChainStatus, const CERT_TRUST_STATUS *ignore, DWORD todo, DWORD testIndex, DWORD chainIndex) @@ -1180,41 +1212,9 @@ static void checkSimpleChainStatus(const CERT_SIMPLE_CHAIN *simpleChain, DWORD i; for (i = 0; i < simpleChain->cElement; i++) - { - DWORD error = - simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus & - ~ignore->dwErrorStatus; - DWORD info = - simpleChain->rgpElement[i]->TrustStatus.dwInfoStatus & - ~ignore->dwInfoStatus; - - if (todo & TODO_ERROR && error != - simpleChainStatus->rgElementStatus[i].dwErrorStatus) - todo_wine ok(error == - simpleChainStatus->rgElementStatus[i].dwErrorStatus, - "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", - testIndex, chainIndex, i, - simpleChainStatus->rgElementStatus[i].dwErrorStatus, error); - else - ok(error == - simpleChainStatus->rgElementStatus[i].dwErrorStatus, - "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", - testIndex, chainIndex, i, - simpleChainStatus->rgElementStatus[i].dwErrorStatus, error); - if (todo & TODO_INFO && info != - simpleChainStatus->rgElementStatus[i].dwInfoStatus) - todo_wine ok(info == - simpleChainStatus->rgElementStatus[i].dwInfoStatus, - "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", - testIndex, chainIndex, i, - simpleChainStatus->rgElementStatus[i].dwInfoStatus, info); - else - ok(info == - simpleChainStatus->rgElementStatus[i].dwInfoStatus, - "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", - testIndex, chainIndex, i, - simpleChainStatus->rgElementStatus[i].dwInfoStatus, info); - } + checkElementStatus(&simpleChain->rgpElement[i]->TrustStatus, + &simpleChainStatus->rgElementStatus[i], ignore, todo, testIndex, + chainIndex, i); } }

1 0

Juan Lang : crypt32: Actually compare chain status instead of doing a no-op comparison, and mark as todo the statuses that don't match in Wine.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: e1e17b89c9bb832ac0961a428cbb2db41eeb4a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1e17b89c9bb832ac0961a428… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 16 14:04:27 2008 -0700 crypt32: Actually compare chain status instead of doing a no-op comparison, and mark as todo the statuses that don't match in Wine. --- dlls/crypt32/tests/chain.c | 47 +++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index b219aed..bfaa802 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1229,30 +1229,41 @@ typedef struct _ChainStatusCheck static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, const ChainStatusCheck *chainStatus, DWORD todo, DWORD testIndex) { - DWORD error = chainStatus->status.dwErrorStatus & - ~chainStatus->statusToIgnore.dwErrorStatus; - DWORD info = chainStatus->status.dwInfoStatus & - ~chainStatus->statusToIgnore.dwInfoStatus; - ok(chain->cChain == chainStatus->cChain, "Chain %d: expected %d simple chains, got %d\n", testIndex, chainStatus->cChain, chain->cChain); - if (todo & TODO_ERROR && error != chainStatus->status.dwErrorStatus) - todo_wine ok(error == chainStatus->status.dwErrorStatus, + if (todo & TODO_ERROR && + chain->TrustStatus.dwErrorStatus != chainStatus->status.dwErrorStatus) + todo_wine ok(chain->TrustStatus.dwErrorStatus == + chainStatus->status.dwErrorStatus, "Chain %d: expected error %08x, got %08x\n", - testIndex, chainStatus->status.dwErrorStatus, error); + testIndex, chainStatus->status.dwErrorStatus, + chain->TrustStatus.dwErrorStatus); else - ok(error == chainStatus->status.dwErrorStatus, + ok(chain->TrustStatus.dwErrorStatus == + chainStatus->status.dwErrorStatus || + broken((chain->TrustStatus.dwErrorStatus & + ~chainStatus->statusToIgnore.dwErrorStatus) == + chainStatus->status.dwErrorStatus), "Chain %d: expected error %08x, got %08x\n", - testIndex, chainStatus->status.dwErrorStatus, error); - if (todo & TODO_INFO && info != chainStatus->status.dwInfoStatus) - todo_wine ok(info == chainStatus->status.dwInfoStatus, + testIndex, chainStatus->status.dwErrorStatus, + chain->TrustStatus.dwErrorStatus); + if (todo & TODO_INFO && + chain->TrustStatus.dwInfoStatus != chainStatus->status.dwInfoStatus) + todo_wine ok(chain->TrustStatus.dwInfoStatus == + chainStatus->status.dwInfoStatus, "Chain %d: expected info %08x, got %08x\n", - testIndex, chainStatus->status.dwInfoStatus, info); + testIndex, chainStatus->status.dwInfoStatus, + chain->TrustStatus.dwInfoStatus); else - ok(info == chainStatus->status.dwInfoStatus, + ok(chain->TrustStatus.dwInfoStatus == + chainStatus->status.dwInfoStatus || + broken((chain->TrustStatus.dwInfoStatus & + ~chainStatus->statusToIgnore.dwInfoStatus) == + chainStatus->status.dwInfoStatus), "Chain %d: expected info %08x, got %08x\n", - testIndex, chainStatus->status.dwInfoStatus, info); + testIndex, chainStatus->status.dwInfoStatus, + chain->TrustStatus.dwInfoStatus); if (chain->cChain == chainStatus->cChain) { DWORD i; @@ -1521,7 +1532,7 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT | CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_CYCLIC, 0 }, 1, simpleStatus9 }, - TODO_INFO }, + TODO_ERROR | TODO_INFO }, { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, 0 }, @@ -1530,7 +1541,7 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, 0 }, { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus12 }, 0 }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus12 }, TODO_ERROR }, { { sizeof(chain13) / sizeof(chain13[0]), chain13 }, { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus13 }, @@ -1566,7 +1577,7 @@ static ChainCheck chainCheckNoStore[] = { { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus8NoStore }, - TODO_INFO }, + TODO_ERROR | TODO_INFO }, }; /* Wednesday, Oct 1, 2007 */

1 0

Juan Lang : crypt32: Make some variables const.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 052238d064fa3ee89512c62e2b0f76355e26437d URL: http://source.winehq.org/git/wine.git/?a=commit;h=052238d064fa3ee89512c62e2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 16 12:24:21 2008 -0700 crypt32: Make some variables const. --- dlls/crypt32/tests/chain.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index eb8db2c..da45602 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1660,7 +1660,7 @@ typedef struct _ChainPolicyCheck DWORD todo; } ChainPolicyCheck; -static ChainPolicyCheck basePolicyCheck[] = { +static const ChainPolicyCheck basePolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, @@ -1691,7 +1691,7 @@ static ChainPolicyCheck basePolicyCheck[] = { { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, 0 }, }; -static ChainPolicyCheck authenticodePolicyCheck[] = { +static const ChainPolicyCheck authenticodePolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, @@ -1722,7 +1722,7 @@ static ChainPolicyCheck authenticodePolicyCheck[] = { { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, 0 }, }; -static ChainPolicyCheck basicConstraintsPolicyCheck[] = { +static const ChainPolicyCheck basicConstraintsPolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, @@ -1762,7 +1762,7 @@ static const char *num_to_str(WORD num) return buf; } -static void checkChainPolicyStatus(LPCSTR policy, ChainPolicyCheck *check, +static void checkChainPolicyStatus(LPCSTR policy, const ChainPolicyCheck *check, DWORD testIndex) { PCCERT_CHAIN_CONTEXT chain = getChain(&check->certs, 0, TRUE, &oct2007,

1 0

Juan Lang : crypt32: Include policy being checked in failure message.
by Alexandre Julliard 17 Oct '08

17 Oct '08

Module: wine Branch: master Commit: 439f5e0de9628361df1b3f02b49281677577d3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=439f5e0de9628361df1b3f02b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 16 12:29:58 2008 -0700 crypt32: Include policy being checked in failure message. --- dlls/crypt32/tests/chain.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index da45602..ca6e6ca 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1775,7 +1775,9 @@ static void checkChainPolicyStatus(LPCSTR policy, const ChainPolicyCheck *check, &policyStatus); if (check->todo & TODO_POLICY) - todo_wine ok(ret, "%d: CertVerifyCertificateChainPolicy failed: %08x\n", + todo_wine ok(ret, + "%s[%d]: CertVerifyCertificateChainPolicy failed: %08x\n", + HIWORD(policy) ? policy : num_to_str(LOWORD(policy)), testIndex, GetLastError()); else { @@ -1786,36 +1788,46 @@ static void checkChainPolicyStatus(LPCSTR policy, const ChainPolicyCheck *check, pCertFreeCertificateChain(chain); return; } - ok(ret, "%d: CertVerifyCertificateChainPolicy failed: %08x\n", - testIndex, GetLastError()); + ok(ret, "%s[%d]: CertVerifyCertificateChainPolicy failed: %08x\n", + HIWORD(policy) ? policy : num_to_str(LOWORD(policy)), testIndex, + GetLastError()); } if (ret) { if (check->todo & TODO_ERROR) todo_wine ok(policyStatus.dwError == check->status.dwError, - "%d: expected %08x, got %08x\n", testIndex, - check->status.dwError, policyStatus.dwError); + "%s[%d]: expected %08x, got %08x\n", + HIWORD(policy) ? policy : num_to_str(LOWORD(policy)), + testIndex, check->status.dwError, policyStatus.dwError); else ok(policyStatus.dwError == check->status.dwError, - "%d: expected %08x, got %08x\n", testIndex, - check->status.dwError, policyStatus.dwError); + "%s[%d]: expected %08x, got %08x\n", + HIWORD(policy) ? policy : num_to_str(LOWORD(policy)), + testIndex, check->status.dwError, policyStatus.dwError); if (check->todo & TODO_CHAINS) todo_wine ok(policyStatus.lChainIndex == - check->status.lChainIndex, "%d: expected %d, got %d\n", + check->status.lChainIndex, "%s[%d]: expected %d, got %d\n", + HIWORD(policy) ? policy : num_to_str(LOWORD(policy)), testIndex, check->status.lChainIndex, policyStatus.lChainIndex); else ok(policyStatus.lChainIndex == check->status.lChainIndex, - "%d: expected %d, got %d\n", testIndex, + "%s[%d]: expected %d, got %d\n", + HIWORD(policy) ? policy : num_to_str(LOWORD(policy)), + testIndex, check->status.lChainIndex, policyStatus.lChainIndex); if (check->todo & TODO_ELEMENTS) todo_wine ok(policyStatus.lElementIndex == check->status.lElementIndex, - "%d: expected %d, got %d\n", testIndex, + "%s[%d]: expected %d, got %d\n", + HIWORD(policy) ? policy : num_to_str(LOWORD(policy)), + testIndex, check->status.lElementIndex, policyStatus.lElementIndex); else ok(policyStatus.lElementIndex == check->status.lElementIndex, - "%d: expected %d, got %d\n", testIndex, + "%s[%d]: expected %d, got %d\n", + HIWORD(policy) ? policy : num_to_str(LOWORD(policy)), + testIndex, check->status.lElementIndex, policyStatus.lElementIndex); } pCertFreeCertificateChain(chain);

1 0