[ros-diffs] [dgorbachev] 37830: Silence compiler warnings (8/11).
dgorbachev at svn.reactos.org
dgorbachev at svn.reactos.org
Wed Dec 3 18:34:49 CET 2008
Author: dgorbachev
Date: Wed Dec 3 11:34:49 2008
New Revision: 37830
URL: http://svn.reactos.org/svn/reactos?rev=37830&view=rev
Log:
Silence compiler warnings (8/11).
Modified:
trunk/reactos/base/applications/msconfig/freeldrpage.c
trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c
trunk/reactos/base/applications/network/whois/whois.c
trunk/reactos/base/applications/sndvol32/mixer.c
trunk/reactos/base/applications/sndvol32/sndvol32.c
trunk/reactos/base/services/eventlog/eventlog.h
trunk/reactos/base/services/eventlog/file.c
trunk/reactos/base/services/eventlog/rpc.c
trunk/reactos/base/shell/explorer-new/precomp.h
trunk/reactos/base/shell/explorer-new/trayntfy.c
trunk/reactos/base/shell/explorer-new/traywnd.c
trunk/reactos/base/shell/explorer-new/undoc.h
trunk/reactos/base/system/regsvr32/regsvr32.c
trunk/reactos/base/system/smss/debug.c
trunk/reactos/base/system/smss/smapiexec.c
Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig/freeldrpage.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/applications/msconfig/freeldrpage.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/msconfig/freeldrpage.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -19,9 +19,9 @@
ULONG szDefaultPos;
ULONG OSConfigurationCount;
BOOL UseBootIni;
-}FREELDR_SETTINGS;
+} FREELDR_SETTINGS;
-static FREELDR_SETTINGS Settings = { 0, {0}, 0 };
+static FREELDR_SETTINGS Settings = { 0, { 0, }, 0, 0, FALSE };
BOOL
Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -162,7 +162,9 @@
}
if (Ret == CR_INVALID_DATA)
+ {
; /*FIXME: what should we do here? */
+ }
/* handle other errors... */
}
Modified: trunk/reactos/base/applications/network/whois/whois.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/whois/whois.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/whois/whois.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/whois/whois.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -85,7 +85,7 @@
struct sockaddr_in sin;
struct hostent *hp;
struct servent *sp;
- int s;
+ SOCKET s;
WORD wVersionRequested;
WSADATA wsaData;
Modified: trunk/reactos/base/applications/sndvol32/mixer.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32/mixer.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/applications/sndvol32/mixer.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/sndvol32/mixer.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -472,7 +472,7 @@
INT
SndMixerGetDestinationCount(PSND_MIXER Mixer)
{
- return (Mixer->hmx ? Mixer->Caps.cDestinations : -1);
+ return (Mixer->hmx ? (INT)Mixer->Caps.cDestinations : -1);
}
BOOL
Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32/sndvol32.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -241,7 +241,7 @@
UpdatePrefDlgControls(PPREFERENCES_CONTEXT Context,
DWORD LineID)
{
- UINT OldID, MixerID = 0;
+ INT OldID, MixerID = 0;
INT DeviceCbIndex;
/* select the mixer */
@@ -381,8 +381,8 @@
{
if (HIWORD(wParam) == CBN_SELCHANGE)
{
- DWORD LineID;
- DWORD Index;
+ INT LineID;
+ INT Index;
Index = SendDlgItemMessage(hwndDlg,
IDC_LINE,
@@ -429,7 +429,7 @@
case IDC_OTHER:
{
INT LineCbIndex;
- DWORD LineID;
+ INT LineID;
EnableWindow(GetDlgItem(hwndDlg,
IDC_LINE),
Modified: trunk/reactos/base/services/eventlog/eventlog.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eventlog.h?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original)
+++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -162,7 +162,7 @@
DWORD dwDataSize,
LPVOID lpRawData);
-void __inline LogfFreeRecord(LPVOID Rec);
+__inline void LogfFreeRecord(LPVOID Rec);
/* eventlog.c */
VOID PRINT_HEADER(PFILE_HEADER header);
Modified: trunk/reactos/base/services/eventlog/file.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/file.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original)
+++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -899,7 +899,7 @@
return Buffer;
}
-void __inline LogfFreeRecord(LPVOID Rec)
+__inline void LogfFreeRecord(LPVOID Rec)
{
HeapFree(MyHeap, 0, Rec);
}
Modified: trunk/reactos/base/services/eventlog/rpc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original)
+++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -343,9 +343,9 @@
DWORD MinorVersion,
IELF_HANDLE *LogHandle)
{
- UNICODE_STRING UNCServerNameW = { 0, };
- UNICODE_STRING ModuleNameW = { 0, };
- UNICODE_STRING RegModuleNameW = { 0, };
+ UNICODE_STRING UNCServerNameW = { 0, 0, NULL };
+ UNICODE_STRING ModuleNameW = { 0, 0, NULL };
+ UNICODE_STRING RegModuleNameW = { 0, 0, NULL };
NTSTATUS Status;
if (UNCServerName &&
Modified: trunk/reactos/base/shell/explorer-new/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/precomp.h?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -41,7 +41,7 @@
/* Constants for RunFileDlg */
#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, ...)
{
char szMsg[512];
Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/trayntfy.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -141,7 +141,7 @@
{
WORD iLinesVisible = 0;
INT i;
- SIZE szMax = {0};
+ SIZE szMax = { 0, 0 };
if (!This->LinesMeasured)
This->LinesMeasured = TrayClockWnd_MeasureLines(This);
@@ -713,7 +713,7 @@
static VOID
TrayNotifyWnd_UpdateStyle(IN OUT PTRAY_NOTIFY_WND_DATA This)
{
- RECT rcClient = {0};
+ RECT rcClient = { 0, 0, 0, 0 };
if (AdjustWindowRectEx(&rcClient,
GetWindowLong(This->hWnd,
@@ -758,7 +758,7 @@
if (!This->HideClock)
{
- SIZE szClock = {0};
+ SIZE szClock = { 0, 0 };
if (Horizontal)
{
Modified: trunk/reactos/base/shell/explorer-new/traywnd.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/traywnd.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -992,7 +992,7 @@
ITrayWindowImpl_UpdateStartButton(IN OUT ITrayWindowImpl *This,
IN HBITMAP hbmStart OPTIONAL)
{
- SIZE Size = {0};
+ SIZE Size = { 0, 0 };
if (This->himlStartBtn == NULL ||
!SendMessage(This->hwndStart,
@@ -1047,7 +1047,7 @@
{
RECT rcClient;
SIZE TraySize, StartSize;
- POINT ptTrayNotify = {0};
+ POINT ptTrayNotify = { 0, 0 };
BOOL Horizontal;
HDWP dwp;
@@ -1131,7 +1131,7 @@
/* Resize/Move the rebar control */
if (This->hwndRebar != NULL)
{
- POINT ptRebar = {0};
+ POINT ptRebar = { 0, 0 };
SIZE szRebar;
SetWindowStyle(This->hwndRebar,
Modified: trunk/reactos/base/shell/explorer-new/undoc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/undoc.h?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/shell/explorer-new/undoc.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer-new/undoc.h [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -127,7 +127,7 @@
BOOL WINAPI SHDesktopMessageLoop(HANDLE);
#else
typedef HANDLE (WINAPI *PSHCreateDesktop)(IShellDesktopTray*);
-static HANDLE __inline
+static __inline HANDLE
SHCreateDesktop(IShellDesktopTray* sdt)
{
static PSHCreateDesktop Func = NULL;
@@ -152,7 +152,7 @@
}
typedef BOOL (WINAPI *PSHDesktopMessageLoop)(HANDLE);
-static BOOL __inline
+static __inline BOOL
SHDesktopMessageLoop(IN HANDLE hDesktop)
{
static PSHDesktopMessageLoop Func = NULL;
@@ -240,7 +240,7 @@
IN DWORD dwReserved);
#else
typedef HRESULT (WINAPI *PSHGetPerScreenResName)(LPWSTR,INT,DWORD);
-static HRESULT __inline
+static __inline HRESULT
SHGetPerScreenResName(OUT LPWSTR lpResName,
IN INT cchResName,
IN DWORD dwReserved OPTIONAL)
@@ -271,7 +271,7 @@
HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag*,LPCWSTR,IStream**);
#else
typedef HRESULT (WINAPI *PSHPropertyBag_ReadStream)(IPropertyBag*,LPCWSTR,IStream**);
-static HRESULT __inline
+static __inline HRESULT
SHPropertyBag_ReadStream(IN IPropertyBag *ppb,
IN LPCWSTR pszPropName,
OUT IStream **ppStream)
Modified: trunk/reactos/base/system/regsvr32/regsvr32.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsvr32.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -220,7 +220,7 @@
// should not be modified until FreeConvertedWideChar has been called.
#ifdef UNICODE
#define ConvertToWideChar(lptString) (lptString)
-#define FreeConvertedWideChar(lpwString)
+#define FreeConvertedWideChar(lpwString) ((void) 0)
#else
LPWSTR ConvertToWideChar(LPCSTR lpString)
Modified: trunk/reactos/base/system/smss/debug.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/debug.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/system/smss/debug.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss/debug.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -71,7 +71,7 @@
IN OUT PHANDLE phServingThread OPTIONAL)
{
NTSTATUS Status = STATUS_SUCCESS;
- UNICODE_STRING PortName = {0};
+ UNICODE_STRING PortName = { 0, 0, NULL };
OBJECT_ATTRIBUTES ObjectAttributes;
HANDLE Thread = (HANDLE) 0;
CLIENT_ID Cid = {0, 0};
Modified: trunk/reactos/base/system/smss/smapiexec.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapiexec.c?rev=37830&r1=37829&r2=37830&view=diff
==============================================================================
--- trunk/reactos/base/system/smss/smapiexec.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss/smapiexec.c [iso-8859-1] Wed Dec 3 11:34:49 2008
@@ -41,12 +41,12 @@
PLARGE_INTEGER Timeout OPTIONAL,
PRTL_USER_PROCESS_INFORMATION UserProcessInfo OPTIONAL)
{
- UNICODE_STRING ImagePathString = {0};
- UNICODE_STRING CommandLineString = {0};
- UNICODE_STRING SystemDirectory = {0};
+ UNICODE_STRING ImagePathString = { 0, 0, NULL };
+ UNICODE_STRING CommandLineString = { 0, 0, NULL };
+ UNICODE_STRING SystemDirectory = { 0, 0, NULL };
PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL;
- RTL_USER_PROCESS_INFORMATION ProcessInfo = {0};
- PRTL_USER_PROCESS_INFORMATION pProcessInfo = & ProcessInfo;
+ RTL_USER_PROCESS_INFORMATION ProcessInfo = {0};
+ PRTL_USER_PROCESS_INFORMATION pProcessInfo = & ProcessInfo;
NTSTATUS Status = STATUS_SUCCESS;
DPRINT("SM: %s called\n", __FUNCTION__);
More information about the Ros-diffs
mailing list