Use correct type instead of void* in item linked list.

This commit is contained in:
Alexandre Julliard 2004-10-27 21:37:02 +00:00
parent 8818ded2dc
commit 7d716db7e7
1 changed files with 7 additions and 7 deletions

View File

@ -45,9 +45,9 @@
WINE_DEFAULT_DEBUG_CHANNEL(comboex); WINE_DEFAULT_DEBUG_CHANNEL(comboex);
/* Item structure */ /* Item structure */
typedef struct typedef struct _CBE_ITEMDATA
{ {
void *next; struct _CBE_ITEMDATA *next;
UINT mask; UINT mask;
LPWSTR pszText; LPWSTR pszText;
LPWSTR pszTemp; LPWSTR pszTemp;
@ -456,7 +456,7 @@ static CBE_ITEMDATA * COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT index)
/* find the item in the list */ /* find the item in the list */
while (item && (i > index)) { while (item && (i > index)) {
item = (CBE_ITEMDATA *)item->next; item = item->next;
i--; i--;
} }
if (!item || (i != index)) { if (!item || (i != index)) {
@ -577,7 +577,7 @@ static INT COMBOEX_InsertItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit)
CBE_ITEMDATA *moving = infoPtr->items; CBE_ITEMDATA *moving = infoPtr->items;
while ((i > index) && moving) { while ((i > index) && moving) {
moving = (CBE_ITEMDATA *)moving->next; moving = moving->next;
i--; i--;
} }
if (!moving) { if (!moving) {
@ -1250,7 +1250,7 @@ static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT *dis)
/* find the prior item in the list */ /* find the prior item in the list */
while (item->next && (i > dis->itemID)) { while (item->next && (i > dis->itemID)) {
item = (CBE_ITEMDATA *)item->next; item = item->next;
i--; i--;
} }
if (!item->next || (i != dis->itemID)) { if (!item->next || (i != dis->itemID)) {
@ -1258,7 +1258,7 @@ static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT *dis)
return FALSE; return FALSE;
} }
olditem = item->next; olditem = item->next;
item->next = (CBE_ITEMDATA *)((CBE_ITEMDATA *)item->next)->next; item->next = item->next->next;
} }
infoPtr->nb_items--; infoPtr->nb_items--;
@ -1527,7 +1527,7 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr)
item = infoPtr->items; item = infoPtr->items;
while (item) { while (item) {
next = (CBE_ITEMDATA *)item->next; next = item->next;
COMBOEX_FreeText (item); COMBOEX_FreeText (item);
Free (item); Free (item);
item = next; item = next;