Andrew Talbot : comctl32: Sign-compare warnings fix.
Alexandre Julliard
julliard at winehq.org
Mon Sep 15 06:54:58 CDT 2008
Module: wine
Branch: master
Commit: 183f92b22a835f7ca39965c74eb98901a1579666
URL: http://source.winehq.org/git/wine.git/?a=commit;h=183f92b22a835f7ca39965c74eb98901a1579666
Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date: Sat Sep 13 19:11:55 2008 +0100
comctl32: Sign-compare warnings fix.
---
dlls/comctl32/comboex.c | 2 +-
dlls/comctl32/listview.c | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 1c9b202..32b18cc 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -198,7 +198,7 @@ static INT COMBOEX_Notify (COMBOEX_INFO *infoPtr, INT code, NMHDR *hdr)
static INT
-COMBOEX_NotifyItem (COMBOEX_INFO *infoPtr, INT code, NMCOMBOBOXEXW *hdr)
+COMBOEX_NotifyItem (COMBOEX_INFO *infoPtr, UINT code, NMCOMBOBOXEXW *hdr)
{
/* Change the Text item from Unicode to ANSI if necessary for NOTIFY */
if (infoPtr->NtfUnicode)
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 1627001..70555e8 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -542,7 +542,7 @@ static inline int lstrncmpiW(LPCWSTR s1, LPCWSTR s2, int n)
{
int res;
- n = min(min(n, strlenW(s1)), strlenW(s2));
+ n = min(min(n, lstrlenW(s1)), lstrlenW(s2));
res = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, s1, n, s2, n);
return res ? res - sizeof(WCHAR) : res;
}
@@ -823,7 +823,7 @@ static BOOL notify_deleteitem(const LISTVIEW_INFO *infoPtr, INT nItem)
return IsWindow(hwnd);
}
-static int get_ansi_notification(INT unicodeNotificationCode)
+static int get_ansi_notification(UINT unicodeNotificationCode)
{
switch (unicodeNotificationCode)
{
@@ -847,11 +847,12 @@ static int get_ansi_notification(INT unicodeNotificationCode)
pdi : dispinfo structure (can be unicode or ansi)
isW : TRUE if dispinfo is Unicode
*/
-static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, INT notificationCode, LPNMLVDISPINFOW pdi, BOOL isW)
+static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT notificationCode, LPNMLVDISPINFOW pdi, BOOL isW)
{
BOOL bResult = FALSE;
BOOL convertToAnsi = FALSE, convertToUnicode = FALSE;
- INT cchTempBufMax = 0, savCchTextMax = 0, realNotifCode;
+ INT cchTempBufMax = 0, savCchTextMax = 0;
+ UINT realNotifCode;
LPWSTR pszTempBuf = NULL, savPszText = NULL;
if ((pdi->item.mask & LVIF_TEXT) && is_textT(pdi->item.pszText, isW))
More information about the wine-cvs
mailing list