update comctl32 regression tests to Wine-0_9_16, which now includes listview testing

svn path=/trunk/; revision=22847
This commit is contained in:
Ged Murphy 2006-07-04 20:58:29 +00:00
parent 4334d625a1
commit df1bfe81ba
4 changed files with 100 additions and 2 deletions

View file

@ -10,6 +10,7 @@
<file>dpa.c</file>
<file>header.c</file>
<file>imagelist.c</file>
<file>listview.c</file>
<file>monthcal.c</file>
<file>mru.c</file>
<file>progress.c</file>

View file

@ -225,7 +225,7 @@ static void check_auto_format(void)
/* Windows implicitly sets some format bits in INSERTITEM */
/* HDF_STRING is automaticaly set and cleared for no text */
/* HDF_STRING is automatically set and cleared for no text */
hdiCreate.mask = HDI_TEXT|HDI_WIDTH|HDI_FORMAT;
hdiCreate.pszText = text;
hdiCreate.cxy = 100;

View file

@ -0,0 +1,97 @@
/*
* ListView tests
*
* Copyright 2006 Mike McCormack for CodeWeavers
*
* 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>
#include <windows.h>
#include <commctrl.h>
#include "wine/test.h"
START_TEST(listview)
{
HWND hwnd, hwndparent = 0;
INITCOMMONCONTROLSEX icc;
DWORD r;
LVITEM item;
HIMAGELIST himl;
HBITMAP hbmp;
RECT r1, r2;
icc.dwICC = 0;
icc.dwSize = sizeof icc;
InitCommonControlsEx(&icc);
himl = ImageList_Create(40, 40, 0, 4, 4);
ok(himl != NULL, "failed to create imagelist\n");
hbmp = CreateBitmap(40, 40, 1, 1, NULL);
ok(hbmp != NULL, "failed to create bitmap\n");
r = ImageList_Add(himl, hbmp, 0);
ok(r == 0, "should be zero\n");
hwnd = CreateWindowEx(0, "SysListView32", "foo", LVS_OWNERDRAWFIXED,
10, 10, 100, 200, hwndparent, NULL, NULL, NULL);
ok(hwnd != NULL, "failed to create listview window\n");
r = SendMessage(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, 0x940);
ok(r == 0, "should return zero\n");
r = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl);
ok(r == 0, "should return zero\n");
r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELONG(100,50));
/* returns dimensions */
r = SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0);
ok(r == 0, "should be zero items\n");
item.mask = LVIF_IMAGE | LVIF_TEXT;
item.iItem = 0;
item.iSubItem = 1;
item.iImage = 0;
r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item);
ok(r == -1, "should fail\n");
item.iSubItem = 0;
item.pszText = "hello";
r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item);
ok(r == 0, "should not fail\n");
memset(&r1, 0, sizeof r1);
r1.left = LVIR_ICON;
r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r1);
r = SendMessage(hwnd, LVM_DELETEALLITEMS, 0, 0);
ok(r == TRUE, "should not fail\n");
item.iSubItem = 0;
item.pszText = "hello";
r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item);
ok(r == 0, "should not fail\n");
memset(&r2, 0, sizeof r2);
r2.left = LVIR_ICON;
r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r2);
ok(!memcmp(&r1, &r2, sizeof r1), "rectangle should be the same\n");
DestroyWindow(hwnd);
}

View file

@ -100,7 +100,7 @@ static void check_reg_entries(const char *mrulist, const char**items)
char buff[128];
HKEY hKey = NULL;
DWORD type, size, ret;
size_t i;
unsigned int i;
ok(!RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_FULLKEY, &hKey),
"Couldn't open test key \"%s\"\n", REG_TEST_FULLKEY);