February 2009 - Wine-commits

Juan Lang : shell32: Fix a couple test failures on NT4.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: dfdf2be7c6108ca89faee3cdb2a789698c8cf170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfdf2be7c6108ca89faee3cdb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 3 09:01:59 2009 -0800 shell32: Fix a couple test failures on NT4. --- dlls/shell32/tests/shellpath.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 7c7cc52..0c7bafd 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -419,7 +419,9 @@ static BYTE testSHGetSpecialFolderLocation(BOOL optional, int folder) pidl = NULL; hr = pSHGetSpecialFolderLocation(NULL, folder, &pidl); - ok(SUCCEEDED(hr) || optional, + ok(SUCCEEDED(hr) || optional || + broken((folder == CSIDL_COOKIES || folder == CSIDL_INTERNET) && + hr == E_INVALIDARG) /* NT4 */, "SHGetSpecialFolderLocation(NULL, %s, &pidl) failed: 0x%08x\n", getFolderName(folder), hr); if (SUCCEEDED(hr)) {

1 0

Juan Lang : shell32: Use list of allowed PIDL types rather than assuming there are no more than two .
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 0bb1c5648b3a266a54dc9a9ab601d58070141010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb1c5648b3a266a54dc9a9ab… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 3 09:45:00 2009 -0800 shell32: Use list of allowed PIDL types rather than assuming there are no more than two. --- dlls/shell32/tests/shellpath.c | 169 +++++++++++++++++++-------------------- 1 files changed, 82 insertions(+), 87 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 0c7bafd..bf125b0 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -74,9 +74,9 @@ static GUID CLSID_CommonDocuments = { 0x0000000c, 0x0000, 0x0000, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x1a } }; struct shellExpectedValues { - int folder; - BYTE pidlType; - BYTE altPidlType; + int folder; + int numTypes; + const BYTE *types; }; static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO *); @@ -90,75 +90,83 @@ static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); static HRESULT (WINAPI *pSHGetMalloc)(LPMALLOC *); static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; +static const BYTE guidType[] = { PT_GUID }; +static const BYTE controlPanelType[] = { PT_SHELLEXT, PT_GUID }; +static const BYTE folderType[] = { PT_FOLDER }; +static const BYTE favoritesType[] = { PT_FOLDER, 0 }; +static const BYTE folderOrSpecialType[] = { PT_FOLDER, PT_IESPECIAL2 }; +/* FIXME: don't know the type of 0x71 returned by Vista/2008 for printers */ +static const BYTE printersType[] = { PT_YAGUID, PT_SHELLEXT, 0x71 }; +static const BYTE ieSpecialType[] = { PT_IESPECIAL2 }; +static const BYTE shellExtType[] = { PT_SHELLEXT }; +static const BYTE workgroupType[] = { PT_WORKGRP }; +#define DECLARE_TYPE(x, y) { x, sizeof(y) / sizeof(y[0]), y } static const struct shellExpectedValues requiredShellValues[] = { - { CSIDL_BITBUCKET, PT_GUID, 0 }, - { CSIDL_CONTROLS, PT_SHELLEXT, PT_GUID }, - { CSIDL_COOKIES, PT_FOLDER, 0 }, - { CSIDL_DESKTOPDIRECTORY, PT_FOLDER, 0 }, - { CSIDL_DRIVES, PT_GUID, 0 }, -/* Note that 0 is an expected type for CSIDL_FAVORITES. Inverting the order - * will cause the test to fail, as it'll only check for PT_FOLDER. - */ - { CSIDL_FAVORITES, 0, PT_FOLDER }, - { CSIDL_FONTS, PT_FOLDER, PT_IESPECIAL2 }, + DECLARE_TYPE(CSIDL_BITBUCKET, guidType), + DECLARE_TYPE(CSIDL_CONTROLS, controlPanelType), + DECLARE_TYPE(CSIDL_COOKIES, folderType), + DECLARE_TYPE(CSIDL_DESKTOPDIRECTORY, folderType), + DECLARE_TYPE(CSIDL_DRIVES, guidType), + DECLARE_TYPE(CSIDL_FAVORITES, favoritesType), + DECLARE_TYPE(CSIDL_FONTS, folderOrSpecialType), /* FIXME: the following fails in Wine, returns type PT_FOLDER - { CSIDL_HISTORY, PT_IESPECIAL2, 0 }, + DECLARE_TYPE(CSIDL_HISTORY, ieSpecialType), */ - { CSIDL_INTERNET, PT_GUID, 0 }, - { CSIDL_NETHOOD, PT_FOLDER, 0 }, - { CSIDL_NETWORK, PT_GUID, 0 }, -/* FIXME: don't know the type of 0x71 returned by Vista/2008 for printers */ - { CSIDL_PRINTERS, PT_YAGUID, 0x71 }, - { CSIDL_PRINTHOOD, PT_FOLDER, 0 }, - { CSIDL_PROGRAMS, PT_FOLDER, 0 }, - { CSIDL_RECENT, PT_FOLDER, PT_IESPECIAL2 }, - { CSIDL_SENDTO, PT_FOLDER, 0 }, - { CSIDL_STARTMENU, PT_FOLDER, 0 }, - { CSIDL_STARTUP, PT_FOLDER, 0 }, - { CSIDL_TEMPLATES, PT_FOLDER, 0 }, + DECLARE_TYPE(CSIDL_INTERNET, guidType), + DECLARE_TYPE(CSIDL_NETHOOD, folderType), + DECLARE_TYPE(CSIDL_NETWORK, guidType), + DECLARE_TYPE(CSIDL_PRINTERS, printersType), + DECLARE_TYPE(CSIDL_PRINTHOOD, folderType), + DECLARE_TYPE(CSIDL_PROGRAMS, folderType), + DECLARE_TYPE(CSIDL_RECENT, folderOrSpecialType), + DECLARE_TYPE(CSIDL_SENDTO, folderType), + DECLARE_TYPE(CSIDL_STARTMENU, folderType), + DECLARE_TYPE(CSIDL_STARTUP, folderType), + DECLARE_TYPE(CSIDL_TEMPLATES, folderType), }; static const struct shellExpectedValues optionalShellValues[] = { /* FIXME: the following only semi-succeed; they return NULL PIDLs on XP.. hmm. - { CSIDL_ALTSTARTUP, PT_FOLDER, 0 }, - { CSIDL_COMMON_ALTSTARTUP, PT_FOLDER, 0 }, - { CSIDL_COMMON_OEM_LINKS, PT_FOLDER, 0 }, + DECLARE_TYPE(CSIDL_ALTSTARTUP, folderType), + DECLARE_TYPE(CSIDL_COMMON_ALTSTARTUP, folderType), + DECLARE_TYPE(CSIDL_COMMON_OEM_LINKS, folderType), */ /* Windows NT-only: */ - { CSIDL_COMMON_DESKTOPDIRECTORY, PT_FOLDER, 0 }, - { CSIDL_COMMON_DOCUMENTS, PT_SHELLEXT, 0 }, - { CSIDL_COMMON_FAVORITES, PT_FOLDER, 0 }, - { CSIDL_COMMON_PROGRAMS, PT_FOLDER, 0 }, - { CSIDL_COMMON_STARTMENU, PT_FOLDER, 0 }, - { CSIDL_COMMON_STARTUP, PT_FOLDER, 0 }, - { CSIDL_COMMON_TEMPLATES, PT_FOLDER, 0 }, + DECLARE_TYPE(CSIDL_COMMON_DESKTOPDIRECTORY, folderType), + DECLARE_TYPE(CSIDL_COMMON_DOCUMENTS, shellExtType), + DECLARE_TYPE(CSIDL_COMMON_FAVORITES, folderType), + DECLARE_TYPE(CSIDL_COMMON_PROGRAMS, folderType), + DECLARE_TYPE(CSIDL_COMMON_STARTMENU, folderType), + DECLARE_TYPE(CSIDL_COMMON_STARTUP, folderType), + DECLARE_TYPE(CSIDL_COMMON_TEMPLATES, folderType), /* first appearing in shell32 version 4.71: */ - { CSIDL_APPDATA, PT_FOLDER, 0 }, + DECLARE_TYPE(CSIDL_APPDATA, folderType), /* first appearing in shell32 version 4.72: */ - { CSIDL_INTERNET_CACHE, PT_IESPECIAL2, 0 }, + DECLARE_TYPE(CSIDL_INTERNET_CACHE, ieSpecialType), /* first appearing in shell32 version 5.0: */ - { CSIDL_ADMINTOOLS, PT_FOLDER, 0 }, - { CSIDL_COMMON_APPDATA, PT_FOLDER, 0 }, - { CSIDL_LOCAL_APPDATA, PT_FOLDER, 0 }, - { OLD_CSIDL_MYDOCUMENTS, PT_FOLDER, 0 }, - { CSIDL_MYMUSIC, PT_FOLDER, 0 }, - { CSIDL_MYPICTURES, PT_FOLDER, 0 }, - { CSIDL_MYVIDEO, PT_FOLDER, 0 }, - { CSIDL_PROFILE, PT_FOLDER, 0 }, - { CSIDL_PROGRAM_FILES, PT_FOLDER, 0 }, - { CSIDL_PROGRAM_FILESX86, PT_FOLDER, 0 }, - { CSIDL_PROGRAM_FILES_COMMON, PT_FOLDER, 0 }, - { CSIDL_PROGRAM_FILES_COMMONX86, PT_FOLDER, 0 }, - { CSIDL_SYSTEM, PT_FOLDER, 0 }, - { CSIDL_WINDOWS, PT_FOLDER, 0 }, + DECLARE_TYPE(CSIDL_ADMINTOOLS, folderType), + DECLARE_TYPE(CSIDL_COMMON_APPDATA, folderType), + DECLARE_TYPE(CSIDL_LOCAL_APPDATA, folderType), + DECLARE_TYPE(OLD_CSIDL_MYDOCUMENTS, folderType), + DECLARE_TYPE(CSIDL_MYMUSIC, folderType), + DECLARE_TYPE(CSIDL_MYPICTURES, folderType), + DECLARE_TYPE(CSIDL_MYVIDEO, folderType), + DECLARE_TYPE(CSIDL_PROFILE, folderType), + DECLARE_TYPE(CSIDL_PROGRAM_FILES, folderType), + DECLARE_TYPE(CSIDL_PROGRAM_FILESX86, folderType), + DECLARE_TYPE(CSIDL_PROGRAM_FILES_COMMON, folderType), + DECLARE_TYPE(CSIDL_PROGRAM_FILES_COMMONX86, folderType), + DECLARE_TYPE(CSIDL_SYSTEM, folderType), + DECLARE_TYPE(CSIDL_WINDOWS, folderType), /* first appearing in shell32 6.0: */ - { CSIDL_CDBURN_AREA, PT_FOLDER, 0 }, - { CSIDL_COMMON_MUSIC, PT_FOLDER, 0 }, - { CSIDL_COMMON_PICTURES, PT_FOLDER, 0 }, - { CSIDL_COMMON_VIDEO, PT_FOLDER, 0 }, - { CSIDL_COMPUTERSNEARME, PT_WORKGRP, 0 }, - { CSIDL_RESOURCES, PT_FOLDER, 0 }, - { CSIDL_RESOURCES_LOCALIZED, PT_FOLDER, 0 }, + DECLARE_TYPE(CSIDL_CDBURN_AREA, folderType), + DECLARE_TYPE(CSIDL_COMMON_MUSIC, folderType), + DECLARE_TYPE(CSIDL_COMMON_PICTURES, folderType), + DECLARE_TYPE(CSIDL_COMMON_VIDEO, folderType), + DECLARE_TYPE(CSIDL_COMPUTERSNEARME, workgroupType), + DECLARE_TYPE(CSIDL_RESOURCES, folderType), + DECLARE_TYPE(CSIDL_RESOURCES_LOCALIZED, folderType), }; +#undef DECLARE_TYPE static void loadShell32(void) { @@ -476,40 +484,27 @@ static void testShellValues(const struct shellExpectedValues testEntries[], for (i = 0; i < numEntries; i++) { BYTE type; + int j; + BOOL foundTypeMatch = FALSE; if (pSHGetFolderLocation) { type = testSHGetFolderLocation(optional, testEntries[i].folder); - if (!testEntries[i].altPidlType) - ok(type == testEntries[i].pidlType || optional || - broken(type == 0xff) /* Win9x */, - "%s has type %d (0x%02x), expected %d (0x%02x)\n", - getFolderName(testEntries[i].folder), type, type, - testEntries[i].pidlType, testEntries[i].pidlType); - else - ok(type == testEntries[i].pidlType || - type == testEntries[i].altPidlType || - optional || broken(type == 0xff) /* Win9x */, - "%s has type %d (0x%02x), expected %d (0x%02x) or %d (0x%02x)\n", - getFolderName(testEntries[i].folder), type, type, - testEntries[i].pidlType, testEntries[i].pidlType, - testEntries[i].altPidlType, testEntries[i].altPidlType); + for (j = 0; !foundTypeMatch && j < testEntries[i].numTypes; j++) + if (testEntries[i].types[j] == type) + foundTypeMatch = TRUE; + ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, + "%s has unexpected type %d (0x%02x)\n", + getFolderName(testEntries[i].folder), type, type); } type = testSHGetSpecialFolderLocation(optional, testEntries[i].folder); - if (!testEntries[i].altPidlType) - ok(type == testEntries[i].pidlType || optional || - broken(type == 0xff) /* Win9x */, - "%s has type %d (0x%02x), expected %d (0x%02x)\n", - getFolderName(testEntries[i].folder), type, type, - testEntries[i].pidlType, testEntries[i].pidlType); - else - ok(type == testEntries[i].pidlType || - type == testEntries[i].altPidlType || - optional || broken(type == 0xff) /* Win9x */, - "%s has type %d (0x%02x), expected %d (0x%02x) or %d (0x%02x)\n", - getFolderName(testEntries[i].folder), type, type, - testEntries[i].pidlType, testEntries[i].pidlType, - testEntries[i].altPidlType, testEntries[i].altPidlType); + for (j = 0, foundTypeMatch = FALSE; !foundTypeMatch && + j < testEntries[i].numTypes; j++) + if (testEntries[i].types[j] == type) + foundTypeMatch = TRUE; + ok(foundTypeMatch || optional || broken(type == 0xff) /* Win9x */, + "%s has unexpected type %d (0x%02x)\n", + getFolderName(testEntries[i].folder), type, type); switch (type) { case PT_FOLDER:

1 0

Juan Lang : mapi32/tests: Fix typo.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: ea3adf2783e8662fb217685f7070fd33cc69b21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3adf2783e8662fb217685f7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 3 11:08:22 2009 -0800 mapi32/tests: Fix typo. --- dlls/mapi32/tests/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index d57fe50..7283fc1 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -153,7 +153,7 @@ static void test_CbOfEncoded(void) memset(buff, '\0', sizeof(buff)); memset(buff, '?', i); ulRet = pCbOfEncoded(buff); - ok(ulRet == ulExpected || broken(ulExpected == 0) /* Win9x */, + ok(ulRet == ulExpected || broken(ulRet == 0) /* Win9x */, "CbOfEncoded(length %d): expected %d, got %d\n", i, ulExpected, ulRet); }

1 0

Aric Stewart : advapi32: Add Security Label sids used by IE7.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 8dc84666a67171670f722513a4fd84625145ebba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc84666a67171670f722513a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 3 12:55:14 2009 -0600 advapi32: Add Security Label sids used by IE7. --- dlls/advapi32/security.c | 4 ++++ include/winnt.h | 25 ++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 43d6d07..ee06270 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -130,6 +130,10 @@ static const WELLKNOWNSID WellKnownSids[] = { {0,0}, WinBuiltinAuthorizationAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS } } }, { {0,0}, WinBuiltinTerminalServerLicenseServersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS } } }, { {0,0}, WinBuiltinDCOMUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_DCOM_USERS } } }, + { {'L','W'}, WinLowLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_LOW_RID} } }, + { {'M','E'}, WinMediumLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_MEDIUM_RID } } }, + { {'H','I'}, WinHighLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_HIGH_RID } } }, + { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } }, }; /* these SIDs must be constructed as relative to some domain - only the RID is well-known */ diff --git a/include/winnt.h b/include/winnt.h index 6dadf9e..69c4b10 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3885,6 +3885,14 @@ typedef struct _SID_AND_ATTRIBUTES { #define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS 0x00000207L #define DOMAIN_GROUP_RID_POLICY_ADMINS 0x00000208L +#define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16} +#define SECURITY_MANDATORY_UNTRUSTED_RID 0x00000000L +#define SECURITY_MANDATORY_LOW_RID 0x00001000L +#define SECURITY_MANDATORY_MEDIUM_RID 0x00002000L +#define SECURITY_MANDATORY_HIGH_RID 0x00003000L +#define SECURITY_MANDATORY_SYSTEM_RID 0x00004000L +#define SECURITY_MANDATORY_PROTECTED_PROCESS_RID 0x00005000L + #define DOMAIN_ALIAS_RID_ADMINS 0x00000220L #define DOMAIN_ALIAS_RID_USERS 0x00000221L #define DOMAIN_ALIAS_RID_GUESTS 0x00000222L @@ -3975,7 +3983,22 @@ typedef enum { WinBuiltinPerfLoggingUsersSid = 58, WinBuiltinAuthorizationAccessSid = 59, WinBuiltinTerminalServerLicenseServersSid = 60, - WinBuiltinDCOMUsersSid = 61 + WinBuiltinDCOMUsersSid = 61, + WinBuiltinIUsersSid = 62, + WinIUserSid = 63, + WinBuiltinCryptoOperatorsSid = 64, + WinUntrustedLabelSid = 65, + WinLowLabelSid = 66, + WinMediumLabelSid = 67, + WinHighLabelSid = 68, + WinSystemLabelSid = 69, + WinWriteRestrictedCodeSid = 70, + WinCreatorOwnerRightsSid = 71, + WinCacheablePrincipalsGroupSid = 72, + WinNonCacheablePrincipalsGroupSid = 73, + WinEnterpriseReadonlyControllersSid = 74, + WinAccountReadonlyControllersSid = 75, + WinBuiltinEventLogReadersGroup = 76, } WELL_KNOWN_SID_TYPE; /*

1 0

Alexandre Julliard : kernel32/tests: Add another error code in the CreateDirectory test.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 5d0f3aa33b000be1b6c2d91506a8b5f9d3a7f68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0f3aa33b000be1b6c2d9150… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 3 22:23:19 2009 +0100 kernel32/tests: Add another error code in the CreateDirectory test. --- dlls/kernel32/tests/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index 2c943d1..a0ccd9f 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -363,7 +363,7 @@ static void test_CreateDirectoryW(void) GetTempPathW(MAX_PATH, tmpdir); tmpdir[3] = 0; /* truncate the path */ ret = CreateDirectoryW(tmpdir, NULL); - ok(ret == FALSE && GetLastError() == ERROR_ACCESS_DENIED, + ok(ret == FALSE && (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_ALREADY_EXISTS), "should deny access to the drive root ret %u err %u\n", ret, GetLastError()); GetTempPathW(MAX_PATH, tmpdir);

1 0

Alexandre Julliard : setupapi/tests: Don' t compare the drive letter of expanded file paths.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 486e66ed6edf3805a07e55e6875d349499e20bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=486e66ed6edf3805a07e55e68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 3 22:23:35 2009 +0100 setupapi/tests: Don't compare the drive letter of expanded file paths. --- dlls/setupapi/tests/parser.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index ddfd0f2..0aa78c1 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -439,6 +439,11 @@ static void test_key_names(void) !strcmp( field, A1200), /* Vista, W2K8 */ "line %u: bad field %s/%s\n", i, field, key_names[i].fields[index] ); + else /* don't compare drive letter of paths */ + if (field[0] && field[1] == ':' && field[2] == '\\') + ok( !strcmp( field + 1, key_names[i].fields[index] + 1 ), + "line %u: bad field %s/%s\n", + i, field, key_names[i].fields[index] ); else ok( !strcmp( field, key_names[i].fields[index] ), "line %u: bad field %s/%s\n", i, field, key_names[i].fields[index] ); @@ -584,18 +589,18 @@ static void test_SetupGetIntField(void) retb = SetupGetIntField( &context, keys[i].index, &intfield ); if ( keys[i].err == ERROR_SUCCESS ) { - ok( retb, "Expected success\n" ); + ok( retb, "%u: Expected success\n", i ); ok( GetLastError() == ERROR_SUCCESS || GetLastError() == 0xdeadbeef /* win9x, NT4 */, - "Expected ERROR_SUCCESS or 0xdeadbeef, got %u\n", GetLastError() ); + "%u: Expected ERROR_SUCCESS or 0xdeadbeef, got %u\n", i, GetLastError() ); } else { - ok( !retb, "Expected failure\n" ); + ok( !retb, "%u: Expected failure\n", i ); ok( GetLastError() == keys[i].err, - "Expected %d, got %u\n", keys[i].err, GetLastError() ); + "%u: Expected %d, got %u\n", i, keys[i].err, GetLastError() ); } - ok( intfield == keys[i].value, "Expected %d, got %d\n", keys[i].value, intfield ); + ok( intfield == keys[i].value, "%u: Expected %d, got %d\n", i, keys[i].value, intfield ); SetupCloseInfFile( hinf ); }

