December 2009 - Wine-commits

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

14 Dec '09

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

Rob Shearman : rpcrt4: Fix some memory leaks in the cstub tests.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 15cd36d21d8f8cea09f45b35293e1b02f887c8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=15cd36d21d8f8cea09f45b352… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 19:46:13 2009 +0000 rpcrt4: Fix some memory leaks in the cstub tests. --- dlls/rpcrt4/tests/cstub.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index ca871b7..93a7fe3 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -770,6 +770,8 @@ static void test_CreateStub(IPSFactoryBuffer *ppsf) /* 0xdeadbeef returned from create_stub_test_QI */ ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject); ok(cstd_stub->pPSFactory != NULL, "pPSFactory was NULL\n"); + cstd_stub->pvServerObject = NULL; + IRpcStubBuffer_Release(pstub); vtbl = &create_stub_test_fail_vtbl; pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE); @@ -908,6 +910,7 @@ static void test_Disconnect(IPSFactoryBuffer *ppsf) IRpcStubBuffer_Disconnect(pstub); ok(connect_test_orig_release_called == 1, "release called %d\n", connect_test_orig_release_called); ok(cstd_stub->pvServerObject == NULL, "pvServerObject %p\n", cstd_stub->pvServerObject); + IRpcStubBuffer_Release(pstub); }

1 0

Rob Shearman : rpcrt4: Add support for context handles in stubless servers.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: b24aa1c153281d7b25a107b52e8052fdbbca99e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24aa1c153281d7b25a107b52… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 19:47:35 2009 +0000 rpcrt4: Add support for context handles in stubless servers. --- dlls/rpcrt4/ndr_marshall.c | 38 +++++++++++++++++++++++++++++++------- dlls/rpcrt4/ndr_stubless.c | 22 ++++++++++++++++------ 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 4511164..4c9f625 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -39,6 +39,7 @@ #include "ndr_misc.h" #include "rpcndr.h" +#include "ndrtypes.h" #include "wine/unicode.h" #include "wine/rpcfc.h" @@ -113,6 +114,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); #define NDR_TABLE_SIZE 128 #define NDR_TABLE_MASK 127 +#define NDRSContextFromValue(user_context) (NDR_SCONTEXT)((char *)(user_context) - (char *)NDRSContextValue((NDR_SCONTEXT)NULL)) + static unsigned char *WINAPI NdrBaseTypeMarshall(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); static unsigned char *WINAPI NdrBaseTypeUnmarshall(PMIDL_STUB_MESSAGE, unsigned char **, PFORMAT_STRING, unsigned char); static void WINAPI NdrBaseTypeBufferSize(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); @@ -6687,10 +6690,19 @@ static unsigned char *WINAPI NdrContextHandleMarshall( } TRACE("flags: 0x%02x\n", pFormat[1]); - if (pFormat[1] & 0x80) - NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE); + if (pStubMsg->IsClient) + { + if (pFormat[1] & HANDLE_PARAM_IS_VIA_PTR) + NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE); + else + NdrClientContextMarshall(pStubMsg, pMemory, FALSE); + } else - NdrClientContextMarshall(pStubMsg, pMemory, FALSE); + { + NDR_SCONTEXT ctxt = NDRSContextFromValue(pMemory); + NDR_RUNDOWN rundown = pStubMsg->StubDesc->apfnNdrRundownRoutines[pFormat[2]]; + NdrServerContextNewMarshall(pStubMsg, ctxt, rundown, pFormat); + } return NULL; } @@ -6714,10 +6726,22 @@ static unsigned char *WINAPI NdrContextHandleUnmarshall( } TRACE("flags: 0x%02x\n", pFormat[1]); - /* [out]-only or [ret] param */ - if ((pFormat[1] & 0x60) == 0x20) - **(NDR_CCONTEXT **)ppMemory = NULL; - NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + if (pStubMsg->IsClient) + { + /* [out]-only or [ret] param */ + if ((pFormat[1] & (HANDLE_PARAM_IS_IN|HANDLE_PARAM_IS_OUT)) == HANDLE_PARAM_IS_OUT) + **(NDR_CCONTEXT **)ppMemory = NULL; + NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + } + else + { + NDR_SCONTEXT ctxt; + ctxt = NdrServerContextNewUnmarshall(pStubMsg, pFormat); + if (pFormat[1] & HANDLE_PARAM_IS_VIA_PTR) + *(void **)ppMemory = NDRSContextValue(ctxt); + else + *(void **)ppMemory = *NDRSContextValue(ctxt); + } return NULL; } diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index bf6a7be..2028fed 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1128,7 +1128,8 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, !pParam->param_attributes.IsByValue && !pParam->param_attributes.ServerAllocSize) { - pStubMsg->pfnFree(*(void **)pArg); + if (*pTypeFormat != RPC_FC_BIND_CONTEXT) + pStubMsg->pfnFree(*(void **)pArg); } if (pParam->param_attributes.ServerAllocSize) @@ -1140,12 +1141,21 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, !pParam->param_attributes.ServerAllocSize && !pParam->param_attributes.IsByValue) { - DWORD size = calc_arg_size(pStubMsg, pTypeFormat); - - if(size) + if (*pTypeFormat == RPC_FC_BIND_CONTEXT) { - *(void **)pArg = NdrAllocate(pStubMsg, size); - memset(*(void **)pArg, 0, size); + NDR_SCONTEXT ctxt = NdrContextHandleInitialize( + pStubMsg, pTypeFormat); + *(void **)pArg = NDRSContextValue(ctxt); + } + else + { + DWORD size = calc_arg_size(pStubMsg, pTypeFormat); + + if(size) + { + *(void **)pArg = NdrAllocate(pStubMsg, size); + memset(*(void **)pArg, 0, size); + } } } break;

