November 2008 - Wine-commits

Juan Lang : crypt32: Check registered CryptFormatObject functions before using default hex format .
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 57fde4e8a2c32992bb66a6cfcc28cc9db9c1972a URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fde4e8a2c32992bb66a6cfc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 20 09:32:57 2008 -0800 crypt32: Check registered CryptFormatObject functions before using default hex format. --- dlls/crypt32/object.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index bd3ad11..e09ca03 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -2337,8 +2337,6 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, format = CRYPT_FormatNetscapeCertType; else if (!strcmp(lpszStructType, SPC_FINANCIAL_CRITERIA_OBJID)) format = CRYPT_FormatSpcFinancialCriteria; - if (!format && !(formatStrType & CRYPT_FORMAT_STR_NO_HEX)) - format = CRYPT_FormatHexString; return format; } @@ -2364,6 +2362,9 @@ BOOL WINAPI CryptFormatObject(DWORD dwCertEncodingType, DWORD dwFormatType, CryptGetOIDFunctionAddress(set, dwCertEncodingType, lpszStructType, 0, (void **)&format, &hFunc); } + if (!format && (dwCertEncodingType & CERT_ENCODING_TYPE_MASK) == + X509_ASN_ENCODING && !(dwFormatStrType & CRYPT_FORMAT_STR_NO_HEX)) + format = CRYPT_FormatHexString; if (format) ret = format(dwCertEncodingType, dwFormatType, dwFormatStrType, pFormatStruct, lpszStructType, pbEncoded, cbEncoded, pbFormat,

1 0

Juan Lang : crypt32: Formatted bits are always in a single line, regardless of dwFormatStrType.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 9d4ab487504ee92bfed0bb05da63fda31f1dc812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4ab487504ee92bfed0bb05d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 20 09:19:15 2008 -0800 crypt32: Formatted bits are always in a single line, regardless of dwFormatStrType. --- dlls/crypt32/object.c | 45 ++++++++++++++------------------------------- 1 files changed, 14 insertions(+), 31 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index e09ca03..5784cc9 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -604,7 +604,6 @@ static BOOL WINAPI CRYPT_FormatHexString(DWORD dwCertEncodingType, #define MAX_STRING_RESOURCE_LEN 128 -static const WCHAR crlf[] = { '\r','\n',0 }; static const WCHAR commaSpace[] = { ',',' ',0 }; struct BitToString @@ -614,30 +613,18 @@ struct BitToString WCHAR str[MAX_STRING_RESOURCE_LEN]; }; -static BOOL CRYPT_FormatBits(DWORD dwFormatStrType, BYTE bits, - const struct BitToString *map, DWORD mapEntries, void *pbFormat, - DWORD *pcbFormat, BOOL *first) +static BOOL CRYPT_FormatBits(BYTE bits, const struct BitToString *map, + DWORD mapEntries, void *pbFormat, DWORD *pcbFormat, BOOL *first) { - LPCWSTR sep; - DWORD sepLen, bytesNeeded = sizeof(WCHAR); + DWORD bytesNeeded = sizeof(WCHAR); int i; BOOL ret = TRUE, localFirst = *first; - if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) - { - sep = crlf; - sepLen = strlenW(crlf) * sizeof(WCHAR); - } - else - { - sep = commaSpace; - sepLen = strlenW(commaSpace) * sizeof(WCHAR); - } for (i = 0; i < mapEntries; i++) if (bits & map[i].bit) { if (!localFirst) - bytesNeeded += sepLen; + bytesNeeded += strlenW(commaSpace) * sizeof(WCHAR); localFirst = FALSE; bytesNeeded += strlenW(map[i].str) * sizeof(WCHAR); } @@ -664,8 +651,8 @@ static BOOL CRYPT_FormatBits(DWORD dwFormatStrType, BYTE bits, { if (!localFirst) { - strcpyW(str, sep); - str += sepLen / sizeof(WCHAR); + strcpyW(str, commaSpace); + str += strlenW(commaSpace); } localFirst = FALSE; strcpyW(str, map[i].str); @@ -753,15 +740,13 @@ static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, keyUsageByte1Map[i].str, MAX_STRING_RESOURCE_LEN); stringsLoaded = TRUE; } - CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], - keyUsageByte0Map, + CRYPT_FormatBits(bits->pbData[0], keyUsageByte0Map, sizeof(keyUsageByte0Map) / sizeof(keyUsageByte0Map[0]), NULL, &bitStringLen, &first); bytesNeeded += bitStringLen; if (bits->cbData == 2) { - CRYPT_FormatBits(dwFormatStrType, bits->pbData[1], - keyUsageByte1Map, + CRYPT_FormatBits(bits->pbData[1], keyUsageByte1Map, sizeof(keyUsageByte1Map) / sizeof(keyUsageByte1Map[0]), NULL, &bitStringLen, &first); bytesNeeded += bitStringLen; @@ -784,16 +769,14 @@ static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, bitStringLen = bytesNeeded; first = TRUE; - CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], - keyUsageByte0Map, + CRYPT_FormatBits(bits->pbData[0], keyUsageByte0Map, sizeof(keyUsageByte0Map) / sizeof(keyUsageByte0Map[0]), str, &bitStringLen, &first); str += bitStringLen / sizeof(WCHAR) - 1; if (bits->cbData == 2) { bitStringLen = bytesNeeded; - CRYPT_FormatBits(dwFormatStrType, bits->pbData[1], - keyUsageByte1Map, + CRYPT_FormatBits(bits->pbData[1], keyUsageByte1Map, sizeof(keyUsageByte1Map) / sizeof(keyUsageByte1Map[0]), str, &bitStringLen, &first); str += bitStringLen / sizeof(WCHAR) - 1; @@ -812,6 +795,8 @@ static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, return ret; } +static const WCHAR crlf[] = { '\r','\n',0 }; + static WCHAR subjectTypeHeader[MAX_STRING_RESOURCE_LEN]; static WCHAR subjectTypeCA[MAX_STRING_RESOURCE_LEN]; static WCHAR subjectTypeEndCert[MAX_STRING_RESOURCE_LEN]; @@ -2123,8 +2108,7 @@ static BOOL WINAPI CRYPT_FormatNetscapeCertType(DWORD dwCertEncodingType, netscapeCertTypeMap[i].str, MAX_STRING_RESOURCE_LEN); stringsLoaded = TRUE; } - CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], - netscapeCertTypeMap, + CRYPT_FormatBits(bits->pbData[0], netscapeCertTypeMap, sizeof(netscapeCertTypeMap) / sizeof(netscapeCertTypeMap[0]), NULL, &bitStringLen, &first); bytesNeeded += bitStringLen; @@ -2146,8 +2130,7 @@ static BOOL WINAPI CRYPT_FormatNetscapeCertType(DWORD dwCertEncodingType, bitStringLen = bytesNeeded; first = TRUE; - CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], - netscapeCertTypeMap, + CRYPT_FormatBits(bits->pbData[0], netscapeCertTypeMap, sizeof(netscapeCertTypeMap) / sizeof(netscapeCertTypeMap[0]), str, &bitStringLen, &first); str += bitStringLen / sizeof(WCHAR) - 1;

1 0

Francois Gouget : regedit: Fix a buffer allocation in export_registry_key() .
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: d92c976803647e4ae75ac9ca4fb7d0e5ad9bacfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92c976803647e4ae75ac9ca4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 20 20:41:04 2008 +0100 regedit: Fix a buffer allocation in export_registry_key(). This fixes a major buffer overflow bug in 'regedit /E'. --- programs/regedit/regproc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index c070ab0..6d04a44 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1239,7 +1239,7 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) val_name_buf = HeapAlloc(GetProcessHeap(), 0, val_name_size * sizeof(*val_name_buf)); val_buf = HeapAlloc(GetProcessHeap(), 0, val_size); - line_buf = HeapAlloc(GetProcessHeap(), 0, line_buf_size); + line_buf = HeapAlloc(GetProcessHeap(), 0, line_buf_size * sizeof(*line_buf)); CHECK_ENOUGH_MEMORY(reg_key_name_buf && val_name_buf && val_buf && line_buf); if (reg_key_name && reg_key_name[0]) {

1 0

Alexandre Julliard : rpcrt4/tests: Fix test failures on Win9x.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: f1d0f81d268c6945663bf0f6e13594983b2df14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d0f81d268c6945663bf0f6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 22:44:46 2008 +0100 rpcrt4/tests: Fix test failures on Win9x. --- dlls/rpcrt4/tests/rpc.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 61155bd..796e408 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -262,7 +262,8 @@ todo_wine { status = RpcBindingSetAuthInfo(IFoo_IfHandle, NULL, RPC_C_AUTHN_LEVEL_NONE, RPC_C_AUTHN_WINNT, NULL, RPC_C_AUTHZ_NAME); - ok(status == RPC_S_OK, "RpcBindingSetAuthInfo failed (%lu)\n", status); + ok(status == RPC_S_OK || broken(status == RPC_S_UNKNOWN_AUTHN_SERVICE), /* win9x */ + "RpcBindingSetAuthInfo failed (%lu)\n", status); status = RpcMgmtStopServerListening(NULL); ok(status == RPC_S_OK, "RpcMgmtStopServerListening failed (%lu)\n", @@ -689,7 +690,8 @@ static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address, unsigned char *binding; status = RpcServerUseProtseqEp(protseq, 20, endpoint, NULL); - ok(status == RPC_S_OK, "%s: RpcServerUseProtseqEp failed (%lu)\n", protseq, status); + ok(status == RPC_S_OK || broken(status == RPC_S_PROTSEQ_NOT_SUPPORTED), /* win9x */ + "%s: RpcServerUseProtseqEp failed (%lu)\n", protseq, status); status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); ok(status == RPC_S_OK, "%s: RpcServerRegisterIf failed (%lu)\n", protseq, status); @@ -715,7 +717,8 @@ static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address, RpcStringFree(&binding); status = RpcEpResolveBinding(handle, IFoo_v0_0_s_ifspec); - ok(status == RPC_S_OK, "%s: RpcEpResolveBinding failed with error %lu\n", protseq, status); + ok(status == RPC_S_OK || broken(status == RPC_S_SERVER_UNAVAILABLE), /* win9x */ + "%s: RpcEpResolveBinding failed with error %lu\n", protseq, status); status = RpcBindingReset(handle); ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %lu\n", protseq, status);

1 0

Alexandre Julliard : shell32/tests: Fix the systray tests on Win9x and NT4.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: c369759cc5aac2a686cf812603a5b2d316044690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c369759cc5aac2a686cf81260… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 22:56:52 2008 +0100 shell32/tests: Fix the systray tests on Win9x and NT4. --- dlls/shell32/tests/systray.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index 5675806..23a6614 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -31,6 +31,7 @@ static BOOL (WINAPI *pShell_NotifyIconW)(DWORD,PNOTIFYICONDATAW); void test_cbsize(void) { NOTIFYICONDATAA nidA; + BOOL ret; if (pShell_NotifyIconW) { @@ -43,16 +44,20 @@ void test_cbsize(void) nidW.uFlags = NIF_ICON|NIF_MESSAGE; nidW.hIcon = LoadIcon(NULL, IDI_APPLICATION); nidW.uCallbackMessage = WM_USER+17; - ok(pShell_NotifyIconW(NIM_ADD, &nidW), "NIM_ADD failed!\n"); - - /* using an invalid cbSize does work */ - nidW.cbSize = 3; - nidW.hWnd = hMainWnd; - nidW.uID = 1; - ok(pShell_NotifyIconW(NIM_DELETE, &nidW), "NIM_DELETE failed!\n"); - /* as icon doesn't exist anymore - now there will be an error */ - nidW.cbSize = sizeof(nidW); - ok(!pShell_NotifyIconW(NIM_DELETE, &nidW), "The icon was not deleted\n"); + ret = pShell_NotifyIconW(NIM_ADD, &nidW); + if (ret) + { + /* using an invalid cbSize does work */ + nidW.cbSize = 3; + nidW.hWnd = hMainWnd; + nidW.uID = 1; + ret = pShell_NotifyIconW(NIM_DELETE, &nidW); + ok( ret || broken(!ret), /* nt4 */ "NIM_DELETE failed!\n"); + /* as icon doesn't exist anymore - now there will be an error */ + nidW.cbSize = sizeof(nidW); + ok(!pShell_NotifyIconW(NIM_DELETE, &nidW) != !ret, "The icon was not deleted\n"); + } + else win_skip( "Shell_NotifyIconW not working\n" ); /* win9x */ } /* same for Shell_NotifyIconA */ @@ -69,10 +74,11 @@ void test_cbsize(void) nidA.cbSize = 3; nidA.hWnd = hMainWnd; nidA.uID = 1; - ok(Shell_NotifyIconA(NIM_DELETE, &nidA), "NIM_DELETE failed!\n"); + ret = Shell_NotifyIconA(NIM_DELETE, &nidA); + ok( ret || broken(!ret), /* win9x */ "NIM_DELETE failed!\n"); /* as icon doesn't exist anymore - now there will be an error */ nidA.cbSize = sizeof(nidA); - ok(!Shell_NotifyIconA(NIM_DELETE, &nidA), "The icon was not deleted\n"); + ok(!Shell_NotifyIconA(NIM_DELETE, &nidA) != !ret, "The icon was not deleted\n"); } START_TEST(systray)

1 0

Alexandre Julliard : kernel32/tests: Fix the mailslot tests on Win9x.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 752416f7c4bcff0af0238da5f98d3a6b7f9a8da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=752416f7c4bcff0af0238da5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 21:59:26 2008 +0100 kernel32/tests: Fix the mailslot tests on Win9x. --- dlls/kernel32/tests/mailslot.c | 77 ++++++++++++++++++++++++--------------- 1 files changed, 47 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 04c89e1..2cea68a 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -34,6 +34,7 @@ static int mailslot_test(void) HANDLE hSlot, hSlot2, hWriter, hWriter2; unsigned char buffer[16]; DWORD count, dwMax, dwNext, dwMsgCount, dwTimeout; + BOOL ret; /* sanity check on GetMailslotInfo */ dwMax = dwNext = dwMsgCount = dwTimeout = 0; @@ -54,10 +55,13 @@ static int mailslot_test(void) /* open a mailslot with a null name */ hSlot = CreateMailslot( NULL, 0, 0, NULL ); - ok( hSlot == INVALID_HANDLE_VALUE, - "Created mailslot with invalid name\n"); - ok( GetLastError() == ERROR_PATH_NOT_FOUND, + ok( hSlot == INVALID_HANDLE_VALUE || broken(hSlot != INVALID_HANDLE_VALUE), /* win9x */ + "Created mailslot with invalid name\n"); + if (hSlot == INVALID_HANDLE_VALUE) + ok( GetLastError() == ERROR_PATH_NOT_FOUND, "error should be ERROR_PATH_NOT_FOUND\n"); + else /* succeeds on win9x */ + CloseHandle( hSlot ); /* valid open, but with wacky parameters ... then check them */ hSlot = CreateMailslot( szmspath, -1, -1, NULL ); @@ -80,32 +84,36 @@ static int mailslot_test(void) /* try and read/write to it */ count = 0; memset(buffer, 0, sizeof buffer); - ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), - "slot read\n"); - ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + ret = ReadFile( hSlot, buffer, sizeof buffer, &count, NULL); + ok( !ret || broken(ret), /* win9x */ "slot read\n"); + if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + else ok( count == 0, "wrong count %u\n", count ); ok( !WriteFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot write\n"); ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); - /* now try and openthe client, but with the wrong sharing mode */ - hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, + /* now try and open the client, but with the wrong sharing mode */ + hWriter = CreateFile(szmspath, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter != INVALID_HANDLE_VALUE /* vista */ || GetLastError() == ERROR_SHARING_VIOLATION, - "error should be ERROR_SHARING_VIOLATION\n"); + "error should be ERROR_SHARING_VIOLATION got %p / %u\n", hWriter, GetLastError()); if (hWriter != INVALID_HANDLE_VALUE) CloseHandle( hWriter ); /* now open the client with the correct sharing mode */ hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok( hWriter != INVALID_HANDLE_VALUE, "existing mailslot\n"); + if (hWriter == INVALID_HANDLE_VALUE) /* win9x doesn't like GENERIC_READ */ + hWriter = CreateFile(szmspath, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + ok( hWriter != INVALID_HANDLE_VALUE, "existing mailslot err %u\n", GetLastError()); /* * opening a client should make no difference to * whether we can read or write the mailslot */ - ok( !ReadFile( hSlot, buffer, sizeof buffer/2, &count, NULL), - "slot read\n"); - ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + ret = ReadFile( hSlot, buffer, sizeof buffer/2, &count, NULL); + ok( !ret || broken(ret), /* win9x */ "slot read\n"); + if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + else ok( count == 0, "wrong count %u\n", count ); ok( !WriteFile( hSlot, buffer, sizeof buffer/2, &count, NULL), "slot write\n"); ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); @@ -116,12 +124,14 @@ static int mailslot_test(void) */ ok( !ReadFile( hWriter, buffer, sizeof buffer/2, &count, NULL), "can read client\n"); - todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ACCESS_DENIED, + "wrong error %u\n", GetLastError() ); ok( WriteFile( hWriter, buffer, sizeof buffer/2, &count, NULL), "can't write client\n"); ok( !ReadFile( hWriter, buffer, sizeof buffer/2, &count, NULL), "can read client\n"); - todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ACCESS_DENIED, + "wrong error %u\n", GetLastError() ); /* * seeing as there's something in the slot, @@ -132,9 +142,10 @@ static int mailslot_test(void) ok( count == (sizeof buffer/2), "short read\n" ); /* but not again */ - ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), - "slot read\n"); - ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + ret = ReadFile( hSlot, buffer, sizeof buffer, &count, NULL); + ok( !ret || broken(ret), /* win9x */ "slot read\n"); + if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + else ok( count == 0, "wrong count %u\n", count ); /* now try open another writer... should fail */ hWriter2 = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, @@ -193,8 +204,10 @@ static int mailslot_test(void) ok( dwTimeout == 0, "dwTimeout incorrect\n"); /* check there's still no data */ - ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); - ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + ret = ReadFile( hSlot, buffer, sizeof buffer, &count, NULL); + ok( !ret || broken(ret), /* win9x */ "slot read\n"); + if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + else ok( count == 0, "wrong count %u\n", count ); /* write two messages */ buffer[0] = 'a'; @@ -228,9 +241,9 @@ static int mailslot_test(void) ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ), "getmailslotinfo failed\n"); ok( dwNext == 1, "dwNext incorrect\n"); - todo_wine { - ok( dwMsgCount == 3, "dwMsgCount incorrect\n"); - } + todo_wine + ok( dwMsgCount == 3 || broken(dwMsgCount == 2), /* win9x */ + "dwMsgCount incorrect %u\n", dwMsgCount); buffer[0]=buffer[1]=0; @@ -249,7 +262,8 @@ static int mailslot_test(void) "getmailslotinfo failed\n"); ok( dwNext == 2, "dwNext incorrect\n"); todo_wine { - ok( dwMsgCount == 2, "dwMsgCount incorrect\n"); + ok( dwMsgCount == 2 || broken(dwMsgCount == 1), /* win9x */ + "dwMsgCount incorrect %u\n", dwMsgCount); } /* read the second message */ @@ -262,9 +276,10 @@ static int mailslot_test(void) dwNext = dwMsgCount = 0; ok( GetMailslotInfo( hSlot, NULL, &dwNext, &dwMsgCount, NULL ), "getmailslotinfo failed\n"); - ok( dwNext == 0, "dwNext incorrect\n"); + ok( dwNext == 0 || broken(dwNext == ~0u), /* win9x */ "dwNext incorrect %u\n", dwNext); todo_wine { - ok( dwMsgCount == 1, "dwMsgCount incorrect\n"); + ok( dwMsgCount == 1 || broken(dwMsgCount == 0), /* win9x */ + "dwMsgCount incorrect %u\n", dwMsgCount); } /* read the 3rd (zero length) message */ @@ -285,9 +300,10 @@ static int mailslot_test(void) ok( dwMsgCount == 0, "dwMsgCount incorrect\n"); /* check that reads fail */ - ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), - "3rd slot read succeeded\n"); - ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + ret = ReadFile( hSlot, buffer, sizeof buffer, &count, NULL); + ok( !ret || broken(ret), /* win9x */ "3rd slot read succeeded\n"); + if (!ret) ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + else ok( count == 0, "wrong count %u\n", count ); /* finally close the mailslot and its client */ ok( CloseHandle( hWriter2 ), "closing 2nd client\n"); @@ -301,7 +317,8 @@ static int mailslot_test(void) memset(buffer, 0, sizeof buffer); dwTimeout = GetTickCount(); ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); - ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_SEM_TIMEOUT || broken(GetLastError() == ERROR_ACCESS_DENIED), /* win9x */ + "wrong error %u\n", GetLastError() ); dwTimeout = GetTickCount() - dwTimeout; ok( dwTimeout >= 990, "timeout too short %u\n", dwTimeout ); ok( CloseHandle( hSlot ), "closing the mailslot\n");

