Alexandre Julliard : msi: Fix some pointer cast warnings on 64-bit.
Alexandre Julliard
julliard at winehq.org
Thu Dec 31 07:42:42 CST 2009
Module: wine
Branch: master
Commit: dcf1a0c891233457f3e131d2d9c624bdf2b28a75
URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf1a0c891233457f3e131d2d9c624bdf2b28a75
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Dec 30 21:24:27 2009 +0100
msi: Fix some pointer cast warnings on 64-bit.
---
dlls/msi/join.c | 2 +-
dlls/msi/storages.c | 4 ++--
dlls/msi/streams.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/msi/join.c b/dlls/msi/join.c
index 134c569..a577aea 100644
--- a/dlls/msi/join.c
+++ b/dlls/msi/join.c
@@ -259,7 +259,7 @@ static UINT JOIN_find_matching_rows( struct tagMSIVIEW *view, UINT col,
if (col == 0 || col > jv->columns)
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)
continue;
diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c
index a54d46f..6a8134b 100644
--- a/dlls/msi/storages.c
+++ b/dlls/msi/storages.c
@@ -452,7 +452,7 @@ static UINT STORAGES_find_matching_rows(struct tagMSIVIEW *view, UINT col,
UINT val, UINT *row, MSIITERHANDLE *handle)
{
MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view;
- UINT index = (UINT)*handle;
+ UINT index = PtrToUlong(*handle);
TRACE("(%d, %d): %d\n", *row, col, val);
@@ -470,7 +470,7 @@ static UINT STORAGES_find_matching_rows(struct tagMSIVIEW *view, UINT col,
index++;
}
- *handle = (MSIITERHANDLE)++index;
+ *handle = UlongToPtr(++index);
if (index >= sv->num_rows)
return ERROR_NO_MORE_ITEMS;
diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c
index 4825ae6..92de01b 100644
--- a/dlls/msi/streams.c
+++ b/dlls/msi/streams.c
@@ -420,7 +420,7 @@ static UINT STREAMS_find_matching_rows(struct tagMSIVIEW *view, UINT col,
UINT val, UINT *row, MSIITERHANDLE *handle)
{
MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view;
- UINT index = (UINT)*handle;
+ UINT index = PtrToUlong(*handle);
TRACE("(%d, %d): %d\n", *row, col, val);
@@ -438,7 +438,7 @@ static UINT STREAMS_find_matching_rows(struct tagMSIVIEW *view, UINT col,
index++;
}
- *handle = (MSIITERHANDLE)++index;
+ *handle = UlongToPtr(++index);
if (index >= sv->num_rows)
return ERROR_NO_MORE_ITEMS;
More information about the wine-cvs
mailing list