Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 37830: Silence compiler warnings (8/11).
by dgorbachev＠svn.reactos.org 03 Dec '08

03 Dec '08

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… ============================================================================== --- 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… ============================================================================== --- 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/… ============================================================================== --- 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… ============================================================================== --- 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… ============================================================================== --- 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/eve… ============================================================================== --- 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/fil… ============================================================================== --- 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… ============================================================================== --- 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/pr… ============================================================================== --- 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/tr… ============================================================================== --- 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/tr… ============================================================================== --- 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/un… ============================================================================== --- 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/regsv… ============================================================================== --- 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?r… ============================================================================== --- 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… ============================================================================== --- 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__);

1 0

[dgorbachev] 37829: Silence compiler warnings (7/11).
by dgorbachev＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: dgorbachev Date: Wed Dec 3 11:33:13 2008 New Revision: 37829 URL: http://svn.reactos.org/svn/reactos?rev=37829&view=rev Log: Silence compiler warnings (7/11). Modified: trunk/reactos/dll/cpl/console/colors.c trunk/reactos/dll/cpl/console/layout.c trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/timedate/ntpclient.c trunk/reactos/dll/ntdll/rtl/version.c trunk/reactos/dll/win32/kernel32/file/dir.c trunk/reactos/dll/win32/kernel32/file/file.c trunk/reactos/dll/win32/kernel32/file/mailslot.c trunk/reactos/dll/win32/kernel32/file/npipe.c trunk/reactos/dll/win32/kernel32/file/volume.c trunk/reactos/dll/win32/kernel32/misc/muldiv.c trunk/reactos/dll/win32/kernel32/misc/profile.c trunk/reactos/dll/win32/kernel32/misc/time.c trunk/reactos/dll/win32/kernel32/process/procsup.c trunk/reactos/dll/win32/kernel32/thread/tls.c trunk/reactos/dll/win32/netcfgx/netcfg_iface.c trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c trunk/reactos/dll/win32/netshell/connectmanager.c trunk/reactos/dll/win32/netshell/lanconnectui.c trunk/reactos/dll/win32/netshell/shfldr_netconnect.c trunk/reactos/dll/win32/opengl32/opengl32.c trunk/reactos/dll/win32/userenv/directory.c trunk/reactos/dll/win32/userenv/profile.c trunk/reactos/dll/win32/userenv/setup.c Modified: trunk/reactos/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -116,7 +116,7 @@ break; } - if (red == -1) + if (red == -1U) { red = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_GETPOS, 0, 0); if (HIWORD(red)) @@ -127,7 +127,7 @@ red = LOBYTE(red); } - if (green == -1) + if (green == -1U) { green = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_GETPOS, 0, 0); if (HIWORD(green)) @@ -138,7 +138,7 @@ green = LOBYTE(green); } - if (blue == -1) + if (blue == -1U) { blue = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_GETPOS, 0, 0); if (HIWORD(blue)) Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -160,7 +160,7 @@ SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(xres, 0)); SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), UDM_SETRANGE, 0, (LPARAM)MAKELONG(yres, 0)); - if (pConInfo->WindowPosition != -1) + if (pConInfo->WindowPosition != -1U) { SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, LOWORD(pConInfo->WindowPosition), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, HIWORD(pConInfo->WindowPosition), FALSE); Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -969,7 +969,7 @@ GetSysColor(COLOR_WINDOWTEXT)); } - if (lpdis->itemID != -1) + if (lpdis->itemID != -1U) { CopyRect(&rc, &lpdis->rcItem); rc.left += 5; Modified: trunk/reactos/dll/cpl/timedate/ntpclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/ntpclient… ============================================================================== --- trunk/reactos/dll/cpl/timedate/ntpclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/ntpclient.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -75,7 +75,7 @@ static BOOL SendData(PINFO pInfo) { - TIMEPACKET tp = {0,}; + TIMEPACKET tp = { 0, 0 }; INT Ret; ZeroMemory(&pInfo->SendPacket, sizeof(pInfo->SendPacket)); Modified: trunk/reactos/dll/ntdll/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/version.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -104,7 +104,7 @@ NTSTATUS NTAPI RtlGetVersion(RTL_OSVERSIONINFOW *Info) { - ULONG i, MaxLength; + LONG i, MaxLength; if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -830,10 +830,10 @@ LPSTR *lpFilePart ) { - UNICODE_STRING PathU = {0}; - UNICODE_STRING FileNameU = {0}; - UNICODE_STRING ExtensionU = {0}; - UNICODE_STRING BufferU = {0}; + UNICODE_STRING PathU = { 0, 0, NULL }; + UNICODE_STRING FileNameU = { 0, 0, NULL }; + UNICODE_STRING ExtensionU = { 0, 0, NULL }; + UNICODE_STRING BufferU = { 0, 0, NULL }; ANSI_STRING Path; ANSI_STRING FileName; ANSI_STRING Extension; Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -479,7 +479,7 @@ *lpDistanceToMoveHigh = FilePosition.CurrentByteOffset.u.HighPart; } - if (FilePosition.CurrentByteOffset.u.LowPart == -1) + if (FilePosition.CurrentByteOffset.u.LowPart == -1U) { /* The value of -1 is valid here, especially when the new file position is greater than 4 GB. Since NtSetInformationFile Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ma… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -165,7 +165,7 @@ if (lpReadTimeout != NULL) { if (Buffer.ReadTimeout.LowPart == 0 && - Buffer.ReadTimeout.HighPart == 0x80000000) + Buffer.ReadTimeout.HighPart == (LONG)0x80000000) *lpReadTimeout = MAILSLOT_WAIT_FOREVER; else *lpReadTimeout = (DWORD)(Buffer.ReadTimeout.QuadPart / -10000); Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -952,7 +952,7 @@ LPSTR lpUserName, DWORD nMaxUserNameSize) { - UNICODE_STRING UserNameW = {0}; + UNICODE_STRING UserNameW = { 0, 0, NULL }; ANSI_STRING UserNameA; BOOL Ret; Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -495,7 +495,7 @@ ) { UNICODE_STRING FileSystemNameU; - UNICODE_STRING VolumeNameU = {0}; + UNICODE_STRING VolumeNameU = { 0, 0, NULL }; ANSI_STRING VolumeName; ANSI_STRING FileSystemName; PWCHAR RootPathNameW; Modified: trunk/reactos/dll/win32/kernel32/misc/muldiv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/mu… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/muldiv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/muldiv.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -53,7 +53,7 @@ /* Do the sign changes */ if ((LONG)Result.LowPart >= 0) { - return (Negative >= 0) ? Result.LowPart : -(LONG)Result.LowPart; + return (Negative >= 0) ? (LONG)Result.LowPart : -(LONG)Result.LowPart; } } Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -76,7 +76,7 @@ { 0, 0, &PROFILE_CritSect, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, 0, 0 + 0, 0, 0, 0, 0 }; static RTL_CRITICAL_SECTION PROFILE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; Modified: trunk/reactos/dll/win32/kernel32/misc/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/time.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -250,7 +250,7 @@ { PDOSTIME pdtime=(PDOSTIME) lpFatTime; PDOSDATE pddate=(PDOSDATE) lpFatDate; - SYSTEMTIME SystemTime = { 0 }; + SYSTEMTIME SystemTime = { 0, 0, 0, 0, 0, 0, 0, 0 }; if ( lpFileTime == NULL ) return FALSE; Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -639,7 +639,7 @@ BOOLEAN FoundQuotes = FALSE; BOOLEAN QuotesNeeded = FALSE; BOOLEAN CmdLineIsAppName = FALSE; - UNICODE_STRING ApplicationName = {0}; + UNICODE_STRING ApplicationName = { 0, 0, NULL }; OBJECT_ATTRIBUTES LocalObjectAttributes; POBJECT_ATTRIBUTES ObjectAttributes; HANDLE hSection = NULL, hProcess = NULL, hThread = NULL, hDebug = NULL; Modified: trunk/reactos/dll/win32/kernel32/thread/tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/tls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/tls.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -31,11 +31,11 @@ /* Try to get regular TEB slot. */ Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsBitmap, 1, 0); - if (Index == ~0) + if (Index == ~0U) { /* If it fails, try to find expansion TEB slot. */ Index = RtlFindClearBitsAndSet(NtCurrentPeb()->TlsExpansionBitmap, 1, 0); - if (Index != ~0) + if (Index != ~0U) { if (NtCurrentTeb()->TlsExpansionSlots == NULL) { Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfg_i… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -14,7 +14,7 @@ NetCfgComponentItem * pProtocol; } INetCfgImpl, *LPINetCfgImpl; -static LPINetCfgImpl __inline impl_from_INetCfgLock(INetCfgLock *iface) +static __inline LPINetCfgImpl impl_from_INetCfgLock(INetCfgLock *iface) { return (INetCfgImpl*)((char *)iface - FIELD_OFFSET(INetCfgImpl, lpVtblLock)); } Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -107,7 +107,7 @@ UINT MaxNum; }TcpipPortSettings; -static LPTcpipConfNotifyImpl __inline impl_from_INetCfgComponentControl(INetCfgComponentControl *iface) +static __inline LPTcpipConfNotifyImpl impl_from_INetCfgComponentControl(INetCfgComponentControl *iface) { return (TcpipConfNotifyImpl*)((char *)iface - FIELD_OFFSET(TcpipConfNotifyImpl, lpVtblCompControl)); } Modified: trunk/reactos/dll/win32/netshell/connectmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect… ============================================================================== --- trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -26,7 +26,7 @@ } INetConnectionImpl, *LPINetConnectionImpl; -static LPINetConnectionManagerImpl __inline impl_from_EnumNetConnection(IEnumNetConnection *iface) +static __inline LPINetConnectionManagerImpl impl_from_EnumNetConnection(IEnumNetConnection *iface) { return (LPINetConnectionManagerImpl)((char *)iface - FIELD_OFFSET(INetConnectionManagerImpl, lpVtblNetConnection)); } Modified: trunk/reactos/dll/win32/netshell/lanconnectui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -32,12 +32,12 @@ LONG ref; }INetConnectionPropertyUiImpl, *LPINetConnectionPropertyUiImpl; -static LPINetConnectionPropertyUiImpl __inline impl_from_NetLanConnectionUiInfo(INetLanConnectionUiInfo *iface) +static __inline LPINetConnectionPropertyUiImpl impl_from_NetLanConnectionUiInfo(INetLanConnectionUiInfo *iface) { return (LPINetConnectionPropertyUiImpl)((char *)iface - FIELD_OFFSET(INetConnectionPropertyUiImpl, lpLanConUiInfoVtbl)); } -static LPINetConnectionPropertyUiImpl __inline impl_from_NetConnectionConnectUi(INetConnectionConnectUi *iface) +static __inline LPINetConnectionPropertyUiImpl impl_from_NetConnectionConnectUi(INetConnectionConnectUi *iface) { return (LPINetConnectionPropertyUiImpl)((char *)iface - FIELD_OFFSET(INetConnectionPropertyUiImpl, lpNetConnectionConnectUi)); } Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -79,28 +79,28 @@ static const IQueryInfoVtbl vt_QueryInfo; static const IExtractIconWVtbl vt_ExtractIconW; -static LPIContextMenuImpl __inline impl_from_IExtractIcon(IExtractIconW *iface) +static __inline LPIContextMenuImpl impl_from_IExtractIcon(IExtractIconW *iface) { return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblExtractIconW)); } -static LPIContextMenuImpl __inline impl_from_IObjectWithSite(IObjectWithSite *iface) +static __inline LPIContextMenuImpl impl_from_IObjectWithSite(IObjectWithSite *iface) { return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblObjectWithSite)); } -static LPIGenericSFImpl __inline impl_from_IPersistFolder2(IPersistFolder2 *iface) +static __inline LPIGenericSFImpl impl_from_IPersistFolder2(IPersistFolder2 *iface) { return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblPersistFolder2)); } -static LPIGenericSFImpl __inline impl_from_IShellExecuteHookW(IShellExecuteHookW *iface) +static __inline LPIGenericSFImpl impl_from_IShellExecuteHookW(IShellExecuteHookW *iface) { return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblShellExecuteHookW)); } -static LPIContextMenuImpl __inline impl_from_IQueryInfo(IQueryInfo *iface) +static __inline LPIContextMenuImpl impl_from_IQueryInfo(IQueryInfo *iface) { return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblQueryInfo)); } Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -21,7 +21,7 @@ /* global vars */ /* Do not assume it have the free value -1 set, any value can be in here */ -DWORD OPENGL32_tls = -1; +DWORD OPENGL32_tls = -1U; GLPROCESSDATA OPENGL32_processdata; @@ -103,7 +103,7 @@ TRUE /* bInheritHandle */ }; OPENGL32_tls = TlsAlloc(); - if (-1 == OPENGL32_tls) + if (-1U == OPENGL32_tls) return FALSE; memset( &OPENGL32_processdata, 0, sizeof (OPENGL32_processdata) ); @@ -179,7 +179,7 @@ CloseHandle( OPENGL32_processdata.dcdata_mutex ); /* free TLS */ - if (OPENGL32_tls != -1) + if (OPENGL32_tls != -1U) TlsFree(OPENGL32_tls); } Modified: trunk/reactos/dll/win32/userenv/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/director… ============================================================================== --- trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/directory.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -169,7 +169,7 @@ FindClose (hFind); - DPRINT ("Copy Directory() done\n"); + DPRINT ("CopyDirectory() done\n"); return TRUE; } Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -912,7 +912,7 @@ DWORD UserNameLength = 0, DomainLength = 0; PTOKEN_USER UserSid = NULL; SID_NAME_USE AccountType; - UNICODE_STRING SidString = { 0, }; + UNICODE_STRING SidString = { 0, 0, NULL }; LONG Error; BOOL ret = FALSE; DWORD dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); Modified: trunk/reactos/dll/win32/userenv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/setup.c?… ============================================================================== --- trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/setup.c [iso-8859-1] Wed Dec 3 11:33:13 2008 @@ -114,6 +114,8 @@ HKEY hKey; LONG Error; + DPRINT("InitializeProfiles()\n"); + /* Load profiles directory path */ if (!LoadStringW(hInstance, IDS_PROFILEPATH,

1 0

[dgorbachev] 37828: Silence compiler warnings (6/11).
by dgorbachev＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: dgorbachev Date: Wed Dec 3 11:32:36 2008 New Revision: 37828 URL: http://svn.reactos.org/svn/reactos?rev=37828&view=rev Log: Silence compiler warnings (6/11). Modified: trunk/reactos/lib/3rdparty/mingw/gccmain.c trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/cmlib/hivewrt.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/sdk/crt/wine/heap.c trunk/reactos/lib/smlib/lookupss.c Modified: trunk/reactos/lib/3rdparty/mingw/gccmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/gccmain… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] Wed Dec 3 11:32:36 2008 @@ -46,7 +46,7 @@ * is terminated with a null entry. Otherwise the first entry was * the number of pointers in the list. */ - if (nptrs == -1) + if (nptrs == (unsigned long) -1) { for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++); } Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Wed Dec 3 11:32:36 2008 @@ -9,7 +9,7 @@ #define NDEBUG #include <debug.h> -static PHCELL __inline CMAPI +static __inline PHCELL CMAPI HvpGetCellHeader( PHHIVE RegistryHive, HCELL_INDEX CellIndex) @@ -74,7 +74,7 @@ return (PVOID)(HvpGetCellHeader(RegistryHive, CellIndex) + 1); } -static LONG __inline CMAPI +static __inline LONG CMAPI HvpGetCellFullSize( PHHIVE RegistryHive, PVOID Cell) @@ -141,7 +141,7 @@ return IsDirty; } -static ULONG __inline CMAPI +static __inline ULONG CMAPI HvpComputeFreeListIndex( ULONG Size) { @@ -424,7 +424,7 @@ * FIXME: Merge with adjacent free cell if possible. * FIXME: Implement shrinking. */ - if (Size > OldCellSize) + if (Size > (ULONG)OldCellSize) { NewCellIndex = HvAllocateCell(RegistryHive, Size, Storage, HCELL_NIL); if (NewCellIndex == HCELL_NIL) Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Wed Dec 3 11:32:36 2008 @@ -80,7 +80,7 @@ // // Cell Magic Values // -#define HCELL_NIL -1 +#define HCELL_NIL -1U #define HCELL_CACHED 1 #define HCELL_TYPE_MASK 0x80000000 Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=37… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] Wed Dec 3 11:32:36 2008 @@ -79,7 +79,7 @@ { LastIndex = BlockIndex; BlockIndex = RtlFindSetBits(&RegistryHive->DirtyVector, 1, BlockIndex); - if (BlockIndex == ~0 || BlockIndex < LastIndex) + if (BlockIndex == ~0U || BlockIndex < LastIndex) { break; } @@ -182,7 +182,7 @@ { LastIndex = BlockIndex; BlockIndex = RtlFindSetBits(&RegistryHive->DirtyVector, 1, BlockIndex); - if (BlockIndex == ~0 || BlockIndex < LastIndex) + if (BlockIndex == ~0U || BlockIndex < LastIndex) { break; } @@ -239,7 +239,7 @@ { ASSERT(RegistryHive->ReadOnly == FALSE); - if (RtlFindSetBits(&RegistryHive->DirtyVector, 1, 0) == ~0) + if (RtlFindSetBits(&RegistryHive->DirtyVector, 1, 0) == ~0U) { return TRUE; } Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Wed Dec 3 11:32:36 2008 @@ -150,8 +150,7 @@ Protocol = 0; } - if (Protocol < IP_PROTOCOL_TABLE_SIZE && - Protocol >= 0) + if (Protocol < IP_PROTOCOL_TABLE_SIZE) { /* Call the appropriate protocol handler */ (*ProtocolTable[Protocol])(Interface, IPPacket); Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=37828&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Wed Dec 3 11:32:36 2008 @@ -61,7 +61,8 @@ EXCEPTION_RECORD ExceptionRecord; /* Check if we should print it or not */ - if ((ComponentId != -1) && !(NtQueryDebugFilterState(ComponentId, Level))) + if ((ComponentId != -1U) && + !(NtQueryDebugFilterState(ComponentId, Level))) { /* This message is masked */ return Status; @@ -96,7 +97,7 @@ if (!NT_SUCCESS(Status)) return Status; /* Check if we went past the buffer */ - if (Length == -1) + if (Length == -1U) { /* Terminate it if we went over-board */ Buffer[sizeof(Buffer) - 1] = '\n'; Modified: trunk/reactos/lib/sdk/crt/wine/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/heap.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/heap.c [iso-8859-1] Wed Dec 3 11:32:36 2008 @@ -255,7 +255,7 @@ /* Get previous size of block */ old_size = _msize(*saved); - if (old_size == -1) + if (old_size == (size_t)-1) { /* It seems this function was called with an invalid pointer. Bail out. */ return NULL; Modified: trunk/reactos/lib/smlib/lookupss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/lookupss.c?rev=3… ============================================================================== --- trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] Wed Dec 3 11:32:36 2008 @@ -36,7 +36,7 @@ IN PVOID Environment OPTIONAL) { NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING usKeyName = {0}; + UNICODE_STRING usKeyName = { 0, 0, NULL }; OBJECT_ATTRIBUTES Oa = {0}; HANDLE hKey = (HANDLE) 0; @@ -62,7 +62,7 @@ & Oa); if(NT_SUCCESS(Status)) { - UNICODE_STRING usValueName = {0}; + UNICODE_STRING usValueName = { 0, 0, NULL }; PWCHAR KeyValueInformation = NULL; ULONG KeyValueInformationLength = 1024; ULONG ResultLength = 0L;

1 0

[dgorbachev] 37827: Silence compiler warnings (5/11).
by dgorbachev＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: dgorbachev Date: Wed Dec 3 11:31:38 2008 New Revision: 37827 URL: http://svn.reactos.org/svn/reactos?rev=37827&view=rev Log: Silence compiler warnings (5/11). Modified: trunk/reactos/hal/halx86/generic/cmos.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/pci.c trunk/reactos/hal/halx86/generic/reboot.c Modified: trunk/reactos/hal/halx86/generic/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/cmos.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] Wed Dec 3 11:31:38 2008 @@ -19,8 +19,8 @@ /* PRIVATE FUNCTIONS *********************************************************/ +FORCEINLINE UCHAR -FORCEINLINE HalpReadCmos(IN UCHAR Reg) { /* Select the register */ @@ -30,8 +30,8 @@ return READ_PORT_UCHAR(CMOS_DATA_PORT); } +FORCEINLINE VOID -FORCEINLINE HalpWriteCmos(IN UCHAR Reg, IN UCHAR Value) { Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Wed Dec 3 11:31:38 2008 @@ -1073,7 +1073,7 @@ { PADAPTER_OBJECT MasterAdapter; PGROW_WORK_ITEM WorkItem; - ULONG Index = ~0; + ULONG Index = ~0U; ULONG Result; KIRQL OldIrql; @@ -1129,7 +1129,7 @@ { Index = RtlFindClearBitsAndSet( MasterAdapter->MapRegisters, NumberOfMapRegisters, 0); - if (Index != ~0) + if (Index != ~0U) { AdapterObject->MapRegisterBase = MasterAdapter->MapRegisterBase + Index; @@ -1143,7 +1143,7 @@ } } - if (Index == ~0) + if (Index == ~0U) { WorkItem = ExAllocatePoolWithTag( NonPagedPool, sizeof(GROW_WORK_ITEM), TAG_DMA); @@ -1287,7 +1287,7 @@ Index = RtlFindClearBitsAndSet( MasterAdapter->MapRegisters, WaitContextBlock->NumberOfMapRegisters, 0); - if (Index != ~0) + if (Index != ~0U) { AdapterObject->MapRegisterBase = MasterAdapter->MapRegisterBase + Index; @@ -1301,7 +1301,7 @@ } } - if (Index == ~0) + if (Index == ~0U) { InsertTailList(&MasterAdapter->AdapterQueue, &AdapterObject->AdapterQueue); KfReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql); @@ -1404,7 +1404,7 @@ MasterAdapter->MapRegisters, AdapterObject->NumberOfMapRegisters, MasterAdapter->NumberOfMapRegisters); - if (Index == ~0) + if (Index == ~0U) { InsertHeadList(&MasterAdapter->AdapterQueue, ListEntry); break; @@ -1602,7 +1602,7 @@ { if ((ULONG_PTR)MapRegisterBase & MAP_BASE_SW_SG) { - if (RealMapRegisterBase->Counter != ~0) + if (RealMapRegisterBase->Counter != ~0U) { if (SlaveDma && !AdapterObject->IgnoreCount) Length -= HalReadDmaCounter(AdapterObject); @@ -1984,13 +1984,12 @@ } /* Try to find free map registers */ - MapRegisterNumber = -1; MapRegisterNumber = RtlFindClearBitsAndSet(MasterAdapter->MapRegisters, *NumberOfMapRegisters, 0); /* Check if nothing was found */ - if (MapRegisterNumber == -1) + if (MapRegisterNumber == -1U) { /* No free registers found, so use the base registers */ RtlSetBits(MasterAdapter->MapRegisters, Modified: trunk/reactos/hal/halx86/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] Wed Dec 3 11:31:38 2008 @@ -81,10 +81,10 @@ HalpWritePCIConfig, NULL, NULL, - {{{0}}}, + {{{0, 0, 0}}}, {0, 0, 0, 0} }, - {{0}}, + {{0, 0}}, 32, }; Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] Wed Dec 3 11:31:38 2008 @@ -29,7 +29,7 @@ { UCHAR Data; PVOID HalpZeroPageMapping; - PHYSICAL_ADDRESS Null = {{0}}; + PHYSICAL_ADDRESS Null = {{0, 0}}; /* Enable warm reboot */ HalpZeroPageMapping = MmMapIoSpace(Null, PAGE_SIZE, MmNonCached);