1 0

Alexandre Julliard : mshtml/tests: Avoid crashing on test failure.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 58def9653ed0019322a1bfd379b8499cdf387297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58def9653ed0019322a1bfd37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 22:35:33 2008 +0100 mshtml/tests: Avoid crashing on test failure. --- dlls/mshtml/tests/dom.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e9d138f..6608a4a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1184,6 +1184,7 @@ static void _test_elem3_get_disabled(unsigned line, IUnknown *unk, VARIANT_BOOL VARIANT_BOOL disabled = 100; HRESULT hres; + if (!elem3) return; hres = IHTMLElement3_get_disabled(elem3, &disabled); ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); @@ -1196,6 +1197,7 @@ static void _test_elem3_set_disabled(unsigned line, IUnknown *unk, VARIANT_BOOL IHTMLElement3 *elem3 = _get_elem3_iface(line, unk); HRESULT hres; + if (!elem3) return; hres = IHTMLElement3_put_disabled(elem3, b); ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); @@ -2881,6 +2883,7 @@ static void test_iframe_elem(IHTMLElement *elem) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase2, (void**)&base2); ok(hres == S_OK, "Could not get IHTMFrameBase2 iface: %08x\n", hres); + if (!base2) return; content_window = NULL; hres = IHTMLFrameBase2_get_contentWindow(base2, &content_window); @@ -3112,12 +3115,15 @@ static void test_elems(IHTMLDocument2 *doc) node = test_node_get_parent((IUnknown*)node2); IHTMLDOMNode_Release(node2); ok(node != NULL, "node == NULL\n"); - test_node_name((IUnknown*)node, "#document"); - type = get_node_type((IUnknown*)node); - ok(type == 9, "type=%ld, expected 9\n", type); - node2 = test_node_get_parent((IUnknown*)node); - IHTMLDOMNode_Release(node); - ok(node2 == NULL, "node != NULL\n"); + if (node) + { + test_node_name((IUnknown*)node, "#document"); + type = get_node_type((IUnknown*)node); + ok(type == 9, "type=%ld, expected 9\n", type); + node2 = test_node_get_parent((IUnknown*)node); + IHTMLDOMNode_Release(node); + ok(node2 == NULL, "node != NULL\n"); + } elem2 = test_elem_get_parent((IUnknown*)elem); ok(elem2 != NULL, "elem2 == NULL\n");

