October 2009 - Wine-commits

Henri Verbeet : wined3d: Refuse to parse shaders with an invalid version token.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: de82b55b209c454c903f25bb4dff5a1628f8c325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de82b55b209c454c903f25bb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 26 10:12:17 2009 +0100 wined3d: Refuse to parse shaders with an invalid version token. --- dlls/wined3d/shader_sm1.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index aef817e..64876b3 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -506,7 +506,18 @@ static int shader_skip_unrecognized(const struct wined3d_sm1_data *priv, const D static void *shader_sm1_init(const DWORD *byte_code, const struct wined3d_shader_signature *output_signature) { - struct wined3d_sm1_data *priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); + struct wined3d_sm1_data *priv; + BYTE major, minor; + + major = WINED3D_SM1_VERSION_MAJOR(*byte_code); + minor = WINED3D_SM1_VERSION_MINOR(*byte_code); + if (WINED3D_SHADER_VERSION(major, minor) > WINED3D_SHADER_VERSION(3, 0)) + { + WARN("Invalid shader version %u.%u (%#x).\n", major, minor, *byte_code); + return NULL; + } + + priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); if (!priv) { ERR("Failed to allocate private data\n");

1 0

Henri Verbeet : wined3d: Fix a typo.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: d03a105c1acfe92cc56e5075edc6a0ff2fee6ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03a105c1acfe92cc56e5075e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 26 10:12:18 2009 +0100 wined3d: Fix a typo. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 83f537c..d7c251a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1357,7 +1357,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice return hr; } - TRACE("Created verrtex declaration %p.\n", object); + TRACE("Created vertex declaration %p.\n", object); *declaration = (IWineD3DVertexDeclaration *)object; return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Print an ERR instead of crashing in context_check_fbo_status().
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 483d5d0a0d74c83aa140b9865ab73f2026a66568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d5d0a0d74c83aa140b9865… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 26 10:12:19 2009 +0100 wined3d: Print an ERR instead of crashing in context_check_fbo_status(). Some version of Mesa will claim the window system provided framebuffer is incomplete when using indirect rendering, although the framebuffer objects spec says this can never happen. Printing an ERR instead of crashing should make it clearer that this isn't a wined3d problem. --- dlls/wined3d/context.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 66ba358..de50f9e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -288,6 +288,12 @@ static void context_check_fbo_status(struct wined3d_context *context) unsigned int i; FIXME("FBO status %s (%#x)\n", debug_fbostatus(status), status); + if (!context->current_fbo) + { + ERR("FBO 0 is incomplete, driver bug?\n"); + return; + } + /* Dump the FBO attachments */ for (i = 0; i < gl_info->max_buffers; ++i) {

1 0