1 0

[dgorbachev] 37826: Silence compiler warnings (4/11).
by dgorbachev＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: dgorbachev Date: Wed Dec 3 11:29:38 2008 New Revision: 37826 URL: http://svn.reactos.org/svn/reactos?rev=37826&view=rev Log: Silence compiler warnings (4/11). Modified: trunk/reactos/drivers/base/bootvid/i386/bootvid.c trunk/reactos/drivers/filesystems/fs_rec/ext2.c trunk/reactos/drivers/filesystems/fs_rec/fat.c trunk/reactos/drivers/filesystems/fs_rec/ntfs.c trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/serial/serial/misc.c trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/drivers/storage/port/diskdump/diskdump.c trunk/reactos/drivers/video/displays/vga/main/enable.c trunk/reactos/drivers/video/videoprt/agp.c trunk/reactos/drivers/video/videoprt/ddc.c Modified: trunk/reactos/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -357,7 +357,7 @@ { ULONG Context = 0; PHYSICAL_ADDRESS TranslatedAddress; - PHYSICAL_ADDRESS NullAddress = {{0}}; + PHYSICAL_ADDRESS NullAddress = {{0, 0}}; ULONG AddressSpace = 1; BOOLEAN Result; ULONG_PTR Base; Modified: trunk/reactos/drivers/filesystems/fs_rec/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -32,7 +32,7 @@ PDEVICE_OBJECT MountDevice; PVOID Bpb = NULL; ULONG SectorSize; - LARGE_INTEGER Offset = {{0}}; + LARGE_INTEGER Offset = {{0, 0}}; BOOLEAN DeviceError = FALSE; PAGED_CODE(); Modified: trunk/reactos/drivers/filesystems/fs_rec/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fat.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -104,7 +104,7 @@ PDEVICE_OBJECT MountDevice; PPACKED_BOOT_SECTOR Bpb = NULL; ULONG SectorSize; - LARGE_INTEGER Offset = {{0}}; + LARGE_INTEGER Offset = {{0, 0}}; BOOLEAN DeviceError = FALSE; PAGED_CODE(); Modified: trunk/reactos/drivers/filesystems/fs_rec/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ntfs.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -53,7 +53,7 @@ PDEVICE_OBJECT MountDevice; PPACKED_BOOT_SECTOR Bpb = NULL; ULONG SectorSize; - LARGE_INTEGER Offset = {{0}}, Offset2, Offset3, SectorCount; + LARGE_INTEGER Offset = {{0, 0}}, Offset2, Offset3, SectorCount; PAGED_CODE(); /* Get the I/O Stack and check the function type */ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -845,7 +845,7 @@ { UNICODE_STRING DeviceMapKeyU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DEVICEMAP"); PCLASS_DRIVER_EXTENSION DriverExtension; - UNICODE_STRING PortBaseName = {0, }; + UNICODE_STRING PortBaseName = { 0, 0, NULL }; PKEY_VALUE_BASIC_INFORMATION KeyValueInformation = NULL; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hDeviceMapKey = (HANDLE)-1; Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -821,7 +821,7 @@ { UNICODE_STRING DeviceMapKeyU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DEVICEMAP"); PCLASS_DRIVER_EXTENSION DriverExtension; - UNICODE_STRING PortBaseName = {0, }; + UNICODE_STRING PortBaseName = { 0, 0, NULL }; PKEY_VALUE_BASIC_INFORMATION KeyValueInformation = NULL; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hDeviceMapKey = (HANDLE)-1; Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -808,9 +808,9 @@ PUNICODE_STRING TargetKeyName, PUNICODE_STRING Name, PUNICODE_STRING DeviceDesc ) { - UNICODE_STRING RootDevice = { 0 }, LinkageKeyName = { 0 }; - UNICODE_STRING DescKeyName = { 0 }, Linkage = { 0 }; - UNICODE_STRING BackSlash = { 0 }; + UNICODE_STRING RootDevice = { 0, 0, NULL }, LinkageKeyName = { 0, 0, NULL }; + UNICODE_STRING DescKeyName = { 0, 0, NULL }, Linkage = { 0, 0, NULL }; + UNICODE_STRING BackSlash = { 0, 0, NULL }; HANDLE DescKey = NULL, LinkageKey = NULL; NTSTATUS Status; @@ -962,7 +962,7 @@ PIP_INTERFACE IF; NDIS_STATUS NdisStatus; LLIP_BIND_INFO BindInfo; - IP_ADDRESS DefaultMask = { 0 }; + IP_ADDRESS DefaultMask; ULONG Lookahead = LOOKAHEAD_SIZE; NTSTATUS Status; @@ -1012,7 +1012,7 @@ TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", &IF->Description)); - DefaultMask.Type = IP_ADDRESS_V4; + AddrInitIPv4(&DefaultMask, 0); IF->Unicast = DefaultMask; IF->Netmask = DefaultMask; Modified: trunk/reactos/drivers/serial/serial/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/misc… ============================================================================== --- trunk/reactos/drivers/serial/serial/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serial/misc.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -186,7 +186,9 @@ if (MSR & SR_MSR_CTS) KeInsertQueueDpc(&DeviceExtension->SendByteDpc, NULL, NULL); else + { ; /* FIXME: stop transmission */ + } Events |= SERIAL_EV_CTS; } if (MSR & SR_MSR_DSR_CHANGED) @@ -194,7 +196,9 @@ if (MSR & SR_MSR_DSR) KeInsertQueueDpc(&DeviceExtension->ReceivedByteDpc, NULL, NULL); else + { ; /* FIXME: stop reception */ + } Events |= SERIAL_EV_DSR; } if (MSR & SR_MSR_RI_CHANGED) Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -1199,7 +1199,7 @@ NTSTATUS Status; PPARTITION_INFORMATION PartitionInfo; PVOID BaseAddress; - LARGE_INTEGER Zero = {{0}}; + LARGE_INTEGER Zero = {{0, 0}}; ULONG Length; PIO_STACK_LOCATION IoStackLocation; Modified: trunk/reactos/drivers/storage/port/diskdump/diskdump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/diskd… ============================================================================== --- trunk/reactos/drivers/storage/port/diskdump/diskdump.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/port/diskdump/diskdump.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -101,16 +101,16 @@ {"ScsiPortConvertUlongToPhysicalAddress", 3, NULL, NULL}, {"ScsiPortFreeDeviceBase", 5, NULL, DiskDumpScsiInvalid}, {"ScsiPortGetBusData", 6, NULL, DiskDumpScsiInvalid}, - {"ScsiPortGetDeviceBase", 7, DiskDumpScsiInvalid}, + {"ScsiPortGetDeviceBase", 7, NULL, DiskDumpScsiInvalid}, {"ScsiPortInitialize", 13, NULL, DiskDumpScsiInvalid}, {"ScsiPortNotification", 17, NULL, _DiskDumpScsiPortNotification}, - {"ScsiPortReadPortBufferUlong", 19, NULL}, - {"ScsiPortReadPortBufferUshort", 20, NULL}, + {"ScsiPortReadPortBufferUlong", 19, NULL, NULL}, + {"ScsiPortReadPortBufferUshort", 20, NULL, NULL}, {"ScsiPortReadPortUchar", 21, NULL, NULL}, {"ScsiPortReadPortUshort", 23, NULL, NULL}, {"ScsiPortStallExecution", 31, NULL, NULL}, - {"ScsiPortWritePortBufferUlong", 34, NULL}, - {"ScsiPortWritePortBufferUshort", 35, NULL}, + {"ScsiPortWritePortBufferUlong", 34, NULL, NULL}, + {"ScsiPortWritePortBufferUshort", 35, NULL, NULL}, {"ScsiPortWritePortUchar", 36, NULL, NULL}, {"ScsiDebugPrint", 0, NULL, NULL}, }; Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/main/enable.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga/main/enable.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -56,7 +56,7 @@ }; static GDIINFO gaulCap = { - GDI_DRIVER_VERSION, + GDI_DRIVER_VERSION, // ulVersion DT_RASDISPLAY, // ulTechnology 0, // ulHorzSize 0, // ulVertSize @@ -73,7 +73,7 @@ TC_RA_ABLE | TC_SCROLLBLT, // flTextCaps 6, // ulDACRed - 6, // ulDACGree + 6, // ulDACGreen 6, // ulDACBlue 0x0024, // ulAspectX (one-to-one aspect ratio) @@ -115,7 +115,18 @@ 8, // ulBltAlignment 0, // ulPanningHorzRes 0, // ulPanningVertRes - }; + + 0, // xPanningAlignment + 0, // yPanningAlignment + 0, // cxHTPat + 0, // cyHTPat + NULL, // pHTPatA + NULL, // pHTPatB + NULL, // pHTPatC + 0, // flShadeBlend + 0, // ulPhysicalPixelCharacteristics + 0 // ulPhysicalPixelGamma +}; // Palette for VGA @@ -170,7 +181,8 @@ BMF_4BPP, // preferred DIB format 8, // Width of color dither 8, // Height of color dither - 0 // Default palette to use for this device + NULL, // Default palette to use for this device + 0 // flGraphicsCaps2 }; BOOL APIENTRY Modified: trunk/reactos/drivers/video/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/agp… ============================================================================== --- trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/agp.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -99,7 +99,7 @@ { PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; PAGP_BUS_INTERFACE_STANDARD AgpBusInterface; - PHYSICAL_ADDRESS MappingAddr = {{0}}; + PHYSICAL_ADDRESS MappingAddr = {{0, 0}}; PVIDEO_PORT_AGP_MAPPING AgpMapping; NTSTATUS Status; @@ -186,7 +186,7 @@ IN VIDEO_PORT_CACHE_TYPE Caching, OUT PVOID *PhysicalContext) { - PHYSICAL_ADDRESS ZeroAddress = {{0}}; + PHYSICAL_ADDRESS ZeroAddress = {{0, 0}}; PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; PAGP_BUS_INTERFACE_STANDARD AgpBusInterface; MEMORY_CACHING_TYPE MemCachingType; Modified: trunk/reactos/drivers/video/videoprt/ddc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/ddc… ============================================================================== --- trunk/reactos/drivers/video/videoprt/ddc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/ddc.c [iso-8859-1] Wed Dec 3 11:29:38 2008 @@ -35,7 +35,7 @@ #define WRITE_SDA(state) (i2c->WriteDataLine(HwDeviceExtension, state)) #define WRITE_SCL(state) (i2c->WriteClockLine(HwDeviceExtension, state)) -STATIC LARGE_INTEGER HalfPeriodDelay = { { 70LL } }; +STATIC LARGE_INTEGER HalfPeriodDelay = {{0, 70}}; #define DELAY_HALF() KeDelayExecutionThread(KernelMode, FALSE, &HalfPeriodDelay)

1 0

[dgorbachev] 37825: Silence compiler warnings (3/11).
by dgorbachev＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: dgorbachev Date: Wed Dec 3 11:28:59 2008 New Revision: 37825 URL: http://svn.reactos.org/svn/reactos?rev=37825&view=rev Log: Silence compiler warnings (3/11). Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/ex/fmutex.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/resource.c trunk/reactos/ntoskrnl/fsrtl/fastio.c trunk/reactos/ntoskrnl/io/iomgr/deviface.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/gmutex.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/krnlinit.c trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/mdlsup.c trunk/reactos/ntoskrnl/mm/ncache.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/region.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/ntoskrnl/ob/oblink.c trunk/reactos/ntoskrnl/ob/obsdcach.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=378… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -556,7 +556,8 @@ return(STATUS_SUCCESS); } -NTSTATUS static +static +NTSTATUS CcRosCreateCacheSegment(PBCB Bcb, ULONG FileOffset, PCACHE_SEGMENT* CacheSeg) Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -310,7 +310,7 @@ CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName, ValueName = {0}; + UNICODE_STRING KeyName, ValueName = { 0, 0, NULL }; HANDLE KeyHandle; NTSTATUS Status; ASSERT(LoaderBlock != NULL); Modified: trunk/reactos/ntoskrnl/ex/fmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fmutex.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fmutex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/fmutex.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -20,8 +20,8 @@ /* PRIVATE FUNCTIONS *********************************************************/ -VOID FORCEINLINE +VOID ExiAcquireFastMutexUnsafe(IN PFAST_MUTEX FastMutex) { PKTHREAD Thread = KeGetCurrentThread(); @@ -47,8 +47,8 @@ FastMutex->Owner = Thread; } -VOID FORCEINLINE +VOID ExiReleaseFastMutexUnsafe(IN OUT PFAST_MUTEX FastMutex) { ASSERT((KeGetCurrentIrql() == APC_LEVEL) || Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=378… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -197,7 +197,7 @@ HANDLE NlsSection; PVOID SectionBase = NULL; ULONG ViewSize = 0; - LARGE_INTEGER SectionOffset = {{0}}; + LARGE_INTEGER SectionOffset = {{0, 0}}; PLIST_ENTRY ListHead, NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; ULONG NlsTablesEncountered = 0; @@ -466,7 +466,7 @@ /* Make sure the buffer is a valid string which within the given length */ if ((NtInitialUserProcessBufferType != REG_SZ) || - ((NtInitialUserProcessBufferLength != -1) && + ((NtInitialUserProcessBufferLength != -1U) && ((NtInitialUserProcessBufferLength < sizeof(WCHAR)) || (NtInitialUserProcessBufferLength > sizeof(NtInitialUserProcessBuffer) - sizeof(WCHAR))))) @@ -1429,7 +1429,7 @@ if (!ExpRealTimeIsUniversal) { /* Check if we don't have a valid bias */ - if (ExpLastTimeZoneBias == -1) + if (ExpLastTimeZoneBias == -1U) { /* Reset */ ResetBias = TRUE; Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -20,8 +20,8 @@ #if (!(defined(CONFIG_SMP)) && !(defined(DBG))) +FORCEINLINE VOID -FORCEINLINE ExAcquireResourceLock(IN PERESOURCE Resource, IN PKLOCK_QUEUE_HANDLE LockHandle) { @@ -32,8 +32,8 @@ _disable(); } +FORCEINLINE VOID -FORCEINLINE ExReleaseResourceLock(IN PERESOURCE Resource, IN PKLOCK_QUEUE_HANDLE LockHandle) { @@ -46,8 +46,8 @@ #else +FORCEINLINE VOID -FORCEINLINE ExAcquireResourceLock(IN PERESOURCE Resource, IN PKLOCK_QUEUE_HANDLE LockHandle) { @@ -55,8 +55,8 @@ KeAcquireInStackQueuedSpinLock(&Resource->SpinLock, LockHandle); } +FORCEINLINE VOID -FORCEINLINE ExReleaseResourceLock(IN PERESOURCE Resource, IN PKLOCK_QUEUE_HANDLE LockHandle) { Modified: trunk/reactos/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fastio.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fastio.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -247,7 +247,7 @@ PFSRTL_COMMON_FCB_HEADER FcbHeader; /* WDK doc. Offset=0xffffffffffffffff indicates append to the end of file */ - BOOLEAN FileOffsetAppend = ((FileOffset->HighPart == 0xffffffff) && (FileOffset->LowPart == 0xffffffff)); + BOOLEAN FileOffsetAppend = ((FileOffset->HighPart == (LONG)0xffffffff) && (FileOffset->LowPart == 0xffffffff)); BOOLEAN ResourceAquiredShared = FALSE; BOOLEAN b_4GB = FALSE; @@ -1153,7 +1153,7 @@ LARGE_INTEGER Offset; /* WDK doc. Offset=0xffffffffffffffff indicates append to the end of file */ - BOOLEAN FileOffsetAppend = ((FileOffset->HighPart == 0xffffffff) && (FileOffset->LowPart == 0xffffffff)); + BOOLEAN FileOffsetAppend = ((FileOffset->HighPart == (LONG)0xffffffff) && (FileOffset->LowPart == 0xffffffff)); BOOLEAN FileSizeModified = FALSE; BOOLEAN ResourceAquiredShared = FALSE; Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -247,7 +247,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; BOOLEAN FoundRightPDO = FALSE; ULONG i = 0, j, Size; - UNICODE_STRING ReturnBuffer = {0,}; + UNICODE_STRING ReturnBuffer = { 0, 0, NULL }; NTSTATUS Status; PAGED_CODE(); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -569,7 +569,7 @@ PDEVICE_NODE DeviceNode, BOOLEAN Lower) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; + RTL_QUERY_REGISTRY_TABLE QueryTable[2] = { { NULL, 0, NULL, NULL, 0, NULL, 0 }, }; UNICODE_STRING Class; WCHAR ClassBuffer[40]; UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT); @@ -1749,7 +1749,7 @@ NTSTATUS NTAPI NtLoadDriver(IN PUNICODE_STRING DriverServiceName) { - UNICODE_STRING CapturedDriverServiceName = {0}; + UNICODE_STRING CapturedDriverServiceName = { 0, 0, NULL }; KPROCESSOR_MODE PreviousMode; LOAD_UNLOAD_PARAMS LoadParams; NTSTATUS Status; Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -16,7 +16,7 @@ /* GLOBALS *******************************************************************/ static CONFIGURATION_INFORMATION -_SystemConfigurationInformation = {0, 0, 0, 0, 0, 0, 0, FALSE, FALSE}; +_SystemConfigurationInformation = { 0, 0, 0, 0, 0, 0, 0, FALSE, FALSE, 0, 0 }; /* API Parameters to Pass in IopQueryBusDescription */ typedef struct IO_QUERY { Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -253,7 +253,7 @@ FileObject); /* Sanity check */ - ASSERT(Irp->IoStatus.Status != 0xFFFFFFFF); + ASSERT(Irp->IoStatus.Status != (NTSTATUS)0xFFFFFFFF); /* Check if we have a file object */ if (*SystemArgument2) @@ -1183,7 +1183,7 @@ ASSERT(Irp->Type == IO_TYPE_IRP); ASSERT(!Irp->CancelRoutine); ASSERT(Irp->IoStatus.Status != STATUS_PENDING); - ASSERT(Irp->IoStatus.Status != 0xFFFFFFFF); + ASSERT(Irp->IoStatus.Status != (NTSTATUS)0xFFFFFFFF); /* Get the last stack */ LastStackPtr = (PIO_STACK_LOCATION)(Irp + 1); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -1267,7 +1267,7 @@ LCID LocaleId; HANDLE InstanceKey = NULL; UNICODE_STRING ValueName; - UNICODE_STRING ParentIdPrefix = { 0 }; + UNICODE_STRING ParentIdPrefix = { 0, 0, NULL }; DEVICE_CAPABILITIES DeviceCapabilities; DPRINT("IopActionInterrogateDeviceStack(%p, %p)\n", DeviceNode, Context); Modified: trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/i386/i386-di… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -63,20 +63,20 @@ return(0); } -int static +static int KdbpReadMemory(unsigned int Addr, unsigned char* Data, unsigned int Length, struct disassemble_info * Ignored) { return KdbpSafeReadMemory(Data, (void *)Addr, Length); /* 0 means no error */ } -void static +static void KdbpMemoryError(int Status, unsigned int Addr, struct disassemble_info * Ignored) { } -void static +static void KdbpPrintAddressInCode(unsigned int Addr, struct disassemble_info * Ignored) { if (!KdbSymPrintAddress((void*)Addr)) @@ -85,7 +85,7 @@ } } -void static +static void KdbpNopPrintAddress(unsigned int Addr, struct disassemble_info * Ignored) { } Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/clock.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -16,7 +16,7 @@ LARGE_INTEGER KeBootTime; ULONGLONG KeBootTimeBias; -volatile KSYSTEM_TIME KeTickCount = {0}; +volatile KSYSTEM_TIME KeTickCount = { 0, 0, 0 }; ULONG KeMaximumIncrement; ULONG KeMinimumIncrement; ULONG KeTimeAdjustment; Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -59,12 +59,12 @@ CHAR BldrArcHwBuffer[16 * 1024]; // 0x1843C /* BIOS Memory Map */ -BIOS_MEMORY_DESCRIPTOR BiosMemoryDescriptors[16] = {{0}}; +BIOS_MEMORY_DESCRIPTOR BiosMemoryDescriptors[16] = { { 0, 0 }, }; PBIOS_MEMORY_DESCRIPTOR BiosMemoryDescriptorList = BiosMemoryDescriptors; /* ARC Memory Map */ ULONG NumberDescriptors = 0; -MEMORY_DESCRIPTOR MDArray[60] = {{0}}; +MEMORY_DESCRIPTOR MDArray[60] = { { 0, 0, 0 }, }; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/gmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gmutex.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -85,8 +85,8 @@ } } -VOID FORCEINLINE +VOID FASTCALL KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex) { @@ -101,8 +101,8 @@ } } -VOID FORCEINLINE +VOID FASTCALL KiReleaseGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex) { Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -105,7 +105,7 @@ LONGLONG RDMSR(IN ULONG Register) { - LARGE_INTEGER LargeVal = {{0}}; + LARGE_INTEGER LargeVal = {{0, 0}}; Ke386Rdmsr(Register, LargeVal.HighPart, LargeVal.LowPart); return LargeVal.QuadPart; } @@ -840,7 +840,7 @@ NTAPI KiI386PentiumLockErrataFixup(VOID) { - KDESCRIPTOR IdtDescriptor = {0}; + KDESCRIPTOR IdtDescriptor = { 0, 0, 0 }; PKIDTENTRY NewIdt, NewIdt2; /* Allocate memory for a new IDT */ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -1011,7 +1011,7 @@ _SEH2_EXCEPT((RtlCopyMemory(&SehExceptRecord, _SEH2_GetExceptionInformation()->ExceptionRecord, sizeof(EXCEPTION_RECORD)), EXCEPTION_EXECUTE_HANDLER)) { /* Check if we got a stack overflow and raise that instead */ - if (SehExceptRecord.ExceptionCode == + if ((NTSTATUS)SehExceptRecord.ExceptionCode == STATUS_STACK_OVERFLOW) { /* Copy the exception address and record */ Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -611,7 +611,7 @@ IN PKIPCR *Pcr, IN PKTSS *Tss) { - KDESCRIPTOR GdtDescriptor = {0}, IdtDescriptor = {0}; + KDESCRIPTOR GdtDescriptor = { 0, 0, 0 }, IdtDescriptor = { 0, 0, 0 }; KGDTENTRY TssSelector, PcrSelector; USHORT Tr = 0, Fs; Modified: trunk/reactos/ntoskrnl/ke/krnlinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/krnlinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/krnlinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/krnlinit.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -111,7 +111,7 @@ KiComputeReciprocal(IN LONG Divisor, OUT PUCHAR Shift) { - LARGE_INTEGER Reciprocal = {{0}}; + LARGE_INTEGER Reciprocal = {{0, 0}}; LONG BitCount = 0, Remainder = 1; /* Start by calculating the remainder */ @@ -140,7 +140,7 @@ { /* Check if the current fraction value is too large */ if ((Reciprocal.LowPart == 0xFFFFFFFF) && - (Reciprocal.HighPart == 0xFFFFFFFF)) + (Reciprocal.HighPart == (LONG)0xFFFFFFFF)) { /* Set the high bit and reduce the bit count */ Reciprocal.LowPart = 0; Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=378… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -628,7 +628,7 @@ { /* Check if it has an invalid count */ if ((Thread == CurrentObject->OwnerThread) && - (CurrentObject->Header.SignalState == MINLONG)) + (CurrentObject->Header.SignalState == (LONG)MINLONG)) { /* Raise an exception */ KiReleaseDispatcherLock(Thread->WaitIrql); Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -436,7 +436,7 @@ return(STATUS_SUCCESS); } -VOID static +static VOID MmModifyAttributes(PMM_AVL_TABLE AddressSpace, PVOID BaseAddress, ULONG RegionSize, @@ -817,7 +817,7 @@ return(STATUS_SUCCESS); } -VOID static +static VOID MmFreeVirtualMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -261,7 +261,7 @@ if (Process) { /* Handle the accounting of locked pages */ - ASSERT(Process->NumberOfLockedPages >= 0); + /* ASSERT(Process->NumberOfLockedPages >= 0); */ // always true InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages, -PageCount); } @@ -276,7 +276,7 @@ if (Process) { /* Handle the accounting of locked pages */ - ASSERT(Process->NumberOfLockedPages >= 0); + /* ASSERT(Process->NumberOfLockedPages >= 0); */ // always true InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages, -PageCount); } Modified: trunk/reactos/ntoskrnl/mm/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ncache.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ncache.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -76,7 +76,7 @@ return ((PVOID)Result); } -VOID static +static VOID MmFreeNonCachedPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -164,7 +164,7 @@ } } -LARGE_INTEGER static +static LARGE_INTEGER MmGetOffsetPageFile(PRETRIEVAL_POINTERS_BUFFER RetrievalPointers, LARGE_INTEGER Offset) { /* Simple binary search */ Modified: trunk/reactos/ntoskrnl/mm/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/region.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/region.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -15,7 +15,7 @@ /* FUNCTIONS *****************************************************************/ -VOID static +static VOID InsertAfterEntry(PLIST_ENTRY Previous, PLIST_ENTRY Entry) /* @@ -30,7 +30,7 @@ Previous->Flink = Entry; } -PMM_REGION static +static PMM_REGION MmSplitRegion(PMM_REGION InitialRegion, PVOID InitialBaseAddress, PVOID StartAddress, ULONG Length, ULONG NewType, ULONG NewProtect, PMM_AVL_TABLE AddressSpace, Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -1990,7 +1990,7 @@ return(STATUS_SUCCESS); } -VOID static +static VOID MmAlterViewAttributes(PMM_AVL_TABLE AddressSpace, PVOID BaseAddress, ULONG RegionSize, @@ -3605,7 +3605,7 @@ return(Status); } -NTSTATUS static +static NTSTATUS MmMapViewOfSegment(PMM_AVL_TABLE AddressSpace, PROS_SECTION_OBJECT Section, PMM_SECTION_SEGMENT Segment, @@ -3865,7 +3865,7 @@ return(Status); } -VOID static +static VOID MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -94,7 +94,7 @@ PVOID Base = NULL; SIZE_T ViewSize = 0; KAPC_STATE ApcState; - LARGE_INTEGER SectionOffset = {{0}}; + LARGE_INTEGER SectionOffset = {{0, 0}}; BOOLEAN LoadSymbols = FALSE; ULONG DriverSize; PVOID DriverBase; Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -455,7 +455,7 @@ OUT PUNICODE_STRING LinkTarget, OUT PULONG ResultLength OPTIONAL) { - UNICODE_STRING SafeLinkTarget = {0}; + UNICODE_STRING SafeLinkTarget = { 0, 0, NULL }; POBJECT_SYMBOLIC_LINK SymlinkObject; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/ob/obsdcach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsdcach.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -19,8 +19,8 @@ /* PRIVATE FUNCTIONS **********************************************************/ -VOID FORCEINLINE +VOID ObpSdAcquireLock(IN POB_SD_CACHE_LIST CacheEntry) { /* Acquire the lock */ @@ -28,8 +28,8 @@ ExAcquirePushLockExclusive(&CacheEntry->PushLock); } -VOID FORCEINLINE +VOID ObpSdReleaseLock(IN POB_SD_CACHE_LIST CacheEntry) { /* Release the lock */ @@ -37,8 +37,8 @@ KeLeaveCriticalRegion(); } -VOID FORCEINLINE +VOID ObpSdAcquireLockShared(IN POB_SD_CACHE_LIST CacheEntry) { /* Acquire the lock */ @@ -46,8 +46,8 @@ ExAcquirePushLockShared(&CacheEntry->PushLock); } -VOID FORCEINLINE +VOID ObpSdReleaseLockShared(IN POB_SD_CACHE_LIST CacheEntry) { /* Release the lock */ Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=378… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -16,7 +16,7 @@ /* GLOBALS *******************************************************************/ -LIST_ENTRY PspReaperListHead = {0}; +LIST_ENTRY PspReaperListHead = { NULL, NULL }; WORK_QUEUE_ITEM PspReaperWorkItem; LARGE_INTEGER ShortTime = {{-10 * 100 * 1000, -1}}; @@ -778,7 +778,7 @@ ObFastDereferenceObject(&CurrentProcess->Token, PrimaryToken); /* Check if this is a VDM Process and rundown the VDM DPCs if so */ - if (CurrentProcess->VdmObjects);// VdmRundownDpcs(CurrentProcess); + if (CurrentProcess->VdmObjects) { /* VdmRundownDpcs(CurrentProcess); */ } /* Kill the process in the Object Manager */ ObKillProcess(CurrentProcess); Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -223,7 +223,7 @@ IN BOOLEAN UseLargePages) { NTSTATUS Status; - LARGE_INTEGER Offset = {{0}}; + LARGE_INTEGER Offset = {{0, 0}}; SIZE_T ViewSize = 0; PVOID ImageBase = 0; @@ -443,7 +443,7 @@ /* Now multiply limits by 1MB */ PspDefaultPagedLimit <<= 20; PspDefaultNonPagedLimit <<= 20; - if (PspDefaultPagefileLimit != -1) PspDefaultPagefileLimit <<= 20; + if (PspDefaultPagefileLimit != -1U) PspDefaultPagefileLimit <<= 20; /* Initialize the Active Process List */ InitializeListHead(&PsActiveProcessHead); Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Wed Dec 3 11:28:59 2008 @@ -1964,7 +1964,7 @@ ULONG i; KPROCESSOR_MODE PreviousMode; ULONG nTokenPrivileges = 0; - LARGE_INTEGER LocalExpirationTime = {{0}}; + LARGE_INTEGER LocalExpirationTime = {{0, 0}}; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE();