1 0

Alexandre Julliard : user32/tests: Fix the monitor tests on NT4.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: dcd8cf72145f5e5a2554efb25d5b6c8adf86789a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcd8cf72145f5e5a2554efb25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 20:06:46 2008 +0100 user32/tests: Fix the monitor tests on NT4. --- dlls/user32/tests/monitor.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 441b94f..3d03596 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -88,7 +88,6 @@ static void test_enumdisplaydevices(void) BOOL ret; HDC dc; ret = pEnumDisplayDevicesA(NULL, num, &dd, 0); - ok(ret || num != 0, "EnumDisplayDevices fails with num == 0\n"); if(!ret) break; if(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) { @@ -104,11 +103,10 @@ static void test_enumdisplaydevices(void) } num++; } - ok(primary_num != -1, "Didn't get the primary device\n"); - if (!pEnumDisplayMonitors || !pGetMonitorInfoA) + if (primary_num == -1 || !pEnumDisplayMonitors || !pGetMonitorInfoA) { - skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); + win_skip("EnumDisplayMonitors or GetMonitorInfoA are not available\n"); return; } @@ -172,7 +170,8 @@ static void test_ChangeDisplaySettingsEx(void) res = ChangeDisplaySettingsA(&dm, CDS_TEST); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); - ok(dm.dmDriverExtra == 0, "ChangeDisplaySettingsA didn't reset dmDriverExtra to 0\n"); + ok(dm.dmDriverExtra == 0 || broken(dm.dmDriverExtra == 1) /* win9x */, + "ChangeDisplaySettingsA didn't reset dmDriverExtra to 0\n"); /* crashes under XP SP3 for large dmDriverExtra values */ dm.dmDriverExtra = 1; @@ -225,8 +224,9 @@ static void test_ChangeDisplaySettingsEx(void) res = pChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) ok(res == DISP_CHANGE_FAILED || + res == DISP_CHANGE_BADPARAM || /* NT4 */ res == DISP_CHANGE_BADMODE /* XP SP3 */, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_FAILED or DISP_CHANGE_BADMODE\n", res); + "ChangeDisplaySettingsExW returned %d\n", res); memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -249,6 +249,8 @@ static void test_ChangeDisplaySettingsEx(void) RECT r, r1, virt; SetRect(&virt, 0, 0, GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN)); + if (IsRectEmpty(&virt)) /* NT4 doesn't have SM_CX/YVIRTUALSCREEN */ + SetRect(&virt, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); OffsetRect(&virt, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN)); /* Resolution change resets clip rect */

1 0

Alexandre Julliard : user32/tests: Fix some of the sysparams tests on Win9x and NT4.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 3359f4d4e5a8200165d7c03fd9627c16435d2673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3359f4d4e5a8200165d7c03fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 20:46:54 2008 +0100 user32/tests: Fix some of the sysparams tests on Win9x and NT4. --- dlls/user32/tests/sysparams.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 60a07af..0bd7d24 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -224,7 +224,7 @@ static BOOL test_error_msg ( int rc, const char *name ) if (rc==0) { - if (last_error==0xdeadbeef || last_error==ERROR_INVALID_SPI_VALUE) + if (last_error==0xdeadbeef || last_error==ERROR_INVALID_SPI_VALUE || last_error==ERROR_INVALID_PARAMETER) { trace("%s not supported on this platform. Skipping test\n", name); } @@ -1778,7 +1778,7 @@ static void test_SPI_SETSHOWSOUNDS( void ) /* 57 */ rc=SystemParametersInfoA( SPI_SETSHOWSOUNDS, vals[i], 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); - test_change_message( SPI_SETSHOWSOUNDS, 0 ); + test_change_message( SPI_SETSHOWSOUNDS, 1 ); test_reg_key( SPI_SETSHOWSOUNDS_REGKEY, SPI_SETSHOWSOUNDS_VALNAME, vals[i] ? "1" : "0" ); @@ -1814,7 +1814,7 @@ static void test_SPI_SETKEYBOARDPREF( void ) /* 69 */ rc=SystemParametersInfoA( SPI_SETKEYBOARDPREF, vals[i], 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); - test_change_message( SPI_SETKEYBOARDPREF, 0 ); + test_change_message( SPI_SETKEYBOARDPREF, 1 ); test_reg_key_ex2( SPI_SETKEYBOARDPREF_REGKEY, SPI_SETKEYBOARDPREF_REGKEY_LEGACY, SPI_SETKEYBOARDPREF_VALNAME, SPI_SETKEYBOARDPREF_VALNAME_LEGACY, vals[i] ? "1" : "0" ); @@ -1848,7 +1848,7 @@ static void test_SPI_SETSCREENREADER( void ) /* 71 */ rc=SystemParametersInfoA( SPI_SETSCREENREADER, vals[i], 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); - test_change_message( SPI_SETSCREENREADER, 0 ); + test_change_message( SPI_SETSCREENREADER, 1 ); test_reg_key_ex2( SPI_SETSCREENREADER_REGKEY, SPI_SETSCREENREADER_REGKEY_LEGACY, SPI_SETSCREENREADER_VALNAME, SPI_SETSCREENREADER_VALNAME_LEGACY, vals[i] ? "1" : "0" ); @@ -1917,7 +1917,7 @@ static void test_SPI_SETLOWPOWERACTIVE( void ) /* 85 */ rc=SystemParametersInfoA( SPI_SETLOWPOWERACTIVE, vals[i], 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); - test_change_message( SPI_SETLOWPOWERACTIVE, 0 ); + test_change_message( SPI_SETLOWPOWERACTIVE, 1 ); test_reg_key( SPI_SETLOWPOWERACTIVE_REGKEY, SPI_SETLOWPOWERACTIVE_VALNAME, vals[i] ? "1" : "0" ); @@ -1954,7 +1954,7 @@ static void test_SPI_SETPOWEROFFACTIVE( void ) /* 86 */ rc=SystemParametersInfoA( SPI_SETPOWEROFFACTIVE, vals[i], 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); - test_change_message( SPI_SETPOWEROFFACTIVE, 0 ); + test_change_message( SPI_SETPOWEROFFACTIVE, 1 ); test_reg_key( SPI_SETPOWEROFFACTIVE_REGKEY, SPI_SETPOWEROFFACTIVE_VALNAME, vals[i] ? "1" : "0" ); @@ -2206,7 +2206,7 @@ static void test_SPI_SETWHEELSCROLLCHARS( void ) /* 108 */ { BOOL rc; UINT old_chars; - const UINT vals[]={0,32767}; + const UINT vals[]={32767,0}; unsigned int i; trace("testing SPI_{GET,SET}WHEELSCROLLCHARS\n"); @@ -2224,7 +2224,7 @@ static void test_SPI_SETWHEELSCROLLCHARS( void ) /* 108 */ rc=SystemParametersInfoA( SPI_SETWHEELSCROLLCHARS, vals[i], 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); - ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); + if (!test_error_msg(rc,"SPI_SETWHEELSCROLLCHARS")) return; test_change_message( SPI_SETWHEELSCROLLCHARS, 0 ); sprintf( buf, "%d", vals[i] ); test_reg_key( SPI_SETMOUSESCROLLCHARS_REGKEY, @@ -2474,6 +2474,8 @@ static void test_GetSystemMetrics( void) INT CaptionWidth; MINIMIZEDMETRICS minim; NONCLIENTMETRICS ncm; + SIZE screen; + minim.cbSize = sizeof( minim); ncm.cbSize = sizeof( ncm); SystemParametersInfo( SPI_GETMINIMIZEDMETRICS, 0, &minim, 0); @@ -2549,8 +2551,9 @@ static void test_GetSystemMetrics( void) /* SM_SECURE */ ok_gsm( SM_CXEDGE, 2); ok_gsm( SM_CYEDGE, 2); - ok_gsm( SM_CXMINSPACING, GetSystemMetrics( SM_CXMINIMIZED) + minim.iHorzGap ); - ok_gsm( SM_CYMINSPACING, GetSystemMetrics( SM_CYMINIMIZED) + minim.iVertGap ); + /* sign-extension for iHorzGap/iVertGap is broken on Win9x */ + ok_gsm( SM_CXMINSPACING, GetSystemMetrics( SM_CXMINIMIZED) + (short)minim.iHorzGap ); + ok_gsm( SM_CYMINSPACING, GetSystemMetrics( SM_CYMINIMIZED) + (short)minim.iVertGap ); /* SM_CXSMICON */ /* SM_CYSMICON */ ok_gsm( SM_CYSMCAPTION, ncm.iSmCaptionHeight + 1); @@ -2566,10 +2569,15 @@ static void test_GetSystemMetrics( void) /* SM_ARRANGE */ ok_gsm( SM_CXMINIMIZED, minim.iWidth + 6); ok_gsm( SM_CYMINIMIZED, GetSystemMetrics( SM_CYCAPTION) + 5); - ok_gsm( SM_CXMAXTRACK, GetSystemMetrics( SM_CXVIRTUALSCREEN) + - 4 + 2 * GetSystemMetrics( SM_CXFRAME)); - ok_gsm( SM_CYMAXTRACK, GetSystemMetrics( SM_CYVIRTUALSCREEN) + - 4 + 2 * GetSystemMetrics( SM_CYFRAME)); + screen.cx = GetSystemMetrics( SM_CXVIRTUALSCREEN ); + screen.cy = GetSystemMetrics( SM_CYVIRTUALSCREEN ); + if (!screen.cx || !screen.cy) /* not supported on NT4 */ + { + screen.cx = GetSystemMetrics( SM_CXSCREEN ); + screen.cy = GetSystemMetrics( SM_CYSCREEN ); + } + ok_gsm( SM_CXMAXTRACK, screen.cx + 4 + 2 * GetSystemMetrics(SM_CXFRAME)); + ok_gsm( SM_CYMAXTRACK, screen.cy + 4 + 2 * GetSystemMetrics(SM_CYFRAME)); /* the next two cannot really be tested as they depend on (application) * toolbars */ /* SM_CXMAXIMIZED */

1 0

Alexandre Julliard : user32/tests: Allow the foreground window to be null in the window tests.
by Alexandre Julliard 21 Nov '08

21 Nov '08

Module: wine Branch: master Commit: 424b5e61f0937b9f7457f2556b513ee4ae781ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=424b5e61f0937b9f7457f2556… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 20:51:06 2008 +0100 user32/tests: Allow the foreground window to be null in the window tests. --- dlls/user32/tests/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d1bf206..9a15236 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -739,7 +739,7 @@ static void verify_window_info(HWND hwnd, const WINDOWINFO *info) */ ok((info->dwExStyle & ~0xe0000800) == (DWORD)GetWindowLongA(hwnd, GWL_EXSTYLE), "wrong dwExStyle: %08x != %08x\n", info->dwExStyle, GetWindowLongA(hwnd, GWL_EXSTYLE)); - status = (GetActiveWindow() == hwnd) ? WS_ACTIVECAPTION : 0; + status = (GetForegroundWindow() == hwnd) ? WS_ACTIVECAPTION : 0; ok(info->dwWindowStatus == status, "wrong dwWindowStatus: %04x != %04x active %p fg %p\n", info->dwWindowStatus, status, GetActiveWindow(), GetForegroundWindow()); @@ -2269,7 +2269,7 @@ static void check_wnd_state_(const char *file, int line, HWND active, HWND foreground, HWND focus, HWND capture) { ok_(file, line)(active == GetActiveWindow(), "GetActiveWindow() = %p\n", GetActiveWindow()); - if (foreground) + if (foreground && GetForegroundWindow()) ok_(file, line)(foreground == GetForegroundWindow(), "GetForegroundWindow() = %p\n", GetForegroundWindow()); ok_(file, line)(focus == GetFocus(), "GetFocus() = %p\n", GetFocus()); ok_(file, line)(capture == GetCapture(), "GetCapture() = %p\n", GetCapture());

1 0