December 2009 - Wine-Commits

Rob Shearman : secur32: Fix memory leak in NTLM's FreeCredentialsHandle.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 3cd88cfab396a10dfbe5516b48e4c851f4eb6dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd88cfab396a10dfbe5516b4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 19:45:38 2009 +0000 secur32: Fix memory leak in NTLM's FreeCredentialsHandle. --- dlls/secur32/ntlm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 79f55e7..74fb2db 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1721,6 +1721,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle( HeapFree(GetProcessHeap(), 0, ntlm_cred->password); HeapFree(GetProcessHeap(), 0, ntlm_cred->username_arg); HeapFree(GetProcessHeap(), 0, ntlm_cred->domain_arg); + HeapFree(GetProcessHeap(), 0, ntlm_cred); ret = SEC_E_OK; } else

1 0

Francois Gouget : shlwapi/tests: Make test_IConnectionPoint() static.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 5a2d9e8e5f7614a4544b494a94dae75694ec1a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2d9e8e5f7614a4544b494a9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 12 20:37:37 2009 +0100 shlwapi/tests: Make test_IConnectionPoint() static. --- dlls/shlwapi/tests/ordinal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index daf221c..8f95797 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1145,7 +1145,7 @@ static const IConnectionPointContainerVtbl contain_vtbl = { Contain_FindConnectionPoint }; -void test_IConnectionPoint(void) +static void test_IConnectionPoint(void) { HRESULT rc; ULONG ref;

1 0

Francois Gouget : oleaut32/tests: Make test_DispGetParam() static.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 9164fc24a65b94f3ad79d9309c3ef2256facfc2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9164fc24a65b94f3ad79d9309… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 12 20:37:50 2009 +0100 oleaut32/tests: Make test_DispGetParam() static. --- dlls/oleaut32/tests/dispatch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/dispatch.c b/dlls/oleaut32/tests/dispatch.c index 09c4d69..a0e418b 100644 --- a/dlls/oleaut32/tests/dispatch.c +++ b/dlls/oleaut32/tests/dispatch.c @@ -63,7 +63,7 @@ static CHAR temp_str[MAX_PATH]; VariantClear(&vararg[1]); \ VariantClear(&vararg[2]); -void test_DispGetParam(void) +static void test_DispGetParam(void) { HRESULT hr; DISPPARAMS dispparams;

1 0

Huw Davies : fusion: Fix a memory leak in the tests.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 998d9d9a8f419dff40d5ca49ee3c03aa495a1382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=998d9d9a8f419dff40d5ca49e… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Dec 12 12:18:37 2009 +0000 fusion: Fix a memory leak in the tests. Found by Valgrind. --- dlls/fusion/tests/asmname.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 864ded5..824837b 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -787,6 +787,7 @@ static void test_CreateAssemblyNameObject(void) "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(name == (IAssemblyName *)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", name); } + if(SUCCEEDED(hr)) IAssemblyName_Release(name); /* no '=' */ to_widechar(namestr, "wine, PublicKeyToken");

1 0

Francois Gouget : winedbg: Use SUBLANG_NEUTRAL for Spanish.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: e19c71ad80181f7ea66baae9392256829bafb402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e19c71ad80181f7ea66baae93… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Dec 12 20:37:32 2009 +0100 winedbg: Use SUBLANG_NEUTRAL for Spanish. --- programs/winedbg/rsrc_Es.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/rsrc_Es.rc b/programs/winedbg/rsrc_Es.rc index f4f64cd..a962768 100644 --- a/programs/winedbg/rsrc_Es.rc +++ b/programs/winedbg/rsrc_Es.rc @@ -23,7 +23,7 @@ /* UTF-8 */ #pragma code_page(65001) -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDM_DEBUG_POPUP MENU BEGIN

1 0

André Hentschel : gdi32/tests: Also test non-style suffix.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: fb56000c13f47a98abd0ecc7d283faf04fcbda96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb56000c13f47a98abd0ecc7d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 12 17:32:19 2009 +0100 gdi32/tests: Also test non-style suffix. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c3e193a..60c42a1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2982,7 +2982,7 @@ static void test_CreateFontIndirect(void) LOGFONTA lf, getobj_lf; int ret, i; HFONT hfont; - char TestName[][16] = {"Arial", "Arial Bold", "Arial Italic"}; + char TestName[][16] = {"Arial", "Arial Bold", "Arial Italic", "Arial Baltic"}; memset(&lf, 0, sizeof(lf)); lf.lfCharSet = ANSI_CHARSET;