1 0

Juan Lang : secur32: Fix a handful of test failures on Win9x.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: b9ae777d966bdc950c97619d0efd3e1262851ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9ae777d966bdc950c97619d0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 3 07:48:59 2009 -0800 secur32: Fix a handful of test failures on Win9x. --- dlls/secur32/tests/secur32.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 39edeea..27e07fb 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -102,9 +102,15 @@ static void test_InitSecurityInterface(void) sftA = pInitSecurityInterfaceA(); ok(sftA != NULL, "pInitSecurityInterfaceA failed\n"); ok(sftA->dwVersion == SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, "wrong dwVersion %d in security function table\n", sftA->dwVersion); - ok(!sftA->Reserved2, "Reserved2 should be NULL instead of %p in security function table\n", sftA->Reserved2); - ok(sftA->Reserved3 == sftA->EncryptMessage, "Reserved3 should be equal to EncryptMessage in the security function table\n"); - ok(sftA->Reserved4 == sftA->DecryptMessage, "Reserved4 should be equal to DecryptMessage in the security function table\n"); + ok(!sftA->Reserved2 || broken(sftA->Reserved2 != NULL) /* WinME */, + "Reserved2 should be NULL instead of %p in security function table\n", + sftA->Reserved2); + ok(sftA->Reserved3 == sftA->EncryptMessage || + broken(sftA->Reserved3 != sftA->EncryptMessage) /* Win9x */, + "Reserved3 should be equal to EncryptMessage in the security function table\n"); + ok(sftA->Reserved4 == sftA->DecryptMessage || + broken(sftA->Reserved4 != sftA->DecryptMessage) /* Win9x */, + "Reserved4 should be equal to DecryptMessage in the security function table\n"); if (!pInitSecurityInterfaceW) {

1 0

Paul Vriens : riched32/tests: Skip some tests on Win9x, WinME and NT4.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: e1b80a04a031336adc28ac78f951bfead79c345f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b80a04a031336adc28ac78f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Feb 3 13:55:53 2009 +0100 riched32/tests: Skip some tests on Win9x, WinME and NT4. --- dlls/riched32/tests/editor.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 006da7d..6216001 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -450,6 +450,10 @@ static void test_EM_LINELENGTH(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); result = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + if (result == 4) { + win_skip("Win9x, WinME and NT4 don't handle '\\r only' correctly\n"); + return; + } ok(result == 9, "Incorrect line count of %ld\n", result); for (i = 0; i < sizeof(offset_test)/sizeof(offset_test[0]); i++) {

1 0

Alexandre Julliard : kernel32/tests: Don' t hardcode C drive for CreateDirectory tests.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: 3cd415005924aacde715720d36b8c8e7e96bf3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd415005924aacde715720d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 3 15:21:47 2009 +0100 kernel32/tests: Don't hardcode C drive for CreateDirectory tests. --- dlls/kernel32/tests/path.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index a272b56..397d4f4 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -384,14 +384,16 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) ok(CreateDirectoryA(tmpstr,NULL),"CreateDirectoryA failed\n"); sprintf(tmpstr,"%s\\%s",newdir,LONGDIR); ok(CreateDirectoryA(tmpstr,NULL),"CreateDirectoryA failed\n"); - bRes = CreateDirectoryA("c:",NULL); - ok(!bRes && (GetLastError() == ERROR_ACCESS_DENIED || + sprintf(tmpstr,"%c:", *curDrive); + bRes = CreateDirectoryA(tmpstr,NULL); + ok(!bRes && (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_ALREADY_EXISTS), - "CreateDirectoryA(\"c:\" should have failed (%d)\n", GetLastError()); - bRes = CreateDirectoryA("c:\\",NULL); + "CreateDirectoryA(\"%s\" should have failed (%d)\n", tmpstr, GetLastError()); + sprintf(tmpstr,"%c:\\", *curDrive); + bRes = CreateDirectoryA(tmpstr,NULL); ok(!bRes && (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_ALREADY_EXISTS), - "CreateDirectoryA(\"c:\\\" should have failed (%d)\n", GetLastError()); + "CreateDirectoryA(\"%s\" should have failed (%d)\n", tmpstr, GetLastError()); sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,SHORTFILE); hndl=CreateFileA(tmpstr,GENERIC_WRITE,0,NULL, CREATE_NEW,FILE_ATTRIBUTE_NORMAL,NULL);

