msi: Fix some pointer cast warnings on 64-bit.
This commit is contained in:
parent
b387880269
commit
dcf1a0c891
|
@ -259,7 +259,7 @@ static UINT JOIN_find_matching_rows( struct tagMSIVIEW *view, UINT col,
|
||||||
if (col == 0 || col > jv->columns)
|
if (col == 0 || col > jv->columns)
|
||||||
return ERROR_INVALID_PARAMETER;
|
return ERROR_INVALID_PARAMETER;
|
||||||
|
|
||||||
for (i = (UINT)*handle; i < jv->rows; i++)
|
for (i = PtrToUlong(*handle); i < jv->rows; i++)
|
||||||
{
|
{
|
||||||
if (view->ops->fetch_int( view, i, col, &row_value ) != ERROR_SUCCESS)
|
if (view->ops->fetch_int( view, i, col, &row_value ) != ERROR_SUCCESS)
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -452,7 +452,7 @@ static UINT STORAGES_find_matching_rows(struct tagMSIVIEW *view, UINT col,
|
||||||
UINT val, UINT *row, MSIITERHANDLE *handle)
|
UINT val, UINT *row, MSIITERHANDLE *handle)
|
||||||
{
|
{
|
||||||
MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
|
MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
|
||||||
UINT index = (UINT)*handle;
|
UINT index = PtrToUlong(*handle);
|
||||||
|
|
||||||
TRACE("(%d, %d): %d\n", *row, col, val);
|
TRACE("(%d, %d): %d\n", *row, col, val);
|
||||||
|
|
||||||
|
@ -470,7 +470,7 @@ static UINT STORAGES_find_matching_rows(struct tagMSIVIEW *view, UINT col,
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
|
||||||
*handle = (MSIITERHANDLE)++index;
|
*handle = UlongToPtr(++index);
|
||||||
if (index >= sv->num_rows)
|
if (index >= sv->num_rows)
|
||||||
return ERROR_NO_MORE_ITEMS;
|
return ERROR_NO_MORE_ITEMS;
|
||||||
|
|
||||||
|
|
|
@ -420,7 +420,7 @@ static UINT STREAMS_find_matching_rows(struct tagMSIVIEW *view, UINT col,
|
||||||
UINT val, UINT *row, MSIITERHANDLE *handle)
|
UINT val, UINT *row, MSIITERHANDLE *handle)
|
||||||
{
|
{
|
||||||
MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
|
MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
|
||||||
UINT index = (UINT)*handle;
|
UINT index = PtrToUlong(*handle);
|
||||||
|
|
||||||
TRACE("(%d, %d): %d\n", *row, col, val);
|
TRACE("(%d, %d): %d\n", *row, col, val);
|
||||||
|
|
||||||
|
@ -438,7 +438,7 @@ static UINT STREAMS_find_matching_rows(struct tagMSIVIEW *view, UINT col,
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
|
||||||
*handle = (MSIITERHANDLE)++index;
|
*handle = UlongToPtr(++index);
|
||||||
if (index >= sv->num_rows)
|
if (index >= sv->num_rows)
|
||||||
return ERROR_NO_MORE_ITEMS;
|
return ERROR_NO_MORE_ITEMS;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue