Index: Core/Value.h =================================================================== --- Core/Value.h (revision 2960) +++ Core/Value.h (working copy) @@ -206,15 +206,15 @@ inline bool operator!=(const Value& v, const wchar *x) { return (WString)v != x; } inline bool operator!=(const wchar *x, const Value& v) { return (WString)v != x; } -inline bool IsVoidValueTypeNo(int q) { return q == VOID_V; } -inline bool IsErrorValueTypeNo(int q) { return q == ERROR_V; } -inline bool IsStringValueTypeNo(int q) { return q == STRING_V || q == WSTRING_V; } +inline bool IsVoidValueTypeNo(int q) { return (dword)q == VOID_V; } +inline bool IsErrorValueTypeNo(int q) { return (dword)q == ERROR_V; } +inline bool IsStringValueTypeNo(int q) { return (dword)q == STRING_V || (dword)q == WSTRING_V; } -inline bool IsIntegerValueTypeNo(int q) { return q == INT_V || q == INT64_V || q == BOOL_V; } -inline bool IsFloatValueTypeNo(int q) { return q == DOUBLE_V; } +inline bool IsIntegerValueTypeNo(int q) { return (dword)q == INT_V || (dword)q == INT64_V || (dword)q == BOOL_V; } +inline bool IsFloatValueTypeNo(int q) { return (dword)q == DOUBLE_V; } inline bool IsNumberValueTypeNo(int q) { return IsIntegerValueTypeNo(q) || IsFloatValueTypeNo(q); } -inline bool IsDateTimeValueTypeNo(int q) { return q == DATE_V || q == TIME_V; } +inline bool IsDateTimeValueTypeNo(int q) { return (dword)q == DATE_V || (dword)q == TIME_V; } inline bool IsVoid(const Value& v) { return v.GetType() == VOID_V; } inline bool IsError(const Value& v) { return v.GetType() == ERROR_V; } Index: CtrlCore/Win32Clip.cpp =================================================================== --- CtrlCore/Win32Clip.cpp (revision 2960) +++ CtrlCore/Win32Clip.cpp (working copy) @@ -338,7 +338,7 @@ } if(clip.Accept("dib")) { String data = ~clip; - if(data.GetCount() < sizeof(BITMAPINFO)) return Null; + if((unsigned)data.GetCount() < sizeof(BITMAPINFO)) return Null; BITMAPINFO *lpBI = (BITMAPINFO *)~data; BITMAPINFOHEADER& hdr = lpBI->bmiHeader; byte *bits = (byte *)lpBI + hdr.biSize; @@ -437,7 +437,7 @@ GuiLock __; Vector f; String data = clip; - if(data.GetCount() < sizeof(sDROPFILES) + 2) + if((unsigned)data.GetCount() < sizeof(sDROPFILES) + 2) return f; const sDROPFILES *df = (const sDROPFILES *)~data; const char *s = ((const char *)df + df->offset); Index: PdfDraw/PdfDraw.cpp =================================================================== --- PdfDraw/PdfDraw.cpp (revision 2960) +++ PdfDraw/PdfDraw.cpp (working copy) @@ -898,7 +898,7 @@ if(hfont) { HDC hdc = Win32_IC(); HFONT ohfont = (HFONT) ::SelectObject(hdc, hfont); - int size = GetFontData(hdc, 0, 0, NULL, 0); + DWORD size = GetFontData(hdc, 0, 0, NULL, 0); if(size == GDI_ERROR) { LLOG("PdfDraw::Finish: GDI_ERROR on font " << pdffont.GetKey(i)); return Null;