October 2009 - Wine-Commits

Ge van Geldorp : user32/tests: Fix sysparams test failure on Win7.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 2165c2640edb0d157220870e6951ef9773aefafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2165c2640edb0d157220870e6… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 user32/tests: Fix sysparams test failure on Win7. --- dlls/user32/tests/sysparams.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 7b2edaf..dd1e708 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -942,7 +942,8 @@ static void test_SPI_SETSCREENSAVEACTIVE( void ) /* 17 */ rc=SystemParametersInfoA( SPI_GETSCREENSAVEACTIVE, 0, &v, 0 ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); - eq( v, vals[i], "SPI_{GET,SET}SCREENSAVEACTIVE", "%d" ); + ok(v == vals[i] || broken(! v) /* Win 7 */, + "SPI_{GET,SET}SCREENSAVEACTIVE: got %d instead of %d\n", v, vals[i]); } rc=SystemParametersInfoA( SPI_SETSCREENSAVEACTIVE, old_b, 0, SPIF_UPDATEINIFILE );

1 0

Ge van Geldorp : secur32/tests: Add acceptable error code for Win7 ntlm test.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 43a28649c35d9b1631656bf891110c2334b07686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a28649c35d9b1631656bf89… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 secur32/tests: Add acceptable error code for Win7 ntlm test. --- dlls/secur32/tests/ntlm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 797b7ab..b7c5105 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -436,7 +436,8 @@ static SECURITY_STATUS runClient(SspiData *sspi_data, BOOL first, ULONG data_rep 0, data_rep, NULL, 0, sspi_data->ctxt, out_buf, &ctxt_attr, &ttl); - ok(ret == SEC_E_INTERNAL_ERROR, "expected SEC_E_INTERNAL_ERROR, got %s\n", getSecError(ret)); + ok(ret == SEC_E_INTERNAL_ERROR || ret == SEC_I_CONTINUE_NEEDED, + "expected SEC_E_INTERNAL_ERROR or SEC_I_CONTINUE_NEEDED, got %s\n", getSecError(ret)); out_buf->pBuffers[0].pvBuffer = old_buf;

1 0

Ge van Geldorp : kernel32/tests: Add acceptable error codes for Win7 process test.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 6571d1e4a809c046f86d371413ead361f09c2f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6571d1e4a809c046f86d37141… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 kernel32/tests: Add acceptable error codes for Win7 process test. --- dlls/kernel32/tests/process.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 5d8f65b..36c86e2 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -955,7 +955,8 @@ static void test_CommandLine(void) ok(!ret, "CreateProcessA unexpectedly succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_PATH_NOT_FOUND /* NT4 */ || - GetLastError() == ERROR_BAD_PATHNAME /* Win98 */, + GetLastError() == ERROR_BAD_PATHNAME /* Win98 */ || + GetLastError() == ERROR_INVALID_PARAMETER /* Win7 */, "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); strcpy(buffer, "doesnotexist.exe");

1 0