Vincent Povirk : ole32: Clarify the timestamp fields in StgProperty.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 224ddb50f325d558d3e4a2f419484f1f30ba1b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=224ddb50f325d558d3e4a2f41… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Oct 23 13:29:56 2009 -0500 ole32: Clarify the timestamp fields in StgProperty. According to the MS spec, these are FILETIME structures containing creation and modification times. --- dlls/ole32/storage32.c | 50 +++++++++++++++++++++-------------------------- dlls/ole32/storage32.h | 14 +++++------- 2 files changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b9c2f29..32ff8b6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -773,10 +773,8 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( renamedProperty.dirProperty = currentProperty.dirProperty; /* call CoFileTime to get the current time - renamedProperty.timeStampS1 - renamedProperty.timeStampD1 - renamedProperty.timeStampS2 - renamedProperty.timeStampD2 + renamedProperty.ctime + renamedProperty.mtime renamedProperty.propertyUniqueID */ @@ -967,10 +965,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( newStreamProperty.dirProperty = PROPERTY_NULL; /* call CoFileTime to get the current time - newStreamProperty.timeStampS1 - newStreamProperty.timeStampD1 - newStreamProperty.timeStampS2 - newStreamProperty.timeStampD2 + newStreamProperty.ctime + newStreamProperty.mtime */ /* newStreamProperty.propertyUniqueID */ @@ -1167,10 +1163,8 @@ static HRESULT WINAPI StorageImpl_CreateStorage( newProperty.dirProperty = PROPERTY_NULL; /* call CoFileTime to get the current time - newProperty.timeStampS1 - newProperty.timeStampD1 - newProperty.timeStampS2 - newProperty.timeStampD2 + newProperty.ctime + newProperty.mtime */ /* newStorageProperty.propertyUniqueID */ @@ -3234,23 +3228,23 @@ BOOL StorageImpl_ReadProperty( StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSS1, - &buffer->timeStampS1); + OFFSET_PS_CTIMELOW, + &buffer->ctime.dwLowDateTime); StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSD1, - &buffer->timeStampD1); + OFFSET_PS_CTIMEHIGH, + &buffer->ctime.dwHighDateTime); StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSS2, - &buffer->timeStampS2); + OFFSET_PS_MTIMELOW, + &buffer->mtime.dwLowDateTime); StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSD2, - &buffer->timeStampD2); + OFFSET_PS_MTIMEHIGH, + &buffer->mtime.dwHighDateTime); StorageUtl_ReadDWord( currentProperty, @@ -3320,23 +3314,23 @@ BOOL StorageImpl_WriteProperty( StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSS1, - buffer->timeStampS1); + OFFSET_PS_CTIMELOW, + buffer->ctime.dwLowDateTime); StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSD1, - buffer->timeStampD1); + OFFSET_PS_CTIMEHIGH, + buffer->ctime.dwHighDateTime); StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSS2, - buffer->timeStampS2); + OFFSET_PS_MTIMELOW, + buffer->mtime.dwLowDateTime); StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSD2, - buffer->timeStampD2); + OFFSET_PS_MTIMEHIGH, + buffer->ctime.dwHighDateTime); StorageUtl_WriteDWord( currentProperty, diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index fc4af32..a1b7ac5 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -58,10 +58,10 @@ static const ULONG OFFSET_PS_PREVIOUSPROP = 0x00000044; static const ULONG OFFSET_PS_NEXTPROP = 0x00000048; static const ULONG OFFSET_PS_DIRPROP = 0x0000004C; static const ULONG OFFSET_PS_GUID = 0x00000050; -static const ULONG OFFSET_PS_TSS1 = 0x00000064; -static const ULONG OFFSET_PS_TSD1 = 0x00000068; -static const ULONG OFFSET_PS_TSS2 = 0x0000006C; -static const ULONG OFFSET_PS_TSD2 = 0x00000070; +static const ULONG OFFSET_PS_CTIMELOW = 0x00000064; +static const ULONG OFFSET_PS_CTIMEHIGH = 0x00000068; +static const ULONG OFFSET_PS_MTIMELOW = 0x0000006C; +static const ULONG OFFSET_PS_MTIMEHIGH = 0x00000070; static const ULONG OFFSET_PS_STARTBLOCK = 0x00000074; static const ULONG OFFSET_PS_SIZE = 0x00000078; static const WORD DEF_BIG_BLOCK_SIZE_BITS = 0x0009; @@ -136,10 +136,8 @@ struct StgProperty ULONG nextProperty; ULONG dirProperty; GUID propertyUniqueID; - ULONG timeStampS1; - ULONG timeStampD1; - ULONG timeStampS2; - ULONG timeStampD2; + FILETIME ctime; + FILETIME mtime; ULONG startingBlock; ULARGE_INTEGER size; };

1 0

Vincent Povirk : ole32: Rename previous/nextProperty to left/rightChild.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: dce1ec06c8f034480abc775b13ef520af2555e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce1ec06c8f034480abc775b1… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Oct 23 13:36:59 2009 -0500 ole32: Rename previous/nextProperty to left/rightChild. These fields are used to build a binary tree of elements in a storage. This should make the usage clearer. --- dlls/ole32/storage32.c | 116 ++++++++++++++++++++++++------------------------ dlls/ole32/storage32.h | 8 ++-- 2 files changed, 62 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dce1ec06c8f034480abc7…

1 0

Vincent Povirk : ole32: Don' t use IEnumSTATSTG to search for elements of storages.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: ee6856d874d687c4504914e61bcde3e6b8823bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6856d874d687c4504914e61… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Oct 23 13:57:42 2009 -0500 ole32: Don't use IEnumSTATSTG to search for elements of storages. We use it to do a linear search of a binary tree, which is overkill. Replace it with a simple binary search. --- dlls/ole32/storage32.c | 181 ++++++++++++++++++------------------------------ 1 files changed, 68 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee6856d874d687c450491…

1 0

