Add config.h/port.h to allow compilation/linking in MSVC.

Fix some unsigned/signed warnings.
This commit is contained in:
Rolf Kalbermatter 2002-12-16 22:43:58 +00:00 committed by Alexandre Julliard
parent 75edee3d55
commit 6c79930413
6 changed files with 24 additions and 16 deletions

View File

@ -1231,7 +1231,7 @@ static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT *dis)
{ {
CBE_ITEMDATA *item, *olditem; CBE_ITEMDATA *item, *olditem;
NMCOMBOBOXEXW nmcit; NMCOMBOBOXEXW nmcit;
INT i; UINT i;
TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%p, data=%08lx\n", TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%p, data=%08lx\n",
dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData); dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData);

View File

@ -29,6 +29,8 @@
* - Add more functions. * - Add more functions.
* - Write some documentation. * - Write some documentation.
*/ */
#include "config.h"
#include "wine/port.h"
#include <string.h> #include <string.h>
#include <stdlib.h> /* atoi */ #include <stdlib.h> /* atoi */
@ -512,7 +514,7 @@ typedef struct tagWINEMRULIST
*/ */
VOID MRU_SaveChanged( LPWINEMRULIST mp ) VOID MRU_SaveChanged( LPWINEMRULIST mp )
{ {
INT i, err; UINT i, err;
HKEY newkey; HKEY newkey;
WCHAR realname[2]; WCHAR realname[2];
LPWINEMRUITEM witem; LPWINEMRUITEM witem;
@ -580,7 +582,7 @@ DWORD WINAPI
FreeMRUList (HANDLE hMRUList) FreeMRUList (HANDLE hMRUList)
{ {
LPWINEMRULIST mp = (LPWINEMRULIST)hMRUList; LPWINEMRULIST mp = (LPWINEMRULIST)hMRUList;
INT i; UINT i;
TRACE("\n"); TRACE("\n");
if (mp->wineFlags & WMRUF_CHANGED) { if (mp->wineFlags & WMRUF_CHANGED) {
@ -619,7 +621,7 @@ INT WINAPI
FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum) FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum)
{ {
LPWINEMRULIST mp = (LPWINEMRULIST)hList; LPWINEMRULIST mp = (LPWINEMRULIST)hList;
INT i, ret; UINT i, ret;
LPSTR dataA = NULL; LPSTR dataA = NULL;
if (!mp->extview.lpfnCompare) { if (!mp->extview.lpfnCompare) {
@ -838,7 +840,7 @@ FindMRUStringA (HANDLE hList, LPCSTR lpszString, LPINT lpRegNum)
*/ */
HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp) HANDLE CreateMRUListLazy_common(LPWINEMRULIST mp)
{ {
INT i, err; UINT i, err;
HKEY newkey; HKEY newkey;
DWORD datasize, dwdisp; DWORD datasize, dwdisp;
WCHAR realname[2]; WCHAR realname[2];

View File

@ -334,7 +334,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
case PBM_SETPOS: case PBM_SETPOS:
{ {
INT oldVal; UINT oldVal;
oldVal = infoPtr->CurVal; oldVal = infoPtr->CurVal;
if(oldVal != wParam) { if(oldVal != wParam) {
infoPtr->CurVal = (INT)wParam; infoPtr->CurVal = (INT)wParam;

View File

@ -2382,7 +2382,7 @@ INT WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh)
int bRet = 0; int bRet = 0;
PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR, PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR,
sizeof(PropSheetInfo)); sizeof(PropSheetInfo));
int i, n; UINT i, n;
BYTE* pByte; BYTE* pByte;
TRACE("(%p)\n", lppsh); TRACE("(%p)\n", lppsh);
@ -2426,7 +2426,7 @@ INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW lppsh)
int bRet = 0; int bRet = 0;
PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR, PropSheetInfo* psInfo = (PropSheetInfo*) GlobalAlloc(GPTR,
sizeof(PropSheetInfo)); sizeof(PropSheetInfo));
int i, n; UINT i, n;
BYTE* pByte; BYTE* pByte;
TRACE("(%p)\n", lppsh); TRACE("(%p)\n", lppsh);

View File

@ -1610,8 +1610,9 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify, BOOL resetclient)
/* assumes that the following variables contain: */ /* assumes that the following variables contain: */
/* y/x current height/width of all rows */ /* y/x current height/width of all rows */
if (lpRect) { if (lpRect) {
INT i, j, prev_rh, new_rh, adj_rh, prev_idx, current_idx; INT i, prev_rh, new_rh, adj_rh, prev_idx, current_idx;
REBAR_BAND *prev, *current, *walk; REBAR_BAND *prev, *current, *walk;
UINT j;
/* FIXME: problem # 2 */ /* FIXME: problem # 2 */
if (((infoPtr->dwStyle & CCS_VERT) ? if (((infoPtr->dwStyle & CCS_VERT) ?
@ -1748,7 +1749,8 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify, BOOL resetclient)
if (((infoPtr->dwStyle & CCS_VERT) ? clientcx > x : clientcy > y) && if (((infoPtr->dwStyle & CCS_VERT) ? clientcx > x : clientcy > y) &&
infoPtr->uNumBands) { infoPtr->uNumBands) {
INT diff, i, iband, j; INT diff, i, iband;
UINT j;
diff = (infoPtr->dwStyle & CCS_VERT) ? clientcx - x : clientcy - y; diff = (infoPtr->dwStyle & CCS_VERT) ? clientcx - x : clientcy - y;
for (i = infoPtr->uNumRows; i >= 1; i--) { for (i = infoPtr->uNumRows; i >= 1; i--) {
@ -1893,7 +1895,7 @@ REBAR_ValidateBand (REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
{ {
UINT header=0; UINT header=0;
UINT textheight=0; UINT textheight=0;
INT i, nonfixed; UINT i, nonfixed;
REBAR_BAND *tBand; REBAR_BAND *tBand;
lpBand->fStatus = 0; lpBand->fStatus = 0;
@ -2112,7 +2114,8 @@ REBAR_InternalEraseBkGnd (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, REC
/* separators are drawn on the first band of the next row. */ /* separators are drawn on the first band of the next row. */
{ {
REBAR_BAND *lpBand; REBAR_BAND *lpBand;
INT i, oldrow; UINT i;
INT oldrow;
HDC hdc = (HDC)wParam; HDC hdc = (HDC)wParam;
RECT rect; RECT rect;
COLORREF old = CLR_NONE, new; COLORREF old = CLR_NONE, new;
@ -2203,7 +2206,7 @@ REBAR_InternalHitTest (REBAR_INFO *infoPtr, LPPOINT lpPt, UINT *pFlags, INT *pBa
{ {
REBAR_BAND *lpBand; REBAR_BAND *lpBand;
RECT rect; RECT rect;
INT iCount; UINT iCount;
GetClientRect (infoPtr->hwndSelf, &rect); GetClientRect (infoPtr->hwndSelf, &rect);
@ -2881,8 +2884,8 @@ static LRESULT
REBAR_GetRowHeight (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) REBAR_GetRowHeight (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{ {
INT iRow = (INT)wParam; INT iRow = (INT)wParam;
int ret = 0; int j = 0, ret = 0;
int i, j = 0; UINT i;
REBAR_BAND *lpBand; REBAR_BAND *lpBand;
for (i=0; i<infoPtr->uNumBands; i++) { for (i=0; i<infoPtr->uNumBands; i++) {
@ -3662,7 +3665,7 @@ static LRESULT
REBAR_Destroy (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) REBAR_Destroy (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{ {
REBAR_BAND *lpBand; REBAR_BAND *lpBand;
INT i; UINT i;
/* free rebar bands */ /* free rebar bands */

View File

@ -38,6 +38,9 @@
* Scroll (instead of repaint) as much as possible. * Scroll (instead of repaint) as much as possible.
*/ */
#include "config.h"
#include "wine/port.h"
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>