1 0

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

14 Dec '09

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

Francois Gouget : winedbg: Use SUBLANG_NEUTRAL for Spanish.
by Alexandre Julliard 14 Dec '09

14 Dec '09

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

Vincent Povirk : gdiplus: Implement GdipGetImagePaletteSize.
by Alexandre Julliard 14 Dec '09

14 Dec '09

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

Vincent Povirk : gdiplus: Implement GdipGetImagePalette.
by Alexandre Julliard 14 Dec '09

14 Dec '09

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: Initialize the palettes of new indexed bitmaps.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 6c040271c16a8d29eee0f8456e40f48f875aa2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c040271c16a8d29eee0f8456… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 17:16:21 2009 -0600 gdiplus: Initialize the palettes of new indexed bitmaps. --- dlls/gdiplus/image.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 982956c..f78b70a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1134,6 +1134,44 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) return Ok; } +static void generate_halftone_palette(ARGB *entries, UINT count) +{ + static const BYTE halftone_values[6]={0x00,0x33,0x66,0x99,0xcc,0xff}; + UINT i; + + for (i=0; i<8 && i<count; i++) + { + entries[i] = 0xff000000; + if (i&1) entries[i] |= 0x800000; + if (i&2) entries[i] |= 0x8000; + if (i&4) entries[i] |= 0x80; + } + + if (8 < count) + entries[i] = 0xffc0c0c0; + + for (i=9; i<16 && i<count; i++) + { + entries[i] = 0xff000000; + if (i&1) entries[i] |= 0xff0000; + if (i&2) entries[i] |= 0xff00; + if (i&4) entries[i] |= 0xff; + } + + for (i=16; i<40 && i<count; i++) + { + entries[i] = 0; + } + + for (i=40; i<256 && i<count; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[(i-40)%6]; + entries[i] |= halftone_values[((i-40)/6)%6] << 8; + entries[i] |= halftone_values[((i-40)/36)%6] << 16; + } +} + GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, PixelFormat format, BYTE* scan0, GpBitmap** bitmap) { @@ -1214,6 +1252,36 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->bits = bits; (*bitmap)->stride = dib_stride; + if (format == PixelFormat1bppIndexed || + format == PixelFormat4bppIndexed || + format == PixelFormat8bppIndexed) + { + (*bitmap)->image.palette_size = (*bitmap)->image.palette_count = 1 << PIXELFORMATBPP(format); + (*bitmap)->image.palette_entries = GdipAlloc(sizeof(ARGB) * ((*bitmap)->image.palette_size)); + + if (!(*bitmap)->image.palette_entries) + { + GdipDisposeImage(&(*bitmap)->image); + *bitmap = NULL; + return OutOfMemory; + } + + if (format == PixelFormat1bppIndexed) + { + (*bitmap)->image.palette_flags = PaletteFlagsGrayScale; + (*bitmap)->image.palette_entries[0] = 0xff000000; + (*bitmap)->image.palette_entries[1] = 0xffffffff; + } + else + { + if (format == PixelFormat8bppIndexed) + (*bitmap)->image.palette_flags = PaletteFlagsHalftone; + + generate_halftone_palette((*bitmap)->image.palette_entries, + (*bitmap)->image.palette_count); + } + } + return Ok; }

1 0