Jeremy White : oleaut32: StructArg tests cannot rely on an unpacked structure memcmp.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 1e0b8367124c8a10648f665ff6edb9d8d3c92788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0b8367124c8a10648f665ff… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Sat Oct 24 17:13:17 2009 -0500 oleaut32: StructArg tests cannot rely on an unpacked structure memcmp. --- dlls/oleaut32/tests/tmarshal.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index b73a0da..9b14613 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -521,9 +521,18 @@ static HRESULT WINAPI Widget_StructArgs( MYSTRUCT *byptr, MYSTRUCT arr[5]) { - ok(memcmp(&byval, &MYSTRUCT_BYVAL, sizeof(MYSTRUCT))==0, "Struct parameter passed by value corrupted\n"); - ok(memcmp(byptr, &MYSTRUCT_BYPTR, sizeof(MYSTRUCT))==0, "Struct parameter passed by pointer corrupted\n"); - ok(memcmp(arr, MYSTRUCT_ARRAY, sizeof(MYSTRUCT_ARRAY))==0, "Array of structs corrupted\n"); + int i, diff = 0; + ok(byval.field1 == MYSTRUCT_BYVAL.field1 && + byval.field2 == MYSTRUCT_BYVAL.field2, + "Struct parameter passed by value corrupted\n"); + ok(byptr->field1 == MYSTRUCT_BYPTR.field1 && + byptr->field2 == MYSTRUCT_BYPTR.field2, + "Struct parameter passed by pointer corrupted\n"); + for (i = 0; i < 5; i++) + if (arr[i].field1 != MYSTRUCT_ARRAY[i].field1 || + arr[i].field2 != MYSTRUCT_ARRAY[i].field2) + diff++; + ok(diff == 0, "Array of structs corrupted\n"); return S_OK; }

1 0

Jeremy White : oleaut32: Implement the ability to marshall VT_CARRAY' s of user defined types.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: b8d7088e88d7c077c0c4ad1b2c4d7f3503e2806a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d7088e88d7c077c0c4ad1b2… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Sat Oct 24 17:29:02 2009 -0500 oleaut32: Implement the ability to marshall VT_CARRAY's of user defined types. --- dlls/oleaut32/tests/tmarshal.c | 2 -- dlls/oleaut32/tmarshal.c | 5 +++-- dlls/oleaut32/typelib.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 9b14613..c9ea77d 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1078,9 +1078,7 @@ static void test_typelibmarshal(void) mystruct = MYSTRUCT_BYPTR; memcpy(mystructArray, MYSTRUCT_ARRAY, sizeof(mystructArray)); hr = IWidget_StructArgs(pWidget, MYSTRUCT_BYVAL, &mystruct, mystructArray); - todo_wine { ok_ole_success(hr, IWidget_StructArgs); - } /* call Clone */ dispparams.cNamedArgs = 0; diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index e7d7b89..b3d1734 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -888,7 +888,7 @@ serialize_param( if (debugout) TRACE_(olerelay)("(vt %s)",debugstr_vt(adesc->tdescElem.vt)); if (debugout) TRACE_(olerelay)("["); for (i=0;i<arrsize;i++) { - hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)arg+i*_xsize(&adesc->tdescElem, tinfo)), buf); + hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)(*arg)+i*_xsize(&adesc->tdescElem, tinfo)), buf); if (hres) return hres; if (debugout && (i<arrsize-1)) TRACE_(olerelay)(","); @@ -1247,6 +1247,7 @@ deserialize_param( if (adesc->cDims > 1) FIXME("cDims > 1 in VT_CARRAY. Does it work?\n"); for (i=0;i<adesc->cDims;i++) arrsize *= adesc->rgbounds[i].cElements; + *arg=(DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo) * arrsize); for (i=0;i<arrsize;i++) deserialize_param( tinfo, @@ -1254,7 +1255,7 @@ deserialize_param( debugout, alloc, &adesc->tdescElem, - (DWORD*)((LPBYTE)(arg)+i*_xsize(&adesc->tdescElem, tinfo)), + (DWORD*)((LPBYTE)(*arg)+i*_xsize(&adesc->tdescElem, tinfo)), buf ); return S_OK; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0bd9b19..9e25e77 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2947,7 +2947,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) if(td[1]<0) pTypeLibImpl->pTypeDesc[i].u.lpadesc->tdescElem.vt = td[0] & VT_TYPEMASK; else - pTypeLibImpl->pTypeDesc[i].u.lpadesc->tdescElem = stndTypeDesc[td[0]/8]; + pTypeLibImpl->pTypeDesc[i].u.lpadesc->tdescElem = cx.pLibInfo->pTypeDesc[td[0]/(2*sizeof(INT))]; pTypeLibImpl->pTypeDesc[i].u.lpadesc->cDims = td[2];

1 0

