Author: tkreuzer Date: Mon Dec 8 02:30:30 2008 New Revision: 37931
URL: http://svn.reactos.org/svn/reactos?rev=37931&view=rev Log: sync trunk head (r37928)
Added: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.h - copied unchanged from r37928, trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp branches/ros-amd64-bringup/reactos/base/services/eventlog/eventlog.h branches/ros-amd64-bringup/reactos/base/services/eventlog/file.c branches/ros-amd64-bringup/reactos/base/services/eventlog/logport.c branches/ros-amd64-bringup/reactos/base/system/services/database.c branches/ros-amd64-bringup/reactos/dll/cpl/desk/general.c branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c branches/ros-amd64-bringup/reactos/dll/cpl/input/add.c branches/ros-amd64-bringup/reactos/dll/cpl/input/settings.c branches/ros-amd64-bringup/reactos/dll/cpl/intl/advanced.c branches/ros-amd64-bringup/reactos/dll/cpl/powercfg/powershemes.c branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c branches/ros-amd64-bringup/reactos/dll/cpl/timedate/monthcal.c branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_main.c branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_stubs.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/sid.c branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c branches/ros-amd64-bringup/reactos/dll/win32/dnsapi/dnsapi/query.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/palette.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/debug/debugger.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lcformat.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsarpc.c branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.c branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c branches/ros-amd64-bringup/reactos/dll/win32/newdev/wizard.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/font.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c branches/ros-amd64-bringup/reactos/drivers/directx/dxapi/main.c branches/ros-amd64-bringup/reactos/drivers/directx/dxg/main.c branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/main.c branches/ros-amd64-bringup/reactos/drivers/setup/blue/font.c branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/id_init.cpp branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h branches/ros-amd64-bringup/reactos/include/reactos/wine/winbase16.h branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Inode.c branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Memory.c branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Mke2fs.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/mbstowcs.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/wcs.c branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c branches/ros-amd64-bringup/reactos/ntoskrnl/dbgk/dbgkobj.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/npool.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pageop.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/misc.c branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c
Modified: branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -114,7 +114,7 @@
if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0) { - if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < 4096 / sizeof(TCHAR)) + if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < (int)(4096 / sizeof(TCHAR))) { CharToOem(buff, buff); ConOutPuts(buff); @@ -145,7 +145,7 @@ 0); if (hFile == INVALID_HANDLE_VALUE) { - if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < sizeof(szMsg) / sizeof(TCHAR)) + if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < (int)(sizeof(szMsg) / sizeof(TCHAR))) { _stprintf(buff, szMsg, szFullPath); CharToOem(buff, buff);
Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/a... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -20,7 +20,7 @@ TCHAR MsgAbout[128]; TCHAR MsgWin[128]; TCHAR MsgDeal[128]; -DWORD dwOptions = 8; +DWORD dwOptions = OPTION_THREE_CARDS;
CardWindow SolWnd;
@@ -477,6 +477,13 @@ // Force the window to process WM_GETMINMAXINFO again GetWindowRect(hwndStatus, &rcStatus); nStatusHeight = rcStatus.bottom - rcStatus.top; + + // Hide status bar if options say so + if (!(dwOptions & OPTION_SHOW_STATUS)) + { + ShowWindow(hwndStatus, SW_HIDE); + } + SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOZORDER);
NewGame(); @@ -497,8 +504,7 @@ if (dwOptions & OPTION_SHOW_STATUS) { MoveWindow(SolWnd, 0, 0, nWidth, nHeight - nStatusHeight, TRUE); - MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nHeight, TRUE); - SendMessage(hwndStatus, WM_SIZE, wParam, lParam); + MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nStatusHeight, TRUE); } else {
Modified: branches/ros-amd64-bringup/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -162,9 +162,9 @@ DWORD dwDataSize, LPVOID lpRawData);
-__inline void LogfFreeRecord(LPVOID Rec); +/* eventlog.c */ +extern HANDLE MyHeap;
-/* eventlog.c */ VOID PRINT_HEADER(PFILE_HEADER header);
VOID PRINT_RECORD(PEVENTLOGRECORD pRec); @@ -185,4 +185,9 @@ /* rpc.c */ DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter);
+static __inline void LogfFreeRecord(LPVOID Rec) +{ + HeapFree(MyHeap, 0, Rec); +} + #endif /* __EVENTLOG_H__ */
Modified: branches/ros-amd64-bringup/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/eventlog/file.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -14,7 +14,6 @@
static LIST_ENTRY LogFileListHead; static CRITICAL_SECTION LogFileListCs; -extern HANDLE MyHeap;
/* FUNCTIONS ****************************************************************/
@@ -898,8 +897,3 @@ *lpRecSize = dwRecSize; return Buffer; } - -__inline void LogfFreeRecord(LPVOID Rec) -{ - HeapFree(MyHeap, 0, Rec); -}
Modified: branches/ros-amd64-bringup/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/eventlog/logport.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/eventlog/logport.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -15,7 +15,6 @@
HANDLE ConnectPortHandle = NULL; HANDLE MessagePortHandle = NULL; -extern HANDLE MyHeap; extern BOOL onLiveCD;
/* FUNCTIONS ****************************************************************/
Modified: branches/ros-amd64-bringup/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/s... ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/services/database.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/services/database.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -123,7 +123,7 @@ PSERVICE CurrentService;
DPRINT("ScmGetServiceEntryByClientHandle() called\n"); - DPRINT("looking for %lu\n", Handle); + DPRINT("looking for %p\n", Handle);
ServiceEntry = ServiceListHead.Flink; while (ServiceEntry != &ServiceListHead)
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/desk/general.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/desk/general.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -70,31 +70,33 @@ InitRadioButtons(HWND hWnd) { HKEY hKey; - - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\Display"), - 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - TCHAR szBuf[64]; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\Display"), + 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + TCHAR szBuf[64]; DWORD dwSize = 64;
if (RegQueryValueEx(hKey, _T("DynaSettingsChange"), 0, NULL, - (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS); - - switch (_ttoi(szBuf)) - { - case 0: - SendDlgItemMessage(hWnd, IDC_RESTART_RB, BM_SETCHECK, 1, 1); - break; - case 1: - SendDlgItemMessage(hWnd, IDC_WITHOUTREBOOT_RB, BM_SETCHECK, 1, 1); - break; - case 3: - SendDlgItemMessage(hWnd, IDC_ASKME_RB, BM_SETCHECK, 1, 1); - break; - } + (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + switch (_ttoi(szBuf)) + { + case 0: + SendDlgItemMessage(hWnd, IDC_RESTART_RB, BM_SETCHECK, 1, 1); + break; + case 1: + SendDlgItemMessage(hWnd, IDC_WITHOUTREBOOT_RB, BM_SETCHECK, 1, 1); + break; + case 3: + SendDlgItemMessage(hWnd, IDC_ASKME_RB, BM_SETCHECK, 1, 1); + break; + } + }
RegCloseKey(hKey); - } + } }
INT_PTR CALLBACK @@ -115,7 +117,7 @@ DispDevice = (PDISPLAY_DEVICE_ENTRY)(((LPPROPSHEETPAGE)lParam)->lParam); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)DispDevice);
- InitFontSizeList(hwndDlg); + InitFontSizeList(hwndDlg); InitRadioButtons(hwndDlg);
Ret = TRUE;
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -283,7 +283,7 @@ BITMAP bitmap; DWORD Result = 0; DWORD iDevNum = 0; - INT i; + DWORD i; DISPLAY_DEVICE displayDevice; PGLOBAL_DATA pGlobalData;
@@ -333,7 +333,7 @@ else /* FIXME: incomplete! */ { PMONSL_MONINFO pMonitors; - INT i; + DWORD i;
SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription); OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList); @@ -341,7 +341,7 @@ pMonitors = (PMONSL_MONINFO)HeapAlloc(GetProcessHeap(), 0, sizeof(MONSL_MONINFO) * Result); if (pMonitors) { - INT hack = 1280; + DWORD hack = 1280; for (i = 0; i < Result; i++) { pMonitors[i].Position.x = hack * i; @@ -817,7 +817,7 @@
case WM_DESTROY: { - INT i; + DWORD i; PDISPLAY_DEVICE_ENTRY Current = pGlobalData->DisplayDeviceList;
while (Current != NULL)
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/input/add.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -42,7 +42,7 @@ HKEY hKey; TCHAR szLayoutID[3 + 1], szPreload[CCH_LAYOUT_ID + 1], szLOLang[MAX_PATH]; DWORD dwIndex = 0, dwType, dwSize; - INT Count = 0, i, j; + UINT Count = 0, i, j;
if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/input/settings.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -214,7 +214,7 @@ DWORD dwBufLen; TCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH]; HANDLE hLib; - int i, j, k; + unsigned i, j, k;
wsprintf(szBuf, _T("SYSTEM\CurrentControlSet\Control\Keyboard Layouts\%s"), szLCID);
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -37,7 +37,7 @@ Count = SetupGetLineCount(hIntlInf, _T("CodePages")); if (Count <= 0) return FALSE;
- for (Number = 0; Number < Count; Number++) + for (Number = 0; Number < (UINT)Count; Number++) { if (SetupGetLineByIndex(hIntlInf, _T("CodePages"), Number, &infCont) && SetupGetIntField(&infCont, 0, (PINT)&uiCPage))
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -169,7 +169,7 @@ memcpy(&pp, &gPP[iCurSel], sizeof(POWER_POLICY));
uiIndex = (UINT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETCURSEL, 0, 0); - if(uiIndex != CB_ERR) + if(uiIndex != (UINT)CB_ERR) { SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH))
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -775,7 +775,7 @@ LRESULT lResult;
lResult = SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); - if (lResult != CB_ERR && lResult != pStartInfo->dwCrashDumpEnabled) + if (lResult != CB_ERR && lResult != (LRESULT)pStartInfo->dwCrashDumpEnabled) { if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2) { @@ -786,7 +786,7 @@ SendDlgItemMessageW(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szMinidumpDir) / sizeof(WCHAR), (LPARAM)pStartInfo->szMinidumpDir); }
- pStartInfo->dwCrashDumpEnabled = lResult; + pStartInfo->dwCrashDumpEnabled = (DWORD)lResult; SetCrashDlgItems(hwndDlg, pStartInfo); } }
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/cp... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -553,7 +553,7 @@ szDayLen, &TextSize)) { - RECT rcHighlight = {0}; + RECT rcHighlight = { 0, 0, 0, 0 };
rcText.left = rcCell.left + (infoPtr->CellSize.cx / 2) - (TextSize.cx / 2); rcText.top = rcCell.top + (infoPtr->CellSize.cy / 2) - (TextSize.cy / 2);
Modified: branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/di... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -478,7 +478,7 @@
DX_WINDBG_trace();
- if (!This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UNLOCK) + if (!(This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UNLOCK)) { DX_STUB_str("DDERR_UNSUPPORTED"); return DDERR_UNSUPPORTED; @@ -539,7 +539,7 @@
DX_WINDBG_trace();
- if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_FLIP) + if (!(This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_FLIP)) { return DDERR_GENERIC; }
Modified: branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/di... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -260,7 +260,7 @@
DX_WINDBG_trace();
- if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) + if (!(This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY)) { return DDERR_GENERIC; }
Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -786,7 +786,7 @@ IN LPCSTR lpSubKey OPTIONAL, IN HKEY hKeyDest) { - UNICODE_STRING SubKeyName = {0}; + UNICODE_STRING SubKeyName = { 0, 0, NULL }; LONG Ret;
if (lpSubKey != NULL && @@ -816,7 +816,7 @@ IN HKEY hKey, OUT PHKEY phkResult) { - UNICODE_STRING MachineName = {0}; + UNICODE_STRING MachineName = { 0, 0, NULL }; LONG Ret;
if (lpMachineName != NULL && @@ -1412,7 +1412,7 @@ IN LPCSTR lpSubKey OPTIONAL, IN LPCSTR lpValueName OPTIONAL) { - UNICODE_STRING SubKey = {0}, ValueName = {0}; + UNICODE_STRING SubKey = { 0, 0, NULL }, ValueName = { 0, 0, NULL }; LONG Ret;
if (lpSubKey != NULL && @@ -1826,7 +1826,7 @@ RegDeleteTreeA(IN HKEY hKey, IN LPCSTR lpSubKey OPTIONAL) { - UNICODE_STRING SubKeyName = {0}; + UNICODE_STRING SubKeyName = { 0, 0, NULL }; LONG Ret;
if (lpSubKey != NULL &&
Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -1530,7 +1530,7 @@ OUT PSID pSid, IN OUT DWORD* cbSid) { - int i; + unsigned int i; TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid);
if (DomainSid != NULL) @@ -1576,7 +1576,7 @@ IsWellKnownSid(IN PSID pSid, IN WELL_KNOWN_SID_TYPE WellKnownSidType) { - int i; + unsigned int i; TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType);
for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) @@ -1638,7 +1638,7 @@ } else /* String constant format - Only available in winxp and above */ { - int i; + unsigned int i;
for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2))
Modified: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -660,10 +660,10 @@ DeviceInfo* device_info, MIDIHDR* header) { - int index = 0; + unsigned int index = 0; UCHAR* midi_bytes = (UCHAR*) header->lpData;
- int msg_index = 0; + unsigned int msg_index = 0; UCHAR msg[3];
/* Initialize the buffer */
Modified: branches/ros-amd64-bringup/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -53,11 +53,11 @@ PVOID *Reserved) { adns_state astate; - int quflags = 0, i; + int quflags = 0; int adns_error; adns_answer *answer; LPSTR CurrentName; - unsigned CNameLoop; + unsigned i, CNameLoop;
*QueryResultSet = 0;
Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -911,7 +911,7 @@ } // Poorly written apps are not ReactOS problem! // We fix it here if the size is larger than the default size. - if( cbSize > sizeof(ENUMLOGFONTEXDVW) ) cbSize = sizeof(ENUMLOGFONTEXDVW); + if( cbSize > (int)sizeof(ENUMLOGFONTEXDVW) ) cbSize = sizeof(ENUMLOGFONTEXDVW);
Result = NtGdiExtGetObjectW(hGdiObj, cbSize, lpBuffer); // Should handle the copy.
Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -86,11 +86,10 @@ UINT cEntries, LPPALETTEENTRY ppe) { - PALETTEENTRY ippe[256]; - - if (cEntries < 0) return 0; - else - { + PALETTEENTRY ippe[256]; + // Make this work! + if ((INT)cEntries < 0 ) return 0; + if ( GetDeviceCaps(hDC, RASTERCAPS) & RC_PALETTE ) return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); else @@ -103,9 +102,9 @@
if (iStartIndex < 256) { - INT Index = 256 - iStartIndex; - - if ( Index >= cEntries ) Index = cEntries; + UINT Index = 256 - iStartIndex; + + if ( Index > cEntries ) Index = cEntries;
RtlCopyMemory( ppe, &ippe[iStartIndex], @@ -113,8 +112,8 @@ } } } - } - return 0; + + return 0; }
UINT
Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -90,7 +90,8 @@ if ( GetRegionData(hRgn, cRgnDSize, pRgnData) ) { HRGN hRgnex; - INT i, SaveL = pRgnData->rdh.rcBound.left; + UINT i; + INT SaveL = pRgnData->rdh.rcBound.left; pRgnData->rdh.rcBound.left = Width - pRgnData->rdh.rcBound.right; pRgnData->rdh.rcBound.right = Width - SaveL; if (pRgnData->rdh.nCount > 0)
Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/debug/debugger.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -232,7 +232,7 @@ CLIENT_ID ClientId;
/* If we don't have a PID, look it up */ - if (dwProcessId == -1) dwProcessId = (ULONG_PTR)CsrGetProcessId(); + if (dwProcessId == -1U) dwProcessId = (DWORD_PTR)CsrGetProcessId();
/* Open a handle to the process */ ClientId.UniqueThread = NULL;
Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -222,7 +222,7 @@ ULONG_PTR ErrorParameters[4]; ULONG ErrorResponse;
- if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && + if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionInfo->ExceptionRecord->NumberParameters >= 2) { switch(ExceptionInfo->ExceptionRecord->ExceptionInformation[0]) @@ -275,7 +275,7 @@ /* Print a stack trace. */ DbgPrint("Unhandled exception\n"); DbgPrint("ExceptionCode: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionCode); - if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && + if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionInfo->ExceptionRecord->NumberParameters == 2) { DbgPrint("Faulting Address: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionInformation[1]); @@ -318,7 +318,7 @@ ErrorParameters[0] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionCode; ErrorParameters[1] = (ULONG_PTR)ExceptionInfo->ExceptionRecord->ExceptionAddress;
- if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) + if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) { /* get the type of operation that caused the access violation */ ErrorParameters[2] = ExceptionInfo->ExceptionRecord->ExceptionInformation[0];
Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -88,7 +88,7 @@ 0, 0, &NLS_FormatsCS, { &NLS_FormatsCS_debug.ProcessLocksList, &NLS_FormatsCS_debug.ProcessLocksList }, - 0, 0, 0, 0 + 0, 0, 0, 0, 0 }; static RTL_CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 };
Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -532,7 +532,7 @@ SetThreadPriority(HANDLE hThread, int nPriority) { - ULONG Prio = nPriority; + LONG Prio = nPriority; NTSTATUS Status;
/* Check if values forcing saturation should be used */ @@ -549,7 +549,7 @@ Status = NtSetInformationThread(hThread, ThreadBasePriority, &Prio, - sizeof(ULONG)); + sizeof(LONG)); if (!NT_SUCCESS(Status)) { /* Failure */
Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -6,6 +6,7 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h>
+#include "lsasrv.h" #include "lsa_s.h"
#include <wine/debug.h>
Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -3,12 +3,11 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h>
-DECLARE_HANDLE(LSAPR_HANDLE); +#include "lsasrv.h"
-#define NDEBUG -#include <debug.h> +#include "wine/debug.h"
-VOID LsarStartRpcServer(VOID); +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv);
NTSTATUS WINAPI @@ -16,7 +15,7 @@ { HANDLE hEvent;
- DPRINT("LsapInitLsa() called\n"); + TRACE("LsapInitLsa()\n");
LsarStartRpcServer();
@@ -31,6 +30,7 @@ return STATUS_SUCCESS; }
+ void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len);
Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -11,4 +11,4 @@ <file>lsarpc.c</file> <file>lsasrv.c</file> <file>lsasrv.rc</file> -</module> +</module>
Modified: branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -24,7 +24,7 @@ LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; ULONG SocketCount = 0; PSOCKET_INFORMATION *Sockets = NULL; -LIST_ENTRY SockHelpersListHead = {NULL}; +LIST_ENTRY SockHelpersListHead = { NULL, NULL }; ULONG SockAsyncThreadRefCount; HANDLE SockAsyncHelperAfdHandle; HANDLE SockAsyncCompletionPort;
Modified: branches/ros-amd64-bringup/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -650,7 +650,9 @@ } } else + { /* FIXME */; + } return TRUE;
default:
Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/font.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/font.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -676,9 +676,10 @@ assert (max >= n); max -= n; while (n--) + { if (*start_str++ == PREFIX && max--) start_str++; - else; + } start_count -= (start_str - str_on_entry); } else @@ -736,7 +737,6 @@ str++; ns--; } - else; i++; } return result;
Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -395,7 +395,7 @@ lstrcpynW(libName, lpDriverName, sizeof(libName) / sizeof(WCHAR));
/* Try and open the driver by filename */ - if ( lpDrv = DRIVER_TryOpenDriver32(libName, lParam) ) + if ( (lpDrv = DRIVER_TryOpenDriver32(libName, lParam)) ) goto the_end;
/* If we got here, the file wasn't found. So we assume the caller @@ -407,7 +407,7 @@ if ( DRIVER_GetLibName(lpDriverName, lsn, libName, sizeof(libName)) ) { /* Now we have the filename, we can try and load it */ - if ( lpDrv = DRIVER_TryOpenDriver32(libName, lParam) ) + if ( (lpDrv = DRIVER_TryOpenDriver32(libName, lParam)) ) goto the_end; }
Modified: branches/ros-amd64-bringup/reactos/drivers/directx/dxapi/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/directx/dxapi/main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/directx/dxapi/main.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -110,7 +110,7 @@ dwFunctionNum -= DD_FIRST_DXAPI;
if ((lpvOutBuffer == NULL) || - (dwFunctionNum < (DD_FIRST_DXAPI - DD_FIRST_DXAPI)) || + /*(dwFunctionNum < (DD_FIRST_DXAPI - DD_FIRST_DXAPI)) ||*/ (dwFunctionNum > (DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI)) || (gDxApiEntryPoint[dwFunctionNum].pfn == NULL) || (cbInBuffer != tblCheckInBuffer[dwFunctionNum]) ||
Modified: branches/ros-amd64-bringup/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/directx/dxg/main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/directx/dxg/main.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -43,7 +43,7 @@ {
PDRVFN drv_func; - INT i; + UINT i;
/* Test see if the data is vaild we got from win32k.sys */ if ((SizeEngDrv != sizeof(DRVENABLEDATA)) ||
Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -357,7 +357,7 @@ RtlCopyMemory(NameInfo->FileName, FCB->PathNameU.Buffer, BytesToCopy);
/* Check if we could write more but are not able to */ - if (*BufferLength < FCB->PathNameU.Length + FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + if (*BufferLength < FCB->PathNameU.Length + (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) { /* Return number of bytes written */ *BufferLength -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + BytesToCopy;
Modified: branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -58,7 +58,7 @@ OID_802_3_MAC_OPTIONS };
-DRIVER_INFORMATION DriverInfo = {0}; +DRIVER_INFORMATION DriverInfo = { NULL, NULL, { NULL, NULL } }; NDIS_PHYSICAL_ADDRESS HighestAcceptableMax = NDIS_PHYSICAL_ADDRESS_CONST(-1, -1);
@@ -161,7 +161,7 @@ PNDIS_RESOURCE_LIST AssignedResources; UINT BufferSize = 0; PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; - int i; + UINT i;
NdisMQueryAdapterResources(Status, WrapperConfigurationContext,
Modified: branches/ros-amd64-bringup/reactos/drivers/setup/blue/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/setup/blue/font.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/setup/blue/font.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -143,7 +143,7 @@
if(NT_SUCCESS(Status)) { - if(!bFoundFile && atoi(FileName) == CodePage) + if(!bFoundFile && (UINT32)atoi(FileName) == CodePage) { // We got the correct file. // Save the offset and loop through the rest of the file table to find the position, where the actual data starts.
Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -1637,7 +1637,7 @@ KdPrint2((PRINT_PREFIX "SIISETCLK\n")); GetPciConfig1(0x8a, tmp8); if ((tmp8 & 0x30) != 0x10) - ChangePciConfig1(0x8a, (a & 0xcf | 0x10)); + ChangePciConfig1(0x8a, (a & 0xcf) | 0x10); GetPciConfig1(0x8a, tmp8); if ((tmp8 & 0x30) != 0x10) { KdPrint2((PRINT_PREFIX "Sil 0680 could not set ATA133 clock\n"));
Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -1078,7 +1078,7 @@ UCHAR ChildDescriptor[256]; ULONG ChildId; ULONG Unused; - INT i; + UINT i;
DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); if (DeviceExtension->DriverExtension->InitializationData.HwGetVideoChildDescriptor == NULL) @@ -1155,7 +1155,7 @@ #ifndef NDEBUG if (ChildType == Monitor) { - INT j; + UINT j; PUCHAR p = ChildDescriptor; INFO_(VIDEOPRT, "Monitor device enumerated! (ChildId = 0x%x)\n", ChildId); for (j = 0; j < sizeof (ChildDescriptor); j += 8)
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -97,10 +97,10 @@
#define APIC_LVT_VECTOR (0xFF << 0) /* Vector */ #define APIC_LVT_DS (0x1 << 12) /* Delivery Status */ -#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ -#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ -#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ -#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ +#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ +#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ +#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ +#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */
#define APIC_LVT3_DM (0x7 << 8) #define APIC_LVT3_IIPP (0x1 << 13) @@ -165,30 +165,92 @@ } CPU_INFO, *PCPU_INFO;
extern ULONG CPUCount; /* Total number of CPUs */ -extern ULONG BootCPU; /* Bootstrap processor */ +extern ULONG BootCPU; /* Bootstrap processor */ extern ULONG OnlineCPUs; /* Bitmask of online CPUs */ extern CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */ +extern PULONG APICBase; /* Virtual address of local APIC */ +extern ULONG lastregr[MAX_CPU]; /* For debugging */ +extern ULONG lastvalr[MAX_CPU]; +extern ULONG lastregw[MAX_CPU]; +extern ULONG lastvalw[MAX_CPU];
/* Prototypes */ - -__inline VOID APICWrite(ULONG Offset, ULONG Value); -__inline ULONG APICRead(ULONG Offset); VOID APICSendIPI(ULONG Target, ULONG Mode); VOID APICSetup(VOID); VOID HaliInitBSP(VOID); VOID APICSyncArbIDs(VOID); -__inline VOID APICSendEOI(VOID); VOID APICCalibrateTimer(ULONG CPU); VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack);
+static __inline ULONG _APICRead(ULONG Offset) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + return *p; +} + +#if 0 +static __inline VOID APICWrite(ULONG Offset, + ULONG Value) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + + *p = Value; +} +#else +static __inline VOID APICWrite(ULONG Offset, + ULONG Value) +{ + PULONG p; + ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; + + lastregw[CPU] = Offset; + lastvalw[CPU] = Value; + + p = (PULONG)((ULONG)APICBase + Offset); + + *p = Value; +} +#endif + +#if 0 +static __inline ULONG APICRead(ULONG Offset) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + return *p; +} +#else +static __inline ULONG APICRead(ULONG Offset) +{ + PULONG p; + ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; + + lastregr[CPU] = Offset; + lastvalr[CPU] = 0; + + p = (PULONG)((ULONG)APICBase + Offset); + + lastvalr[CPU] = *p; + return lastvalr[CPU]; +} +#endif + static __inline ULONG ThisCPU(VOID) { return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24; }
- -#endif - +static __inline VOID APICSendEOI(VOID) +{ + // Send the EOI + APICWrite(APIC_EOI, 0); +} + +#endif /* __INTERNAL_HAL_APIC_H */
/* EOF */ -
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -223,72 +223,6 @@ APICWrite(APIC_SIVR, tmp); }
- -__inline ULONG _APICRead(ULONG Offset) -{ - PULONG p; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - return *p; -} - -#if 0 -__inline VOID APICWrite(ULONG Offset, - ULONG Value) -{ - PULONG p; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - - *p = Value; -} -#else -__inline VOID APICWrite(ULONG Offset, - ULONG Value) -{ - PULONG p; - ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; - - lastregw[CPU] = Offset; - lastvalw[CPU] = Value; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - - *p = Value; -} -#endif - - -#if 0 -__inline ULONG APICRead(ULONG Offset) -{ - PULONG p; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - return *p; -} -#else -__inline ULONG APICRead(ULONG Offset) -{ - PULONG p; - ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; - - lastregr[CPU] = Offset; - lastvalr[CPU] = 0; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - - lastvalr[CPU] = *p; - return lastvalr[CPU]; -} -#endif - -__inline VOID APICSendEOI(VOID) -{ - // Send the EOI - APICWrite(APIC_EOI, 0); -} - static VOID APICDumpBit(ULONG base) { ULONG v, i, j; @@ -317,7 +251,6 @@ ULONG v, ver, maxlvt; ULONG r1, r2, w1, w2; ULONG CPU = ThisCPU();; -
r1 = lastregr[CPU];
Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ... ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -180,10 +180,10 @@ #ifdef __i386__ # ifdef __GNUC__ # define __DEFINE_GET_SEG(seg) \ - extern inline unsigned short wine_get_##seg(void) \ + static inline unsigned short wine_get_##seg(void) \ { unsigned short res; __asm__("movw %%" #seg ",%w0" : "=r"(res)); return res; } # define __DEFINE_SET_SEG(seg) \ - extern inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); } + static inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); } # elif defined(_MSC_VER) # define __DEFINE_GET_SEG(seg) \ extern inline unsigned short wine_get_##seg(void) \
Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/winbase16.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ... ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/wine/winbase16.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/wine/winbase16.h [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -520,7 +520,7 @@ BOOL16 WINAPI WriteProfileSection16(LPCSTR,LPCSTR);
/* Some optimizations */ -extern inline LPVOID WINAPI MapSL( SEGPTR segptr ) +static inline LPVOID WINAPI MapSL( SEGPTR segptr ) { return (char *)wine_ldt_copy.base[SELECTOROF(segptr) >> __AHSHIFT] + OFFSETOF(segptr); }
Modified: branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Inode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/fs... ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Inode.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Inode.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -348,11 +348,11 @@
bool ext2_block_map(PEXT2_FILESYS Ext2Sys, PEXT2_INODE inode, ULONG block, ULONG *dwRet) { - ULONG dwSizes[4] = {12, 1, 1, 1}; + ULONG dwSizes[4] = { 12, 1, 1, 1 }; ULONG Index = 0; ULONG dwBlk = 0; PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; - int i; + UINT i; bool bRet = false;
Index = block;
Modified: branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Memory.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/fs... ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Memory.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Memory.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -93,8 +93,7 @@ PEXT2_BLOCK_BITMAP bmap) { bool retval; - ULONG group_blk, start_blk, last_blk, new_blk, blk; - int j; + ULONG group_blk, start_blk, last_blk, new_blk, blk, j;
group_blk = fs->ext2_sb->s_first_data_block + (group * fs->ext2_sb->s_blocks_per_group);
Modified: branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/fs... ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -885,7 +885,7 @@ * kludgy hack of using the UUID to derive a random jitter value. */ { - int i, val; + ULONG i, val;
for (i = 0, val = 0 ; i < sizeof(Ext2Sb.s_uuid); i++) val += Ext2Sb.s_uuid[i];
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd... ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -40,6 +40,7 @@
#include <sys/utime.h> #include <direct.h> + int *__p__fmode(void); int *__p___mb_cur_max(void);
@@ -3024,4 +3025,4 @@ /********************************************************************* * __badioinfo (MSVCRT.@) */ -ioinfo __badioinfo = { INVALID_HANDLE_VALUE, WX_TEXT }; +ioinfo __badioinfo = { INVALID_HANDLE_VALUE, WX_TEXT, { 0, } };
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/mbstowcs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd... ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/mbstowcs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/mbstowcs.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -7,12 +7,12 @@ size_t mbstowcs (wchar_t *widechar, const char *multibyte, size_t number) { int bytes; - int n = 0; + size_t n = 0;
while (n < number) {
if ((bytes = mbtowc (widechar, multibyte, MB_LEN_MAX)) < 0) - return -1; + return (size_t) -1;
if (bytes == 0) { *widechar = (wchar_t) '\0';
Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/sd... ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -430,7 +430,7 @@
/* pf_integer_conv: prints x to buf, including alternate formats and additional precision digits, but not field characters or the sign */ -static void pf_integer_conv( char *buf, int buf_len, pf_flags *flags, +static void pf_integer_conv( char *buf, unsigned int buf_len, pf_flags *flags, LONGLONG x ) { unsigned int base; @@ -679,8 +679,8 @@ * Includes extra bytes: 1 byte for null, 1 byte for sign, 4 bytes for exponent, 2 bytes for alternate formats, 1 byte for a decimal, and 1 byte for an additional float digit. */ - int x_len = ((flags.FieldLength > flags.Precision) ? - flags.FieldLength : flags.Precision) + 10; + unsigned x_len = ((flags.FieldLength > flags.Precision) ? + flags.FieldLength : flags.Precision) + 10;
if( x_len >= sizeof number) x = HeapAlloc( GetProcessHeap(), 0, x_len ); @@ -702,8 +702,8 @@ * Includes extra bytes: 1 byte for null, 1 byte for sign, 4 bytes for exponent, 2 bytes for alternate formats, 1 byte for a decimal, and 1 byte for an additional float digit. */ - int x_len = ((flags.FieldLength > flags.Precision) ? - flags.FieldLength : flags.Precision) + 10; + unsigned x_len = ((flags.FieldLength > flags.Precision) ? + flags.FieldLength : flags.Precision) + 10;
if( x_len >= sizeof number) x = HeapAlloc( GetProcessHeap(), 0, x_len );
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -245,7 +245,7 @@ PCHAR PartialString = NULL, BiosVersion; CHAR CpuString[48]; PVOID BaseAddress = NULL; - LARGE_INTEGER ViewBase = {{0}}; + LARGE_INTEGER ViewBase = {{0, 0}}; ULONG_PTR VideoRomBase; PCHAR CurrentVersion; extern UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion;
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -844,13 +844,13 @@ case DbgKmExceptionApi:
/* Look at the exception code */ - if (DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == + if ((NTSTATUS)DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == STATUS_BREAKPOINT) { /* Update this as a breakpoint exception */ WaitStateChange->NewState = DbgBreakpointStateChange; } - else if (DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == + else if ((NTSTATUS)DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == STATUS_SINGLE_STEP) { /* Update this as a single step exception */
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -163,7 +163,7 @@
if (Page == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
/* @@ -301,7 +301,7 @@ if (PageOp == NULL) { DPRINT1("MmGetPageOp failed"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
/* @@ -322,12 +322,12 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageOp->Status == STATUS_PENDING) { DPRINT1("Woke for page op before completion\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* * If this wasn't a pagein then we need to restart the handling @@ -373,7 +373,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MmRequestPageMemoryConsumer failed, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
/* @@ -387,7 +387,7 @@ Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmSetSavedSwapEntryPage(Page, SwapEntry); } @@ -414,7 +414,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MmCreateVirtualMapping failed, not out of memory\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(Status); }
@@ -888,7 +888,7 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmLockAddressSpace(&Process->VadRoot); MmReleasePageOp(PageOp);
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -97,7 +97,7 @@ if (Page == 0) { DPRINT1("Tried to release page zero.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
KeAcquireSpinLock(&AllocationListLock, &oldIrql); @@ -169,7 +169,7 @@ Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Target = Target - NrFreedPages; } @@ -326,7 +326,7 @@ Status = MiMemoryConsumers[i].Trim(MiMinimumPagesPerRun, 0, &NrFreedPages); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -357,7 +357,7 @@ Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -366,7 +366,7 @@ else { DPRINT1("KeWaitForMultipleObjects failed, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -406,7 +406,7 @@ NULL); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
Priority = LOW_REALTIME_PRIORITY + 1;
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -270,7 +270,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } else @@ -416,7 +416,7 @@ if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { DPRINT1("Mapping non-used page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->MapCount++; Page->ReferenceCount++; @@ -438,12 +438,12 @@ if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { DPRINT1("Unmapping non-used page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->MapCount == 0) { DPRINT1("Unmapping not mapped page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->MapCount--; Page->ReferenceCount--; @@ -511,7 +511,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Referencing non-used page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
Page->ReferenceCount++; @@ -542,7 +542,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting reference count for free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
RCount = Page->ReferenceCount; @@ -577,12 +577,12 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Dereferencing free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->ReferenceCount == 0) { DPRINT1("Derefrencing page with reference count 0\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
Page->ReferenceCount--; @@ -594,29 +594,29 @@ if (Page->RmapListHead != NULL) { DPRINT1("Freeing page with rmap entries.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->MapCount != 0) { DPRINT1("Freeing mapped page (0x%x count %d)\n", Pfn << PAGE_SHIFT, Page->MapCount); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->LockCount > 0) { DPRINT1("Freeing locked page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->SavedSwapEntry != 0) { DPRINT1("Freeing page with swap entry.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Freeing page with flags %x\n", Page->Flags.Type); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->Flags.Type = MM_PHYSICAL_PAGE_FREE; Page->Flags.Consumer = MC_MAXIMUM; @@ -647,7 +647,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting lock count for free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
LockCount = Page->LockCount; @@ -671,7 +671,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Locking free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
Page->LockCount++; @@ -702,7 +702,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Unlocking free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
Page->LockCount--; @@ -757,17 +757,17 @@ if (PageDescriptor->Flags.Type != MM_PHYSICAL_PAGE_FREE) { DPRINT1("Got non-free page from freelist\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageDescriptor->MapCount != 0) { DPRINT1("Got mapped page from freelist\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageDescriptor->ReferenceCount != 0) { DPRINT1("%d\n", PageDescriptor->ReferenceCount); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED; PageDescriptor->Flags.Consumer = Consumer; @@ -789,7 +789,7 @@ if (PageDescriptor->MapCount != 0) { DPRINT1("Returning mapped page.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } return PfnOffset; } @@ -970,7 +970,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("ZeroPageThread: Wait failed\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
if (ZeroPageThreadShouldTerminate) @@ -995,7 +995,7 @@ if (PageDescriptor->MapCount != 0) { DPRINT1("Mapped page on freelist.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } PageDescriptor->Flags.Zero = 1; PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_FREE;
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -104,7 +104,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } return (PVOID)((ULONG_PTR)Result + Offset);
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -899,7 +899,7 @@ BaseAddress); if (MemoryArea == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); }
@@ -1039,7 +1039,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to allocate page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Status = MmCreateVirtualMapping (NULL, (PVOID)((ULONG_PTR)BaseAddress + (i * PAGE_SIZE)), @@ -1049,7 +1049,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } }
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -57,7 +57,7 @@ if (!NT_SUCCESS(Status)) { MmUnlockAddressSpace(MmGetKernelAddressSpace()); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmUnlockAddressSpace(MmGetKernelAddressSpace());
@@ -692,7 +692,7 @@ { return NULL; } - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Base = (PVOID)((ULONG_PTR)MiMdlMappingRegionBase + StartingOffset * PAGE_SIZE); if (MiMdlMappingRegionHint == StartingOffset) MiMdlMappingRegionHint += PageCount;
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -71,7 +71,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("MpwThread: Wait failed\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); } if (MpwThreadShouldTerminate)
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/npool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/npool.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/npool.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -936,7 +936,7 @@ { DbgPrint("Bad block magic (probable pool corruption) at %x\n", current); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
if (base_addr < MiNonPagedPoolStart || @@ -946,13 +946,13 @@ DbgPrint("Size %d\n",current->hdr.Size); DbgPrint("Limits are %x %x\n",MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart+MiNonPagedPoolLength); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } blocks_seen++; if (blocks_seen > EiNrFreeBlocks) { DbgPrint("Too many blocks on free list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } p = avl_get_next(FreeBlockListRoot, p); } @@ -979,7 +979,7 @@ { DbgPrint("Bad block magic (probable pool corruption) at %x\n", current); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (base_addr < MiNonPagedPoolStart || ((ULONG_PTR)base_addr+current->hdr.Size) > @@ -989,13 +989,13 @@ DbgPrint("Size %d\n",current->hdr.Size); DbgPrint("Limits are %x %x\n",MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart+MiNonPagedPoolLength); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } blocks_seen++; if (blocks_seen > EiNrUsedBlocks) { DbgPrint("Too many blocks on used list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (current->ListEntry.Flink != &UsedBlockListHead && current->ListEntry.Flink->Blink != ¤t->ListEntry) @@ -1004,7 +1004,7 @@ "current->next->previous %x)\n", __FILE__,__LINE__,current, current->ListEntry.Flink, current->ListEntry.Flink->Blink); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
current_entry = current_entry->Flink; @@ -1035,19 +1035,19 @@ { DbgPrint("Bad block magic (probable pool corruption) at %x\n", free); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
if ( (ULONG_PTR)free > base && (ULONG_PTR)free < last ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if ( (ULONG_PTR)free < base && ((ULONG_PTR)free + free->hdr.Size) > base ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } p = avl_get_next(FreeBlockListRoot, p); } @@ -1060,13 +1060,13 @@ if ( (ULONG_PTR)used > base && (ULONG_PTR)used < last ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if ( (ULONG_PTR)used < base && ((ULONG_PTR)used + used->hdr.Size) > base ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
current_entry = current_entry->Flink; @@ -1460,7 +1460,7 @@ { HDR_USED* blk=(HDR_USED*)((ULONG_PTR)Addr - HDR_USED_SIZE); if (blk->hdr.Magic != BLOCK_HDR_USED_MAGIC) - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT);
return blk->Tag; } @@ -1510,7 +1510,7 @@ DbgPrint("NPPOL: High-side redzone overwritten, Block %x, Size %d, Tag %x(%s), Caller %x\n", (ULONG_PTR)hdr + HDR_USED_SIZE, hdr->UserSize, hdr->Tag, c, hdr->Caller); } - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } #endif @@ -1728,7 +1728,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("Unable to allocate a page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
Status = MmCreateVirtualMapping(NULL, @@ -1739,7 +1739,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Address = (PVOID)((ULONG_PTR)Address + PAGE_SIZE); }
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -205,7 +205,7 @@ first = mid + 1; } } - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); #if defined(__GNUC__)
return (LARGE_INTEGER)0LL; @@ -237,7 +237,7 @@
if (SwapEntry == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); }
@@ -247,13 +247,13 @@ if (i >= MAX_PAGING_FILES) { DPRINT1("Bad swap entry 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PagingFileList[i]->FileObject == NULL || PagingFileList[i]->FileObject->DeviceObject == NULL) { DPRINT1("Bad paging file 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
MmInitializeMdl(Mdl, NULL, PAGE_SIZE); @@ -298,7 +298,7 @@
if (SwapEntry == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); }
@@ -308,13 +308,13 @@ if (i >= MAX_PAGING_FILES) { DPRINT1("Bad swap entry 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PagingFileList[i]->FileObject == NULL || PagingFileList[i]->FileObject->DeviceObject == NULL) { DPRINT1("Bad paging file 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
MmInitializeMdl(Mdl, NULL, PAGE_SIZE); @@ -450,13 +450,13 @@ if (i >= MAX_PAGING_FILES) { DPRINT1("Bad swap entry 0x%.8X\n", Entry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
KeAcquireSpinLock(&PagingFileListLock, &oldIrql); if (PagingFileList[i] == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } KeAcquireSpinLockAtDpcLevel(&PagingFileList[i]->AllocMapLock);
@@ -504,7 +504,7 @@ off = MiAllocPageFromPagingFile(PagingFileList[i]); if (off == 0xFFFFFFFF) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); KeReleaseSpinLock(&PagingFileListLock, oldIrql); return(STATUS_UNSUCCESSFUL); } @@ -518,7 +518,7 @@ }
KeReleaseSpinLock(&PagingFileListLock, oldIrql); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(0); }
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -66,7 +66,7 @@ PrevPageOp = PrevPageOp->Next; } KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
PMM_PAGEOP @@ -211,7 +211,7 @@ if (PageOp == NULL) { KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(NULL); }
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -217,7 +217,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create thread stack\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
/* @@ -241,7 +241,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Could not create Virtual Mapping for Kernel Stack\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
/* Return the stack base */ @@ -715,7 +715,7 @@ break;
default: - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } }
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -81,7 +81,7 @@ Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Address < MmSystemRangeStart) { @@ -177,7 +177,7 @@ } else { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Address < MmSystemRangeStart) { @@ -211,7 +211,7 @@ Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
if (Address < MmSystemRangeStart) @@ -301,7 +301,7 @@ } else { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Address < MmSystemRangeStart) { @@ -321,7 +321,7 @@ if (current_entry == NULL) { DPRINT1("MmIsDirtyRmap: No rmaps.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } while (current_entry != NULL) { @@ -342,7 +342,7 @@ if (current_entry == NULL) { DPRINT1("MmIsDirtyRmap: No rmaps.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } while (current_entry != NULL) { @@ -392,7 +392,7 @@ new_entry = ExAllocateFromNPagedLookasideList(&RmapLookasideList); if (new_entry == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } new_entry->Address = Address; new_entry->Process = (PEPROCESS)Process; @@ -410,7 +410,7 @@ "address 0x%.8X\n", Process->UniqueProcessId, Address, MmGetPfnForProcess(Process, Address) << PAGE_SHIFT, Page << PAGE_SHIFT); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); }
ExAcquireFastMutex(&RmapListLock); @@ -427,7 +427,7 @@ DbgPrint("\n previous caller "); DbgPrint("%p", current_entry->Caller); DbgPrint("\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } current_entry = current_entry->Next; } @@ -463,7 +463,7 @@ if (current_entry == NULL) { DPRINT1("MmDeleteAllRmaps: No rmaps.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmSetRmapListHeadPage(Page, NULL); ExReleaseFastMutex(&RmapListLock); @@ -527,5 +527,5 @@ previous_entry = current_entry; current_entry = current_entry->Next; } - ASSERT(FALSE); -} + KeBugCheck(MEMORY_MANAGEMENT); +}
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -991,7 +991,6 @@ if (!KeInsertQueueApc(Apc, Apc, NULL, 2)) { /* The APC was already in the queue, fail */ - ExFreePool(Apc); Status = STATUS_UNSUCCESSFUL; } else
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -39,7 +39,8 @@ NTSTATUS NTAPI RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) { - ULONG i, MaxLength; + LONG i; + ULONG MaxLength; if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) {
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -629,7 +629,7 @@ OUT PACCESS_MASK GrantedAccess, OUT PNTSTATUS AccessStatus) { - SECURITY_SUBJECT_CONTEXT SubjectSecurityContext = {0}; + SECURITY_SUBJECT_CONTEXT SubjectSecurityContext = { NULL, 0, NULL, NULL }; KPROCESSOR_MODE PreviousMode; PTOKEN Token; NTSTATUS Status;
-
tkreuzer＠svn.reactos.org