1 0

[dgorbachev] 37824: Silence compiler warnings (2/11).
by dgorbachev＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: dgorbachev Date: Wed Dec 3 11:28:33 2008 New Revision: 37824 URL: http://svn.reactos.org/svn/reactos?rev=37824&view=rev Log: Silence compiler warnings (2/11). Modified: trunk/reactos/ntoskrnl/include/internal/cm_x.h trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/io_x.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/lpc_x.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/include/internal/ps_x.h Modified: trunk/reactos/ntoskrnl/include/internal/cm_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008 @@ -9,8 +9,8 @@ // // Returns whether or not this is a small valued key // +FORCEINLINE BOOLEAN -FORCEINLINE CmpIsKeyValueSmall(OUT PULONG RealLength, IN ULONG Length) { @@ -30,8 +30,8 @@ // // Returns whether or not this is a big valued key // +FORCEINLINE BOOLEAN -FORCEINLINE CmpIsKeyValueBig(IN PHHIVE Hive, IN ULONG Length) { Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Wed Dec 3 11:28:33 2008 @@ -431,8 +431,8 @@ /* CALLBACKS *****************************************************************/ -VOID -FORCEINLINE +FORCEINLINE +VOID ExDoCallBack(IN OUT PEX_CALLBACK Callback, IN PVOID Context, IN PVOID Argument1, @@ -462,7 +462,7 @@ #define ExpChangeRundown(x, y, z) InterlockedCompareExchange64((PLONGLONG)x, y, z) #define ExpSetRundown(x, y) InterlockedExchange64((PLONGLONG)x, y) #else -#define ExpChangeRundown(x, y, z) InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z)) +#define ExpChangeRundown(x, y, z) PtrToUlong(InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z))) #define ExpChangePushlock(x, y, z) LongToPtr(InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z))) #define ExpSetRundown(x, y) InterlockedExchange((PLONG)x, y) #endif @@ -484,8 +484,8 @@ * function. * *--*/ -BOOLEAN -FORCEINLINE +FORCEINLINE +BOOLEAN _ExAcquireRundownProtection(IN PEX_RUNDOWN_REF RunRef) { ULONG_PTR Value, NewValue; @@ -525,8 +525,8 @@ * function. * *--*/ -VOID -FORCEINLINE +FORCEINLINE +VOID _ExReleaseRundownProtection(IN PEX_RUNDOWN_REF RunRef) { ULONG_PTR Value, NewValue; @@ -568,8 +568,8 @@ * @remarks This is the internal macro for system use only. * *--*/ -VOID -FORCEINLINE +FORCEINLINE +VOID _ExInitializeRundownProtection(IN PEX_RUNDOWN_REF RunRef) { /* Set the count to zero */ @@ -592,8 +592,8 @@ * necessary, then the slow path is taken through the exported function. * *--*/ -VOID -FORCEINLINE +FORCEINLINE +VOID _ExWaitForRundownProtectionRelease(IN PEX_RUNDOWN_REF RunRef) { ULONG_PTR Value; @@ -622,8 +622,8 @@ * @remarks This is the internal macro for system use only. * *--*/ -VOID -FORCEINLINE +FORCEINLINE +VOID _ExRundownCompleted(IN PEX_RUNDOWN_REF RunRef) { /* Sanity check */ @@ -672,8 +672,8 @@ * @remarks None. * *--*/ -VOID -FORCEINLINE +FORCEINLINE +VOID ExInitializePushLock(IN PULONG_PTR PushLock) { /* Set the value to 0 */ @@ -699,8 +699,8 @@ * This macro should usually be paired up with KeAcquireCriticalRegion. * *--*/ -VOID -FORCEINLINE +FORCEINLINE +VOID ExAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock) { /* Try acquiring the lock */ @@ -733,8 +733,8 @@ * This macro should usually be paired up with KeAcquireCriticalRegion. * *--*/ -BOOLEAN -FORCEINLINE +FORCEINLINE +BOOLEAN ExTryToAcquirePushLockExclusive(PEX_PUSH_LOCK PushLock) { /* Try acquiring the lock */ @@ -768,8 +768,8 @@ * This macro should usually be paired up with KeAcquireCriticalRegion. * *--*/ -VOID -FORCEINLINE +FORCEINLINE +VOID ExAcquirePushLockShared(PEX_PUSH_LOCK PushLock) { EX_PUSH_LOCK NewValue; @@ -803,8 +803,8 @@ * to simply set the lock bit and remove any other bits. * *--*/ -BOOLEAN -FORCEINLINE +FORCEINLINE +BOOLEAN ExConvertPushLockSharedToExclusive(IN PEX_PUSH_LOCK PushLock) { EX_PUSH_LOCK OldValue; @@ -842,8 +842,8 @@ * Callers of ExWaitOnPushLock must be running at IRQL <= APC_LEVEL. * *--*/ -VOID -FORCEINLINE +FORCEINLINE +VOID ExWaitOnPushLock(PEX_PUSH_LOCK PushLock) { /* Check if we're locked */ @@ -877,8 +877,8 @@ * This macro should usually be paired up with KeLeaveCriticalRegion. * *--*/ -VOID -FORCEINLINE +FORCEINLINE +VOID ExReleasePushLockShared(PEX_PUSH_LOCK PushLock) { EX_PUSH_LOCK OldValue; @@ -917,8 +917,8 @@ * This macro should usually be paired up with KeLeaveCriticalRegion. * *--*/ -VOID -FORCEINLINE +FORCEINLINE +VOID ExReleasePushLockExclusive(PEX_PUSH_LOCK PushLock) { EX_PUSH_LOCK OldValue; @@ -962,8 +962,8 @@ * This macro should usually be paired up with KeLeaveCriticalRegion. * *--*/ -VOID -FORCEINLINE +FORCEINLINE +VOID ExReleasePushLock(PEX_PUSH_LOCK PushLock) { EX_PUSH_LOCK OldValue = *PushLock; Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Wed Dec 3 11:28:33 2008 @@ -115,8 +115,8 @@ #elif defined(_MSC_VER) -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386Wrmsr(IN ULONG Register, IN ULONG Var1, IN ULONG Var2) @@ -126,8 +126,8 @@ __asm wrmsr; } +FORCEINLINE ULONGLONG -FORCEINLINE Ke386Rdmsr(IN ULONG Register, IN ULONG Var1, IN ULONG Var2) @@ -137,8 +137,8 @@ __asm rdmsr; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ki386Cpuid(IN ULONG Operation, OUT PULONG Var1, OUT PULONG Var2, @@ -153,87 +153,87 @@ __asm mov [Var4], edx; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386FnInit(VOID) { __asm fninit; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386HaltProcessor(VOID) { __asm hlt; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386GetInterruptDescriptorTable(OUT KDESCRIPTOR Descriptor) { __asm sidt Descriptor; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetInterruptDescriptorTable(IN KDESCRIPTOR Descriptor) { __asm lidt Descriptor; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386GetGlobalDescriptorTable(OUT KDESCRIPTOR Descriptor) { __asm sgdt Descriptor; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetGlobalDescriptorTable(IN KDESCRIPTOR Descriptor) { __asm lgdt Descriptor; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386GetLocalDescriptorTable(OUT USHORT Descriptor) { __asm sldt Descriptor; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetLocalDescriptorTable(IN USHORT Descriptor) { __asm lldt Descriptor; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SaveFlags(IN ULONG Flags) { __asm pushf; __asm pop Flags; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386RestoreFlags(IN ULONG Flags) { __asm push Flags; __asm popf; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetTr(IN USHORT Tr) { __asm ltr Tr; } +FORCEINLINE USHORT -FORCEINLINE Ke386GetTr(IN USHORT Tr) { __asm str Tr; @@ -242,8 +242,8 @@ // // CR Macros // -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetCr2(IN ULONG Value) { __asm mov eax, Value; @@ -253,90 +253,90 @@ // // DR Macros // -ULONG -FORCEINLINE +FORCEINLINE +ULONG Ke386GetDr0(VOID) { __asm mov eax, dr0; } -ULONG -FORCEINLINE +FORCEINLINE +ULONG Ke386GetDr1(VOID) { __asm mov eax, dr1; } -ULONG -FORCEINLINE +FORCEINLINE +ULONG Ke386GetDr2(VOID) { __asm mov eax, dr2; } -ULONG -FORCEINLINE +FORCEINLINE +ULONG Ke386GetDr3(VOID) { __asm mov eax, dr3; } -ULONG -FORCEINLINE +FORCEINLINE +ULONG Ke386GetDr6(VOID) { __asm mov eax, dr6; } -ULONG -FORCEINLINE +FORCEINLINE +ULONG Ke386GetDr7(VOID) { __asm mov eax, dr7; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetDr0(IN ULONG Value) { __asm mov eax, Value; __asm mov dr0, eax; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetDr1(IN ULONG Value) { __asm mov eax, Value; __asm mov dr1, eax; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetDr2(IN ULONG Value) { __asm mov eax, Value; __asm mov dr2, eax; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetDr3(IN ULONG Value) { __asm mov eax, Value; __asm mov dr3, eax; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetDr6(IN ULONG Value) { __asm mov eax, Value; __asm mov dr6, eax; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetDr7(IN ULONG Value) { __asm mov eax, Value; @@ -346,60 +346,60 @@ // // Segment Macros // +FORCEINLINE USHORT -FORCEINLINE Ke386GetSs(VOID) { __asm mov ax, ss; } +FORCEINLINE USHORT -FORCEINLINE Ke386GetFs(VOID) { __asm mov ax, fs; } +FORCEINLINE USHORT -FORCEINLINE Ke386GetDs(VOID) { __asm mov ax, ds; } +FORCEINLINE USHORT -FORCEINLINE Ke386GetEs(VOID) { __asm mov ax, es; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetSs(IN USHORT Value) { __asm mov ax, Value; __asm mov ss, ax; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetFs(IN USHORT Value) { __asm mov ax, Value; __asm mov fs, ax; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetDs(IN USHORT Value) { __asm mov ax, Value; __asm mov ds, ax; } -VOID -FORCEINLINE +FORCEINLINE +VOID Ke386SetEs(IN USHORT Value) { __asm mov ax, Value; Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008 @@ -6,8 +6,9 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ +static +__inline VOID -static __inline IopLockFileObject(IN PFILE_OBJECT FileObject) { /* Lock the FO and check for contention */ @@ -19,8 +20,9 @@ InterlockedDecrement((PLONG)&FileObject->Waiters); } +static +__inline VOID -static __inline IopUnlockFileObject(IN PFILE_OBJECT FileObject) { /* Unlock the FO and wake any waiters up */ @@ -28,8 +30,8 @@ if (FileObject->Waiters) KeSetEvent(&FileObject->Lock, 0, FALSE); } +FORCEINLINE VOID -FORCEINLINE IopQueueIrpToThread(IN PIRP Irp) { KIRQL OldIrql; @@ -44,8 +46,8 @@ KeLowerIrql(OldIrql); } +FORCEINLINE VOID -FORCEINLINE IopUnQueueIrpFromThread(IN PIRP Irp) { /* Remove it from the list and reset it */ @@ -53,8 +55,9 @@ InitializeListHead(&Irp->ThreadListEntry); } +static +__inline VOID -static __inline IopUpdateOperationCount(IN IOP_TRANSFER_TYPE Type) { PLARGE_INTEGER CountToChange; @@ -86,8 +89,9 @@ } } +static +__inline BOOLEAN -static __inline IopValidateOpenPacket(IN POPEN_PACKET OpenPacket) { /* Validate the packet */ Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008 @@ -89,8 +89,8 @@ #endif /* _M_IX86 */ #ifndef _M_ARM +FORCEINLINE PRKTHREAD -FORCEINLINE KeGetCurrentThread(VOID) { #ifdef _M_IX86 @@ -102,8 +102,8 @@ #endif } +FORCEINLINE UCHAR -FORCEINLINE KeGetPreviousMode(VOID) { /* Return the current mode */ @@ -111,8 +111,8 @@ } #endif -VOID -FORCEINLINE +FORCEINLINE +VOID KeFlushProcessTb(VOID) { /* Flush the TLB by resetting CR3 */ @@ -243,8 +243,8 @@ // // This routine protects against multiple CPU acquires, it's meaningless on UP. // -VOID -FORCEINLINE +FORCEINLINE +VOID KiAcquireDispatcherObject(IN DISPATCHER_HEADER* Object) { UNREFERENCED_PARAMETER(Object); @@ -253,39 +253,39 @@ // // This routine protects against multiple CPU acquires, it's meaningless on UP. // -VOID -FORCEINLINE +FORCEINLINE +VOID KiReleaseDispatcherObject(IN DISPATCHER_HEADER* Object) { UNREFERENCED_PARAMETER(Object); } +FORCEINLINE KIRQL -FORCEINLINE KiAcquireDispatcherLock(VOID) { /* Raise to DPC level */ return KeRaiseIrqlToDpcLevel(); } -VOID -FORCEINLINE +FORCEINLINE +VOID KiReleaseDispatcherLock(IN KIRQL OldIrql) { /* Just exit the dispatcher */ KiExitDispatcher(OldIrql); } -VOID -FORCEINLINE +FORCEINLINE +VOID KiAcquireDispatcherLockAtDpcLevel(VOID) { /* This is a no-op at DPC Level for UP systems */ return; } -VOID -FORCEINLINE +FORCEINLINE +VOID KiReleaseDispatcherLockFromDpcLevel(VOID) { /* This is a no-op at DPC Level for UP systems */ @@ -492,8 +492,8 @@ InterlockedAnd((PLONG)SpinLock, 0); } -VOID -FORCEINLINE +FORCEINLINE +VOID KiAcquireDispatcherObject(IN DISPATCHER_HEADER* Object) { LONG OldValue; @@ -521,8 +521,8 @@ OldValue) != OldValue); } -VOID -FORCEINLINE +FORCEINLINE +VOID KiReleaseDispatcherObject(IN DISPATCHER_HEADER* Object) { /* Make sure we're at a safe level to touch the lock */ @@ -532,16 +532,16 @@ InterlockedAnd(&Object->Lock, ~KOBJECT_LOCK_BIT); } +FORCEINLINE KIRQL -FORCEINLINE KiAcquireDispatcherLock(VOID) { /* Raise to synchronization level and acquire the dispatcher lock */ return KeAcquireQueuedSpinLockRaiseToSynch(LockQueueDispatcherLock); } -VOID -FORCEINLINE +FORCEINLINE +VOID KiReleaseDispatcherLock(IN KIRQL OldIrql) { /* First release the lock */ @@ -552,16 +552,16 @@ KiExitDispatcher(OldIrql); } -VOID -FORCEINLINE +FORCEINLINE +VOID KiAcquireDispatcherLockAtDpcLevel(VOID) { /* Acquire the dispatcher lock */ KeAcquireQueuedSpinLockAtDpcLevel(LockQueueDispatcherLock); } -VOID -FORCEINLINE +FORCEINLINE +VOID KiReleaseDispatcherLockFromDpcLevel(VOID) { /* Release the dispatcher lock */ @@ -1003,8 +1003,8 @@ // // Recalculates the due time // +FORCEINLINE PLARGE_INTEGER -FORCEINLINE KiRecalculateDueTime(IN PLARGE_INTEGER OriginalDueTime, IN PLARGE_INTEGER DueTime, IN OUT PLARGE_INTEGER NewDueTime) @@ -1103,8 +1103,8 @@ // Called from KiCompleteTimer, KiInsertTreeTimer, KeSetSystemTime // to remove timer entries // See Windows HPI blog for more information. -VOID -FORCEINLINE +FORCEINLINE +VOID KiRemoveEntryTimer(IN PKTIMER Timer) { ULONG Hand; @@ -1134,8 +1134,8 @@ // Called by Wait and Queue code to insert a timer for dispatching. // Also called by KeSetTimerEx to insert a timer from the caller. // -VOID -FORCEINLINE +FORCEINLINE +VOID KxInsertTimer(IN PKTIMER Timer, IN ULONG Hand) { @@ -1162,8 +1162,8 @@ // Called by KeSetTimerEx and KiInsertTreeTimer to calculate Due Time // See the Windows HPI Blog for more information // +FORCEINLINE BOOLEAN -FORCEINLINE KiComputeDueTime(IN PKTIMER Timer, IN LARGE_INTEGER DueTime, OUT PULONG Hand) @@ -1214,8 +1214,8 @@ // Also called by timer code when canceling an inserted timer. // Removes a timer from it's tree. // -VOID -FORCEINLINE +FORCEINLINE +VOID KxRemoveTreeTimer(IN PKTIMER Timer) { ULONG Hand = Timer->Header.Hand; @@ -1244,8 +1244,8 @@ KiReleaseTimerLock(LockQueue); } -VOID -FORCEINLINE +FORCEINLINE +VOID KxSetTimerForThreadWait(IN PKTIMER Timer, IN LARGE_INTEGER Interval, OUT PULONG Hand) @@ -1632,7 +1632,8 @@ KiSelectReadyThread(IN KPRIORITY Priority, IN PKPRCB Prcb) { - ULONG PrioritySet, HighPriority; + ULONG PrioritySet; + LONG HighPriority; PLIST_ENTRY ListEntry; PKTHREAD Thread = NULL; @@ -1676,8 +1677,8 @@ // This routine computes the new priority for a thread. It is only valid for // threads with priorities in the dynamic priority range. // +FORCEINLINE SCHAR -FORCEINLINE KiComputeNewPriority(IN PKTHREAD Thread, IN SCHAR Adjustment) { Modified: trunk/reactos/ntoskrnl/include/internal/lpc_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008 @@ -95,8 +95,8 @@ // // Allocates a new message // +FORCEINLINE PLPCP_MESSAGE -FORCEINLINE LpcpAllocateFromPortZone(VOID) { PLPCP_MESSAGE Message; @@ -124,8 +124,8 @@ // // Get the LPC Message associated to the Thread // +FORCEINLINE PLPCP_MESSAGE -FORCEINLINE LpcpGetMessageFromThread(IN PETHREAD Thread) { /* Check if the port flag is set */ @@ -139,8 +139,8 @@ return (PVOID)((ULONG_PTR)Thread->LpcReplyMessage & ~LPCP_THREAD_FLAGS); } +FORCEINLINE PLPCP_PORT_OBJECT -FORCEINLINE LpcpGetPortFromThread(IN PETHREAD Thread) { /* Check if the port flag is set */ @@ -155,8 +155,8 @@ return NULL; } +FORCEINLINE VOID -FORCEINLINE LpcpSetPortToThread(IN PETHREAD Thread, IN PLPCP_PORT_OBJECT Port) { Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Dec 3 11:28:33 2008 @@ -166,10 +166,10 @@ #define InterlockedCompareExchangePte(PointerPte, Exchange, Comperand) \ - InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand) + (ULONG)InterlockedCompareExchange((PLONG)(PointerPte), Exchange, Comperand) #define InterlockedExchangePte(PointerPte, Value) \ - InterlockedExchange((PLONG)(PointerPte), Value) + (ULONG)InterlockedExchange((PLONG)(PointerPte), Value) typedef struct { @@ -1016,7 +1016,8 @@ NTAPI MmGetLockCountPage(PFN_TYPE Page); -static __inline +static +__inline KIRQL NTAPI MmAcquirePageListLock() Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008 @@ -17,16 +17,16 @@ #define OBP_NAME_LOOKASIDE_MAX_SIZE 248 +FORCEINLINE ULONG -FORCEINLINE ObpSelectObjectLockSlot(IN POBJECT_HEADER ObjectHeader) { /* We have 4 locks total, this will return a 0-index slot */ return (((ULONG_PTR)ObjectHeader) >> 8) & 3; } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpAcquireObjectLock(IN POBJECT_HEADER ObjectHeader) { ULONG Slot; @@ -43,8 +43,8 @@ ExAcquireResourceExclusiveLite(&ObjectType->ObjectLocks[Slot], TRUE); } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpAcquireObjectLockShared(IN POBJECT_HEADER ObjectHeader) { ULONG Slot; @@ -61,8 +61,8 @@ ExAcquireResourceSharedLite(&ObjectType->ObjectLocks[Slot], TRUE); } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpReleaseObjectLock(IN POBJECT_HEADER ObjectHeader) { ULONG Slot; @@ -79,8 +79,8 @@ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); } +FORCEINLINE POBJECT_HEADER_NAME_INFO -FORCEINLINE ObpReferenceNameInfo(IN POBJECT_HEADER ObjectHeader) { POBJECT_HEADER_NAME_INFO ObjectNameInfo; @@ -120,8 +120,8 @@ return ObjectNameInfo; } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpDereferenceNameInfo(IN POBJECT_HEADER_NAME_INFO HeaderNameInfo) { POBJECT_DIRECTORY Directory; @@ -151,8 +151,8 @@ } } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpAcquireDirectoryLockShared(IN POBJECT_DIRECTORY Directory, IN POBP_LOOKUP_CONTEXT Context) { @@ -167,8 +167,8 @@ Context->LockStateSignature = OBP_LOCK_STATE_POST_ACQUISITION_SHARED; } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpAcquireDirectoryLockExclusive(IN POBJECT_DIRECTORY Directory, IN POBP_LOOKUP_CONTEXT Context) { @@ -187,8 +187,8 @@ Context->DirectoryLocked = TRUE; } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpReleaseDirectoryLock(IN POBJECT_DIRECTORY Directory, IN POBP_LOOKUP_CONTEXT Context) { @@ -198,8 +198,8 @@ KeLeaveCriticalRegion(); } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpInitializeLookupContext(IN POBP_LOOKUP_CONTEXT Context) { /* Initialize a null context */ @@ -209,8 +209,8 @@ Context->LockStateSignature = OBP_LOCK_STATE_INITIALIZED; } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpReleaseLookupContextObject(IN POBP_LOOKUP_CONTEXT Context) { POBJECT_HEADER ObjectHeader; @@ -232,8 +232,8 @@ } } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpReleaseLookupContext(IN POBP_LOOKUP_CONTEXT Context) { /* Check if we came back with the directory locked */ @@ -249,8 +249,8 @@ ObpReleaseLookupContextObject(Context); } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpEnterObjectTypeMutex(IN POBJECT_TYPE ObjectType) { /* Sanity check */ @@ -261,8 +261,8 @@ ExAcquireResourceExclusiveLite(&ObjectType->Mutex, TRUE); } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpLeaveObjectTypeMutex(IN POBJECT_TYPE ObjectType) { /* Enter a critical region and acquire the resource */ @@ -273,8 +273,8 @@ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpReleaseObjectCreateInformation(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) { /* Check if we have a security descriptor */ @@ -288,8 +288,8 @@ } } +FORCEINLINE PVOID -FORCEINLINE ObpAllocateObjectCreateInfoBuffer(IN PP_NPAGED_LOOKASIDE_NUMBER Type) { PVOID Buffer; @@ -325,8 +325,8 @@ return Buffer; } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpFreeCapturedAttributes(IN PVOID Buffer, IN PP_NPAGED_LOOKASIDE_NUMBER Type) { @@ -369,8 +369,8 @@ } } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpFreeObjectCreateInformation(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo) { /* First release the attributes, then free them from the lookaside list */ @@ -379,16 +379,16 @@ } #if DBG -VOID -FORCEINLINE +FORCEINLINE +VOID ObpCalloutStart(IN PKIRQL CalloutIrql) { /* Save the callout IRQL */ *CalloutIrql = KeGetCurrentIrql(); } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpCalloutEnd(IN KIRQL CalloutIrql, IN PCHAR Procedure, IN POBJECT_TYPE ObjectType, @@ -406,16 +406,16 @@ } } #else -VOID -FORCEINLINE +FORCEINLINE +VOID ObpCalloutStart(IN PKIRQL CalloutIrql) { /* No-op */ UNREFERENCED_PARAMETER(CalloutIrql); } -VOID -FORCEINLINE +FORCEINLINE +VOID ObpCalloutEnd(IN KIRQL CalloutIrql, IN PCHAR Procedure, IN POBJECT_TYPE ObjectType, Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h [iso-8859-1] Wed Dec 3 11:28:33 2008 @@ -35,8 +35,8 @@ #define PspClearProcessFlag(Process, Flag) \ InterlockedAnd((PLONG)&Process->Flags, ~Flag) -VOID -FORCEINLINE +FORCEINLINE +VOID PspRunCreateThreadNotifyRoutines(IN PETHREAD CurrentThread, IN BOOLEAN Create) { @@ -57,8 +57,8 @@ } } -VOID -FORCEINLINE +FORCEINLINE +VOID PspRunCreateProcessNotifyRoutines(IN PEPROCESS CurrentProcess, IN BOOLEAN Create) { @@ -79,8 +79,8 @@ } } -VOID -FORCEINLINE +FORCEINLINE +VOID PspRunLoadImageNotifyRoutines(PUNICODE_STRING FullImageName, HANDLE ProcessId, PIMAGE_INFO ImageInfo) @@ -98,16 +98,16 @@ } } -VOID -FORCEINLINE +FORCEINLINE +VOID PspRunLegoRoutine(IN PKTHREAD Thread) { /* Call it */ if (PspLegoNotifyRoutine) PspLegoNotifyRoutine(Thread); } -VOID -FORCEINLINE +FORCEINLINE +VOID PspLockProcessSecurityShared(IN PEPROCESS Process) { /* Enter a Critical Region */ @@ -117,8 +117,8 @@ ExAcquirePushLockShared(&Process->ProcessLock); } -VOID -FORCEINLINE +FORCEINLINE +VOID PspUnlockProcessSecurityShared(IN PEPROCESS Process) { /* Unlock the Process */ @@ -128,8 +128,8 @@ KeLeaveCriticalRegion(); } -VOID -FORCEINLINE +FORCEINLINE +VOID PspLockProcessSecurityExclusive(IN PEPROCESS Process) { /* Enter a Critical Region */ @@ -139,8 +139,8 @@ ExAcquirePushLockExclusive(&Process->ProcessLock); } -VOID -FORCEINLINE +FORCEINLINE +VOID PspUnlockProcessSecurityExclusive(IN PEPROCESS Process) { /* Unlock the Process */ @@ -150,8 +150,8 @@ KeLeaveCriticalRegion(); } -VOID -FORCEINLINE +FORCEINLINE +VOID PspLockThreadSecurityShared(IN PETHREAD Thread) { /* Enter a Critical Region */ @@ -161,8 +161,8 @@ ExAcquirePushLockShared(&Thread->ThreadLock); } -VOID -FORCEINLINE +FORCEINLINE +VOID PspUnlockThreadSecurityShared(IN PETHREAD Thread) { /* Unlock the Thread */ @@ -172,8 +172,8 @@ KeLeaveCriticalRegion(); } -VOID -FORCEINLINE +FORCEINLINE +VOID PspLockThreadSecurityExclusive(IN PETHREAD Thread) { /* Enter a Critical Region */ @@ -183,8 +183,8 @@ ExAcquirePushLockExclusive(&Thread->ThreadLock); } -VOID -FORCEINLINE +FORCEINLINE +VOID PspUnlockThreadSecurityExclusive(IN PETHREAD Thread) { /* Unlock the Process */ @@ -194,8 +194,8 @@ KeLeaveCriticalRegion(); } +FORCEINLINE PEPROCESS -FORCEINLINE _PsGetCurrentProcess(VOID) { /* Get the current process */