1 0

Alexandre Julliard : kernel32/tests: Allow more error codes from GetDiskFreeSpace.
by Alexandre Julliard 03 Feb '09

03 Feb '09

Module: wine Branch: master Commit: bdfa9c3a1bcb134948175d0866df1af351f17bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfa9c3a1bcb134948175d086… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 3 15:04:24 2009 +0100 kernel32/tests: Allow more error codes from GetDiskFreeSpace. --- dlls/kernel32/tests/drive.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index a94cbdf..81e04bf 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -118,7 +118,10 @@ static void test_GetDiskFreeSpaceA(void) else { ok(ret || - (!ret && (GetLastError() == ERROR_NOT_READY || GetLastError() == ERROR_INVALID_DRIVE)), + GetLastError() == ERROR_NOT_READY || + GetLastError() == ERROR_INVALID_DRIVE || + GetLastError() == ERROR_PATH_NOT_FOUND || + GetLastError() == ERROR_UNRECOGNIZED_VOLUME, "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n", drive, ret, GetLastError()); if( GetVersion() & 0x80000000) @@ -132,7 +135,10 @@ static void test_GetDiskFreeSpaceA(void) tot.QuadPart = sectors_per_cluster; tot.QuadPart = (tot.QuadPart * bytes_per_sector) * total_clusters; ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL); - ok( ret || (!ret && ERROR_NOT_READY == GetLastError()), + ok( ret || + GetLastError() == ERROR_NOT_READY || + GetLastError() == ERROR_PATH_NOT_FOUND || + GetLastError() == ERROR_UNRECOGNIZED_VOLUME, "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%d\n", drive, GetLastError()); ok( bytes_per_sector == 0 || /* empty cd rom drive */ totEx.QuadPart <= tot.QuadPart, @@ -188,7 +194,10 @@ static void test_GetDiskFreeSpaceW(void) "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", drive[0], ret, GetLastError()); else - ok(ret || GetLastError() == ERROR_NOT_READY, + ok( ret || + GetLastError() == ERROR_NOT_READY || + GetLastError() == ERROR_PATH_NOT_FOUND || + GetLastError() == ERROR_UNRECOGNIZED_VOLUME, "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", drive[0], ret, GetLastError()); }

1 0