Ge van Geldorp : kernel32/tests: Fix atom tests on Win7.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 4d5059060ac9e2c3f876a8d82d161d70bd8eb013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5059060ac9e2c3f876a8d82… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 kernel32/tests: Fix atom tests on Win7. --- dlls/kernel32/tests/Makefile.in | 2 +- dlls/kernel32/tests/atom.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e48ecaf..0c81c29 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = kernel32.dll -IMPORTS = advapi32 kernel32 +IMPORTS = user32 advapi32 kernel32 CTESTS = \ actctx.c \ diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index c739850..84013b9 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -619,6 +619,10 @@ static void test_local_error_handling(void) START_TEST(atom) { + /* Global atom table seems to be available to GUI apps only in + Win7, so let's turn this app into a GUI app */ + GetDesktopWindow(); + test_add_atom(); test_get_atom_name(); test_error_handling();

1 0

Hans Leidekker : secur32: Test passing null authentication data to AcquireCredentialsHandle.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 8bb68933ea37766c3fd4edb6a86ea3a7ca6059f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb68933ea37766c3fd4edb6a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 09:05:05 2009 +0200 secur32: Test passing null authentication data to AcquireCredentialsHandle. --- dlls/secur32/tests/ntlm.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 43b7265..797b7ab 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -32,6 +32,7 @@ #include <sspi.h> #include <rpc.h> #include <rpcdce.h> +#include <secext.h> #include "wine/test.h" @@ -59,6 +60,7 @@ static SECURITY_STATUS (SEC_ENTRY * pEncryptMessage)(PCtxtHandle, ULONG, PSecBufferDesc, ULONG); static SECURITY_STATUS (SEC_ENTRY * pDecryptMessage)(PCtxtHandle, PSecBufferDesc, ULONG, PULONG); +static BOOLEAN (WINAPI * pGetUserNameExA)(EXTENDED_NAME_FORMAT, LPSTR, PULONG); typedef struct _SspiData { PCredHandle cred; @@ -168,6 +170,7 @@ static void InitFunctionPtrs(void) pVerifySignature = (PVOID)GetProcAddress(secdll, "VerifySignature"); pEncryptMessage = (PVOID)GetProcAddress(secdll, "EncryptMessage"); pDecryptMessage = (PVOID)GetProcAddress(secdll, "DecryptMessage"); + pGetUserNameExA = (PVOID)GetProcAddress(secdll, "GetUserNameExA"); } } @@ -1267,6 +1270,48 @@ static void test_cred_multiple_use(void) ok(ret == SEC_E_OK, "FreeCredentialsHandle failed with error 0x%x\n", ret); } +static void test_null_auth_data(void) +{ + SECURITY_STATUS status; + PSecPkgInfo info; + CredHandle cred; + CtxtHandle ctx; + SecBufferDesc buffer_desc; + SecBuffer buffers[1]; + char user[256]; + TimeStamp ttl; + ULONG attr, size; + BOOLEAN ret; + + if(pQuerySecurityPackageInfoA((SEC_CHAR *)"NTLM", &info) != SEC_E_OK) + { + skip("NTLM package not installed, skipping test\n"); + return; + } + + status = pAcquireCredentialsHandleA(NULL, (SEC_CHAR *)"NTLM", SECPKG_CRED_OUTBOUND, + NULL, NULL, NULL, NULL, &cred, &ttl); + ok(status == SEC_E_OK, "AcquireCredentialsHande() failed %s\n", getSecError(status)); + + buffers[0].cbBuffer = info->cbMaxToken; + buffers[0].BufferType = SECBUFFER_TOKEN; + buffers[0].pvBuffer = HeapAlloc(GetProcessHeap(), 0, buffers[0].cbBuffer); + + buffer_desc.ulVersion = SECBUFFER_VERSION; + buffer_desc.cBuffers = sizeof(buffers)/sizeof(buffers[0]); + buffer_desc.pBuffers = buffers; + + size = sizeof(user); + ret = pGetUserNameExA(NameSamCompatible, user, &size); + ok(ret, "GetUserNameExA failed %u\n", GetLastError()); + + status = pInitializeSecurityContextA(&cred, NULL, (SEC_CHAR *)user, + ISC_REQ_CONNECTION, 0, SECURITY_NETWORK_DREP, + NULL, 0, &ctx, &buffer_desc, &attr, &ttl); + todo_wine + ok(status == SEC_I_CONTINUE_NEEDED, "InitializeSecurityContextA failed %s\n", getSecError(status)); +} + START_TEST(ntlm) { InitFunctionPtrs(); @@ -1290,6 +1335,7 @@ START_TEST(ntlm) testSignSeal(); test_cred_multiple_use(); + if (pGetUserNameExA) test_null_auth_data(); } else win_skip("Needed functions are not available\n");

1 0

Andrew Eikum : ole32/tests: Add tests for IStorage:: CopyTo with SNB exlusions.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 29fc53b6328e2359ad58cda8c0dd057e53f11515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fc53b6328e2359ad58cda8c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 16:13:59 2009 -0500 ole32/tests: Add tests for IStorage::CopyTo with SNB exlusions. --- dlls/ole32/tests/storage32.c | 84 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e115874..acff5e2 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1998,6 +1998,89 @@ cleanup: DeleteFileW(file2_name); } +static void test_copyto_snbexclusions(void) +{ + static const WCHAR *snb_exclude[] = {stgA_name, strmB_name, strmC_name, 0}; + + IStorage *file1 = NULL, *file2 = NULL, *stg_tmp; + IStream *strm_tmp; + WCHAR buf[64]; + HRESULT hr; + + /* create & populate file1 */ + hr = StgCreateDocfile(file1_name, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &file1); + ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + hr = create_test_file(file1); + if(FAILED(hr)) + goto cleanup; + + /* create file2 */ + hr = StgCreateDocfile(file2_name, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &file2); + ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + /* copy file1 to file2 with name exclusions */ + hr = IStorage_CopyTo(file1, 0, NULL, (SNB)snb_exclude, file2); + ok(hr == S_OK, "CopyTo failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + /* verify that file1 copied over, respecting exclusions */ + hr = IStorage_OpenStorage(file2, stgA_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg_tmp); + ok(hr == STG_E_FILENOTFOUND, "OpenStorage should give STG_E_FILENOTFOUND, gave: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + IStorage_Release(stg_tmp); + + hr = IStorage_OpenStream(file2, strmA_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == STG_E_FILENOTFOUND, "OpenStream should give STG_E_FILENOTFOUND, gave: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + IStream_Release(strm_tmp); + + hr = IStorage_OpenStorage(file2, stgB_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg_tmp); + ok(hr == S_OK, "OpenStorage failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)){ + hr = IStorage_OpenStream(stg_tmp, strmB_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == S_OK, "OpenStream failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)){ + memset(buf, 0, sizeof(buf)); + hr = IStream_Read(strm_tmp, buf, sizeof(buf), NULL); + ok(hr == S_OK, "Read failed: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + ok(lstrcmpW(buf, strmB_name) == 0, + "Expected %s to be read, got %s\n", wine_dbgstr_w(strmB_name), wine_dbgstr_w(buf)); + + IStream_Release(strm_tmp); + } + + IStorage_Release(stg_tmp); + } + + hr = IStorage_OpenStream(file2, strmC_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == STG_E_FILENOTFOUND, "OpenStream should give STG_E_FILENOTFOUND, gave: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + IStream_Release(strm_tmp); + +cleanup: + if(file1) + IStorage_Release(file1); + if(file2) + IStorage_Release(file2); + + DeleteFileW(file1_name); + DeleteFileW(file2_name); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -2029,4 +2112,5 @@ START_TEST(storage32) test_fmtusertypestg(); test_references(); test_copyto(); + test_copyto_snbexclusions(); }

1 0

Ge van Geldorp : ntdll/tests: Fix atom tests on Win7.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 9925991bf3363088d70fbcf6f185f65e8eab4795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9925991bf3363088d70fbcf6f… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 ntdll/tests: Fix atom tests on Win7. --- dlls/ntdll/tests/Makefile.in | 2 +- dlls/ntdll/tests/atom.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 6bc2623..e501d6a 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = ntdll.dll -IMPORTS = kernel32 +IMPORTS = user32 kernel32 CTESTS = \ atom.c \ diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 220ea40..149078f 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -34,6 +34,7 @@ #include "winbase.h" #include "winreg.h" #include "winnls.h" +#include "winuser.h" #include "wine/test.h" #include "winternl.h" @@ -478,6 +479,10 @@ START_TEST(atom) InitFunctionPtr(); if (pRtlCreateAtomTable) { + /* Global atom table seems to be available to GUI apps only in + Win7, so let's turn this app into a GUI app */ + GetDesktopWindow(); + test_NtAtom(); test_NtIntAtom(); test_NtRefPinAtom();

1 0

Ge van Geldorp : shlwapi/tests: Add acceptable error code for Win7 clist test.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: c93c68b0f4933ae71be5aba55e09049a2cd7176b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c93c68b0f4933ae71be5aba55… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 shlwapi/tests: Add acceptable error code for Win7 clist test. --- dlls/shlwapi/tests/clist.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index 84a05e6..3b979fd 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -353,7 +353,8 @@ static void test_CList(void) InitDummyStream(&streamobj); streamobj.failwritesize = TRUE; hRet = pSHLWAPI_17(&streamobj, list); - ok(hRet == STG_E_MEDIUMFULL, "changed size failure return\n"); + ok(hRet == STG_E_MEDIUMFULL || broken(hRet == E_FAIL) /* Win7 */, + "changed size failure return\n"); ok(streamobj.writecalls == 1, "called object after size failure\n"); ok(streamobj.readcalls == 0,"called Read() after failure\n"); ok(streamobj.seekcalls == 0,"called Seek() after failure\n");

1 0

Ge van Geldorp : comctl32/tests: Fix misc test on Win7.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: e1b5ca70bb2a62d9f2452075855997a8cf18f0b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b5ca70bb2a62d9f24520758… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 comctl32/tests: Fix misc test on Win7. --- dlls/comctl32/tests/misc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index e3cf04b..8f83260 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -104,7 +104,9 @@ static void test_GetPtrAW(void) ok (count == sourcelen || broken(count == 0), /* win9x */ "Expected count to be %d, it was %d\n", sourcelen, count); - ok (!lstrcmp(dest, desttest), "Expected destination to not have changed\n"); + ok (!lstrcmp(dest, desttest) || + broken(!lstrcmp(dest, "")), /* Win7 */ + "Expected destination to not have changed\n"); count = 0; count = pStr_GetPtrA(source, NULL, destsize);

1 0

Michael Stefaniuc : dlls/msacm32: Avoid a sizeof()+cast in an ok() call.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: a29b421425b1b02951be65c9ee73aefab7c265ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29b421425b1b02951be65c9e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 6 10:35:29 2009 +0200 dlls/msacm32: Avoid a sizeof()+cast in an ok() call. --- dlls/msacm32/tests/msacm.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index c528f78..b68ff8c 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -126,10 +126,9 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, /* cbStruct should contain size of returned data (at most sizeof(dd)) TODO: should it be *exactly* sizeof(dd), as tested here? */ - if (rc == MMSYSERR_NOERROR) { + if (rc == MMSYSERR_NOERROR) { ok(dd.cbStruct == sizeof(dd), - "acmDriverDetails(): cbStruct = %08x, should be %08lx\n", - dd.cbStruct, (unsigned long)sizeof(dd)); + "acmDriverDetails(): cbStruct = %08x\n", dd.cbStruct); } if (rc == MMSYSERR_NOERROR && winetest_interactive) {

1 0