Nikolay Sivov : comctl32/header: Test item rectangles updating after reordering.
Alexandre Julliard
julliard at winehq.org
Fri Jul 10 08:52:02 CDT 2009
Module: wine
Branch: master
Commit: 67d2292b00c6fa743accfd7e80eb720ea082c8e9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d2292b00c6fa743accfd7e80eb720ea082c8e9
Author: Nikolay Sivov <bunglehead at gmail.com>
Date: Thu Jul 9 23:10:25 2009 +0400
comctl32/header: Test item rectangles updating after reordering.
---
dlls/comctl32/tests/header.c | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c
index 6bf0212..3268ccc 100644
--- a/dlls/comctl32/tests/header.c
+++ b/dlls/comctl32/tests/header.c
@@ -121,7 +121,6 @@ static const struct message deleteItem_getItemCount_seq[] = {
};
static const struct message orderArray_seq[] = {
- { HDM_GETITEMCOUNT, sent },
{ HDM_SETORDERARRAY, sent|wparam, 2 },
{ HDM_GETORDERARRAY, sent|wparam, 2 },
{ 0 }
@@ -1108,6 +1107,7 @@ static void test_hdm_index_messages(HWND hParent)
static char thirdHeaderItem[] = "Type";
static char fourthHeaderItem[] = "Date Modified";
static char *items[] = {firstHeaderItem, secondHeaderItem, thirdHeaderItem, fourthHeaderItem};
+ RECT rect;
HDITEM hdItem;
hdItem.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT;
hdItem.fmt = HDF_LEFT;
@@ -1135,17 +1135,17 @@ static void test_hdm_index_messages(HWND hParent)
retVal = SendMessage(hChild, HDM_DELETEITEM, 3, (LPARAM) &hdItem);
ok(retVal == TRUE, "Deleting item 3 should return TRUE, got %d\n", retVal);
- retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem);
+ retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0);
ok(retVal == 3, "Getting item count should return 3, got %d\n", retVal);
retVal = SendMessage(hChild, HDM_DELETEITEM, 3, (LPARAM) &hdItem);
ok(retVal == FALSE, "Deleting already-deleted item should return FALSE, got %d\n", retVal);
- retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem);
+ retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0);
ok(retVal == 3, "Getting item count should return 3, got %d\n", retVal);
retVal = SendMessage(hChild, HDM_DELETEITEM, 2, (LPARAM) &hdItem);
ok(retVal == TRUE, "Deleting item 2 should return TRUE, got %d\n", retVal);
- retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem);
+ retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0);
ok(retVal == 2, "Getting item count should return 2, got %d\n", retVal);
ok_sequence(sequences, HEADER_SEQ_INDEX, deleteItem_getItemCount_seq,
@@ -1166,9 +1166,19 @@ static void test_hdm_index_messages(HWND hParent)
expect(0, strcmpResult);
expect(80, hdItem.cxy);
+ iSize = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0);
+
+ /* item should be updated just after accepting new array */
+ ShowWindow(hChild, SW_HIDE);
+ retVal = SendMessage(hChild, HDM_SETORDERARRAY, iSize, (LPARAM) lpiarray);
+ expect(TRUE, retVal);
+ rect.left = 0;
+ retVal = SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM) &rect);
+ expect(TRUE, retVal);
+ todo_wine ok(rect.left != 0, "Expected updated rectangle\n");
+
flush_sequences(sequences, NUM_MSG_SEQUENCES);
- iSize = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem);
retVal = SendMessage(hChild, HDM_SETORDERARRAY, iSize, (LPARAM) lpiarray);
ok(retVal == TRUE, "Setting header items order should return TRUE, got %d\n", retVal);
More information about the wine-cvs
mailing list