December 2009 - Wine-Commits

Dan Kegel : user32/tests: Allocate big enough buffer for UnpackDDElParam test.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 3e28e4ab0f7bf17cb478236ddb2851426b5e37bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e28e4ab0f7bf17cb478236dd… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Dec 2 11:02:09 2009 -0800 user32/tests: Allocate big enough buffer for UnpackDDElParam test. --- dlls/user32/tests/dde.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index afeef4d..3a0d656 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2013,7 +2013,7 @@ static void test_UnpackDDElParam(void) broken(hi == 0xbeef), /* win2k */ "Expected 0, got %08lx\n", hi); - hglobal = GlobalAlloc(GMEM_DDESHARE, 2); + hglobal = GlobalAlloc(GMEM_DDESHARE, 2 * sizeof(*ptr)); ptr = GlobalLock(hglobal); ptr[0] = 0xcafebabe; ptr[1] = 0xdeadbeef;

1 0

Peter Rosin : msvcrt: Handle the SIGBREAK signal.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: f79cd33fc46a8c18b88a20040515a5e244a97901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f79cd33fc46a8c18b88a20040… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Wed Dec 2 20:21:21 2009 +0100 msvcrt: Handle the SIGBREAK signal. --- dlls/msvcrt/except.c | 2 ++ dlls/msvcrt/tests/signal.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 119469b..9f7c22d 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -556,6 +556,7 @@ MSVCRT___sighandler_t CDECL MSVCRT_signal(int sig, MSVCRT___sighandler_t func) case MSVCRT_SIGSEGV: case MSVCRT_SIGINT: case MSVCRT_SIGTERM: + case MSVCRT_SIGBREAK: ret = sighandlers[sig]; sighandlers[sig] = func; break; @@ -582,6 +583,7 @@ int CDECL MSVCRT_raise(int sig) case MSVCRT_SIGSEGV: case MSVCRT_SIGINT: case MSVCRT_SIGTERM: + case MSVCRT_SIGBREAK: handler = sighandlers[sig]; if (handler == MSVCRT_SIG_DFL) MSVCRT__exit(3); if (handler != MSVCRT_SIG_IGN) diff --git a/dlls/msvcrt/tests/signal.c b/dlls/msvcrt/tests/signal.c index b871a85..b2c16d5 100644 --- a/dlls/msvcrt/tests/signal.c +++ b/dlls/msvcrt/tests/signal.c @@ -37,11 +37,11 @@ static void test_signal(void) int res; old = signal(SIGBREAK, sighandler); - todo_wine ok(old != SIG_ERR, "Failed to install signal handler for SIGBREAK\n"); + ok(old != SIG_ERR, "Failed to install signal handler for SIGBREAK\n"); test_value = 0; res = raise(SIGBREAK); - todo_wine ok(res == 0, "Failed to raise SIGBREAK\n"); - todo_wine ok(test_value == 1, "SIGBREAK handler not invoked\n"); + ok(res == 0, "Failed to raise SIGBREAK\n"); + ok(test_value == 1, "SIGBREAK handler not invoked\n"); } START_TEST(signal)

1 0

Peter Rosin : msvcrt: Add test to check if signal(SIGBREAK, ...) works ( todo_wine).
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 83ec2f4f049aa511c5f60dbc3abd6a4b81138f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ec2f4f049aa511c5f60dbc3… Author: Peter Rosin <peda(a)lysator.liu.se> Date: Wed Dec 2 20:21:14 2009 +0100 msvcrt: Add test to check if signal(SIGBREAK, ...) works (todo_wine). --- dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/signal.c | 50 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 74199e1..d0486d1 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -18,6 +18,7 @@ CTESTS = \ heap.c \ printf.c \ scanf.c \ + signal.c \ string.c \ time.c diff --git a/dlls/msvcrt/tests/signal.c b/dlls/msvcrt/tests/signal.c new file mode 100644 index 0000000..b871a85 --- /dev/null +++ b/dlls/msvcrt/tests/signal.c @@ -0,0 +1,50 @@ +/* + * Unit test suite for signal function. + * + * Copyright 2009 Peter Rosin + * + * 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 "wine/test.h" +#include <winbase.h> +#include <signal.h> + +static int test_value = 0; + +typedef void (sighandler_type)(int); + +static void sighandler(int signum) +{ + ++test_value; +} + +static void test_signal(void) +{ + sighandler_type *old; + int res; + + old = signal(SIGBREAK, sighandler); + todo_wine ok(old != SIG_ERR, "Failed to install signal handler for SIGBREAK\n"); + test_value = 0; + res = raise(SIGBREAK); + todo_wine ok(res == 0, "Failed to raise SIGBREAK\n"); + todo_wine ok(test_value == 1, "SIGBREAK handler not invoked\n"); +} + +START_TEST(signal) +{ + test_signal(); +}

1 0

Juan Lang : crypt32: Only check revocation on a chain without other errors.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 596cd16fc491db7484ca3cd84f31dc2298826a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=596cd16fc491db7484ca3cd84… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 09:28:51 2009 -0800 crypt32: Only check revocation on a chain without other errors. --- dlls/crypt32/chain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index de482ae..5cc46b7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2638,7 +2638,8 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, if (!(dwFlags & CERT_CHAIN_RETURN_LOWER_QUALITY_CONTEXTS)) CRYPT_FreeLowerQualityChains(chain); pChain = (PCERT_CHAIN_CONTEXT)chain; - CRYPT_VerifyChainRevocation(pChain, pTime, pChainPara, dwFlags); + if (!pChain->TrustStatus.dwErrorStatus) + CRYPT_VerifyChainRevocation(pChain, pTime, pChainPara, dwFlags); CRYPT_CheckUsages(pChain, pChainPara); if (ppChainContext) *ppChainContext = pChain;

1 0

Juan Lang : crypt32: Fix test failures on Win2k.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 865669eeb3da0dadbd4417c07cf89acaefa9afae URL: http://source.winehq.org/git/wine.git/?a=commit;h=865669eeb3da0dadbd4417c07… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 10:06:00 2009 -0800 crypt32: Fix test failures on Win2k. --- dlls/crypt32/tests/cert.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 4a3b0ae..a107250 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3256,9 +3256,14 @@ static void testVerifyRevocation(void) SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &revPara, &status); - ok(!ret && GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, + /* Win2k thinks the cert is revoked, and it is, except the CRL is out of + * date, hence the revocation status should be unknown. + */ + ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || + broken(GetLastError() == CRYPT_E_REVOKED /* Win2k */)), "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); - ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK, + ok(status.dwError == CRYPT_E_NO_REVOCATION_CHECK || + broken(status.dwError == CRYPT_E_REVOKED /* Win2k */), "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); CertCloseStore(revPara.hCrlStore, 0);

