Author: cwittich Date: Fri Nov 16 20:50:54 2007 New Revision: 30510
URL: http://svn.reactos.org/svn/reactos?rev=30510&view=rev Log: sync to wine
Modified: trunk/reactos/dll/win32/user32/controls/listbox.c
Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/l... ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Fri Nov 16 20:50:54 2007 @@ -72,10 +72,10 @@ /* Item structure */ typedef struct { - LPWSTR str; /* Item text */ - BOOL selected; /* Is item selected? */ - UINT height; /* Item height (only for OWNERDRAWVARIABLE) */ - DWORD data; /* User data */ + LPWSTR str; /* Item text */ + BOOL selected; /* Is item selected? */ + UINT height; /* Item height (only for OWNERDRAWVARIABLE) */ + ULONG_PTR data; /* User data */ } LB_ITEMDATA;
/* Listbox structure */ @@ -929,7 +929,7 @@ /* note that some application (MetaStock) expects the second item * to be in the listbox */ cis.itemID1 = -1; - cis.itemData1 = (DWORD)str; + cis.itemData1 = (ULONG_PTR)str; cis.itemID2 = index; cis.itemData2 = descr->items[index].data; cis.dwLocaleId = descr->locale; @@ -1604,7 +1604,7 @@ * LISTBOX_InsertItem */ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, - LPWSTR str, DWORD data ) + LPWSTR str, ULONG_PTR data ) { LB_ITEMDATA *item; INT max_items; @@ -2815,8 +2815,9 @@ SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - descr->items[wParam].data = (DWORD)lParam; - return LB_OKAY; + descr->items[wParam].data = lParam; + /* undocumented: returns TRUE, not LB_OKAY (0) */ + return TRUE;
#ifndef __REACTOS__ case LB_GETCOUNT16: