Silence compiler warnings (8/11).

svn path=/trunk/; revision=37830
This commit is contained in:
Dmitry Gorbachev 2008-12-03 17:34:49 +00:00
parent ff091bdac5
commit 7e3410d2b3
15 changed files with 33 additions and 31 deletions

View file

@ -19,9 +19,9 @@ typedef struct
ULONG szDefaultPos; ULONG szDefaultPos;
ULONG OSConfigurationCount; ULONG OSConfigurationCount;
BOOL UseBootIni; BOOL UseBootIni;
}FREELDR_SETTINGS; } FREELDR_SETTINGS;
static FREELDR_SETTINGS Settings = { 0, {0}, 0 }; static FREELDR_SETTINGS Settings = { 0, { 0, }, 0, 0, FALSE };
BOOL BOOL

View file

@ -162,7 +162,9 @@ EnumDeviceClasses(INT ClassIndex,
} }
if (Ret == CR_INVALID_DATA) if (Ret == CR_INVALID_DATA)
{
; /*FIXME: what should we do here? */ ; /*FIXME: what should we do here? */
}
/* handle other errors... */ /* handle other errors... */
} }

View file

@ -85,7 +85,7 @@ int main(int argc, char **argv)
struct sockaddr_in sin; struct sockaddr_in sin;
struct hostent *hp; struct hostent *hp;
struct servent *sp; struct servent *sp;
int s; SOCKET s;
WORD wVersionRequested; WORD wVersionRequested;
WSADATA wsaData; WSADATA wsaData;

View file

@ -472,7 +472,7 @@ SndMixerEnumProducts(PSND_MIXER Mixer,
INT INT
SndMixerGetDestinationCount(PSND_MIXER Mixer) SndMixerGetDestinationCount(PSND_MIXER Mixer)
{ {
return (Mixer->hmx ? Mixer->Caps.cDestinations : -1); return (Mixer->hmx ? (INT)Mixer->Caps.cDestinations : -1);
} }
BOOL BOOL

View file

@ -241,7 +241,7 @@ static VOID
UpdatePrefDlgControls(PPREFERENCES_CONTEXT Context, UpdatePrefDlgControls(PPREFERENCES_CONTEXT Context,
DWORD LineID) DWORD LineID)
{ {
UINT OldID, MixerID = 0; INT OldID, MixerID = 0;
INT DeviceCbIndex; INT DeviceCbIndex;
/* select the mixer */ /* select the mixer */
@ -381,8 +381,8 @@ DlgPreferencesProc(HWND hwndDlg,
{ {
if (HIWORD(wParam) == CBN_SELCHANGE) if (HIWORD(wParam) == CBN_SELCHANGE)
{ {
DWORD LineID; INT LineID;
DWORD Index; INT Index;
Index = SendDlgItemMessage(hwndDlg, Index = SendDlgItemMessage(hwndDlg,
IDC_LINE, IDC_LINE,
@ -429,7 +429,7 @@ DlgPreferencesProc(HWND hwndDlg,
case IDC_OTHER: case IDC_OTHER:
{ {
INT LineCbIndex; INT LineCbIndex;
DWORD LineID; INT LineID;
EnableWindow(GetDlgItem(hwndDlg, EnableWindow(GetDlgItem(hwndDlg,
IDC_LINE), IDC_LINE),

View file

@ -162,7 +162,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize,
DWORD dwDataSize, DWORD dwDataSize,
LPVOID lpRawData); LPVOID lpRawData);
void __inline LogfFreeRecord(LPVOID Rec); __inline void LogfFreeRecord(LPVOID Rec);
/* eventlog.c */ /* eventlog.c */
VOID PRINT_HEADER(PFILE_HEADER header); VOID PRINT_HEADER(PFILE_HEADER header);

View file

@ -899,7 +899,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize,
return Buffer; return Buffer;
} }
void __inline LogfFreeRecord(LPVOID Rec) __inline void LogfFreeRecord(LPVOID Rec)
{ {
HeapFree(MyHeap, 0, Rec); HeapFree(MyHeap, 0, Rec);
} }

View file

@ -343,9 +343,9 @@ NTSTATUS ElfrOpenELA(
DWORD MinorVersion, DWORD MinorVersion,
IELF_HANDLE *LogHandle) IELF_HANDLE *LogHandle)
{ {
UNICODE_STRING UNCServerNameW = { 0, }; UNICODE_STRING UNCServerNameW = { 0, 0, NULL };
UNICODE_STRING ModuleNameW = { 0, }; UNICODE_STRING ModuleNameW = { 0, 0, NULL };
UNICODE_STRING RegModuleNameW = { 0, }; UNICODE_STRING RegModuleNameW = { 0, 0, NULL };
NTSTATUS Status; NTSTATUS Status;
if (UNCServerName && if (UNCServerName &&

View file

@ -41,7 +41,7 @@ typedef HRESULT (APIENTRY *SHWINHELP)(HWND, LPWSTR, UINT, DWORD);
/* Constants for RunFileDlg */ /* Constants for RunFileDlg */
#define RFF_CALCDIRECTORY 0x04 /* Calculates the working directory from the file name. */ #define RFF_CALCDIRECTORY 0x04 /* Calculates the working directory from the file name. */
static ULONG __inline static __inline ULONG
Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...)
{ {
char szMsg[512]; char szMsg[512];

View file

@ -141,7 +141,7 @@ TrayClockWnd_GetMinimumSize(IN OUT PTRAY_CLOCK_WND_DATA This,
{ {
WORD iLinesVisible = 0; WORD iLinesVisible = 0;
INT i; INT i;
SIZE szMax = {0}; SIZE szMax = { 0, 0 };
if (!This->LinesMeasured) if (!This->LinesMeasured)
This->LinesMeasured = TrayClockWnd_MeasureLines(This); This->LinesMeasured = TrayClockWnd_MeasureLines(This);
@ -713,7 +713,7 @@ typedef struct _TRAY_NOTIFY_WND_DATA
static VOID static VOID
TrayNotifyWnd_UpdateStyle(IN OUT PTRAY_NOTIFY_WND_DATA This) TrayNotifyWnd_UpdateStyle(IN OUT PTRAY_NOTIFY_WND_DATA This)
{ {
RECT rcClient = {0}; RECT rcClient = { 0, 0, 0, 0 };
if (AdjustWindowRectEx(&rcClient, if (AdjustWindowRectEx(&rcClient,
GetWindowLong(This->hWnd, GetWindowLong(This->hWnd,
@ -758,7 +758,7 @@ TrayNotifyWnd_GetMinimumSize(IN OUT PTRAY_NOTIFY_WND_DATA This,
if (!This->HideClock) if (!This->HideClock)
{ {
SIZE szClock = {0}; SIZE szClock = { 0, 0 };
if (Horizontal) if (Horizontal)
{ {

View file

@ -992,7 +992,7 @@ static VOID
ITrayWindowImpl_UpdateStartButton(IN OUT ITrayWindowImpl *This, ITrayWindowImpl_UpdateStartButton(IN OUT ITrayWindowImpl *This,
IN HBITMAP hbmStart OPTIONAL) IN HBITMAP hbmStart OPTIONAL)
{ {
SIZE Size = {0}; SIZE Size = { 0, 0 };
if (This->himlStartBtn == NULL || if (This->himlStartBtn == NULL ||
!SendMessage(This->hwndStart, !SendMessage(This->hwndStart,
@ -1047,7 +1047,7 @@ ITrayWindowImpl_AlignControls(IN OUT ITrayWindowImpl *This,
{ {
RECT rcClient; RECT rcClient;
SIZE TraySize, StartSize; SIZE TraySize, StartSize;
POINT ptTrayNotify = {0}; POINT ptTrayNotify = { 0, 0 };
BOOL Horizontal; BOOL Horizontal;
HDWP dwp; HDWP dwp;
@ -1131,7 +1131,7 @@ ITrayWindowImpl_AlignControls(IN OUT ITrayWindowImpl *This,
/* Resize/Move the rebar control */ /* Resize/Move the rebar control */
if (This->hwndRebar != NULL) if (This->hwndRebar != NULL)
{ {
POINT ptRebar = {0}; POINT ptRebar = { 0, 0 };
SIZE szRebar; SIZE szRebar;
SetWindowStyle(This->hwndRebar, SetWindowStyle(This->hwndRebar,

View file

@ -127,7 +127,7 @@ HANDLE WINAPI SHCreateDesktop(IShellDesktopTray*);
BOOL WINAPI SHDesktopMessageLoop(HANDLE); BOOL WINAPI SHDesktopMessageLoop(HANDLE);
#else #else
typedef HANDLE (WINAPI *PSHCreateDesktop)(IShellDesktopTray*); typedef HANDLE (WINAPI *PSHCreateDesktop)(IShellDesktopTray*);
static HANDLE __inline static __inline HANDLE
SHCreateDesktop(IShellDesktopTray* sdt) SHCreateDesktop(IShellDesktopTray* sdt)
{ {
static PSHCreateDesktop Func = NULL; static PSHCreateDesktop Func = NULL;
@ -152,7 +152,7 @@ SHCreateDesktop(IShellDesktopTray* sdt)
} }
typedef BOOL (WINAPI *PSHDesktopMessageLoop)(HANDLE); typedef BOOL (WINAPI *PSHDesktopMessageLoop)(HANDLE);
static BOOL __inline static __inline BOOL
SHDesktopMessageLoop(IN HANDLE hDesktop) SHDesktopMessageLoop(IN HANDLE hDesktop)
{ {
static PSHDesktopMessageLoop Func = NULL; static PSHDesktopMessageLoop Func = NULL;
@ -240,7 +240,7 @@ HRESULT WINAPI SHGetPerScreenResName(OUT LPWSTR lpResName,
IN DWORD dwReserved); IN DWORD dwReserved);
#else #else
typedef HRESULT (WINAPI *PSHGetPerScreenResName)(LPWSTR,INT,DWORD); typedef HRESULT (WINAPI *PSHGetPerScreenResName)(LPWSTR,INT,DWORD);
static HRESULT __inline static __inline HRESULT
SHGetPerScreenResName(OUT LPWSTR lpResName, SHGetPerScreenResName(OUT LPWSTR lpResName,
IN INT cchResName, IN INT cchResName,
IN DWORD dwReserved OPTIONAL) IN DWORD dwReserved OPTIONAL)
@ -271,7 +271,7 @@ SHGetPerScreenResName(OUT LPWSTR lpResName,
HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag*,LPCWSTR,IStream**); HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag*,LPCWSTR,IStream**);
#else #else
typedef HRESULT (WINAPI *PSHPropertyBag_ReadStream)(IPropertyBag*,LPCWSTR,IStream**); typedef HRESULT (WINAPI *PSHPropertyBag_ReadStream)(IPropertyBag*,LPCWSTR,IStream**);
static HRESULT __inline static __inline HRESULT
SHPropertyBag_ReadStream(IN IPropertyBag *ppb, SHPropertyBag_ReadStream(IN IPropertyBag *ppb,
IN LPCWSTR pszPropName, IN LPCWSTR pszPropName,
OUT IStream **ppStream) OUT IStream **ppStream)

View file

@ -220,7 +220,7 @@ LPTSTR *WINAPI CommandLineToArgvT(LPCTSTR lpCmdLine, int *lpArgc)
// should not be modified until FreeConvertedWideChar has been called. // should not be modified until FreeConvertedWideChar has been called.
#ifdef UNICODE #ifdef UNICODE
#define ConvertToWideChar(lptString) (lptString) #define ConvertToWideChar(lptString) (lptString)
#define FreeConvertedWideChar(lpwString) #define FreeConvertedWideChar(lpwString) ((void) 0)
#else #else
LPWSTR ConvertToWideChar(LPCSTR lpString) LPWSTR ConvertToWideChar(LPCSTR lpString)

View file

@ -71,7 +71,7 @@ SmpCreatePT (IN OUT PHANDLE hPort,
IN OUT PHANDLE phServingThread OPTIONAL) IN OUT PHANDLE phServingThread OPTIONAL)
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
UNICODE_STRING PortName = {0}; UNICODE_STRING PortName = { 0, 0, NULL };
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
HANDLE Thread = (HANDLE) 0; HANDLE Thread = (HANDLE) 0;
CLIENT_ID Cid = {0, 0}; CLIENT_ID Cid = {0, 0};

View file

@ -41,12 +41,12 @@ SmCreateUserProcess (LPWSTR ImagePath,
PLARGE_INTEGER Timeout OPTIONAL, PLARGE_INTEGER Timeout OPTIONAL,
PRTL_USER_PROCESS_INFORMATION UserProcessInfo OPTIONAL) PRTL_USER_PROCESS_INFORMATION UserProcessInfo OPTIONAL)
{ {
UNICODE_STRING ImagePathString = {0}; UNICODE_STRING ImagePathString = { 0, 0, NULL };
UNICODE_STRING CommandLineString = {0}; UNICODE_STRING CommandLineString = { 0, 0, NULL };
UNICODE_STRING SystemDirectory = {0}; UNICODE_STRING SystemDirectory = { 0, 0, NULL };
PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL;
RTL_USER_PROCESS_INFORMATION ProcessInfo = {0}; RTL_USER_PROCESS_INFORMATION ProcessInfo = {0};
PRTL_USER_PROCESS_INFORMATION pProcessInfo = & ProcessInfo; PRTL_USER_PROCESS_INFORMATION pProcessInfo = & ProcessInfo;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
DPRINT("SM: %s called\n", __FUNCTION__); DPRINT("SM: %s called\n", __FUNCTION__);