1 0

Alexandre Julliard : ntdll: Don' t report a file id for directory entries that are on a different device.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 6677565f34d19a55c3f17f4eef764f0dbc5d9b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6677565f34d19a55c3f17f4ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 17:33:28 2009 +0100 ntdll: Don't report a file id for directory entries that are on a different device. --- dlls/ntdll/directory.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index de8d57c..b01519e 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -166,6 +166,7 @@ static const int is_case_sensitive = FALSE; UNICODE_STRING windows_dir = { 0, 0, NULL }; /* windows directory */ UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */ +static struct file_identity curdir; static struct file_identity windir; static RTL_CRITICAL_SECTION dir_section; @@ -1025,6 +1026,7 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK io->u.Status = STATUS_BUFFER_OVERFLOW; } info = (union file_directory_info *)((char *)info_ptr + io->Information); + if (st.st_dev != curdir.dev) st.st_ino = 0; /* ignore inode if on a different device */ /* all the structures start with a FileDirectoryInformation layout */ fill_stat_info( &st, info, class ); info->dir.NextEntryOffset = total_len; @@ -1713,6 +1715,10 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, cwd = open( ".", O_RDONLY ); if (fchdir( fd ) != -1) { + struct stat st; + fstat( fd, &st ); + curdir.dev = st.st_dev; + curdir.ino = st.st_ino; #ifdef VFAT_IOCTL_READDIR_BOTH if ((read_directory_vfat( fd, io, buffer, length, single_entry, mask, restart_scan, info_class )) != -1) goto done;

1 0

Alexandre Julliard : ntdll: Fix test failure on recent Windows versions.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 7dc1c2af52176342b82102342c4acc9cb107748e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dc1c2af52176342b82102342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 3 10:08:56 2009 +0100 ntdll: Fix test failure on recent Windows versions. --- dlls/ntdll/directory.c | 2 +- dlls/ntdll/tests/file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 8af2d00..de8d57c 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2349,7 +2349,7 @@ NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING * name = attr->ObjectName->Buffer; name_len = attr->ObjectName->Length / sizeof(WCHAR); - if (name_len && IS_SEPARATOR(name[0])) return STATUS_OBJECT_PATH_SYNTAX_BAD; + if (name_len && IS_SEPARATOR(name[0])) return STATUS_INVALID_PARAMETER; /* check for invalid characters */ for (p = name; p < name + name_len; p++) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ccec589..ca0ef28 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -195,7 +195,7 @@ static void open_file_test(void) nameW.Length += sizeof(WCHAR); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); - ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, + ok( status == STATUS_INVALID_PARAMETER || status == STATUS_OBJECT_PATH_SYNTAX_BAD, /* nt4 */ "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); if (!status) CloseHandle( handle );

1 0

Alexandre Julliard : ntdll: Remove an unnecessary NULL pointer check.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: d189ed6fddda6e444ba87342a30ceb34510f7625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d189ed6fddda6e444ba87342a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 17:38:05 2009 +0100 ntdll: Remove an unnecessary NULL pointer check. --- dlls/ntdll/file.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 213d083..56c26c2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -142,20 +142,16 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT if (io->u.Status == STATUS_SUCCESS) { - struct security_descriptor *sd = NULL; + struct security_descriptor *sd; struct object_attributes objattr; objattr.rootdir = wine_server_obj_handle( attr->RootDirectory ); - objattr.sd_len = 0; objattr.name_len = 0; - if (attr) + io->u.Status = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); + if (io->u.Status != STATUS_SUCCESS) { - io->u.Status = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); - if (io->u.Status != STATUS_SUCCESS) - { - RtlFreeAnsiString( &unix_name ); - return io->u.Status; - } + RtlFreeAnsiString( &unix_name ); + return io->u.Status; } SERVER_START_REQ( create_file )

1 0

Alexandre Julliard : rsaenh: Fix padding bytes check for 0-byte payload.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: b402b7878063a3dbd8eda37fae9c660ec78fbf40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b402b7878063a3dbd8eda37fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 14:59:56 2009 +0100 rsaenh: Fix padding bytes check for 0-byte payload. --- dlls/crypt32/tests/protectdata.c | 20 ++++++-------------- dlls/rsaenh/rsaenh.c | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index c3173c3..91bad8e 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -213,7 +213,7 @@ static void test_cryptunprotectdata(void) plain.cbData=0; } -static void test_simpleroundtrip(const char *plaintext, int wine_fails) +static void test_simpleroundtrip(const char *plaintext) { DATA_BLOB input; DATA_BLOB encrypted; @@ -234,17 +234,9 @@ static void test_simpleroundtrip(const char *plaintext, int wine_fails) } res = pCryptUnprotectData(&encrypted, NULL, NULL, NULL, NULL, 0, &output); - if (wine_fails) { - todo_wine - ok(res != 0, "can't unprotect; last error %u\n", GetLastError()); - } else { - ok(res != 0, "can't unprotect; last error %u\n", GetLastError()); - } - - if (res) { - ok(output.cbData == strlen(plaintext), "output wrong length %d for input '%s', wanted %d\n", output.cbData, plaintext, strlen(plaintext)); - ok(!memcmp(plaintext, (char *)output.pbData, output.cbData), "output wrong contents for input '%s'\n", plaintext); - } + ok(res != 0, "can't unprotect; last error %u\n", GetLastError()); + ok(output.cbData == strlen(plaintext), "output wrong length %d for input '%s', wanted %d\n", output.cbData, plaintext, strlen(plaintext)); + ok(!memcmp(plaintext, (char *)output.pbData, output.cbData), "output wrong contents for input '%s'\n", plaintext); } START_TEST(protectdata) @@ -262,8 +254,8 @@ START_TEST(protectdata) protected=FALSE; test_cryptprotectdata(); test_cryptunprotectdata(); - test_simpleroundtrip("", 1); - test_simpleroundtrip("hello", 0); + test_simpleroundtrip(""); + test_simpleroundtrip("hello"); /* deinit globals here */ if (cipher.pbData) LocalFree(cipher.pbData); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 4f13c17..8234688 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2324,7 +2324,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, if (Final) { if (pbData[*pdwDataLen-1] && pbData[*pdwDataLen-1] <= pCryptKey->dwBlockLen && - pbData[*pdwDataLen-1] < *pdwDataLen) { + pbData[*pdwDataLen-1] <= *pdwDataLen) { BOOL padOkay = TRUE; /* check that every bad byte has the same value */

1 0

Huw Davies : gdi32: Fix incorrect initialization of path array.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: b5ca0a9c2a55b0420cda6cea931d1490eda66bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ca0a9c2a55b0420cda6cea9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 2 12:04:08 2009 +0000 gdi32: Fix incorrect initialization of path array. Found by Valgrind. --- dlls/gdi32/path.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 88b7b0a..4b035d7 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1852,7 +1852,7 @@ static BOOL PATH_WidenPath(DC *dc) { INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; BOOL ret = FALSE; - GdiPath *pPath, *pNewPath, **pStrokes, *pUpPath, *pDownPath; + GdiPath *pPath, *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; EXTLOGPEN *elp; DWORD obj_type, joint, endcap, penType; @@ -1907,13 +1907,6 @@ static BOOL PATH_WidenPath(DC *dc) numStrokes = 0; - pStrokes = HeapAlloc(GetProcessHeap(), 0, numStrokes * sizeof(GdiPath*)); - pStrokes[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); - PATH_InitGdiPath(pStrokes[0]); - pStrokes[0]->pFlags = HeapAlloc(GetProcessHeap(), 0, pPath->numEntriesUsed * sizeof(INT)); - pStrokes[0]->pPoints = HeapAlloc(GetProcessHeap(), 0, pPath->numEntriesUsed * sizeof(POINT)); - pStrokes[0]->numEntriesUsed = 0; - for(i = 0, j = 0; i < pPath->numEntriesUsed; i++, j++) { POINT point; if((i == 0 || (pPath->pFlags[i-1] & PT_CLOSEFIGURE)) && @@ -1930,7 +1923,11 @@ static BOOL PATH_WidenPath(DC *dc) } numStrokes++; j = 0; - pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*)); + if(numStrokes == 1) + pStrokes = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath*)); + else + pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*)); + if(!pStrokes) return FALSE; pStrokes[numStrokes - 1] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); PATH_InitGdiPath(pStrokes[numStrokes - 1]); pStrokes[numStrokes - 1]->state = PATH_Open;

1 0