1 0

[dgorbachev] 37823: Silence compiler warnings (1/11).
by dgorbachev＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: dgorbachev Date: Wed Dec 3 11:28:24 2008 New Revision: 37823 URL: http://svn.reactos.org/svn/reactos?rev=37823&view=rev Log: Silence compiler warnings (1/11). Modified: trunk/reactos/include/ddk/ntstrsafe.h trunk/reactos/include/host/typedefs.h trunk/reactos/include/ndk/dbgktypes.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/reactos/dll/desk/deskcplx.h trunk/reactos/include/reactos/probe.h Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -140,13 +140,13 @@ IN va_list argList) { NTSTATUS Status = STATUS_SUCCESS; - ULONG Return; + LONG Return; SIZE_T MaxLength, LocalNewLength = 0; MaxLength = Length - 1; Return = _vsnprintf(Destination, MaxLength, Format, argList); - if ((Return < 0) || (Return > MaxLength)) + if ((Return < 0) || ((SIZE_T)Return > MaxLength)) { Destination += MaxLength; *Destination = ANSI_NULL; @@ -155,7 +155,7 @@ Status = STATUS_BUFFER_OVERFLOW; } - else if (Return == MaxLength) + else if ((SIZE_T)Return == MaxLength) { Destination += MaxLength; *Destination = ANSI_NULL; Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -153,8 +153,8 @@ ListHead->Blink = Entry; } +static __inline BOOLEAN -static __inline IsListEmpty( IN const LIST_ENTRY * ListHead ) Modified: trunk/reactos/include/ndk/dbgktypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgktypes.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgktypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/dbgktypes.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -191,7 +191,7 @@ { PORT_MESSAGE h; DBGKM_APINUMBER ApiNumber; - ULONG ReturnedStatus; + NTSTATUS ReturnedStatus; union { DBGKM_EXCEPTION Exception; Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -77,8 +77,8 @@ ListHead->Blink = Entry; } -BOOLEAN FORCEINLINE +BOOLEAN IsListEmpty( IN const LIST_ENTRY * ListHead ) Modified: trunk/reactos/include/reactos/dll/desk/deskcplx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/desk/d… ============================================================================== --- trunk/reactos/include/reactos/dll/desk/deskcplx.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/dll/desk/deskcplx.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -44,7 +44,7 @@ LONG WINAPI DisplaySaveSettings(PVOID pContext, HWND hwndPropSheet); -static PDESK_EXT_INTERFACE __inline +static __inline PDESK_EXT_INTERFACE QueryDeskCplExtInterface(IDataObject *pdo) { PDESK_EXT_INTERFACE pRecvBuffer, pExtIface = NULL; @@ -80,7 +80,7 @@ return pExtIface; } -static LPTSTR __inline +static __inline LPTSTR QueryDeskCplString(IDataObject *pdo, UINT cfFormat) { FORMATETC fetc; @@ -118,7 +118,7 @@ return lpStr; } -static LONG __inline +static __inline LONG DeskCplExtDisplaySaveSettings(PDESK_EXT_INTERFACE DeskExtInterface, HWND hwndDlg) { Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… ============================================================================== --- trunk/reactos/include/reactos/probe.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/probe.h [iso-8859-1] Wed Dec 3 11:28:24 2008 @@ -5,7 +5,7 @@ #error Header intended for use by NTOSKRNL/WIN32K only! #endif -static const UNICODE_STRING __emptyUnicodeString = {0}; +static const UNICODE_STRING __emptyUnicodeString = {0, 0, NULL}; static const LARGE_INTEGER __emptyLargeInteger = {{0, 0}}; static const ULARGE_INTEGER __emptyULargeInteger = {{0, 0}}; static const IO_STATUS_BLOCK __emptyIoStatusBlock = {{0}, 0};

1 0

[tkreuzer] 37822: - Implement iInitializeCouFeatures, replacing KiSetCR0Bits. This allows us to save / restore xmm registers - check supported cpu features
by tkreuzer＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: tkreuzer Date: Wed Dec 3 11:24:40 2008 New Revision: 37822 URL: http://svn.reactos.org/svn/reactos?rev=37822&view=rev Log: - Implement iInitializeCouFeatures, replacing KiSetCR0Bits. This allows us to save / restore xmm registers - check supported cpu features Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Wed Dec 3 11:24:40 2008 @@ -120,10 +120,6 @@ VOID NTAPI -KiSetCR0Bits(VOID); - -VOID -NTAPI KiGetCacheInformation(VOID); BOOLEAN @@ -145,6 +141,10 @@ ULONG NTAPI KiGetFeatureBits(VOID); + +VOID +NTAPI +KiInitializeCpuFeatures(); ULONG KeAllocateGdtSelector(ULONG Desc[2]); VOID KeFreeGdtSelector(ULONG Entry); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Wed Dec 3 11:24:40 2008 @@ -240,6 +240,21 @@ VOID NTAPI +KiInitializeCpuFeatures() +{ + /* Enable Write-Protection */ + __writecr0(__readcr0() | CR0_WP); + + /* Disable fpu monitoring */ + __writecr0(__readcr0() & ~CR0_MP); + + /* Enable fx save restore support */ + __writecr4(__readcr4() | CR4_FXSR); + +} + +VOID +NTAPI KiGetCacheInformation(VOID) { PKIPCR Pcr = (PKIPCR)KeGetPcr(); @@ -348,23 +363,6 @@ VOID -NTAPI -KiSetCR0Bits(VOID) -{ - ULONG64 Cr0; - - /* Save current CR0 */ - Cr0 = __readcr0(); - - /* If this is a 486, enable Write-Protection */ - if (KeGetCurrentPrcb()->CpuType > 3) Cr0 |= CR0_WP; - - /* Set new Cr0 */ - __writecr0(Cr0); -} - - -VOID FASTCALL Ki386InitializeTss(IN PKTSS64 Tss, IN PKIDTENTRY Idt, Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Wed Dec 3 11:24:40 2008 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/ke/i386/kiinit.c * PURPOSE: Kernel Initialization for x86 CPUs * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -11,6 +12,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#define REQUIRED_FEATURE_BITS (KF_RDTSC|KF_CR4|KF_CMPXCHG8B|KF_XMMI|KF_XMMI64| \ + KF_NX_BIT) /* GLOBALS *******************************************************************/ @@ -393,7 +397,6 @@ IN CCHAR Number, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - BOOLEAN NpxPresent; ULONG FeatureBits; ULONG PageDirectory[2]; PVOID DpcStack; @@ -401,14 +404,20 @@ /* Detect and set the CPU Type */ KiSetProcessorType(); - /* Set CR0 features based on detected CPU */ - KiSetCR0Bits(); - /* Initialize the Power Management Support for this PRCB */ // PoInitializePrcb(Prcb); /* Get the processor features for the CPU */ FeatureBits = KiGetFeatureBits(); + + /* Check if we support all needed features */ + if ((FeatureBits & REQUIRED_FEATURE_BITS) != REQUIRED_FEATURE_BITS) + { + /* If not, bugcheck system */ + DPRINT1("CPU doesn't have needed features! Has: 0x%x, required: 0x%x\n", + FeatureBits, REQUIRED_FEATURE_BITS); + KeBugCheck(0); + } /* Set the default NX policy (opt-in) */ SharedUserData->NXSupportPolicy = NX_SUPPORT_POLICY_OPTIN; @@ -442,6 +451,9 @@ /* Save feature bits */ Prcb->FeatureBits = FeatureBits; + + /* Initialize the CPU features */ + KiInitializeCpuFeatures(); /* Save CPU state */ KiSaveProcessorControlState(&Prcb->ProcessorState); @@ -461,7 +473,7 @@ KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; /* Set boot-level flags */ - KeI386NpxPresent = NpxPresent; + KeI386NpxPresent = TRUE; KeI386CpuType = Prcb->CpuType; KeI386CpuStep = Prcb->CpuStep; KeProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; @@ -758,9 +770,12 @@ /* Check for break-in */ // if (KdPollBreakIn()) DbgBreakPointWithStatus(1); } +DPRINT1("after KdInitSystem\n"); /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); + +FrLdrDbgPrint("before KiSetupStackAndInitializeKernel\n"); /* Switch to new kernel stack and start kernel bootstrapping */ KiSetupStackAndInitializeKernel(&KiInitialProcess.Pcb,

1 0

[tkreuzer] 37821: fix UNIMPLEMENTED asm macro
by tkreuzer＠svn.reactos.org 03 Dec '08

03 Dec '08

Author: tkreuzer Date: Wed Dec 3 11:15:09 2008 New Revision: 37821 URL: http://svn.reactos.org/svn/reactos?rev=37821&view=rev Log: fix UNIMPLEMENTED asm macro Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S [iso-8859-1] Wed Dec 3 11:15:09 2008 @@ -63,11 +63,11 @@ .macro .endprolog .endm -.macro UNIMPLEMENTED2 line, func +.macro UNIMPLEMENTED2 file, line, func jmp 3f .equ expr, 12 1: .asciz "\func" -2: .asciz __FILE__ +2: .asciz "\file" 3: sub rsp, 0x20 lea rcx, _MsgUnimplemented[rip] @@ -77,5 +77,5 @@ call _DbgPrint add rsp, 0x20 .endm -#define UNIMPLEMENTED UNIMPLEMENTED2 __LINE__, +#define UNIMPLEMENTED UNIMPLEMENTED2 __FILE__, __LINE__,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs