November 2011 - Wine-Commits

Alexandre Julliard : dpnet/tests: Fix a test that fails on Windows.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 997cb5c6751816f2fc39bed3d5211845a9b12396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=997cb5c6751816f2fc39bed3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 11:24:30 2011 +0100 dpnet/tests: Fix a test that fails on Windows. --- dlls/dpnet/tests/peer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 1756ac9..0deb988 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -131,8 +131,8 @@ static void test_get_sp_caps(void) ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); ok(caps.dwFlags == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS | - DPNSPCAPS_SUPPORTSTHREADPOOL), "provider unexpectedly misses some capability flags\n"); - ok(caps.dwNumThreads == 3, "expected 3, got %d\n", caps.dwNumThreads); + DPNSPCAPS_SUPPORTSTHREADPOOL), "unexpected flags %x\n", caps.dwFlags); + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout);

1 0

Jacek Caban : mshtml: Fixed ref count leaks.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 92d55a84d674be49bd570d51663967d5e524e15a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d55a84d674be49bd570d516… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 19:26:07 2011 +0100 mshtml: Fixed ref count leaks. --- dlls/mshtml/htmlelem.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9d9fc8d..36103be 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1038,7 +1038,7 @@ static HRESULT WINAPI HTMLElement_put_innerHTML(IHTMLElement *iface, BSTR v) nsAString_InitDepend(&html_str, v); nsres = nsIDOMNSHTMLElement_SetInnerHTML(nselem, &html_str); nsAString_Finish(&html_str); - + nsIDOMNSHTMLElement_Release(nselem); if(NS_FAILED(nsres)) { FIXME("SetInnerHtml failed %08x\n", nsres); return E_FAIL; @@ -1069,6 +1069,7 @@ static HRESULT WINAPI HTMLElement_get_innerHTML(IHTMLElement *iface, BSTR *p) nsAString_Init(&html_str, NULL); nsres = nsIDOMNSHTMLElement_GetInnerHTML(nselem, &html_str); + nsIDOMNSHTMLElement_Release(nselem); if(NS_SUCCEEDED(nsres)) { const PRUnichar *html;

1 0

Austin English : wininet: Add a stub for ShowClientAuthCerts.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 25bc31ac2e8a07ed59bcbc734c79fb7af18a8803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bc31ac2e8a07ed59bcbc734… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 31 11:37:47 2011 -0700 wininet: Add a stub for ShowClientAuthCerts. --- dlls/wininet/internet.c | 6 ++++++ dlls/wininet/wininet.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 020fe2c..43be36d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4385,3 +4385,9 @@ BOOL WINAPI InternetQueryFortezzaStatus(DWORD *a, DWORD_PTR b) FIXME("(%p, %08lx) stub\n", a, b); return 0; } + +DWORD WINAPI ShowClientAuthCerts(HWND parent) +{ + FIXME("%p: stub\n", parent); + return 0; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 2773d4b..1e651b5 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -234,7 +234,7 @@ @ stdcall SetUrlCacheGroupAttributeW(int64 long long ptr ptr) @ stub SetUrlCacheHeaderData @ stub ShowCertificate -@ stub ShowClientAuthCerts +@ stdcall ShowClientAuthCerts(ptr) @ stub ShowSecurityInfo @ stdcall ShowX509EncodedCertificate(ptr ptr long) @ stdcall UnlockUrlCacheEntryFile(str long) UnlockUrlCacheEntryFileA

1 0

Austin English : urlmon: Add some more tests for FindMimeFromData().
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: aa80ce8cf7058e43f93a5a7f5cce6fe143a3982e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa80ce8cf7058e43f93a5a7f5… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 1 22:17:45 2011 -0700 urlmon: Add some more tests for FindMimeFromData(). --- dlls/urlmon/tests/misc.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index d9aebc7..cc69c72 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -733,6 +733,31 @@ static void test_FindMimeFromData(void) ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); CoTaskMemFree(mime); + hres = pFindMimeFromData(NULL, url1, NULL, 0, NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, NULL, sizeof(data1), NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, 0, 0, NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, 0, sizeof(data1), NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextHtml), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + + hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); + ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); + ok(!lstrcmpW(mime, mimeTextPlain), "wrong mime: %s\n", wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + hres = pFindMimeFromData(NULL, NULL, NULL, 0, NULL, 0, &mime, 0); ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, excepted E_INVALIDARG\n", hres);

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: c872590a42b7e8f747ecbabbafe705ae193d941e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c872590a42b7e8f747ecbabba… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Nov 3 18:13:48 2011 +0100 po: Update Polish translation. --- po/pl.po | 236 ++++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 130 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c872590a42b7e8f747ecb…

1 0

Octavian Voicu : ddraw/tests: Move surface attachment tests from refcount. c to dsurface.c.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 6e7bb6495002421c4fd21b265ebe1f12b04f75d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7bb6495002421c4fd21b265… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Nov 3 13:32:09 2011 +0200 ddraw/tests: Move surface attachment tests from refcount.c to dsurface.c. --- dlls/ddraw/tests/dsurface.c | 131 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/refcount.c | 106 +--------------------------------- 2 files changed, 133 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e7bb6495002421c4fd21…

1 0

Nikolay Sivov : msxml3: Add type id placeholder for index 0 to make lookup code actually work.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 8d602efe88dc2bc3d1e3551720e4ed2b31bba218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d602efe88dc2bc3d1e355172… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 2 23:13:24 2011 +0300 msxml3: Add type id placeholder for index 0 to make lookup code actually work. --- dlls/msxml3/dispex.c | 1 + dlls/msxml3/msxml_private.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 436c277..67ce77c 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -78,6 +78,7 @@ static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { + &IID_NULL, &IID_IXMLDOMAttribute, &IID_IXMLDOMCDATASection, &IID_IXMLDOMComment, diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8b84aca..698655e 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -38,6 +38,7 @@ typedef enum { /* typelibs */ typedef enum tid_t { + NULL_tid, IXMLDOMAttribute_tid, IXMLDOMCDATASection_tid, IXMLDOMComment_tid,

1 0

Alexandre Julliard : gdi32: Don't free bitmap bits when changing the owner, we may still have pointers to them.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 8277ac3f7cb670c8c2bc64310f3d384089a765ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8277ac3f7cb670c8c2bc64310… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 12:49:46 2011 +0100 gdi32: Don't free bitmap bits when changing the owner, we may still have pointers to them. --- dlls/gdi32/bitmap.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8aea89c..a158735 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -574,8 +574,6 @@ static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) get_ddb_bitmapinfo( bmp, info ); SetDIBits( 0, hbitmap, 0, bmp->bitmap.bmHeight, bmp->bitmap.bmBits, info, DIB_RGB_COLORS ); - HeapFree( GetProcessHeap(), 0, bmp->bitmap.bmBits ); - bmp->bitmap.bmBits = NULL; } /***********************************************************************

1 0

Hans Leidekker : msi: GetComputerName returns ERROR_BUFFER_OVERFLOW when the buffer is too small .
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: eb7d8b92cb3f74655f9721e020e12d971076d58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7d8b92cb3f74655f9721e02… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 3 11:40:16 2011 +0100 msi: GetComputerName returns ERROR_BUFFER_OVERFLOW when the buffer is too small. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c265cca..756be42 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1014,7 +1014,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) } } len = 0; - if (!GetComputerNameW( NULL, &len ) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + if (!GetComputerNameW( NULL, &len ) && GetLastError() == ERROR_BUFFER_OVERFLOW) { WCHAR *computername; if ((computername = msi_alloc( len * sizeof(WCHAR) )))

1 0

Alexandre Julliard : gdi32: Pass the full brush contents in the SelectBrush driver entry point.
by Alexandre Julliard Nov. 3, 2011

Nov. 3, 2011

Module: wine Branch: master Commit: 24ac8c66bb494a11dca121fa31ddd3e9bd52d3a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ac8c66bb494a11dca121fa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 2 21:17:15 2011 +0100 gdi32: Pass the full brush contents in the SelectBrush driver entry point. --- dlls/gdi32/brush.c | 6 +++++- dlls/gdi32/dibdrv/dibdrv.h | 3 ++- dlls/gdi32/dibdrv/objects.c | 5 +++-- dlls/gdi32/driver.c | 3 ++- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 ++- dlls/gdi32/enhmfdrv/objects.c | 3 ++- dlls/gdi32/mfdrv/metafiledrv.h | 3 ++- dlls/gdi32/mfdrv/objects.c | 3 ++- dlls/wineps.drv/brush.c | 3 ++- dlls/wineps.drv/psdrv.h | 4 ++-- dlls/winex11.drv/brush.c | 3 ++- dlls/winex11.drv/x11drv.h | 3 ++- include/wine/gdi_driver.h | 4 ++-- 13 files changed, 30 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24ac8c66bb494a11dca12…

1 0