1 0

Huw Davies : oleaut32: Fix a memory leak in the tests.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 663e11b256de90fd9521841a62a34c78844691a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663e11b256de90fd9521841a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Dec 12 14:04:35 2009 +0000 oleaut32: Fix a memory leak in the tests. Found by Valgrind. --- dlls/oleaut32/tests/dispatch.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/dispatch.c b/dlls/oleaut32/tests/dispatch.c index c81210f..09c4d69 100644 --- a/dlls/oleaut32/tests/dispatch.c +++ b/dlls/oleaut32/tests/dispatch.c @@ -264,6 +264,7 @@ void test_DispGetParam(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(V_VT(&result) == VT_BSTR, "Expected VT_BSTR, got %08x\n", V_VT(&result)); ok(err_index == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", err_index); + VariantClear(&result); } START_TEST(dispatch)

1 0

Huw Davies : shdocvw: Fix a memory leak in the tests.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 53ee807a3b906d9035c4e2e87e98f01e7719b4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ee807a3b906d9035c4e2e87… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Dec 12 12:19:05 2009 +0000 shdocvw: Fix a memory leak in the tests. Found by Valgrind. --- dlls/shdocvw/tests/shortcut.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/tests/shortcut.c b/dlls/shdocvw/tests/shortcut.c index 5a740dc..f38ae2b 100644 --- a/dlls/shdocvw/tests/shortcut.c +++ b/dlls/shdocvw/tests/shortcut.c @@ -216,9 +216,10 @@ static void test_ShortcutFolder(void) { ok (pidlCurFolder->mkid.cb == 20 && ((LPSHITEMID)((BYTE*)pidlCurFolder+20))->cb == 0 && IsEqualCLSID(&CLSID_WineTest, (REFCLSID)((LPBYTE)pidlCurFolder+4)), "GetCurFolder returned unexpected pidl!\n"); - + + ILFree(pidlCurFolder); IPersistFolder3_Release(pWineTestPersistFolder); - + cleanup: unregister_keys(HKEY_CLASSES_ROOT, HKEY_CLASSES_ROOT_keys, 1); }

1 0

Vincent Povirk : gdiplus: Implement GdipGetImagePalette.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 9615dd8fdba958150dd7d3ea05eb8ae97c55bed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9615dd8fdba958150dd7d3ea0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 17:00:19 2009 -0600 gdiplus: Implement GdipGetImagePalette. --- dlls/gdiplus/image.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 74c3f11..982956c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2242,15 +2242,22 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, */ GpStatus WINGDIPAPI GdipGetImagePalette(GpImage *image, ColorPalette *palette, INT size) { - static int calls = 0; + TRACE("(%p,%p,%i)\n", image, palette, size); - if(!image) + if (!image || !palette) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if (size < (sizeof(UINT)*2+sizeof(ARGB)*image->palette_count)) + { + TRACE("<-- InsufficientBuffer\n"); + return InsufficientBuffer; + } - return NotImplemented; + palette->Flags = image->palette_flags; + palette->Count = image->palette_count; + memcpy(palette->Entries, image->palette_entries, sizeof(ARGB)*image->palette_count); + + return Ok; } /*****************************************************************************

1 0

Vincent Povirk : gdiplus: Implement GdipGetImagePaletteSize.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 59f45f2cbb2e3bc0006f697c3c1cddd7b41a9739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f45f2cbb2e3bc0006f697c3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 16:56:08 2009 -0600 gdiplus: Implement GdipGetImagePaletteSize. --- dlls/gdiplus/image.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 340f2e6..74c3f11 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1465,12 +1465,19 @@ GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage *image, REAL *res) GpStatus WINGDIPAPI GdipGetImagePaletteSize(GpImage *image, INT *size) { - FIXME("%p %p\n", image, size); + TRACE("%p %p\n", image, size); if(!image || !size) return InvalidParameter; - return NotImplemented; + if (image->palette_count == 0) + *size = sizeof(ColorPalette); + else + *size = sizeof(UINT)*2 + sizeof(ARGB)*image->palette_count; + + TRACE("<-- %u\n", *size); + + return Ok; } /* FIXME: test this function for non-bitmap types */

1 0