wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Detlef Riekenberg : gdi32/enhmfdrv: Remove unneded if() before HeapFree.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 3bae9b725cc119ed40c68877b5e0c86ade2ac902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bae9b725cc119ed40c68877b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 20 14:33:37 2010 +0200 gdi32/enhmfdrv: Remove unneded if() before HeapFree. --- dlls/gdi32/enhmfdrv/init.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 7e1c9b8..279300d 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -285,10 +285,8 @@ HDC WINAPI CreateEnhMetaFileA( hReturnDC = CreateEnhMetaFileW(hdc, filenameW, rect, descriptionW); - if(filenameW) - HeapFree( GetProcessHeap(), 0, filenameW ); - if(descriptionW) - HeapFree( GetProcessHeap(), 0, descriptionW ); + HeapFree( GetProcessHeap(), 0, filenameW ); + HeapFree( GetProcessHeap(), 0, descriptionW ); return hReturnDC; }

1 0

David Hedberg : shell32: Implement IExplorerBrowser::SetRect.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: bee7d4b7e34892131b95d2ca8ef6e22057ed28b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee7d4b7e34892131b95d2ca8… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Aug 20 07:46:00 2010 +0200 shell32: Implement IExplorerBrowser::SetRect. --- dlls/shell32/ebrowser.c | 16 ++++++++- dlls/shell32/tests/ebrowser.c | 72 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 9f9308e..b2c4497 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -191,9 +191,21 @@ static HRESULT WINAPI IExplorerBrowser_fnSetRect(IExplorerBrowser *iface, HDWP *phdwp, RECT rcBrowser) { ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface; - FIXME("stub, %p (%p, %s)\n", This, phdwp, wine_dbgstr_rect(&rcBrowser)); + TRACE("%p (%p, %s)\n", This, phdwp, wine_dbgstr_rect(&rcBrowser)); - return E_NOTIMPL; + if(phdwp) + { + *phdwp = DeferWindowPos(*phdwp, This->hwnd_main, NULL, rcBrowser.left, rcBrowser.top, + rcBrowser.right - rcBrowser.left, rcBrowser.bottom - rcBrowser.top, + SWP_NOZORDER | SWP_NOACTIVATE); + } + else + { + MoveWindow(This->hwnd_main, rcBrowser.left, rcBrowser.top, + rcBrowser.right - rcBrowser.left, rcBrowser.bottom - rcBrowser.top, TRUE); + } + + return S_OK; } static HRESULT WINAPI IExplorerBrowser_fnSetPropertyBag(IExplorerBrowser *iface, diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index e3f4e9c..be993dd 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -37,6 +37,13 @@ static HRESULT ebrowser_instantiate(IExplorerBrowser **peb) &IID_IExplorerBrowser, (void**)peb); } +static HRESULT ebrowser_initialize(IExplorerBrowser *peb) +{ + RECT rc; + rc.top = rc.left = 0; rc.bottom = rc.right = 500; + return IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); +} + static void test_QueryInterface(void) { IExplorerBrowser *peb; @@ -265,6 +272,70 @@ static void test_initialization(void) ok(lres == 0, "Got refcount %d\n", lres); } +static void test_basics(void) +{ + IExplorerBrowser *peb; + IShellBrowser *psb; + ULONG lres; + HDWP hdwp; + RECT rc; + HRESULT hr; + + ebrowser_instantiate(&peb); + ebrowser_initialize(peb); + + /* SetRect */ + rc.left = 0; rc.top = 0; rc.right = 0; rc.bottom = 0; + hr = IExplorerBrowser_SetRect(peb, NULL, rc); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + rc.left = 100; rc.top = 100; rc.right = 10; rc.bottom = 10; + hr = IExplorerBrowser_SetRect(peb, NULL, rc); + ok(hr == S_OK, "got (0x%08x)\n", hr); + + /* SetRect with DeferWindowPos */ + rc.left = rc.top = 0; rc.right = rc.bottom = 10; + hdwp = BeginDeferWindowPos(1); + hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); + ok(hr == S_OK, "got (0x%08x)\n", hr); + lres = EndDeferWindowPos(hdwp); + ok(lres, "EndDeferWindowPos failed.\n"); + + hdwp = NULL; + hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(hdwp == NULL, "got %p\n", hdwp); + lres = EndDeferWindowPos(hdwp); + ok(!lres, "EndDeferWindowPos succeeded unexpectedly.\n"); + + /* Test positioning */ + rc.left = 10; rc.top = 20; rc.right = 50; rc.bottom = 50; + hr = IExplorerBrowser_SetRect(peb, NULL, rc); + ok(hr == S_OK, "got (0x%08x)\n", hr); + hr = IExplorerBrowser_QueryInterface(peb, &IID_IShellBrowser, (void**)&psb); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + HWND eb_hwnd; + RECT eb_rc; + static const RECT exp_rc = {11, 21, 49, 49}; + + hr = IShellBrowser_GetWindow(psb, &eb_hwnd); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + GetClientRect(eb_hwnd, &eb_rc); + MapWindowPoints(eb_hwnd, hwnd, (POINT*)&eb_rc, 2); + ok(EqualRect(&eb_rc, &exp_rc), "Got rect (%d, %d) - (%d, %d)\n", + eb_rc.left, eb_rc.top, eb_rc.right, eb_rc.bottom); + + IShellBrowser_Release(psb); + } + + IExplorerBrowser_Destroy(peb); + lres = IExplorerBrowser_Release(peb); + ok(lres == 0, "Got %d\n", lres); +} + static BOOL test_instantiate_control(void) { IExplorerBrowser *peb; @@ -310,6 +381,7 @@ START_TEST(ebrowser) test_QueryInterface(); test_SB_misc(); test_initialization(); + test_basics(); DestroyWindow(hwnd); OleUninitialize();

1 0

David Hedberg : shell32: Implement IExplorerBrowser::Initialize.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: e4e62e707a8971576b5f3fdd388078c9dcf1471c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e62e707a8971576b5f3fdd3… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Aug 20 07:45:59 2010 +0200 shell32: Implement IExplorerBrowser::Initialize. --- dlls/shell32/ebrowser.c | 77 ++++++++++++++++++++- dlls/shell32/tests/ebrowser.c | 155 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 230 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4e62e707a8971576b5f3…

1 0

David Hedberg : shell32: Add IShellBrowser stub.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 1efc54088b9dcb924ecce63c4b6760f224391ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1efc54088b9dcb924ecce63c4… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Aug 20 07:45:58 2010 +0200 shell32: Add IShellBrowser stub. --- dlls/shell32/ebrowser.c | 204 +++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/ebrowser.c | 55 +++++++++++- 2 files changed, 258 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1efc54088b9dcb924ecce…

1 0

David Hedberg : shell32/tests: Add initial tests for the IExplorerBrowser control.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 19979df9650bb56bc2b3003a0cc5c86a932adda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19979df9650bb56bc2b3003a0… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Aug 20 07:45:57 2010 +0200 shell32/tests: Add initial tests for the IExplorerBrowser control. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/ebrowser.c | 108 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index f02b546..1d15fc0 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ appbar.c \ autocomplete.c \ brsfolder.c \ + ebrowser.c \ generated.c \ progman_dde.c \ shelllink.c \ diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c new file mode 100644 index 0000000..35c87bd --- /dev/null +++ b/dlls/shell32/tests/ebrowser.c @@ -0,0 +1,108 @@ +/* + * Unit tests for the Explorer Browser control + * + * Copyright 2010 David Hedberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#define COBJMACROS + +#include "shlobj.h" + +#include "wine/test.h" + +/********************************************************************* + * Some simple helpers + */ +static HRESULT ebrowser_instantiate(IExplorerBrowser **peb) +{ + return CoCreateInstance(&CLSID_ExplorerBrowser, NULL, CLSCTX_INPROC_SERVER, + &IID_IExplorerBrowser, (void**)peb); +} + +static void test_QueryInterface(void) +{ + IExplorerBrowser *peb; + IUnknown *punk; + HRESULT hr; + LONG lres; + + hr = ebrowser_instantiate(&peb); + ok(hr == S_OK, "Got 0x%08x\n", hr); + +#define test_qinterface(iid, exp) \ + do { \ + hr = IExplorerBrowser_QueryInterface(peb, &iid, (void**)&punk); \ + ok(hr == exp, "(%s:)Expected (0x%08x), got (0x%08x)\n", \ + #iid, exp, hr); \ + if(SUCCEEDED(hr)) IUnknown_Release(punk); \ + } while(0) + + test_qinterface(IID_IUnknown, S_OK); + test_qinterface(IID_IExplorerBrowser, S_OK); + todo_wine test_qinterface(IID_IShellBrowser, S_OK); + todo_wine test_qinterface(IID_IOleWindow, S_OK); + todo_wine test_qinterface(IID_ICommDlgBrowser, S_OK); + todo_wine test_qinterface(IID_ICommDlgBrowser2, S_OK); + todo_wine test_qinterface(IID_ICommDlgBrowser3, S_OK); + todo_wine test_qinterface(IID_IServiceProvider, S_OK); + todo_wine test_qinterface(IID_IObjectWithSite, S_OK); + todo_wine test_qinterface(IID_IConnectionPointContainer, S_OK); + test_qinterface(IID_IOleObject, E_NOINTERFACE); + test_qinterface(IID_IViewObject, E_NOINTERFACE); + test_qinterface(IID_IViewObject2, E_NOINTERFACE); + test_qinterface(IID_IViewObjectEx, E_NOINTERFACE); + test_qinterface(IID_IConnectionPoint, E_NOINTERFACE); + test_qinterface(IID_IShellView, E_NOINTERFACE); + test_qinterface(IID_INameSpaceTreeControlEvents, E_NOINTERFACE); + +#undef test_qinterface + + lres = IExplorerBrowser_Release(peb); + ok(lres == 0, "Got %d\n", lres); +} + +static BOOL test_instantiate_control(void) +{ + IExplorerBrowser *peb; + HRESULT hr; + + hr = ebrowser_instantiate(&peb); + ok(hr == S_OK || hr == REGDB_E_CLASSNOTREG, "Got (0x%08x)\n", hr); + if(FAILED(hr)) + return FALSE; + + IExplorerBrowser_Release(peb); + return TRUE; +} + +START_TEST(ebrowser) +{ + OleInitialize(NULL); + + if(!test_instantiate_control()) + { + win_skip("No ExplorerBrowser control..\n"); + OleUninitialize(); + return; + } + + test_QueryInterface(); + + OleUninitialize(); +}

1 0

David Hedberg : shell32: Add IExplorerBrowser interface stub.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: d66269696fa9311f460a8ec4d711037dae996834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66269696fa9311f460a8ec4d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Aug 20 07:45:56 2010 +0200 shell32: Add IExplorerBrowser interface stub. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/ebrowser.c | 279 +++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/regsvr.c | 7 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 1 + 5 files changed, 289 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d66269696fa9311f460a8…

1 0

Henri Verbeet : wined3d: Do not release a reference we do not have in IWineD3DSurfaceImpl_Flip().
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 910d3022c3b1881d6b1355b446598d29bdf2bef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=910d3022c3b1881d6b1355b44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 20 13:56:23 2010 +0200 wined3d: Do not release a reference we do not have in IWineD3DSurfaceImpl_Flip(). This fixes a regression introduced by 368e5eb87ae983e4ea2f66b3ca2f4154b36bbcda. --- dlls/wined3d/surface.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ea66033..dfa124d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2739,7 +2739,7 @@ void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back) { static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DSurface *override, DWORD Flags) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DSwapChainImpl *swapchain = NULL; - HRESULT hr; + TRACE("(%p)->(%p,%x)\n", This, override, Flags); /* Flipping is only supported on RenderTargets and overlays*/ @@ -2791,10 +2791,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS } /* Flipping a OpenGL surface -> Use WineD3DDevice::Present */ - hr = IWineD3DSwapChain_Present((IWineD3DSwapChain *)swapchain, + return IWineD3DSwapChain_Present((IWineD3DSwapChain *)swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); - IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - return hr; } /* Does a direct frame buffer -> texture copy. Stretching is done

1 0

Nikolay Sivov : comctl32/imagelist: Fail to create imagelist with zero or negative image dimensions.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: d84cad6a0664b756dc346ab2afc82142563d155e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84cad6a0664b756dc346ab2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 10:20:11 2010 +0400 comctl32/imagelist: Fail to create imagelist with zero or negative image dimensions. --- dlls/comctl32/imagelist.c | 2 ++ dlls/comctl32/tests/imagelist.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 6fee577..2218d99 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -694,6 +694,8 @@ ImageList_Create (INT cx, INT cy, UINT flags, TRACE("(%d %d 0x%x %d %d)\n", cx, cy, flags, cInitial, cGrow); + if (cx <= 0 || cy <= 0) return NULL; + /* Create the IImageList interface for the image list */ if (FAILED(ImageListImpl_CreateInstance(NULL, &IID_IImageList, (void **)&himl))) return NULL; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index d4699bc..26c7e12 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1754,7 +1754,6 @@ static void test_create(void) { HIMAGELIST himl; -todo_wine { /* list with zero or negative image dimensions */ himl = ImageList_Create(0, 0, ILC_COLOR16, 0, 3); ok(himl == NULL, "got %p\n", himl); @@ -1772,8 +1771,6 @@ todo_wine { ok(himl == NULL, "got %p\n", himl); } -} - START_TEST(imagelist) { ULONG_PTR ctx_cookie;

1 0

Nikolay Sivov : comctl32/imagelist: Fail in ImageList_GetIconSize on null parameters.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 66c9a73db55103fd83718838c99c866121c7c6a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66c9a73db55103fd83718838c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 10:18:16 2010 +0400 comctl32/imagelist: Fail in ImageList_GetIconSize on null parameters. --- dlls/comctl32/imagelist.c | 8 +++----- dlls/comctl32/tab.c | 8 +++++--- dlls/comctl32/tests/imagelist.c | 8 +++----- dlls/comdlg32/fontdlg.c | 4 ++-- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index f0652e5..6fee577 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1726,15 +1726,13 @@ ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle) BOOL WINAPI ImageList_GetIconSize (HIMAGELIST himl, INT *cx, INT *cy) { - if (!is_valid(himl)) + if (!is_valid(himl) || !cx || !cy) return FALSE; if ((himl->cx <= 0) || (himl->cy <= 0)) return FALSE; - if (cx) - *cx = himl->cx; - if (cy) - *cy = himl->cy; + *cx = himl->cx; + *cy = himl->cy; return TRUE; } diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 7057531..8807a11 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1163,14 +1163,14 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) if (!(infoPtr->fHeightSet)) { int item_height; - int icon_height = 0; + INT icon_height = 0, cx; /* Use the current font to determine the height of a tab. */ GetTextMetricsW(hdc, &fontMetrics); /* Get the icon height */ if (infoPtr->himl) - ImageList_GetIconSize(infoPtr->himl, 0, &icon_height); + ImageList_GetIconSize(infoPtr->himl, &cx, &icon_height); /* Take the highest between font or icon */ if (fontMetrics.tmHeight > icon_height) @@ -1195,7 +1195,9 @@ static void TAB_SetItemBounds (TAB_INFO *infoPtr) /* Get the icon width */ if (infoPtr->himl) { - ImageList_GetIconSize(infoPtr->himl, &icon_width, 0); + INT cy; + + ImageList_GetIconSize(infoPtr->himl, &icon_width, &cy); if (infoPtr->dwStyle & TCS_FIXEDWIDTH) icon_width += 4; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index b6b509c..d4699bc 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1734,21 +1734,19 @@ static void test_iconsize(void) himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); /* null pointers, not zero imagelist dimensions */ ret = ImageList_GetIconSize(himl, NULL, NULL); - todo_wine ok(!ret, "got %d\n", ret); + ok(!ret, "got %d\n", ret); /* doesn't touch return pointers */ cx = 0xdeadbeef; ret = ImageList_GetIconSize(himl, &cx, NULL); -todo_wine { ok(!ret, "got %d\n", ret); ok(cx == 0xdeadbeef, "got %d\n", cx); -} + cy = 0xdeadbeef; ret = ImageList_GetIconSize(himl, NULL, &cy); -todo_wine { ok(!ret, "got %d\n", ret); ok(cy == 0xdeadbeef, "got %d\n", cy); -} + ImageList_Destroy(himl); } diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 6d3ee73..83400fc 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -772,12 +772,12 @@ static LRESULT CFn_WMMeasureItem(HWND hDlg, LPARAM lParam) HFONT hfontprev; TEXTMETRICW tm; LPMEASUREITEMSTRUCT lpmi=(LPMEASUREITEMSTRUCT)lParam; - INT height = 0; + INT height = 0, cx; if (!himlTT) himlTT = ImageList_LoadImageW( COMDLG32_hInstance, MAKEINTRESOURCEW(38), TTBITMAP_XSIZE, 0, CLR_DEFAULT, IMAGE_BITMAP, 0); - ImageList_GetIconSize( himlTT, 0, &height); + ImageList_GetIconSize( himlTT, &cx, &height); lpmi->itemHeight = height + 2; /* use MAX of bitmap height and tm.tmHeight .*/ hdc=GetDC(hDlg);

