Silence GCC warnings.

svn path=/trunk/; revision=37919
This commit is contained in:
Dmitry Gorbachev 2008-12-07 21:52:22 +00:00
parent 2772b79efd
commit 32580ec32a
41 changed files with 75 additions and 74 deletions

View file

@ -114,7 +114,7 @@ int main (int argc, char **argv)
if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0) if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0)
{ {
if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < 4096 / sizeof(TCHAR)) if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < (int)(4096 / sizeof(TCHAR)))
{ {
CharToOem(buff, buff); CharToOem(buff, buff);
ConOutPuts(buff); ConOutPuts(buff);
@ -145,7 +145,7 @@ int main (int argc, char **argv)
0); 0);
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < sizeof(szMsg) / sizeof(TCHAR)) if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < (int)(sizeof(szMsg) / sizeof(TCHAR)))
{ {
_stprintf(buff, szMsg, szFullPath); _stprintf(buff, szMsg, szFullPath);
CharToOem(buff, buff); CharToOem(buff, buff);

View file

@ -283,7 +283,7 @@ OnInitDialog(IN HWND hwndDlg)
BITMAP bitmap; BITMAP bitmap;
DWORD Result = 0; DWORD Result = 0;
DWORD iDevNum = 0; DWORD iDevNum = 0;
INT i; DWORD i;
DISPLAY_DEVICE displayDevice; DISPLAY_DEVICE displayDevice;
PGLOBAL_DATA pGlobalData; PGLOBAL_DATA pGlobalData;
@ -333,7 +333,7 @@ OnInitDialog(IN HWND hwndDlg)
else /* FIXME: incomplete! */ else /* FIXME: incomplete! */
{ {
PMONSL_MONINFO pMonitors; PMONSL_MONINFO pMonitors;
INT i; DWORD i;
SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription);
OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList); OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList);
@ -341,7 +341,7 @@ OnInitDialog(IN HWND hwndDlg)
pMonitors = (PMONSL_MONINFO)HeapAlloc(GetProcessHeap(), 0, sizeof(MONSL_MONINFO) * Result); pMonitors = (PMONSL_MONINFO)HeapAlloc(GetProcessHeap(), 0, sizeof(MONSL_MONINFO) * Result);
if (pMonitors) if (pMonitors)
{ {
INT hack = 1280; DWORD hack = 1280;
for (i = 0; i < Result; i++) for (i = 0; i < Result; i++)
{ {
pMonitors[i].Position.x = hack * i; pMonitors[i].Position.x = hack * i;
@ -817,7 +817,7 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lPar
case WM_DESTROY: case WM_DESTROY:
{ {
INT i; DWORD i;
PDISPLAY_DEVICE_ENTRY Current = pGlobalData->DisplayDeviceList; PDISPLAY_DEVICE_ENTRY Current = pGlobalData->DisplayDeviceList;
while (Current != NULL) while (Current != NULL)

View file

@ -42,7 +42,7 @@ GetLayoutCount(LPTSTR szLang)
HKEY hKey; HKEY hKey;
TCHAR szLayoutID[3 + 1], szPreload[CCH_LAYOUT_ID + 1], szLOLang[MAX_PATH]; TCHAR szLayoutID[3 + 1], szPreload[CCH_LAYOUT_ID + 1], szLOLang[MAX_PATH];
DWORD dwIndex = 0, dwType, dwSize; DWORD dwIndex = 0, dwType, dwSize;
INT Count = 0, i, j; UINT Count = 0, i, j;
if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"),
0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)

View file

@ -214,7 +214,7 @@ GetLayoutName(LPCTSTR szLCID, LPTSTR szName)
DWORD dwBufLen; DWORD dwBufLen;
TCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH]; TCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH];
HANDLE hLib; HANDLE hLib;
int i, j, k; unsigned i, j, k;
wsprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); wsprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID);

View file

@ -37,7 +37,7 @@ GetSupportedCP(VOID)
Count = SetupGetLineCount(hIntlInf, _T("CodePages")); Count = SetupGetLineCount(hIntlInf, _T("CodePages"));
if (Count <= 0) return FALSE; if (Count <= 0) return FALSE;
for (Number = 0; Number < Count; Number++) for (Number = 0; Number < (UINT)Count; Number++)
{ {
if (SetupGetLineByIndex(hIntlInf, _T("CodePages"), Number, &infCont) && if (SetupGetLineByIndex(hIntlInf, _T("CodePages"), Number, &infCont) &&
SetupGetIntField(&infCont, 0, (PINT)&uiCPage)) SetupGetIntField(&infCont, 0, (PINT)&uiCPage))

View file

@ -169,7 +169,7 @@ LoadConfig(HWND hwndDlg)
memcpy(&pp, &gPP[iCurSel], sizeof(POWER_POLICY)); memcpy(&pp, &gPP[iCurSel], sizeof(POWER_POLICY));
uiIndex = (UINT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETCURSEL, 0, 0); uiIndex = (UINT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETCURSEL, 0, 0);
if(uiIndex != CB_ERR) if(uiIndex != (UINT)CB_ERR)
{ {
SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETLBTEXT, uiIndex, (LPARAM)szProfile);
if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH)) if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH))

View file

@ -775,7 +775,7 @@ StartRecDlgProc(HWND hwndDlg,
LRESULT lResult; LRESULT lResult;
lResult = SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); lResult = SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0);
if (lResult != CB_ERR && lResult != pStartInfo->dwCrashDumpEnabled) if (lResult != CB_ERR && lResult != (LRESULT)pStartInfo->dwCrashDumpEnabled)
{ {
if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2) if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2)
{ {
@ -786,7 +786,7 @@ StartRecDlgProc(HWND hwndDlg,
SendDlgItemMessageW(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szMinidumpDir) / sizeof(WCHAR), (LPARAM)pStartInfo->szMinidumpDir); SendDlgItemMessageW(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szMinidumpDir) / sizeof(WCHAR), (LPARAM)pStartInfo->szMinidumpDir);
} }
pStartInfo->dwCrashDumpEnabled = lResult; pStartInfo->dwCrashDumpEnabled = (DWORD)lResult;
SetCrashDlgItems(hwndDlg, pStartInfo); SetCrashDlgItems(hwndDlg, pStartInfo);
} }
} }

View file

@ -553,7 +553,7 @@ MonthCalPaint(IN PMONTHCALWND infoPtr,
szDayLen, szDayLen,
&TextSize)) &TextSize))
{ {
RECT rcHighlight = {0}; RECT rcHighlight = { 0, 0, 0, 0 };
rcText.left = rcCell.left + (infoPtr->CellSize.cx / 2) - (TextSize.cx / 2); rcText.left = rcCell.left + (infoPtr->CellSize.cx / 2) - (TextSize.cx / 2);
rcText.top = rcCell.top + (infoPtr->CellSize.cy / 2) - (TextSize.cy / 2); rcText.top = rcCell.top + (infoPtr->CellSize.cy / 2) - (TextSize.cy / 2);

View file

@ -786,7 +786,7 @@ RegCopyTreeA(IN HKEY hKeySrc,
IN LPCSTR lpSubKey OPTIONAL, IN LPCSTR lpSubKey OPTIONAL,
IN HKEY hKeyDest) IN HKEY hKeyDest)
{ {
UNICODE_STRING SubKeyName = {0}; UNICODE_STRING SubKeyName = { 0, 0, NULL };
LONG Ret; LONG Ret;
if (lpSubKey != NULL && if (lpSubKey != NULL &&
@ -816,7 +816,7 @@ RegConnectRegistryA(IN LPCSTR lpMachineName,
IN HKEY hKey, IN HKEY hKey,
OUT PHKEY phkResult) OUT PHKEY phkResult)
{ {
UNICODE_STRING MachineName = {0}; UNICODE_STRING MachineName = { 0, 0, NULL };
LONG Ret; LONG Ret;
if (lpMachineName != NULL && if (lpMachineName != NULL &&
@ -1414,7 +1414,7 @@ RegDeleteKeyValueA(IN HKEY hKey,
IN LPCSTR lpSubKey OPTIONAL, IN LPCSTR lpSubKey OPTIONAL,
IN LPCSTR lpValueName OPTIONAL) IN LPCSTR lpValueName OPTIONAL)
{ {
UNICODE_STRING SubKey = {0}, ValueName = {0}; UNICODE_STRING SubKey = { 0, 0, NULL }, ValueName = { 0, 0, NULL };
LONG Ret; LONG Ret;
if (lpSubKey != NULL && if (lpSubKey != NULL &&
@ -1828,7 +1828,7 @@ LONG WINAPI
RegDeleteTreeA(IN HKEY hKey, RegDeleteTreeA(IN HKEY hKey,
IN LPCSTR lpSubKey OPTIONAL) IN LPCSTR lpSubKey OPTIONAL)
{ {
UNICODE_STRING SubKeyName = {0}; UNICODE_STRING SubKeyName = { 0, 0, NULL };
LONG Ret; LONG Ret;
if (lpSubKey != NULL && if (lpSubKey != NULL &&

View file

@ -1530,7 +1530,7 @@ CreateWellKnownSid(IN WELL_KNOWN_SID_TYPE WellKnownSidType,
OUT PSID pSid, OUT PSID pSid,
IN OUT DWORD* cbSid) IN OUT DWORD* cbSid)
{ {
int i; unsigned int i;
TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid);
if (DomainSid != NULL) if (DomainSid != NULL)
@ -1576,7 +1576,7 @@ BOOL WINAPI
IsWellKnownSid(IN PSID pSid, IsWellKnownSid(IN PSID pSid,
IN WELL_KNOWN_SID_TYPE WellKnownSidType) IN WELL_KNOWN_SID_TYPE WellKnownSidType)
{ {
int i; unsigned int i;
TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType);
for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++)
@ -1638,7 +1638,7 @@ ComputeStringSidSize(LPCWSTR StringSid)
} }
else /* String constant format - Only available in winxp and above */ else /* String constant format - Only available in winxp and above */
{ {
int i; unsigned int i;
for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++)
if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2))

View file

@ -660,10 +660,10 @@ ProcessLongMidiMessage(
DeviceInfo* device_info, DeviceInfo* device_info,
MIDIHDR* header) MIDIHDR* header)
{ {
int index = 0; unsigned int index = 0;
UCHAR* midi_bytes = (UCHAR*) header->lpData; UCHAR* midi_bytes = (UCHAR*) header->lpData;
int msg_index = 0; unsigned int msg_index = 0;
UCHAR msg[3]; UCHAR msg[3];
/* Initialize the buffer */ /* Initialize the buffer */

View file

@ -53,11 +53,11 @@ DnsQuery_A(LPCSTR Name,
PVOID *Reserved) PVOID *Reserved)
{ {
adns_state astate; adns_state astate;
int quflags = 0, i; int quflags = 0;
int adns_error; int adns_error;
adns_answer *answer; adns_answer *answer;
LPSTR CurrentName; LPSTR CurrentName;
unsigned CNameLoop; unsigned i, CNameLoop;
*QueryResultSet = 0; *QueryResultSet = 0;

View file

@ -911,7 +911,7 @@ GetObjectW(HGDIOBJ hGdiObj, int cbSize, LPVOID lpBuffer)
} }
// Poorly written apps are not ReactOS problem! // Poorly written apps are not ReactOS problem!
// We fix it here if the size is larger than the default size. // We fix it here if the size is larger than the default size.
if( cbSize > sizeof(ENUMLOGFONTEXDVW) ) cbSize = sizeof(ENUMLOGFONTEXDVW); if( cbSize > (int)sizeof(ENUMLOGFONTEXDVW) ) cbSize = sizeof(ENUMLOGFONTEXDVW);
Result = NtGdiExtGetObjectW(hGdiObj, cbSize, lpBuffer); // Should handle the copy. Result = NtGdiExtGetObjectW(hGdiObj, cbSize, lpBuffer); // Should handle the copy.

View file

@ -86,11 +86,8 @@ GetSystemPaletteEntries(HDC hDC,
UINT cEntries, UINT cEntries,
LPPALETTEENTRY ppe) LPPALETTEENTRY ppe)
{ {
PALETTEENTRY ippe[256]; PALETTEENTRY ippe[256];
if (cEntries < 0) return 0;
else
{
if ( GetDeviceCaps(hDC, RASTERCAPS) & RC_PALETTE ) if ( GetDeviceCaps(hDC, RASTERCAPS) & RC_PALETTE )
return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE);
else else
@ -103,9 +100,9 @@ GetSystemPaletteEntries(HDC hDC,
if (iStartIndex < 256) if (iStartIndex < 256)
{ {
INT Index = 256 - iStartIndex; UINT Index = 256 - iStartIndex;
if ( Index >= cEntries ) Index = cEntries; if ( Index > cEntries ) Index = cEntries;
RtlCopyMemory( ppe, RtlCopyMemory( ppe,
&ippe[iStartIndex], &ippe[iStartIndex],
@ -113,8 +110,8 @@ GetSystemPaletteEntries(HDC hDC,
} }
} }
} }
}
return 0; return 0;
} }
UINT UINT

View file

@ -90,7 +90,8 @@ MirrorRgnByWidth(HRGN hRgn, INT Width, HRGN *phRgn)
if ( GetRegionData(hRgn, cRgnDSize, pRgnData) ) if ( GetRegionData(hRgn, cRgnDSize, pRgnData) )
{ {
HRGN hRgnex; HRGN hRgnex;
INT i, SaveL = pRgnData->rdh.rcBound.left; UINT i;
INT SaveL = pRgnData->rdh.rcBound.left;
pRgnData->rdh.rcBound.left = Width - pRgnData->rdh.rcBound.right; pRgnData->rdh.rcBound.left = Width - pRgnData->rdh.rcBound.right;
pRgnData->rdh.rcBound.right = Width - SaveL; pRgnData->rdh.rcBound.right = Width - SaveL;
if (pRgnData->rdh.nCount > 0) if (pRgnData->rdh.nCount > 0)

View file

@ -232,7 +232,7 @@ ProcessIdToHandle(IN DWORD dwProcessId)
CLIENT_ID ClientId; CLIENT_ID ClientId;
/* If we don't have a PID, look it up */ /* If we don't have a PID, look it up */
if (dwProcessId == -1) dwProcessId = (DWORD)CsrGetProcessId(); if (dwProcessId == -1U) dwProcessId = (DWORD)CsrGetProcessId();
/* Open a handle to the process */ /* Open a handle to the process */
ClientId.UniqueThread = NULL; ClientId.UniqueThread = NULL;

View file

@ -216,7 +216,7 @@ UnhandledExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo)
ULONG ErrorParameters[4]; ULONG ErrorParameters[4];
ULONG ErrorResponse; ULONG ErrorResponse;
if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION &&
ExceptionInfo->ExceptionRecord->NumberParameters >= 2) ExceptionInfo->ExceptionRecord->NumberParameters >= 2)
{ {
switch(ExceptionInfo->ExceptionRecord->ExceptionInformation[0]) switch(ExceptionInfo->ExceptionRecord->ExceptionInformation[0])
@ -269,7 +269,7 @@ UnhandledExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo)
/* Print a stack trace. */ /* Print a stack trace. */
DbgPrint("Unhandled exception\n"); DbgPrint("Unhandled exception\n");
DbgPrint("ExceptionCode: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionCode); DbgPrint("ExceptionCode: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionCode);
if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION &&
ExceptionInfo->ExceptionRecord->NumberParameters == 2) ExceptionInfo->ExceptionRecord->NumberParameters == 2)
{ {
DbgPrint("Faulting Address: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionInformation[1]); DbgPrint("Faulting Address: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionInformation[1]);
@ -312,7 +312,7 @@ UnhandledExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo)
ErrorParameters[0] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionCode; ErrorParameters[0] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionCode;
ErrorParameters[1] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionAddress; ErrorParameters[1] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionAddress;
if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION)
{ {
/* get the type of operation that caused the access violation */ /* get the type of operation that caused the access violation */
ErrorParameters[2] = ExceptionInfo->ExceptionRecord->ExceptionInformation[0]; ErrorParameters[2] = ExceptionInfo->ExceptionRecord->ExceptionInformation[0];

View file

@ -88,7 +88,7 @@ static RTL_CRITICAL_SECTION_DEBUG NLS_FormatsCS_debug =
0, 0, &NLS_FormatsCS, 0, 0, &NLS_FormatsCS,
{ &NLS_FormatsCS_debug.ProcessLocksList, { &NLS_FormatsCS_debug.ProcessLocksList,
&NLS_FormatsCS_debug.ProcessLocksList }, &NLS_FormatsCS_debug.ProcessLocksList },
0, 0, 0, 0 0, 0, 0, 0, 0
}; };
static RTL_CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 }; static RTL_CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 };

View file

@ -532,7 +532,7 @@ WINAPI
SetThreadPriority(HANDLE hThread, SetThreadPriority(HANDLE hThread,
int nPriority) int nPriority)
{ {
ULONG Prio = nPriority; LONG Prio = nPriority;
NTSTATUS Status; NTSTATUS Status;
/* Check if values forcing saturation should be used */ /* Check if values forcing saturation should be used */
@ -549,7 +549,7 @@ SetThreadPriority(HANDLE hThread,
Status = NtSetInformationThread(hThread, Status = NtSetInformationThread(hThread,
ThreadBasePriority, ThreadBasePriority,
&Prio, &Prio,
sizeof(ULONG)); sizeof(LONG));
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
/* Failure */ /* Failure */

View file

@ -24,7 +24,7 @@ WSPUPCALLTABLE Upcalls;
LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest;
ULONG SocketCount = 0; ULONG SocketCount = 0;
PSOCKET_INFORMATION *Sockets = NULL; PSOCKET_INFORMATION *Sockets = NULL;
LIST_ENTRY SockHelpersListHead = {NULL}; LIST_ENTRY SockHelpersListHead = { NULL, NULL };
ULONG SockAsyncThreadRefCount; ULONG SockAsyncThreadRefCount;
HANDLE SockAsyncHelperAfdHandle; HANDLE SockAsyncHelperAfdHandle;
HANDLE SockAsyncCompletionPort; HANDLE SockAsyncCompletionPort;

View file

@ -650,7 +650,9 @@ CHSourceDlgProc(
} }
} }
else else
{
/* FIXME */; /* FIXME */;
}
return TRUE; return TRUE;
default: default:

View file

@ -395,7 +395,7 @@ HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lPar
lstrcpynW(libName, lpDriverName, sizeof(libName) / sizeof(WCHAR)); lstrcpynW(libName, lpDriverName, sizeof(libName) / sizeof(WCHAR));
/* Try and open the driver by filename */ /* Try and open the driver by filename */
if ( lpDrv = DRIVER_TryOpenDriver32(libName, lParam) ) if ( (lpDrv = DRIVER_TryOpenDriver32(libName, lParam)) )
goto the_end; goto the_end;
/* If we got here, the file wasn't found. So we assume the caller /* If we got here, the file wasn't found. So we assume the caller
@ -407,7 +407,7 @@ HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lPar
if ( DRIVER_GetLibName(lpDriverName, lsn, libName, sizeof(libName)) ) if ( DRIVER_GetLibName(lpDriverName, lsn, libName, sizeof(libName)) )
{ {
/* Now we have the filename, we can try and load it */ /* Now we have the filename, we can try and load it */
if ( lpDrv = DRIVER_TryOpenDriver32(libName, lParam) ) if ( (lpDrv = DRIVER_TryOpenDriver32(libName, lParam)) )
goto the_end; goto the_end;
} }

View file

@ -110,7 +110,7 @@ DxApi(IN DWORD dwFunctionNum,
dwFunctionNum -= DD_FIRST_DXAPI; dwFunctionNum -= DD_FIRST_DXAPI;
if ((lpvOutBuffer == NULL) || if ((lpvOutBuffer == NULL) ||
(dwFunctionNum < (DD_FIRST_DXAPI - DD_FIRST_DXAPI)) || /*(dwFunctionNum < (DD_FIRST_DXAPI - DD_FIRST_DXAPI)) ||*/
(dwFunctionNum > (DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI)) || (dwFunctionNum > (DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI)) ||
(gDxApiEntryPoint[dwFunctionNum].pfn == NULL) || (gDxApiEntryPoint[dwFunctionNum].pfn == NULL) ||
(cbInBuffer != tblCheckInBuffer[dwFunctionNum]) || (cbInBuffer != tblCheckInBuffer[dwFunctionNum]) ||

View file

@ -43,7 +43,7 @@ DxDdStartupDxGraphics (ULONG SizeEngDrv,
{ {
PDRVFN drv_func; PDRVFN drv_func;
INT i; UINT i;
/* Test see if the data is vaild we got from win32k.sys */ /* Test see if the data is vaild we got from win32k.sys */
if ((SizeEngDrv != sizeof(DRVENABLEDATA)) || if ((SizeEngDrv != sizeof(DRVENABLEDATA)) ||

View file

@ -357,7 +357,7 @@ VfatGetNameInformation(PFILE_OBJECT FileObject,
RtlCopyMemory(NameInfo->FileName, FCB->PathNameU.Buffer, BytesToCopy); RtlCopyMemory(NameInfo->FileName, FCB->PathNameU.Buffer, BytesToCopy);
/* Check if we could write more but are not able to */ /* Check if we could write more but are not able to */
if (*BufferLength < FCB->PathNameU.Length + FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) if (*BufferLength < FCB->PathNameU.Length + (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]))
{ {
/* Return number of bytes written */ /* Return number of bytes written */
*BufferLength -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + BytesToCopy; *BufferLength -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + BytesToCopy;

View file

@ -58,7 +58,7 @@ static ULONG MiniportOIDList[] = {
OID_802_3_MAC_OPTIONS OID_802_3_MAC_OPTIONS
}; };
DRIVER_INFORMATION DriverInfo = {0}; DRIVER_INFORMATION DriverInfo = { NULL, NULL, { NULL, NULL } };
NDIS_PHYSICAL_ADDRESS HighestAcceptableMax = NDIS_PHYSICAL_ADDRESS_CONST(-1, -1); NDIS_PHYSICAL_ADDRESS HighestAcceptableMax = NDIS_PHYSICAL_ADDRESS_CONST(-1, -1);
@ -161,7 +161,7 @@ static VOID NTAPI MiQueryResources(
PNDIS_RESOURCE_LIST AssignedResources; PNDIS_RESOURCE_LIST AssignedResources;
UINT BufferSize = 0; UINT BufferSize = 0;
PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor;
int i; UINT i;
NdisMQueryAdapterResources(Status, NdisMQueryAdapterResources(Status,
WrapperConfigurationContext, WrapperConfigurationContext,

View file

@ -143,7 +143,7 @@ NTSTATUS ExtractFont(UINT32 CodePage, PUCHAR FontBitField)
if(NT_SUCCESS(Status)) if(NT_SUCCESS(Status))
{ {
if(!bFoundFile && atoi(FileName) == CodePage) if(!bFoundFile && (UINT32)atoi(FileName) == CodePage)
{ {
// We got the correct file. // We got the correct file.
// Save the offset and loop through the rest of the file table to find the position, where the actual data starts. // Save the offset and loop through the rest of the file table to find the position, where the actual data starts.

View file

@ -1637,7 +1637,7 @@ AtapiChipInit(
KdPrint2((PRINT_PREFIX "SIISETCLK\n")); KdPrint2((PRINT_PREFIX "SIISETCLK\n"));
GetPciConfig1(0x8a, tmp8); GetPciConfig1(0x8a, tmp8);
if ((tmp8 & 0x30) != 0x10) if ((tmp8 & 0x30) != 0x10)
ChangePciConfig1(0x8a, (a & 0xcf | 0x10)); ChangePciConfig1(0x8a, (a & 0xcf) | 0x10);
GetPciConfig1(0x8a, tmp8); GetPciConfig1(0x8a, tmp8);
if ((tmp8 & 0x30) != 0x10) { if ((tmp8 & 0x30) != 0x10) {
KdPrint2((PRINT_PREFIX "Sil 0680 could not set ATA133 clock\n")); KdPrint2((PRINT_PREFIX "Sil 0680 could not set ATA133 clock\n"));

View file

@ -1078,7 +1078,7 @@ VideoPortEnumerateChildren(
UCHAR ChildDescriptor[256]; UCHAR ChildDescriptor[256];
ULONG ChildId; ULONG ChildId;
ULONG Unused; ULONG Unused;
INT i; UINT i;
DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension);
if (DeviceExtension->DriverExtension->InitializationData.HwGetVideoChildDescriptor == NULL) if (DeviceExtension->DriverExtension->InitializationData.HwGetVideoChildDescriptor == NULL)
@ -1155,7 +1155,7 @@ VideoPortEnumerateChildren(
#ifndef NDEBUG #ifndef NDEBUG
if (ChildType == Monitor) if (ChildType == Monitor)
{ {
INT j; UINT j;
PUCHAR p = ChildDescriptor; PUCHAR p = ChildDescriptor;
INFO_(VIDEOPRT, "Monitor device enumerated! (ChildId = 0x%x)\n", ChildId); INFO_(VIDEOPRT, "Monitor device enumerated! (ChildId = 0x%x)\n", ChildId);
for (j = 0; j < sizeof (ChildDescriptor); j += 8) for (j = 0; j < sizeof (ChildDescriptor); j += 8)

View file

@ -180,10 +180,10 @@ inline static int wine_ldt_is_empty( const LDT_ENTRY *ent )
#ifdef __i386__ #ifdef __i386__
# ifdef __GNUC__ # ifdef __GNUC__
# define __DEFINE_GET_SEG(seg) \ # define __DEFINE_GET_SEG(seg) \
extern inline unsigned short wine_get_##seg(void) \ static inline unsigned short wine_get_##seg(void) \
{ unsigned short res; __asm__("movw %%" #seg ",%w0" : "=r"(res)); return res; } { unsigned short res; __asm__("movw %%" #seg ",%w0" : "=r"(res)); return res; }
# define __DEFINE_SET_SEG(seg) \ # define __DEFINE_SET_SEG(seg) \
extern inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); } static inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); }
# elif defined(_MSC_VER) # elif defined(_MSC_VER)
# define __DEFINE_GET_SEG(seg) \ # define __DEFINE_GET_SEG(seg) \
extern inline unsigned short wine_get_##seg(void) \ extern inline unsigned short wine_get_##seg(void) \

View file

@ -520,7 +520,7 @@ BOOL16 WINAPI WritePrivateProfileStruct16(LPCSTR,LPCSTR,LPVOID,UINT16,LPCST
BOOL16 WINAPI WriteProfileSection16(LPCSTR,LPCSTR); BOOL16 WINAPI WriteProfileSection16(LPCSTR,LPCSTR);
/* Some optimizations */ /* Some optimizations */
extern inline LPVOID WINAPI MapSL( SEGPTR segptr ) static inline LPVOID WINAPI MapSL( SEGPTR segptr )
{ {
return (char *)wine_ldt_copy.base[SELECTOROF(segptr) >> __AHSHIFT] + OFFSETOF(segptr); return (char *)wine_ldt_copy.base[SELECTOROF(segptr) >> __AHSHIFT] + OFFSETOF(segptr);
} }

View file

@ -348,11 +348,11 @@ errorout:
bool ext2_block_map(PEXT2_FILESYS Ext2Sys, PEXT2_INODE inode, ULONG block, ULONG *dwRet) bool ext2_block_map(PEXT2_FILESYS Ext2Sys, PEXT2_INODE inode, ULONG block, ULONG *dwRet)
{ {
ULONG dwSizes[4] = {12, 1, 1, 1}; ULONG dwSizes[4] = { 12, 1, 1, 1 };
ULONG Index = 0; ULONG Index = 0;
ULONG dwBlk = 0; ULONG dwBlk = 0;
PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb;
int i; UINT i;
bool bRet = false; bool bRet = false;
Index = block; Index = block;

View file

@ -93,8 +93,7 @@ bool ext2_allocate_group_table(PEXT2_FILESYS fs, ULONG group,
PEXT2_BLOCK_BITMAP bmap) PEXT2_BLOCK_BITMAP bmap)
{ {
bool retval; bool retval;
ULONG group_blk, start_blk, last_blk, new_blk, blk; ULONG group_blk, start_blk, last_blk, new_blk, blk, j;
int j;
group_blk = fs->ext2_sb->s_first_data_block + group_blk = fs->ext2_sb->s_first_data_block +
(group * fs->ext2_sb->s_blocks_per_group); (group * fs->ext2_sb->s_blocks_per_group);

View file

@ -885,7 +885,7 @@ Ext2Format(
* kludgy hack of using the UUID to derive a random jitter value. * kludgy hack of using the UUID to derive a random jitter value.
*/ */
{ {
int i, val; ULONG i, val;
for (i = 0, val = 0 ; i < sizeof(Ext2Sb.s_uuid); i++) for (i = 0, val = 0 ; i < sizeof(Ext2Sb.s_uuid); i++)
val += Ext2Sb.s_uuid[i]; val += Ext2Sb.s_uuid[i];

View file

@ -40,6 +40,7 @@
#include <sys/utime.h> #include <sys/utime.h>
#include <direct.h> #include <direct.h>
int *__p__fmode(void); int *__p__fmode(void);
int *__p___mb_cur_max(void); int *__p___mb_cur_max(void);
@ -3323,4 +3324,4 @@ ioinfo * __pioinfo[] = { /* array of pointers to ioinfo arrays [64] */
/********************************************************************* /*********************************************************************
* __badioinfo (MSVCRT.@) * __badioinfo (MSVCRT.@)
*/ */
ioinfo __badioinfo = { INVALID_HANDLE_VALUE, WX_TEXT }; ioinfo __badioinfo = { INVALID_HANDLE_VALUE, WX_TEXT, { 0, } };

View file

@ -7,12 +7,12 @@
size_t mbstowcs (wchar_t *widechar, const char *multibyte, size_t number) size_t mbstowcs (wchar_t *widechar, const char *multibyte, size_t number)
{ {
int bytes; int bytes;
int n = 0; size_t n = 0;
while (n < number) { while (n < number) {
if ((bytes = mbtowc (widechar, multibyte, MB_LEN_MAX)) < 0) if ((bytes = mbtowc (widechar, multibyte, MB_LEN_MAX)) < 0)
return -1; return (size_t) -1;
if (bytes == 0) { if (bytes == 0) {
*widechar = (wchar_t) '\0'; *widechar = (wchar_t) '\0';

View file

@ -430,7 +430,7 @@ static void pf_rebuild_format_string( char *p, pf_flags *flags )
/* pf_integer_conv: prints x to buf, including alternate formats and /* pf_integer_conv: prints x to buf, including alternate formats and
additional precision digits, but not field characters or the sign */ additional precision digits, but not field characters or the sign */
static void pf_integer_conv( char *buf, int buf_len, pf_flags *flags, static void pf_integer_conv( char *buf, unsigned int buf_len, pf_flags *flags,
LONGLONG x ) LONGLONG x )
{ {
unsigned int base; unsigned int base;
@ -679,8 +679,8 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist )
* Includes extra bytes: 1 byte for null, 1 byte for sign, * Includes extra bytes: 1 byte for null, 1 byte for sign,
4 bytes for exponent, 2 bytes for alternate formats, 1 byte 4 bytes for exponent, 2 bytes for alternate formats, 1 byte
for a decimal, and 1 byte for an additional float digit. */ for a decimal, and 1 byte for an additional float digit. */
int x_len = ((flags.FieldLength > flags.Precision) ? unsigned x_len = ((flags.FieldLength > flags.Precision) ?
flags.FieldLength : flags.Precision) + 10; flags.FieldLength : flags.Precision) + 10;
if( x_len >= sizeof number) if( x_len >= sizeof number)
x = HeapAlloc( GetProcessHeap(), 0, x_len ); x = HeapAlloc( GetProcessHeap(), 0, x_len );
@ -702,8 +702,8 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist )
* Includes extra bytes: 1 byte for null, 1 byte for sign, * Includes extra bytes: 1 byte for null, 1 byte for sign,
4 bytes for exponent, 2 bytes for alternate formats, 1 byte 4 bytes for exponent, 2 bytes for alternate formats, 1 byte
for a decimal, and 1 byte for an additional float digit. */ for a decimal, and 1 byte for an additional float digit. */
int x_len = ((flags.FieldLength > flags.Precision) ? unsigned x_len = ((flags.FieldLength > flags.Precision) ?
flags.FieldLength : flags.Precision) + 10; flags.FieldLength : flags.Precision) + 10;
if( x_len >= sizeof number) if( x_len >= sizeof number)
x = HeapAlloc( GetProcessHeap(), 0, x_len ); x = HeapAlloc( GetProcessHeap(), 0, x_len );

View file

@ -245,7 +245,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc
PCHAR PartialString = NULL, BiosVersion; PCHAR PartialString = NULL, BiosVersion;
CHAR CpuString[48]; CHAR CpuString[48];
PVOID BaseAddress = NULL; PVOID BaseAddress = NULL;
LARGE_INTEGER ViewBase = {{0}}; LARGE_INTEGER ViewBase = {{0, 0}};
ULONG_PTR VideoRomBase; ULONG_PTR VideoRomBase;
PCHAR CurrentVersion; PCHAR CurrentVersion;
extern UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion; extern UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion;

View file

@ -844,13 +844,13 @@ DbgkpConvertKernelToUserStateChange(IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange,
case DbgKmExceptionApi: case DbgKmExceptionApi:
/* Look at the exception code */ /* Look at the exception code */
if (DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == if ((NTSTATUS)DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode ==
STATUS_BREAKPOINT) STATUS_BREAKPOINT)
{ {
/* Update this as a breakpoint exception */ /* Update this as a breakpoint exception */
WaitStateChange->NewState = DbgBreakpointStateChange; WaitStateChange->NewState = DbgBreakpointStateChange;
} }
else if (DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == else if ((NTSTATUS)DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode ==
STATUS_SINGLE_STEP) STATUS_SINGLE_STEP)
{ {
/* Update this as a single step exception */ /* Update this as a single step exception */

View file

@ -39,7 +39,8 @@ RtlGetNtGlobalFlags(VOID)
NTSTATUS NTAPI NTSTATUS NTAPI
RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation)
{ {
ULONG i, MaxLength; LONG i;
ULONG MaxLength;
if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) ||
lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW))
{ {

View file

@ -629,7 +629,7 @@ NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor,
OUT PACCESS_MASK GrantedAccess, OUT PACCESS_MASK GrantedAccess,
OUT PNTSTATUS AccessStatus) OUT PNTSTATUS AccessStatus)
{ {
SECURITY_SUBJECT_CONTEXT SubjectSecurityContext = {0}; SECURITY_SUBJECT_CONTEXT SubjectSecurityContext = { NULL, 0, NULL, NULL };
KPROCESSOR_MODE PreviousMode; KPROCESSOR_MODE PreviousMode;
PTOKEN Token; PTOKEN Token;
NTSTATUS Status; NTSTATUS Status;