September 2008 - Wine-commits

Paul Vriens : quartz/tests: Add a missing CoUninitialize.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 8f23fc4e2f612c6a331ca34571f1f4673b24c62a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f23fc4e2f612c6a331ca3457… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Sep 5 16:13:16 2008 +0200 quartz/tests: Add a missing CoUninitialize. --- dlls/quartz/tests/avisplitter.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index cdebe26..82fd4cf 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -477,4 +477,6 @@ START_TEST(avisplitter) test_threads(); release_avisplitter(); + + CoUninitialize(); }

1 0

Paul Vriens : wintrust/tests: Add a missing FreeLibrary.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 6d6881a79162e87b7090e8fc766180f3ecddc50a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6881a79162e87b7090e8fc7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Sep 5 16:14:56 2008 +0200 wintrust/tests: Add a missing FreeLibrary. --- dlls/wintrust/tests/asn.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index dff0adf..eb9ca0f 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -465,4 +465,6 @@ START_TEST(asn) test_decodeSPCLink(); test_encodeSPCPEImage(); test_decodeSPCPEImage(); + + FreeLibrary(hCrypt32); }

1 0

Hans Leidekker : winhttp: Implement WinHttpQueryOption( WINHTTP_OPTION_SECURITY_FLAGS).
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: b34e816f4a8a7284a29d1a20e56a5d37b63b897b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34e816f4a8a7284a29d1a20e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 5 14:10:57 2008 +0200 winhttp: Implement WinHttpQueryOption(WINHTTP_OPTION_SECURITY_FLAGS). --- dlls/winhttp/session.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index d429fcb..8725f7e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -245,6 +245,25 @@ static void request_destroy( object_header_t *hdr ) heap_free( request ); } +static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) +{ + switch (option) + { + case WINHTTP_OPTION_SECURITY_FLAGS: + { + DWORD flags = 0; + + if (hdr->flags & WINHTTP_FLAG_SECURE) flags |= SECURITY_FLAG_SECURE; + *(DWORD *)buffer = flags; + *buflen = sizeof(DWORD); + return TRUE; + } + default: + FIXME("unimplemented option %u\n", option); + return FALSE; + } +} + static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffer, DWORD buflen ) { switch (option) @@ -289,7 +308,7 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe static const object_vtbl_t request_vtbl = { request_destroy, - NULL, + request_query_option, request_set_option };

1 0

Paul Vriens : urlmon/tests: Fix test on win98.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: f0bed78455b44fc5fd76736563e24f6bfc8cdd79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0bed78455b44fc5fd7673656… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Sep 5 11:14:59 2008 +0200 urlmon/tests: Fix test on win98. --- dlls/urlmon/tests/stream.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 4fc96ef..6b25e2d 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -76,6 +76,7 @@ DEFINE_EXPECT(OnStopBinding); DEFINE_EXPECT(OnDataAvailable); DEFINE_EXPECT(GetBindInfo); +static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static WCHAR INDEX_HTML[MAX_PATH]; static const char szHtmlDoc[] = "<HTML></HTML>"; @@ -260,26 +261,22 @@ static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { static IBindStatusCallback BindStatusCallback = { &BindStatusCallbackVtbl }; -static void set_file_url(void) +static void set_file_url(char *path) { - int len; + char INDEX_HTML_A[MAX_PATH]; - static const WCHAR wszFile[] = {'f','i','l','e',':','/','/'}; - - memcpy(INDEX_HTML, wszFile, sizeof(wszFile)); - len = sizeof(wszFile)/sizeof(WCHAR); - INDEX_HTML[len++] = '/'; - len += GetCurrentDirectoryW(sizeof(INDEX_HTML)/sizeof(WCHAR)-len, INDEX_HTML+len); - INDEX_HTML[len++] = '\\'; - memcpy(INDEX_HTML+len, wszIndexHtml, sizeof(wszIndexHtml)); + lstrcpyA(INDEX_HTML_A, "file:///"); + lstrcatA(INDEX_HTML_A, path); + MultiByteToWideChar(CP_ACP, 0, INDEX_HTML_A, -1, INDEX_HTML, MAX_PATH); } static void create_file(void) { HANDLE file; DWORD size; + CHAR path[MAX_PATH]; - file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + file = CreateFileA(wszIndexHtmlA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); if(file == INVALID_HANDLE_VALUE) @@ -288,7 +285,10 @@ static void create_file(void) WriteFile(file, szHtmlDoc, sizeof(szHtmlDoc)-1, &size, NULL); CloseHandle(file); - set_file_url(); + GetCurrentDirectoryA(MAX_PATH, path); + lstrcatA(path, "\\"); + lstrcatA(path, wszIndexHtmlA); + set_file_url(path); } static void test_URLOpenBlockingStreamW(void) @@ -370,5 +370,5 @@ START_TEST(stream) create_file(); test_URLOpenBlockingStreamW(); test_URLOpenStreamW(); - DeleteFileW(wszIndexHtml); + DeleteFileA(wszIndexHtmlA); }

1 0

Paul Vriens : dsound/tests: Fix typos in tests.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: e3a15936528ec7c28798c4cfacfe9b364a2d2a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a15936528ec7c28798c4cfa… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Sep 5 13:37:30 2008 +0200 dsound/tests: Fix typos in tests. --- dlls/dsound/tests/dsound.c | 2 +- dlls/dsound/tests/dsound8.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 14a6a77..d6c0f29 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -759,7 +759,7 @@ static HRESULT test_secondary(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(DSERR_CONTROLUNAVAIL && !secondary, + ok(rc==DSERR_CONTROLUNAVAIL && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index e45f289..8edb9b4 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -753,7 +753,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(DSERR_CONTROLUNAVAIL && !secondary, + ok(rc==DSERR_CONTROLUNAVAIL && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary)

1 0

Francois Gouget : kernel32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: d8914673ba7767577bfcba475648f9b7e68b3bb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8914673ba7767577bfcba475… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 5 13:15:04 2008 +0200 kernel32/tests: Add a trailing '\n' to an ok() call. --- dlls/kernel32/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index fce3fad..94bc975 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -862,7 +862,7 @@ static void test_DeleteFileW( void ) ret = GetTempPathW(MAX_PATH, pathW); if (ret + sizeof(dirW)/sizeof(WCHAR)-1 + sizeof(subdirW)/sizeof(WCHAR)-1 >= MAX_PATH) { - ok(0, "MAX_PATH exceeded in constructing paths"); + ok(0, "MAX_PATH exceeded in constructing paths\n"); return; } lstrcatW(pathW, dirW);

1 0

Francois Gouget : d3dxof: Add a '\n' to a Wine trace.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: b0f52410e98129ee4fbff24f8254853a1220eb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f52410e98129ee4fbff24f8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 5 13:15:10 2008 +0200 d3dxof: Add a '\n' to a Wine trace. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index c2a5624..88403df 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -235,7 +235,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (header[2] == XOFFILE_FORMAT_COMPRESSED) { - FIXME("Compressed formats not supported yet"); + FIXME("Compressed formats not supported yet\n"); hr = DXFILEERR_BADVALUE; goto error; }

1 0

Francois Gouget : gdiplus: Add/fix the trailing '\n' in Wine traces.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 758c453ff19696e0841b1c8abac02d0e0d08148f URL: http://source.winehq.org/git/wine.git/?a=commit;h=758c453ff19696e0841b1c8ab… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 5 13:14:56 2008 +0200 gdiplus: Add/fix the trailing '\n' in Wine traces. --- dlls/gdiplus/brush.c | 2 +- dlls/gdiplus/graphics.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 8bb807b..067fdde 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -580,7 +580,7 @@ GpStatus WINGDIPAPI GdipCreateTexture2I(GpImage *image, GpWrapMode wrapmode, { GpImageAttributes imageattr; - TRACE("%p %d %d %d %d %d %p", image, wrapmode, x, y, width, height, + TRACE("%p %d %d %d %d %d %p\n", image, wrapmode, x, y, width, height, texture); imageattr.wrap = wrapmode; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b6cf090..a8afa25 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1441,7 +1441,7 @@ GpStatus WINGDIPAPI GdipDrawImageRectRect(GpGraphics *graphics, GpImage *image, { GpPointF points[3]; - TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %d, %p, %p, %p)\n)", + TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %d, %p, %p, %p)\n", graphics, image, dstx, dsty, dstwidth, dstheight, srcx, srcy, srcwidth, srcheight, srcUnit, imageattr, callback, callbackData); @@ -1464,7 +1464,7 @@ GpStatus WINGDIPAPI GdipDrawImageRectRectI(GpGraphics *graphics, GpImage *image, { GpPointF points[3]; - TRACE("(%p, %p, %d, %d, %d, %d, %d, %d, %d, %d, %d, %p, %p, %p)\n)", + TRACE("(%p, %p, %d, %d, %d, %d, %d, %d, %d, %d, %d, %p, %p, %p)\n", graphics, image, dstx, dsty, dstwidth, dstheight, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, callback, callbackData);

1 0

Paul Vriens : crypt32/tests: Don't crash on Vista.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 961d65ab30963e47120ee5a1178430b678a270c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961d65ab30963e47120ee5a11… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Sep 5 13:27:41 2008 +0200 crypt32/tests: Don't crash on Vista. --- dlls/crypt32/tests/chain.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 5bae989..ccb4cfc 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1579,9 +1579,13 @@ static void testGetCertChain(void) DWORD i; /* Basic parameter checks */ - ret = pCertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); + if (0) + { + /* Crash on Vista */ + ret = pCertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + } ret = pCertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, &chain); ok(!ret && GetLastError() == E_INVALIDARG, @@ -1593,9 +1597,13 @@ static void testGetCertChain(void) */ cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); - ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, NULL, 0, NULL, NULL); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); + if (0) + { + /* Crash on Vista */ + ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, NULL, 0, NULL, NULL); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + } /* Crash ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, NULL); */

1 0

Francois Gouget : crypt32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 80ef97be1a77d8b5b4b320fbd6398c9a18b6ab9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ef97be1a77d8b5b4b320fbd… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 5 13:14:36 2008 +0200 crypt32/tests: Add a trailing '\n' to an ok() call. --- dlls/crypt32/tests/ctl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index f92760c..d8c4a62 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -231,7 +231,7 @@ static void testCTLProperties(void) ok(ret, "CertGetCTLContextProperty failed: %08x\n", GetLastError()); ret = CertGetCTLContextProperty(ctl, CERT_ACCESS_STATE_PROP_ID, &access, &size); - ok(ret, "CertGetCTLContextProperty failed: %08x", GetLastError()); + ok(ret, "CertGetCTLContextProperty failed: %08x\n", GetLastError()); ok(!(access & CERT_ACCESS_STATE_WRITE_PERSIST_FLAG), "Didn't expect a persisted cert\n");

1 0