Nikolay Sivov : comctl32/toolbar: Don't leak button strings.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: 31ae6a902ea8ba0dff214e207801216dd8bb1b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ae6a902ea8ba0dff214e207… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 24 18:18:19 2009 +0400 comctl32/toolbar: Don't leak button strings. --- dlls/comctl32/toolbar.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d05a40d..b485f04 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -315,6 +315,11 @@ TOOLBAR_DumpToolbar(const TOOLBAR_INFO *iP, INT line) } } +static inline BOOL +TOOLBAR_ButtonHasString(const TBUTTON_INFO *btnPtr) +{ + return HIWORD(btnPtr->iString) && btnPtr->iString != -1; +} /*********************************************************************** * TOOLBAR_CheckStyle @@ -3203,6 +3208,8 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) if (infoPtr->nNumButtons == 1) { TRACE(" simple delete!\n"); + if (TOOLBAR_ButtonHasString(infoPtr->buttons)) + Free((LPWSTR)infoPtr->buttons[0].iString); Free (infoPtr->buttons); infoPtr->buttons = NULL; infoPtr->nNumButtons = 0; @@ -3223,6 +3230,8 @@ TOOLBAR_DeleteButton (TOOLBAR_INFO *infoPtr, INT nIndex) (infoPtr->nNumButtons - nIndex) * sizeof(TBUTTON_INFO)); } + if (TOOLBAR_ButtonHasString(oldButtons)) + Free((LPWSTR)oldButtons->iString); Free (oldButtons); } @@ -4331,11 +4340,10 @@ TOOLBAR_SetButtonInfoA (TOOLBAR_INFO *infoPtr, INT Id, const TBBUTTONINFOA *lptb btnPtr->fsStyle = lptbbi->fsStyle; if ((lptbbi->dwMask & TBIF_TEXT) && ((INT_PTR)lptbbi->pszText != -1)) { - if ((HIWORD(btnPtr->iString) == 0) || (btnPtr->iString == -1)) - /* iString is index, zero it to make Str_SetPtr succeed */ - btnPtr->iString=0; + /* iString is index, zero it to make Str_SetPtr succeed */ + if (!TOOLBAR_ButtonHasString(btnPtr)) btnPtr->iString = 0; - Str_SetPtrAtoW ((LPWSTR *)&btnPtr->iString, lptbbi->pszText); + Str_SetPtrAtoW ((LPWSTR *)&btnPtr->iString, lptbbi->pszText); } /* save the button rect to see if we need to redraw the whole toolbar */ @@ -4382,9 +4390,9 @@ TOOLBAR_SetButtonInfoW (TOOLBAR_INFO *infoPtr, INT Id, const TBBUTTONINFOW *lptb btnPtr->fsStyle = lptbbi->fsStyle; if ((lptbbi->dwMask & TBIF_TEXT) && ((INT_PTR)lptbbi->pszText != -1)) { - if ((HIWORD(btnPtr->iString) == 0) || (btnPtr->iString == -1)) - /* iString is index, zero it to make Str_SetPtr succeed */ - btnPtr->iString=0; + /* iString is index, zero it to make Str_SetPtr succeed */ + if (!TOOLBAR_ButtonHasString(btnPtr)) btnPtr->iString = 0; + Str_SetPtrW ((LPWSTR *)&btnPtr->iString, lptbbi->pszText); } @@ -5222,6 +5230,8 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) static LRESULT TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) { + INT i; + /* delete tooltip control */ if (infoPtr->hwndToolTip) DestroyWindow (infoPtr->hwndToolTip); @@ -5231,11 +5241,13 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr) Free (infoPtr->bitmaps); /* bitmaps list */ /* delete button data */ + for (i = 0; i < infoPtr->nNumButtons; i++) + if (TOOLBAR_ButtonHasString(&infoPtr->buttons[i])) + Free ((LPWSTR)infoPtr->buttons[i].iString); Free (infoPtr->buttons); /* delete strings */ if (infoPtr->strings) { - INT i; for (i = 0; i < infoPtr->nNumStrings; i++) Free (infoPtr->strings[i]);

1 0

Nikolay Sivov : comctl32/tests: Release Imagelist handles when no needed anymore.
by Alexandre Julliard 26 Oct '09

26 Oct '09

Module: wine Branch: master Commit: eaa939e9425e5903f26535a0e7015d4b6bc1f232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa939e9425e5903f26535a0e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 24 19:33:36 2009 +0400 comctl32/tests: Release Imagelist handles when no needed anymore. --- dlls/comctl32/tests/toolbar.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 3b3708b..41f4f2d 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -373,6 +373,8 @@ static void test_add_bitmap(void) addbmp.hInst = HINST_COMMCTRL; addbmp.nID = IDB_STD_SMALL_COLOR; rebuild_toolbar(&hToolbar); + ImageList_Destroy(himl); + ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); CHECK_IMAGELIST(15, 16, 16); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), MAKELONG(23, 22), "%x"); @@ -980,6 +982,7 @@ static void test_sizes(void) rebuild_toolbar(&hToolbar); ImageList_Destroy(himl); + ImageList_Destroy(himl2); SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 39), "Unexpected button size\n");

1 0