Vincent Povirk : gdiplus: Add test for image palette functions.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 01c26d14166b3102332c41a42e9094fb4fefa559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c26d14166b3102332c41a42… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 15:55:01 2009 -0600 gdiplus: Add test for image palette functions. --- dlls/gdiplus/tests/image.c | 174 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 174 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index cd761bd..1ef2651 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -876,6 +876,179 @@ static void test_getsetpixel(void) expect(Ok, stat); } +static void check_halftone_palette(ColorPalette *palette) +{ + static const BYTE halftone_values[6]={0x00,0x33,0x66,0x99,0xcc,0xff}; + UINT i; + + for (i=0; i<palette->Count; i++) + { + ARGB expected=0xff000000; + if (i<8) + { + if (i&1) expected |= 0x800000; + if (i&2) expected |= 0x8000; + if (i&4) expected |= 0x80; + } + else if (i == 8) + { + expected = 0xffc0c0c0; + } + else if (i < 16) + { + if (i&1) expected |= 0xff0000; + if (i&2) expected |= 0xff00; + if (i&4) expected |= 0xff; + } + else if (i < 40) + { + expected = 0x00000000; + } + else + { + expected |= halftone_values[(i-40)%6]; + expected |= halftone_values[((i-40)/6)%6] << 8; + expected |= halftone_values[((i-40)/36)%6] << 16; + } + ok(expected == palette->Entries[i], "Expected %.8x, got %.8x, i=%u/%u\n", + expected, palette->Entries[i], i, palette->Count); + } +} + +static void test_palette(void) +{ + GpStatus stat; + GpBitmap *bitmap; + INT size; + BYTE buffer[1040]; + ColorPalette *palette=(ColorPalette*)buffer; + + /* test initial palette from non-indexed bitmap */ + stat = GdipCreateBitmapFromScan0(2, 2, 8, PixelFormat32bppRGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB), size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(0, palette->Count); + + /* test setting palette on not-indexed bitmap */ + palette->Count = 3; + + stat = GdipSetImagePalette((GpImage*)bitmap, palette); + expect(Ok, stat); + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*3, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(3, palette->Count); + + GdipDisposeImage((GpImage*)bitmap); + + /* test initial palette on 1-bit bitmap */ + stat = GdipCreateBitmapFromScan0(2, 2, 4, PixelFormat1bppIndexed, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*2, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(PaletteFlagsGrayScale, palette->Flags); + expect(2, palette->Count); + + expect(0xff000000, palette->Entries[0]); + expect(0xffffffff, palette->Entries[1]); + + GdipDisposeImage((GpImage*)bitmap); + + /* test initial palette on 4-bit bitmap */ + stat = GdipCreateBitmapFromScan0(2, 2, 4, PixelFormat4bppIndexed, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*16, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(0, palette->Flags); + expect(16, palette->Count); + + check_halftone_palette(palette); + + GdipDisposeImage((GpImage*)bitmap); + + /* test initial palette on 8-bit bitmap */ + stat = GdipCreateBitmapFromScan0(2, 2, 8, PixelFormat8bppIndexed, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*256, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(PaletteFlagsHalftone, palette->Flags); + expect(256, palette->Count); + + check_halftone_palette(palette); + + /* test setting/getting a different palette */ + palette->Entries[1] = 0xffcccccc; + + stat = GdipSetImagePalette((GpImage*)bitmap, palette); + expect(Ok, stat); + + palette->Entries[1] = 0; + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*256, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(PaletteFlagsHalftone, palette->Flags); + expect(256, palette->Count); + expect(0xffcccccc, palette->Entries[1]); + + /* test count < 256 */ + palette->Flags = 12345; + palette->Count = 3; + + stat = GdipSetImagePalette((GpImage*)bitmap, palette); + expect(Ok, stat); + + palette->Entries[1] = 0; + palette->Entries[3] = 0xdeadbeef; + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*3, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(12345, palette->Flags); + expect(3, palette->Count); + expect(0xffcccccc, palette->Entries[1]); + expect(0xdeadbeef, palette->Entries[3]); + + /* test count > 256 */ + palette->Count = 257; + + stat = GdipSetImagePalette((GpImage*)bitmap, palette); + expect(InvalidParameter, stat); + + GdipDisposeImage((GpImage*)bitmap); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -903,6 +1076,7 @@ START_TEST(image) test_getrawformat(); test_createhbitmap(); test_getsetpixel(); + test_palette(); GdiplusShutdown(gdiplusToken); }

1 0

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

14 Dec '09

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