1 0

Nikolay Sivov : comctl32/tests: More imagelist tests to show broken parameter validation.
by Alexandre Julliard 20 Aug '10

20 Aug '10

Module: wine Branch: master Commit: 8bcdc9ad4372674cdb358d6584801c45589ce9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bcdc9ad4372674cdb358d658… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 10:15:38 2010 +0400 comctl32/tests: More imagelist tests to show broken parameter validation. --- dlls/comctl32/tests/imagelist.c | 58 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index a8e31da..b6b509c 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1475,7 +1475,7 @@ static void test_IImageList_Add_Remove(void) HICON hicon2; HICON hicon3; - int ret = 0; + int ret; /* create an imagelist to play with */ himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); @@ -1500,8 +1500,11 @@ static void test_IImageList_Add_Remove(void) ok(hr == S_OK, "removed nonexistent icon\n"); /* add three */ + ret = -1; ok( IImageList_ReplaceIcon(imgl, -1, hicon1, &ret) == S_OK && (ret == 0),"failed to add icon1\n"); + ret = -1; ok( IImageList_ReplaceIcon(imgl, -1, hicon2, &ret) == S_OK && (ret == 1),"failed to add icon2\n"); + ret = -1; ok( IImageList_ReplaceIcon(imgl, -1, hicon3, &ret) == S_OK && (ret == 2),"failed to add icon3\n"); /* remove an index out of range */ @@ -1722,6 +1725,57 @@ static void test_IImageList_Merge(void) DestroyWindow(hwnd); } +static void test_iconsize(void) +{ + HIMAGELIST himl; + INT cx, cy; + BOOL ret; + + himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + /* null pointers, not zero imagelist dimensions */ + ret = ImageList_GetIconSize(himl, NULL, NULL); + todo_wine ok(!ret, "got %d\n", ret); + + /* doesn't touch return pointers */ + cx = 0xdeadbeef; + ret = ImageList_GetIconSize(himl, &cx, NULL); +todo_wine { + ok(!ret, "got %d\n", ret); + ok(cx == 0xdeadbeef, "got %d\n", cx); +} + cy = 0xdeadbeef; + ret = ImageList_GetIconSize(himl, NULL, &cy); +todo_wine { + ok(!ret, "got %d\n", ret); + ok(cy == 0xdeadbeef, "got %d\n", cy); +} + ImageList_Destroy(himl); +} + +static void test_create(void) +{ + HIMAGELIST himl; + +todo_wine { + /* list with zero or negative image dimensions */ + himl = ImageList_Create(0, 0, ILC_COLOR16, 0, 3); + ok(himl == NULL, "got %p\n", himl); + + himl = ImageList_Create(0, 16, ILC_COLOR16, 0, 3); + ok(himl == NULL, "got %p\n", himl); + + himl = ImageList_Create(16, 0, ILC_COLOR16, 0, 3); + ok(himl == NULL, "got %p\n", himl); + + himl = ImageList_Create(16, -1, ILC_COLOR16, 0, 3); + ok(himl == NULL, "got %p\n", himl); + + himl = ImageList_Create(-1, 16, ILC_COLOR16, 0, 3); + ok(himl == NULL, "got %p\n", himl); +} + +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1737,12 +1791,14 @@ START_TEST(imagelist) InitCommonControls(); + test_create(); test_hotspot(); test_add_remove(); test_imagecount(); test_DrawIndirect(); test_merge(); test_imagelist_storage(); + test_iconsize(); FreeLibrary(hComCtl32);

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010