Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sedwards] 15167: strip whitespace from end of lines
by sedwards＠svn.reactos.com 09 May '05

09 May '05

strip whitespace from end of lines Modified: trunk/reactos/lib/user32/controls/controls.h Modified: trunk/reactos/lib/user32/controls/edit.c Modified: trunk/reactos/lib/user32/controls/regcontrol.c Modified: trunk/reactos/lib/user32/controls/scrollbar.c Modified: trunk/reactos/lib/user32/include/draw.h Modified: trunk/reactos/lib/user32/misc/desktop.c Modified: trunk/reactos/lib/user32/misc/display.c Modified: trunk/reactos/lib/user32/misc/dllmain.c Modified: trunk/reactos/lib/user32/misc/exit.c Modified: trunk/reactos/lib/user32/misc/exticon.c Modified: trunk/reactos/lib/user32/misc/object.c Modified: trunk/reactos/lib/user32/misc/resources.c Modified: trunk/reactos/lib/user32/misc/strpool.c Modified: trunk/reactos/lib/user32/misc/stubs.c Modified: trunk/reactos/lib/user32/misc/timer.c Modified: trunk/reactos/lib/user32/misc/winhelp.c Modified: trunk/reactos/lib/user32/misc/winsta.c Modified: trunk/reactos/lib/user32/misc/wsprintf.c Modified: trunk/reactos/lib/user32/windows/accel.c Modified: trunk/reactos/lib/user32/windows/bitmap.c Modified: trunk/reactos/lib/user32/windows/caret.c Modified: trunk/reactos/lib/user32/windows/class.c Modified: trunk/reactos/lib/user32/windows/clipboard.c Modified: trunk/reactos/lib/user32/windows/cursor.c Modified: trunk/reactos/lib/user32/windows/defwnd.c Modified: trunk/reactos/lib/user32/windows/dialog.c Modified: trunk/reactos/lib/user32/windows/draw.c Modified: trunk/reactos/lib/user32/windows/icon.c Modified: trunk/reactos/lib/user32/windows/input.c Modified: trunk/reactos/lib/user32/windows/mdi.c Modified: trunk/reactos/lib/user32/windows/menu.c Modified: trunk/reactos/lib/user32/windows/message.c Modified: trunk/reactos/lib/user32/windows/messagebox.c Modified: trunk/reactos/lib/user32/windows/nonclient.c Modified: trunk/reactos/lib/user32/windows/paint.c Modified: trunk/reactos/lib/user32/windows/prop.c Modified: trunk/reactos/lib/user32/windows/rect.c Modified: trunk/reactos/lib/user32/windows/window.c Modified: trunk/reactos/lib/user32/windows/winpos.c _____ Modified: trunk/reactos/lib/user32/controls/controls.h --- trunk/reactos/lib/user32/controls/controls.h 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/controls/controls.h 2005-05-09 01:42:07 UTC (rev 15167) @@ -6,9 +6,9 @@ #ifndef MAKEINTATOMA #define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom)))) #endif -#ifndef WM_ISACTIVEICON +#ifndef WM_ISACTIVEICON #define WM_ISACTIVEICON 0x0035 -#endif +#endif #ifndef __USE_W32API #if defined(STRICT) _____ Modified: trunk/reactos/lib/user32/controls/edit.c --- trunk/reactos/lib/user32/controls/edit.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/controls/edit.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -824,7 +824,7 @@ case WM_GETDLGCODE: result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS; - + if (es->style & ES_MULTILINE) { result |= DLGC_WANTALLKEYS; @@ -3799,7 +3799,7 @@ /*If Edit control style is ES_NUMBER allow users to key in only numeric values*/ if( (es->style & ES_NUMBER) && !( c >= '0' && c <= '9') ) break; - + if (!(es->style & ES_READONLY) && (c >= ' ') && (c != 127)) { WCHAR str[2]; str[0] = c; @@ -4593,7 +4593,7 @@ * If WS_BORDER without WS_EX_CLIENTEDGE is specified we shouldn't have * a nonclient area and we should handle painting the border ourselves. * - * When making modifications please ensure that the code still works + * When making modifications please ensure that the code still works * for edit controls created directly with style 0x50800000, exStyle 0 * (which should have a single pixel border) */ _____ Modified: trunk/reactos/lib/user32/controls/regcontrol.c --- trunk/reactos/lib/user32/controls/regcontrol.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/controls/regcontrol.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -19,7 +19,7 @@ WNDCLASSEXW wc; UNICODE_STRING ClassName; UNICODE_STRING MenuName; - + wc.cbSize = sizeof(WNDCLASSEXW); wc.lpszClassName = Descr->name; wc.lpfnWndProc = Descr->procW; _____ Modified: trunk/reactos/lib/user32/controls/scrollbar.c --- trunk/reactos/lib/user32/controls/scrollbar.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/controls/scrollbar.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -52,7 +52,7 @@ #define SCROLL_FIRST_DELAY 200 /* Delay (in ms) before first repetition when holding the button down */ #define SCROLL_REPEAT_DELAY 50 /* Delay (in ms) between scroll repetitions */ - + #define SCROLL_TIMER 0 /* Scroll timer id */ /* Minimum size of the rectangle between the arrows */ @@ -157,7 +157,7 @@ SelectObject(hDC, hSaveBrush); return; } - + ThumbTop -= ScrollBarInfo->dxyLineButton; if (ScrollBarInfo->dxyLineButton) @@ -312,7 +312,7 @@ STATIC BOOL FASTCALL IntGetScrollBarInfo(HWND Wnd, INT Bar, PSCROLLBARINFO ScrollBarInfo) -{ +{ ScrollBarInfo->cbSize = sizeof(SCROLLBARINFO); return NtUserGetScrollBarInfo(Wnd, IntScrollGetObjectId(Bar), ScrollBarInfo); @@ -349,7 +349,7 @@ { return; } - + if (IsRectEmpty(&Info.rcScrollBar)) { return; @@ -419,7 +419,7 @@ ThumbSize = ScrollBarInfo->xyThumbBottom - ThumbPos; ArrowSize = ScrollBarInfo->dxyLineButton; - if (Vertical) + if (Vertical) { if (Pt.y < ScrollBarInfo->rcScrollBar.top + ArrowSize) { @@ -1069,7 +1069,7 @@ LPCREATESTRUCTW lpCreate /* [in] The style and place of the scroll bar */) { SCROLLINFO Info; - + Info.cbSize = sizeof(SCROLLINFO); Info.fMask = SIF_RANGE | SIF_PAGE | SIF_POS; Info.nMin = 0; @@ -1098,7 +1098,7 @@ } else if (0 != (lpCreate->style & SBS_SIZEBOXBOTTOMRIGHTALIGN)) { - MoveWindow(Wnd, lpCreate->x + lpCreate->cx - GetSystemMetrics(SM_CXVSCROLL) - 1, + MoveWindow(Wnd, lpCreate->x + lpCreate->cx - GetSystemMetrics(SM_CXVSCROLL) - 1, lpCreate->y + lpCreate->cy - GetSystemMetrics(SM_CYHSCROLL) - 1, GetSystemMetrics(SM_CXVSCROLL) + 1, GetSystemMetrics(SM_CYHSCROLL) + 1, FALSE); @@ -1140,7 +1140,7 @@ IntScrollGetScrollPos(HWND Wnd, INT Bar) { SCROLLINFO ScrollInfo; - + ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_POS; if (! NtUserGetScrollInfo(Wnd, Bar, &ScrollInfo)) @@ -1156,13 +1156,13 @@ { BOOL Result; SCROLLINFO ScrollInfo; - + if (NULL == MinPos || NULL == MaxPos) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - + ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_RANGE; Result = NtUserGetScrollInfo(Wnd, Bar, &ScrollInfo); @@ -1171,7 +1171,7 @@ *MinPos = ScrollInfo.nMin; *MaxPos = ScrollInfo.nMax; } - + return Result; } @@ -1194,7 +1194,7 @@ if (SB_CTL != SBType) { NtUserGetWindowRect(Wnd, &WindowRect); - + Pt.x -= WindowRect.left; Pt.y -= WindowRect.top; @@ -1551,10 +1551,10 @@ { INT Result = 0; SCROLLINFO ScrollInfo; - + ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_POS; - + /* * Call NtUserGetScrollInfo() to get the previous position that * we will later return. @@ -1569,7 +1569,7 @@ NtUserSetScrollInfo(hWnd, nBar, &ScrollInfo, bRedraw); } } - + return Result; } _____ Modified: trunk/reactos/lib/user32/include/draw.h --- trunk/reactos/lib/user32/include/draw.h 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/include/draw.h 2005-05-09 01:42:07 UTC (rev 15167) @@ -1 +1 @@ -HPEN STDCALL GetSysColorPen (int nIndex);; +HPEN STDCALL GetSysColorPen (int nIndex); _____ Modified: trunk/reactos/lib/user32/misc/desktop.c --- trunk/reactos/lib/user32/misc/desktop.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/desktop.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -110,7 +110,7 @@ return TRUE; } #endif - + /* FIXME - Read the registry key for now, but what happens if the wallpaper was changed without SPIF_UPDATEINIFILE?! */ if(RegOpenKeyExW(HKEY_CURRENT_USER, @@ -138,7 +138,7 @@ HBITMAP hNewWallpaper; BOOL Ret; LPSTR lpWallpaper = (LPSTR)pvParam; - + if(lpWallpaper != NULL && *lpWallpaper != '\0') { hNewWallpaper = LoadImageA(0, lpWallpaper, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); @@ -152,7 +152,7 @@ hNewWallpaper = NULL; lpWallpaper = NULL; } - + /* Set the wallpaper bitmap */ if(!NtUserSystemParametersInfo(SPI_SETDESKWALLPAPER, 0, &hNewWallpaper, fWinIni & SPIF_SENDCHANGE)) { @@ -161,7 +161,7 @@ return FALSE; } /* Do not use the bitmap handle anymore, it doesn't belong to our process anymore! */ - + Ret = TRUE; if(fWinIni & SPIF_UPDATEINIFILE) { @@ -317,12 +317,12 @@ HDESK hDesktop; DEVMODEW DevmodeW; - if (lpszDesktop != NULL) + if (lpszDesktop != NULL) { RtlInitAnsiString(&DesktopNameA, (LPSTR)lpszDesktop); RtlAnsiStringToUnicodeString(&DesktopNameU, &DesktopNameA, TRUE); - } - else + } + else { RtlInitUnicodeString(&DesktopNameU, NULL); } _____ Modified: trunk/reactos/lib/user32/misc/display.c --- trunk/reactos/lib/user32/misc/display.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/display.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -49,7 +49,7 @@ BOOL rc; UNICODE_STRING Device; DISPLAY_DEVICEW DisplayDeviceW; - + if ( !RtlCreateUnicodeStringFromAsciiz ( &Device, (PCSZ)lpDevice ) ) { SetLastError ( ERROR_OUTOFMEMORY ); @@ -62,7 +62,7 @@ iDevNum, &DisplayDeviceW, dwFlags ); - + /* Copy result from DisplayDeviceW to lpDisplayDevice */ lpDisplayDevice->StateFlags = DisplayDeviceW.StateFlags; WideCharToMultiByte(CP_ACP,0, _____ Modified: trunk/reactos/lib/user32/misc/dllmain.c --- trunk/reactos/lib/user32/misc/dllmain.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/dllmain.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -36,7 +36,7 @@ { PUSER32_THREAD_DATA ThreadData; - ThreadData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + ThreadData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(USER32_THREAD_DATA)); TlsSetValue(User32TlsIndex, ThreadData); } _____ Modified: trunk/reactos/lib/user32/misc/exit.c --- trunk/reactos/lib/user32/misc/exit.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/exit.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -43,10 +43,10 @@ * Execution continues in WinLogon, which calls ExitWindowsEx() again to * terminate COM processes in the interactive user's session. * - WinLogon stops impersonating the interactive user (whos processes are - * all dead by now). and enters log-out state + * all dead by now). and enters log-out state * - If the ExitWindowsEx() request was for a logoff, WinLogon sends a SAS * event (to display the "press ctrl+alt+del") to the GINA. WinLogon then - * waits for the GINA to send a SAS event to login. + * waits for the GINA to send a SAS event to login. * - If the ExitWindowsEx() request was for shutdown/restart, WinLogon calls * ExitWindowsEx() again in the system process context. * - CSRSS goes through the motions of sending WM_QUERYENDSESSION/WM_ENDSESSION _____ Modified: trunk/reactos/lib/user32/misc/exticon.c --- trunk/reactos/lib/user32/misc/exticon.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/exticon.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -333,9 +333,9 @@ NE_NAMEINFO *pIconStorage = NULL; NE_NAMEINFO *pIconDir = NULL; LPicoICONDIR lpiID = NULL; - + TRACE("-- OS2/icon Signature (0x%08lx)\n", sig); - + if (pData == (BYTE*)-1) { pCIDir = ICO_GetIconDirectory(peimage, &lpiID, &uSize); /* check for .ICO file */ @@ -361,7 +361,7 @@ } pTInfo = (NE_TYPEINFO *)((char*)(pTInfo+1)+pTInfo->count*sizeof(NE_NAMEINFO)); } - + if ((pIconStorage && pIconDir) || lpiID) /* load resources and create icons */ { if (nIcons == 0) @@ -375,7 +375,7 @@ UINT16 i, icon; if (nIcons > iconDirCount - nIconIndex) nIcons = iconDirCount - nIconIndex; - + for (i = 0; i < nIcons; i++) { /* .ICO files have only one icon directory */ @@ -385,7 +385,7 @@ } if (lpiID && pCIDir) /* *.ico file, deallocate heap pointer*/ HeapFree(GetProcessHeap(), 0, pCIDir); - + for (icon = 0; icon < nIcons; icon++) { pCIDir = NULL; @@ -395,7 +395,7 @@ for (i = 0; i < iconCount; i++) if (pIconStorage[i].id == ((int)pIconId[icon] | 0x8000) ) pCIDir = USER32_LoadResource(peimage, pIconStorage + i, *(WORD*)pData, &uSize); - + if (pCIDir) RetPtr[icon] = (HICON)CreateIconFromResourceEx(pCIDir, uSize, TRUE, 0x00030000, (icon & 1) ? cx2 : cx1, (icon & 1) ? cy2 : cy1, flags); @@ -410,7 +410,7 @@ /* exe/dll */ else if( sig == IMAGE_NT_SIGNATURE ) -#endif +#endif if( sig == IMAGE_NT_SIGNATURE ) { LPBYTE idata,igdata; _____ Modified: trunk/reactos/lib/user32/misc/object.c --- trunk/reactos/lib/user32/misc/object.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/object.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -93,15 +93,15 @@ LPDWORD lpnLengthNeeded) { LPWSTR buffer; - BOOL ret = TRUE; - + BOOL ret = TRUE; + DPRINT("GetUserObjectInformationA(%x %d %x %d %x)\n", hObj, nIndex, pvInfo, nLength, lpnLengthNeeded); - + if (nIndex != UOI_NAME && nIndex != UOI_TYPE) return GetUserObjectInformationW(hObj, nIndex, pvInfo, nLength, lpnLengthNeeded); - /* allocate unicode buffer */ + /* allocate unicode buffer */ buffer = HeapAlloc(GetProcessHeap(), 0, nLength*2); if (buffer == NULL) { @@ -124,7 +124,7 @@ } } - /* free resources */ + /* free resources */ HeapFree(GetProcessHeap(), 0, buffer); return ret; } _____ Modified: trunk/reactos/lib/user32/misc/resources.c --- trunk/reactos/lib/user32/misc/resources.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/resources.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -127,7 +127,7 @@ strBuf.Buffer = lpBuffer; nErrCode = RtlUnicodeStringToAnsiString(&strBuf, &wstrResStr, FALSE); - + if(!NT_SUCCESS(nErrCode)) { /* failure */ @@ -198,10 +198,10 @@ /* copy the string */ memcpy(lpBuffer, wstrResStr.Buffer, nStringLen * sizeof(WCHAR)); - + /* null-terminate it */ lpBuffer[nStringLen] = 0; - + /* success */ return nStringLen; } _____ Modified: trunk/reactos/lib/user32/misc/strpool.c --- trunk/reactos/lib/user32/misc/strpool.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/strpool.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -62,7 +62,7 @@ HEAP_strcpyAtoW ( LPWSTR lpszW, LPCSTR lpszA, DWORD len ) { NTSTATUS Status = - RtlMultiByteToUnicodeN ( lpszW, len*sizeof(WCHAR), NULL, (LPSTR)lpszA, len ); + RtlMultiByteToUnicodeN ( lpszW, len*sizeof(WCHAR), NULL, (LPSTR)lpszA, len ); lpszW[len] = L'\0'; return Status; } _____ Modified: trunk/reactos/lib/user32/misc/stubs.c --- trunk/reactos/lib/user32/misc/stubs.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/stubs.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -177,7 +177,7 @@ BOOL fForce) { SendMessageW(hWnd, WM_CLOSE, 0, 0); - + if (IsWindow(hWnd)) { if (fForce) @@ -185,7 +185,7 @@ else return FALSE; } - + return TRUE; } @@ -515,7 +515,7 @@ /* * @unimplemented */ -BOOL +BOOL STDCALL AlignRects(LPRECT rect, DWORD b, DWORD c, DWORD d) { @@ -752,7 +752,7 @@ /* * @unimplemented */ -LRESULT +LRESULT STDCALL SendIMEMessageExW(HWND hwnd,LPARAM lparam) { @@ -763,7 +763,7 @@ /* * @unimplemented */ -LRESULT +LRESULT STDCALL SendIMEMessageExA(HWND hwnd, LPARAM lparam) { _____ Modified: trunk/reactos/lib/user32/misc/timer.c --- trunk/reactos/lib/user32/misc/timer.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/timer.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -43,7 +43,7 @@ HWND hWnd, UINT_PTR IDEvent) { - return NtUserKillSystemTimer(hWnd, IDEvent); + return NtUserKillSystemTimer(hWnd, IDEvent); } @@ -56,7 +56,7 @@ HWND hWnd, UINT_PTR IDEvent) { - return NtUserKillTimer(hWnd, IDEvent); + return NtUserKillTimer(hWnd, IDEvent); } _____ Modified: trunk/reactos/lib/user32/misc/winhelp.c --- trunk/reactos/lib/user32/misc/winhelp.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/winhelp.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -71,7 +71,7 @@ if (WinExec("winhlp32.exe -x", SW_SHOWNORMAL) < 32) { //ERR("can't start winhlp32.exe -x ?\n"); return FALSE; - } + } if (!(hDest = FindWindowA("MS_WINHELP", NULL))) { //FIXME("did not find MS_WINHELP (FindWindow() failed, maybe global window handling still unimplemented)\n"); return FALSE; _____ Modified: trunk/reactos/lib/user32/misc/winsta.c --- trunk/reactos/lib/user32/misc/winsta.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/winsta.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -35,14 +35,14 @@ ANSI_STRING WindowStationNameA; UNICODE_STRING WindowStationNameU; HWINSTA hWinSta; - - if (lpwinsta != NULL) + + if (lpwinsta != NULL) { RtlInitAnsiString(&WindowStationNameA, lpwinsta); - RtlAnsiStringToUnicodeString(&WindowStationNameU, &WindowStationNameA, + RtlAnsiStringToUnicodeString(&WindowStationNameU, &WindowStationNameA, TRUE); - } - else + } + else { RtlInitUnicodeString(&WindowStationNameU, NULL); } @@ -53,7 +53,7 @@ lpsa); RtlFreeUnicodeString(&WindowStationNameU); - + return hWinSta; } @@ -68,9 +68,9 @@ LPSECURITY_ATTRIBUTES lpsa) { UNICODE_STRING WindowStationName; - + RtlInitUnicodeString(&WindowStationName, lpwinsta); - + return NtUserCreateWindowStation(&WindowStationName, dwDesiredAccess, lpsa, 0, 0, 0); @@ -294,22 +294,22 @@ ANSI_STRING WindowStationNameA; UNICODE_STRING WindowStationNameU; HWINSTA hWinSta; - - if (lpszWinSta != NULL) + + if (lpszWinSta != NULL) { RtlInitAnsiString(&WindowStationNameA, lpszWinSta); - RtlAnsiStringToUnicodeString(&WindowStationNameU, &WindowStationNameA, + RtlAnsiStringToUnicodeString(&WindowStationNameU, &WindowStationNameA, TRUE); - } - else + } + else { RtlInitUnicodeString(&WindowStationNameU, NULL); } - + hWinSta = OpenWindowStationW(WindowStationNameU.Buffer, fInherit, dwDesiredAccess); - + RtlFreeUnicodeString(&WindowStationNameU); return hWinSta; _____ Modified: trunk/reactos/lib/user32/misc/wsprintf.c --- trunk/reactos/lib/user32/misc/wsprintf.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/misc/wsprintf.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -26,7 +26,7 @@ * PROJECT: ReactOS User32 * PURPOSE: [w]sprintf functions * FILE: lib/user32/wsprintf.c - * PROGRAMER: Steven Edwards + * PROGRAMER: Steven Edwards * REVISION HISTORY: 2003/07/13 Merged from wine user/wsprintf.c * NOTES: Adapted from Wine */ _____ Modified: trunk/reactos/lib/user32/windows/accel.c --- trunk/reactos/lib/user32/windows/accel.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/windows/accel.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -59,7 +59,7 @@ return a pointer to the list link that points to the desired entry */ U32_ACCEL_CACHE_ENTRY ** ppEntry = &U32AccelCache; - + for(; *ppEntry; ppEntry = &((*ppEntry)->Next)) if((*ppEntry)->Object == Object || (*ppEntry)->Data == Data) break; @@ -145,7 +145,7 @@ /* free the buffer */ LocalFree(pAccTableData); - + /* failure */ if(hAccTable == NULL) goto l_Leave; @@ -229,7 +229,7 @@ { return U32LoadAccelerators ( - hInstance, + hInstance, FindResourceExW(hInstance, MAKEINTRESOURCEW(RT_ACCELERATOR), lpTableName, 0) ); } @@ -296,9 +296,9 @@ ) { int i; - + cAccelEntries = CopyAcceleratorTableW(hAccelSrc, lpAccelDst, cAccelEntries); - + if (lpAccelDst == NULL) return cAccelEntries; for(i = 0; i < cAccelEntries; ++ i) @@ -310,11 +310,11 @@ NULL, (PWCHAR)&lpAccelDst[i].key, sizeof(lpAccelDst[i].key) - ); - + ); + if(!NT_SUCCESS(nErrCode)) lpAccelDst[i].key = 0; } - + return cAccelEntries; } _____ Modified: trunk/reactos/lib/user32/windows/bitmap.c --- trunk/reactos/lib/user32/windows/bitmap.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/windows/bitmap.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -57,7 +57,7 @@ UNICODE_STRING NameString; if (HIWORD(lpszName)) - { + { RtlCreateUnicodeStringFromAsciiz(&NameString, (LPSTR)lpszName); lpszWName = NameString.Buffer; Handle = LoadImageW(hinst, lpszWName, uType, cxDesired, @@ -93,7 +93,7 @@ INT id; ICONIMAGE *ResIcon; UINT ColorBits; - + if (!(fuLoad & LR_LOADFROMFILE)) { if (hinst == NULL) @@ -105,7 +105,7 @@ { return NULL; } - + if (fuLoad & LR_SHARED) { /* FIXME - pass size! */ @@ -151,7 +151,7 @@ 32, 32, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); if (hIcon && 0 != (fuLoad & LR_SHARED)) { - NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, (HRSRC)hfRes, + NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, (HRSRC)hfRes, (HRSRC)NULL); } @@ -162,7 +162,7 @@ { DbgPrint("FIXME: need LR_SHARED support loading cursor images from files\n"); } - + hFile = CreateFileW(lpszName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == NULL) @@ -185,7 +185,7 @@ return NULL; } - /* + /* * Get a handle to the screen dc, the icon we create is going to be * compatable with it. */ @@ -219,7 +219,7 @@ return(NULL); } - SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, dirEntry->dwBytesInRes); + SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, dirEntry->dwBytesInRes); memcpy(SafeIconImage, ((PBYTE)IconDIR) + dirEntry->dwImageOffset, dirEntry->dwBytesInRes); /* at this point we have a copy of the icon image to play with */ @@ -241,7 +241,7 @@ } HeaderSize = sizeof(BITMAPINFOHEADER) + ColorCount * sizeof(RGBQUAD); } - + /* make data point to the start of the XOR image data */ Data = (PBYTE)SafeIconImage + HeaderSize; @@ -271,7 +271,7 @@ GRPCURSORICONDIR* IconResDir; INT id; ICONIMAGE *ResIcon; - + if (!(fuLoad & LR_LOADFROMFILE)) { if (hinst == NULL) @@ -283,7 +283,7 @@ { return(NULL); } - + if (fuLoad & LR_SHARED) { hIcon = NtUserFindExistingCursorIcon(hinst, (HRSRC)hfRes, width, height); @@ -326,7 +326,7 @@ width, height, fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME)); if (hIcon && 0 != (fuLoad & LR_SHARED)) { - NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, (HRSRC)hfRes, + NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, (HRSRC)hfRes, (HRSRC)NULL); } return hIcon; @@ -334,7 +334,7 @@ else { /* - * FIXME: This code is incorrect and is likely to crash in many cases. + * FIXME: This code is incorrect and is likely to crash in many cases. * In the file the cursor/icon directory records are stored like * CURSORICONFILEDIR, but we treat them like CURSORICONDIR. In Wine * this is solved by creating a fake cursor/icon directory in memory @@ -345,7 +345,7 @@ { DbgPrint("FIXME: need LR_SHARED support for loading icon images from files\n"); } - + hFile = CreateFileW(lpszName, GENERIC_READ, FILE_SHARE_READ, @@ -396,7 +396,7 @@ return(NULL); } - SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, dirEntry->dwBytesInRes); + SafeIconImage = RtlAllocateHeap(GetProcessHeap(), 0, dirEntry->dwBytesInRes); memcpy(SafeIconImage, ((PBYTE)IconDIR) + dirEntry->dwImageOffset, dirEntry->dwBytesInRes); @@ -423,7 +423,7 @@ } HeaderSize = sizeof(BITMAPINFOHEADER) + ColorCount * sizeof(RGBQUAD); } - + //make data point to the start of the XOR image data Data = (PBYTE)SafeIconImage + HeaderSize; @@ -503,7 +503,7 @@ NULL); CloseHandle(hFile); if (hSection == NULL) - { + { return(NULL); } BitmapInfo = MapViewOfFile(hSection, @@ -567,7 +567,7 @@ { DIBSECTION Dib; - hBitmap = CreateDIBSection(hScreenDc, PrivateInfo, DIB_RGB_COLORS, NULL, + hBitmap = CreateDIBSection(hScreenDc, PrivateInfo, DIB_RGB_COLORS, NULL, 0, 0); GetObjectA(hBitmap, sizeof(DIBSECTION), &Dib); SetDIBits(hScreenDc, hBitmap, 0, Dib.dsBm.bmHeight, Data, BitmapInfo, @@ -595,7 +595,7 @@ int cxDesired, int cyDesired, UINT fuLoad) -{ +{ if (fuLoad & LR_DEFAULTSIZE) { if (uType == IMAGE_ICON) @@ -692,7 +692,7 @@ } return res; } - case IMAGE_ICON: + case IMAGE_ICON: { static BOOL IconMsgDisplayed = FALSE; /* FIXME: support loading the image as shared from an instance */ @@ -702,7 +702,7 @@ } return CopyIcon(hnd); } - case IMAGE_CURSOR: + case IMAGE_CURSOR: { static BOOL IconMsgDisplayed = FALSE; /* FIXME: support loading the image as shared from an instance */ _____ Modified: trunk/reactos/lib/user32/windows/caret.c --- trunk/reactos/lib/user32/windows/caret.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/windows/caret.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -36,7 +36,7 @@ void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo) { HDC hDC, hComp; - + hDC = GetDC(hWnd); if(hDC) { _____ Modified: trunk/reactos/lib/user32/windows/class.c --- trunk/reactos/lib/user32/windows/class.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/windows/class.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -56,7 +56,7 @@ else { Status = HEAP_strdupAtoW(&str, (LPCSTR)lpszClass, NULL); - + if (! NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -278,7 +278,7 @@ int result; LPWSTR ClassNameW; NTSTATUS Status; - + if(!lpClassName) return 0; @@ -436,7 +436,7 @@ /* Yes, this is correct. We should modify the passed structure. */ if (lpwcx->hInstance == NULL) ((WNDCLASSEXA*)lpwcx)->hInstance = GetModuleHandleW(NULL); - + RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW)); if (IS_ATOM(lpwcx->lpszMenuName) || lpwcx->lpszMenuName == 0) @@ -728,7 +728,7 @@ LPWSTR ClassName; NTSTATUS Status; BOOL Result; - + if(!IS_ATOM(lpClassName)) { Status = HEAP_strdupAtoW(&ClassName, lpClassName, NULL); @@ -740,12 +740,12 @@ } else ClassName = (LPWSTR)lpClassName; - + Result = (BOOL)NtUserUnregisterClass((LPCWSTR)ClassName, hInstance, 0); - - if(ClassName && !IS_ATOM(lpClassName)) + + if(ClassName && !IS_ATOM(lpClassName)) HEAP_free(ClassName); - + return Result; } _____ Modified: trunk/reactos/lib/user32/windows/clipboard.c --- trunk/reactos/lib/user32/windows/clipboard.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/windows/clipboard.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -114,7 +114,7 @@ HEAP_strcpyWtoA(lpszFormatName, lpBuffer, Length); HEAP_free(lpBuffer); DPRINT("GetClipboardFormatNameA(%x): returning %s\n", format, lpszFormatName); - + return Length; } @@ -126,7 +126,7 @@ { UNICODE_STRING FormatName; ULONG Ret; - + FormatName.Length = 0; FormatName.MaximumLength = cchMaxCount * sizeof(WCHAR); FormatName.Buffer = (PWSTR)lpszFormatName; _____ Modified: trunk/reactos/lib/user32/windows/cursor.c --- trunk/reactos/lib/user32/windows/cursor.c 2005-05-09 01:41:26 UTC (rev 15166) +++ trunk/reactos/lib/user32/windows/cursor.c 2005-05-09 01:42:07 UTC (rev 15167) @@ -44,7 +44,7 @@ { BOOL *DefaultCursor = (BOOL*)Arguments; LRESULT Result = TRUE; - + if(*DefaultCursor) { /* set default cursor */ @@ -56,7 +56,7 @@ SetCursor(0); SetCursor(LoadCursorW(0, (LPCWSTR)IDC_ARROW)); } - + return(ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS)); } @@ -70,7 +70,7 @@ CopyCursor(HCURSOR pcur) { ICONINFO IconInfo; - + if(NtUserGetCursorIconInfo((HANDLE)pcur, &IconInfo)) { return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); @@ -124,10 +124,10 @@ IconInfo.hbmMask = CreateDIBitmap(hScreenDc, &bwBIH->bmiHeader, 0, NULL, bwBIH, DIB_RGB_COLORS); if (IconInfo.hbmMask) - { - SetDIBits(hScreenDc, IconInfo.hbmMask, 0, nHeight, + { + SetDIBits(hScreenDc, IconInfo.hbmMask, 0, nHeight, pvXORPlane, bwBIH, DIB_RGB_COLORS); - SetDIBits(hScreenDc, IconInfo.hbmMask, nHeight, nHeight, + SetDIBits(hScreenDc, IconInfo.hbmMask, nHeight, nHeight, pvANDPlane, bwBIH, DIB_RGB_COLORS); } else @@ -141,7 +141,7 @@ IconInfo.xHotspot = xHotSpot; IconInfo.yHotspot = yHotSpot; IconInfo.hbmColor = 0; - + return (HCURSOR)NtUserCreateCursorIconHandle(&IconInfo, FALSE); } [truncated at 1000 lines; 3276 more skipped]

1 0

[sedwards] 15166: strip whitespace from end of lines
by sedwards＠svn.reactos.com 09 May '05

09 May '05

strip whitespace from end of lines Modified: trunk/reactos/lib/crt/conio/cgets.c Modified: trunk/reactos/lib/crt/conio/cprintf.c Modified: trunk/reactos/lib/crt/conio/getche.c Modified: trunk/reactos/lib/crt/conio/ungetch.c Modified: trunk/reactos/lib/crt/ctype/isctype.c Modified: trunk/reactos/lib/crt/direct/chdrive.c Modified: trunk/reactos/lib/crt/direct/getcwd.c Modified: trunk/reactos/lib/crt/direct/getdcwd.c Modified: trunk/reactos/lib/crt/float/chgsign.c Modified: trunk/reactos/lib/crt/float/cntrlfp.c Modified: trunk/reactos/lib/crt/float/copysign.c Modified: trunk/reactos/lib/crt/float/fpclass.c Modified: trunk/reactos/lib/crt/float/isnan.c Modified: trunk/reactos/lib/crt/float/scalb.c Modified: trunk/reactos/lib/crt/float/statfp.c Modified: trunk/reactos/lib/crt/include/float.h Modified: trunk/reactos/lib/crt/include/internal/debug.h Modified: trunk/reactos/lib/crt/include/internal/file.h Modified: trunk/reactos/lib/crt/io/access.c Modified: trunk/reactos/lib/crt/io/chmod.c Modified: trunk/reactos/lib/crt/io/close.c Modified: trunk/reactos/lib/crt/io/dup.c Modified: trunk/reactos/lib/crt/io/find.c Modified: trunk/reactos/lib/crt/io/locking.c Modified: trunk/reactos/lib/crt/io/lseeki64.c Modified: trunk/reactos/lib/crt/io/mktemp.c Modified: trunk/reactos/lib/crt/io/open.c Modified: trunk/reactos/lib/crt/io/read.c Modified: trunk/reactos/lib/crt/io/utime.c Modified: trunk/reactos/lib/crt/io/wmktemp.c Modified: trunk/reactos/lib/crt/io/wopen.c Modified: trunk/reactos/lib/crt/io/write.c Modified: trunk/reactos/lib/crt/io/wutime.c Modified: trunk/reactos/lib/crt/locale/locale.c Modified: trunk/reactos/lib/crt/math/frexp.c Modified: trunk/reactos/lib/crt/math/hypot.c Modified: trunk/reactos/lib/crt/math/j0_y0.c Modified: trunk/reactos/lib/crt/math/j1_y1.c Modified: trunk/reactos/lib/crt/math/jn_yn.c Modified: trunk/reactos/lib/crt/math/modf.c Modified: trunk/reactos/lib/crt/mbstring/hanzen.c Modified: trunk/reactos/lib/crt/mbstring/ischira.c Modified: trunk/reactos/lib/crt/mbstring/iskpun.c Modified: trunk/reactos/lib/crt/mbstring/islwr.c Modified: trunk/reactos/lib/crt/mbstring/ismbc.c Modified: trunk/reactos/lib/crt/mbstring/ismbkaln.c Modified: trunk/reactos/lib/crt/mbstring/ismblead.c Modified: trunk/reactos/lib/crt/mbstring/ismbtrl.c Modified: trunk/reactos/lib/crt/mbstring/isuppr.c Modified: trunk/reactos/lib/crt/mbstring/mbbtype.c Modified: trunk/reactos/lib/crt/mbstring/mbscoll.c Modified: trunk/reactos/lib/crt/mbstring/mbsdec.c Modified: trunk/reactos/lib/crt/mbstring/mbsicmp.c Modified: trunk/reactos/lib/crt/mbstring/mbsicoll.c Modified: trunk/reactos/lib/crt/mbstring/mbsinc.c Modified: trunk/reactos/lib/crt/mbstring/mbslen.c Modified: trunk/reactos/lib/crt/mbstring/mbsncat.c Modified: trunk/reactos/lib/crt/mbstring/mbsnccnt.c Modified: trunk/reactos/lib/crt/mbstring/mbsncmp.c Modified: trunk/reactos/lib/crt/mbstring/mbsncoll.c Modified: trunk/reactos/lib/crt/mbstring/mbsncpy.c Modified: trunk/reactos/lib/crt/mbstring/mbsnset.c Modified: trunk/reactos/lib/crt/mbstring/mbsrchr.c Modified: trunk/reactos/lib/crt/mbstring/mbsrev.c Modified: trunk/reactos/lib/crt/mbstring/mbsset.c Modified: trunk/reactos/lib/crt/mbstring/mbsupr.c Modified: trunk/reactos/lib/crt/misc/crtmain.c Modified: trunk/reactos/lib/crt/misc/environ.c Modified: trunk/reactos/lib/crt/process/_cwait.c Modified: trunk/reactos/lib/crt/process/_system.c Modified: trunk/reactos/lib/crt/process/dll.c Modified: trunk/reactos/lib/crt/process/process.c Modified: trunk/reactos/lib/crt/stdio/allocfil.c Modified: trunk/reactos/lib/crt/stdio/fclose.c Modified: trunk/reactos/lib/crt/stdio/fdopen.c Modified: trunk/reactos/lib/crt/stdio/fflush.c Modified: trunk/reactos/lib/crt/stdio/filbuf.c Modified: trunk/reactos/lib/crt/stdio/flsbuf.c Modified: trunk/reactos/lib/crt/stdio/fopen.c Modified: trunk/reactos/lib/crt/stdio/fprintf.c Modified: trunk/reactos/lib/crt/stdio/fread.c Modified: trunk/reactos/lib/crt/stdio/fseek.c Modified: trunk/reactos/lib/crt/stdio/fsopen.c Modified: trunk/reactos/lib/crt/stdio/fwalk.c Modified: trunk/reactos/lib/crt/stdio/gets.c Modified: trunk/reactos/lib/crt/stdio/getw.c Modified: trunk/reactos/lib/crt/stdio/popen.c Modified: trunk/reactos/lib/crt/stdio/putc.c Modified: trunk/reactos/lib/crt/stdio/puts.c Modified: trunk/reactos/lib/crt/stdio/putw.c Modified: trunk/reactos/lib/crt/stdio/rmtmp.c Modified: trunk/reactos/lib/crt/stdio/setvbuf.c Modified: trunk/reactos/lib/crt/stdio/ungetc.c Modified: trunk/reactos/lib/crt/stdio/vfprintf.c Modified: trunk/reactos/lib/crt/stdio/vsprintf.c Modified: trunk/reactos/lib/crt/stdlib/_exit.c Modified: trunk/reactos/lib/crt/stdlib/errno.c Modified: trunk/reactos/lib/crt/stdlib/itoa.c Modified: trunk/reactos/lib/crt/stdlib/itow.c Modified: trunk/reactos/lib/crt/stdlib/putenv.c [truncated at 100 lines; 22 more skipped] _____ Modified: trunk/reactos/lib/crt/conio/cgets.c --- trunk/reactos/lib/crt/conio/cgets.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/conio/cgets.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -26,7 +26,7 @@ return(NULL); maxlen_wanted = (unsigned int)((unsigned char)string[0]); sp = &(string[2]); - /* + /* * Should the string be shorter maxlen_wanted including or excluding * the trailing '\0' ? We don't take any risk. */ _____ Modified: trunk/reactos/lib/crt/conio/cprintf.c --- trunk/reactos/lib/crt/conio/cprintf.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/conio/cprintf.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -19,11 +19,11 @@ int cnt; char buf[ 2048 ]; /* this is buggy, because buffer might be too small. */ va_list ap; - + va_start(ap, fmt); cnt = vsprintf(buf, fmt, ap); va_end(ap); - + _cputs(buf); return cnt; } _____ Modified: trunk/reactos/lib/crt/conio/getche.c --- trunk/reactos/lib/crt/conio/getche.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/conio/getche.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details + * Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details * PROJECT: ReactOS system libraries * FILE: lib/msvcrt/conio/getche.c * PURPOSE: Reads a character from stdin @@ -25,7 +25,7 @@ * ungetch could have been called with a character that * hasn't been got by a conio function. * We don't echo again. - */ + */ return(_getch()); return (_putch(_getch())); } _____ Modified: trunk/reactos/lib/crt/conio/ungetch.c --- trunk/reactos/lib/crt/conio/ungetch.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/conio/ungetch.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details + * Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details * PROJECT: ReactOS system libraries * FILE: lib/msvcrt/conio/ungetch.c * PURPOSE: Ungets a character from stdin _____ Modified: trunk/reactos/lib/crt/ctype/isctype.c --- trunk/reactos/lib/crt/ctype/isctype.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/ctype/isctype.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -5,7 +5,7 @@ * PURPOSE: C Runtime * PROGRAMMER: Copyright (C) 1995 DJ Delorie */ - + #include <ctype.h> _____ Modified: trunk/reactos/lib/crt/direct/chdrive.c --- trunk/reactos/lib/crt/direct/chdrive.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/direct/chdrive.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -7,7 +7,7 @@ /* - * @implemented + * @implemented * * _chdrive (MSVCRT.@) * _____ Modified: trunk/reactos/lib/crt/direct/getcwd.c --- trunk/reactos/lib/crt/direct/getcwd.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/direct/getcwd.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -23,13 +23,13 @@ { return _tcsdup(dir); } - + if (dir_len >= size) { __set_errno(ERANGE); return NULL; /* buf too small */ } - + _tcscpy(buf,dir); return buf; } _____ Modified: trunk/reactos/lib/crt/direct/getdcwd.c --- trunk/reactos/lib/crt/direct/getdcwd.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/direct/getdcwd.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -11,7 +11,7 @@ * _getdcwd (MSVCRT.@) * * Get the current working directory on a given disk. - * + * * PARAMS * drive [I] Drive letter to get the current working directory from. * buf [O] Destination for the current working directory. _____ Modified: trunk/reactos/lib/crt/float/chgsign.c --- trunk/reactos/lib/crt/float/chgsign.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/float/chgsign.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -16,7 +16,7 @@ if ( u.x->sign == 1 ) u.x->sign = 0; - else + else u.x->sign = 1; return __x; _____ Modified: trunk/reactos/lib/crt/float/cntrlfp.c --- trunk/reactos/lib/crt/float/cntrlfp.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/float/cntrlfp.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -37,11 +37,11 @@ { unsigned int FpuCw; unsigned int DummyCw = 0; - + /* get the controlword */ asm volatile("fstcw %0\n\t" : "=m"(FpuCw)); FpuCw &= 0x0000ffff; - + /* translate it into _control87 format */ if (FpuCw & X87_CW_IM) DummyCw |= _EM_INVALID; @@ -88,10 +88,10 @@ /* unset (un)masked bits */ DummyCw &= ~unMask; unNew &= unMask; - + /* set new bits */ DummyCw |= unNew; - + /* translate back into x87 format * FIXME: translate infinity control! */ @@ -141,7 +141,7 @@ /* set controlword */ asm volatile("fldcw %0" : : "m"(FpuCw)); - + return DummyCw; #if 0 /* The follwing is the original code, broken I think! -blight */ _____ Modified: trunk/reactos/lib/crt/float/copysign.c --- trunk/reactos/lib/crt/float/copysign.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/float/copysign.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -11,7 +11,7 @@ double* __d; double_t* d; } d; - union + union { double* __s; double_t* s; _____ Modified: trunk/reactos/lib/crt/float/fpclass.c --- trunk/reactos/lib/crt/float/fpclass.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/float/fpclass.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -36,7 +36,7 @@ * @implemented */ fpclass_t _fpclass(double __d) -{ +{ union { double* __d; @@ -63,14 +63,14 @@ return FP_NINF; else return FP_PINF; - } + } else if ( d.d->mantissah == 0 && d.d->mantissal != 0 ) { return FP_QNAN; } else if ( d.d->mantissah == 0 && d.d->mantissal != 0 ) { return FP_SNAN; } - + } return 0; } _____ Modified: trunk/reactos/lib/crt/float/isnan.c --- trunk/reactos/lib/crt/float/isnan.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/float/isnan.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -25,14 +25,14 @@ * @implemented */ int _isnan(double __x) -{ +{ union { double* __x; double_t* x; } x; x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); + return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); } int _isnanl(long double __x) @@ -45,26 +45,26 @@ long_double_t* x; } x; x.__x = &__x; - - + + /* IEEE 854 NaN's have the maximum possible exponent and a nonzero mantissa. */ - - return (( x.x->exponent == 0x7fff) - && ( (x.x->mantissah & 0x80000000) != 0) - && ( (x.x->mantissah & (unsigned int)0x7fffffff) != 0 || x.x->mantissal != 0 )); + + return (( x.x->exponent == 0x7fff) + && ( (x.x->mantissah & 0x80000000) != 0) + && ( (x.x->mantissah & (unsigned int)0x7fffffff) != 0 || x.x->mantissal != 0 )); } int _isinf(double __x) { union - { + { double* __x; double_t* x; } x; - + x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah == 0 && x.x->mantissal == 0 )); + return ( x.x->exponent == 0x7ff && ( x.x->mantissah == 0 && x.x->mantissal == 0 )); } /* @@ -84,14 +84,14 @@ long double* __x; long_double_t* x; } x; - + x.__x = &__x; - - + + /* An IEEE 854 infinity has an exponent with the maximum possible value and a zero mantissa. */ - - + + if ( x.x->exponent == 0x7fff && ( (x.x->mantissah == 0x80000000 ) && x.x->mantissal == 0 )) return x.x->sign ? -1 : 1; return 0; _____ Modified: trunk/reactos/lib/crt/float/scalb.c --- trunk/reactos/lib/crt/float/scalb.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/float/scalb.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -5,15 +5,15 @@ * @implemented */ double _scalb( double __x, long e ) -{ +{ union { double* __x; double_t* x; } x; - + x.__x = &__x; - + x.x->exponent += e; return __x; _____ Modified: trunk/reactos/lib/crt/float/statfp.c --- trunk/reactos/lib/crt/float/statfp.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/float/statfp.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -4,7 +4,7 @@ * @implemented */ unsigned int _statusfp (void) -{ +{ register unsigned short __res; #ifdef __GNUC__ _____ Modified: trunk/reactos/lib/crt/include/float.h --- trunk/reactos/lib/crt/include/float.h 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/include/float.h 2005-05-09 01:41:26 UTC (rev 15166) @@ -1,4 +1,4 @@ -/* +/* * float.h * This file has no copyright assigned and is placed in the Public Domain. * This file is a part of the mingw-runtime package. @@ -12,7 +12,7 @@ * NOTE: GCC provides float.h, but it doesn't include the non-standard * stuff for accessing the fp controller. We include_next the * GCC-supplied header and just define the MS-specific extensions - * here. + * here. * */ @@ -116,7 +116,7 @@ word to 0x37f (64 bit mantissa precison rather than 53 bit). By default, the mingw version of _fpreset sets fp control as per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when - building your application. + building your application. */ void __cdecl _fpreset (void); void __cdecl fpreset (void); _____ Modified: trunk/reactos/lib/crt/include/internal/debug.h --- trunk/reactos/lib/crt/include/internal/debug.h 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/include/internal/debug.h 2005-05-09 01:41:26 UTC (rev 15166) @@ -3,9 +3,9 @@ * PROJECT: ReactOS kernel * FILE: include/msvcrt/msvcrtdbg.h * PURPOSE: Useful debugging macros - * PROGRAMMER: - * UPDATE HISTORY: - * + * PROGRAMMER: + * UPDATE HISTORY: + * */ /* @@ -24,12 +24,12 @@ #ifdef _UNICODE #define sT "S" -#else +#else #define sT "s" #endif - - - + + + #define TRACE(...) @@ -45,7 +45,7 @@ #define CHECKPOINT1 #endif -#if !defined(NDEBUG) && defined(DBG) +#if !defined(NDEBUG) && defined(DBG) #define DPRINT(args...) do { DbgPrint("(MSVCRT:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); #define CHECKPOINT do { DbgPrint("MSVCRT:%s:%d\n",__FILE__,__LINE__); } while(0); #else _____ Modified: trunk/reactos/lib/crt/include/internal/file.h --- trunk/reactos/lib/crt/include/internal/file.h 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/include/internal/file.h 2005-05-09 01:41:26 UTC (rev 15166) @@ -59,7 +59,7 @@ #define __FILE_REC_MAX 20 -typedef struct __file_rec +typedef struct __file_rec { struct __file_rec* next; int count; @@ -178,8 +178,8 @@ #define _IOLBF 0x0040 /* line buffered */ #define _IONBF 0x0004 /* not buffered */ -#define _IO_LBF 0x80000 /* this value is used insteat of _IOLBF within the - structure FILE as value for _flags, +#define _IO_LBF 0x80000 /* this value is used insteat of _IOLBF within the + structure FILE as value for _flags, because _IOLBF has the same value as _IOSTRG */ _____ Modified: trunk/reactos/lib/crt/io/access.c --- trunk/reactos/lib/crt/io/access.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/access.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -32,7 +32,7 @@ return -1; } } - + return 0; } @@ -50,8 +50,8 @@ _dosmaperr(GetLastError()); return -1; } - - if ((Attributes & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) + + if ((Attributes & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) { __set_errno(EACCES); return -1; _____ Modified: trunk/reactos/lib/crt/io/chmod.c --- trunk/reactos/lib/crt/io/chmod.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/chmod.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -30,7 +30,7 @@ if ( mode == 0 ) return -1; - + if (mode & _S_IWRITE) { if (FileAttributes & FILE_ATTRIBUTE_READONLY) { FileAttributes &= ~FILE_ATTRIBUTE_READONLY; _____ Modified: trunk/reactos/lib/crt/io/close.c --- trunk/reactos/lib/crt/io/close.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/close.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -11,7 +11,7 @@ int _close(int _fd) { TRACE("_close(%i)", _fd); - + if (_fd == -1) return(-1); if (CloseHandle((HANDLE)_get_osfhandle(_fd)) == FALSE) _____ Modified: trunk/reactos/lib/crt/io/dup.c --- trunk/reactos/lib/crt/io/dup.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/dup.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -13,18 +13,18 @@ HANDLE hProcess = GetCurrentProcess(); BOOL result; int fd; - + hFile = (HANDLE)_get_osfhandle(handle); if (hFile == INVALID_HANDLE_VALUE) { __set_errno(EBADF); return -1; } - result = DuplicateHandle(hProcess, - hFile, - hProcess, - &hFile, - 0, - TRUE, + result = DuplicateHandle(hProcess, + hFile, + hProcess, + &hFile, + 0, + TRUE, DUPLICATE_SAME_ACCESS); if (result == FALSE) { _dosmaperr(GetLastError()); _____ Modified: trunk/reactos/lib/crt/io/find.c --- trunk/reactos/lib/crt/io/find.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/find.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -64,7 +64,7 @@ long handle, #else int handle, -#endif +#endif struct _tfinddata_t* result) { WIN32_FIND_DATA FindFileData; _____ Modified: trunk/reactos/lib/crt/io/locking.c --- trunk/reactos/lib/crt/io/locking.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/locking.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -15,6 +15,6 @@ _dosmaperr(GetLastError()); return -1; } - + return 0; } _____ Modified: trunk/reactos/lib/crt/io/lseeki64.c --- trunk/reactos/lib/crt/io/lseeki64.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/lseeki64.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -34,7 +34,7 @@ LARGE_INTEGER offset; offset.QuadPart = _offset; - offset.u.LowPart = SetFilePointer((HANDLE)fdinfo(_fildes)->hFile, + offset.u.LowPart = SetFilePointer((HANDLE)fdinfo(_fildes)->hFile, offset.u.LowPart, &offset.u.HighPart, _whence); return ((((__int64)offset.u.HighPart) << 32) + offset.u.LowPart); _____ Modified: trunk/reactos/lib/crt/io/mktemp.c --- trunk/reactos/lib/crt/io/mktemp.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/mktemp.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details + * Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details * PROJECT: ReactOS system libraries * FILE: lib/msvcrt/io/mktemp.c * PURPOSE: Makes a temp file based on a template _____ Modified: trunk/reactos/lib/crt/io/open.c --- trunk/reactos/lib/crt/io/open.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/open.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -31,7 +31,7 @@ * Copyright 2004 Eric Pouech * Copyright 2004 Juan Lang */ - + // rember to interlock the allocation of fileno when making this thread safe // possibly store extra information at the handle @@ -97,13 +97,13 @@ inline BOOL is_valid_fd(int fd) { BOOL b = (fd >= 0 && fd < g_fdend && (fdinfo(fd)->fdflags & FOPEN)); - + if (!b){ DPRINT1("not valid fd %i, g_fdend %i, fdinfo %x, bucket %x, fdflags %x\n", fd,g_fdend,fdinfo(fd),fdinfo_bucket(fd),fdinfo(fd)->fdflags); - + } - + return b; } @@ -115,12 +115,12 @@ char fdflags = 0; if (oflags & _O_APPEND) fdflags |= FAPPEND; - + if (oflags & _O_BINARY) ; else if (oflags & _O_TEXT) fdflags |= FTEXT; else if (_fmode& _O_BINARY) ; else fdflags |= FTEXT; /* default to TEXT*/ - + if (oflags & _O_NOINHERIT) fdflags |= FNOINHERIT; if (oflags & ~(_O_BINARY|_O_TEXT|_O_APPEND|_O_TRUNC| @@ -235,7 +235,7 @@ hFile = CreateFileA(_path, dwDesiredAccess, - dwShareMode, + dwShareMode, &sa, dwCreationDistribution, dwFlagsAndAttributes, @@ -259,9 +259,9 @@ static void init_bucket(FDINFO* entry) { int i; - - for(i=0; - i < FDINFO_ENTRIES_PER_BUCKET; + + for(i=0; + i < FDINFO_ENTRIES_PER_BUCKET; i++, entry++) { entry->hFile = INVALID_HANDLE_VALUE; @@ -278,29 +278,29 @@ { fdinfo_bucket(fd) = malloc(FDINFO_ENTRIES_PER_BUCKET * sizeof(FDINFO)); if (!fdinfo_bucket(fd)) return FALSE; - + init_bucket(fdinfo_bucket(fd)); - + return TRUE; } -/* +/* * INTERNAL * Allocate an fd slot from a Win32 HANDLE, starting from fd * caller must hold the files lock */ static int alloc_fd_from(HANDLE hand, char flag, int fd) { - + if (fd >= FDINFO_ENTRIES) { DPRINT1("files exhausted!\n"); return -1; } - + if (!fdinfo_bucket(fd)) { if (!alloc_init_bucket(fd)){ @@ -308,10 +308,10 @@ return -1; } } - + fdinfo(fd)->hFile = hand; fdinfo(fd)->fdflags = FOPEN | (flag & (FNOINHERIT | FAPPEND | FTEXT)); - fdinfo(fd)->pipechar = LF; + fdinfo(fd)->pipechar = LF; fdinfo(fd)->lockinitflag = 0; //fdinfo(fd)->lock @@ -342,9 +342,9 @@ { g_fdstart++; } -#endif +#endif } - + /* update last fd in use */ if (fd >= g_fdend) g_fdend = fd + 1; @@ -369,18 +369,18 @@ } -/* - * INTERNAL: Allocate an fd slot from a Win32 HANDLE +/* + * INTERNAL: Allocate an fd slot from a Win32 HANDLE */ int alloc_fd(HANDLE hand, char flag) { int ret; LOCK_FILES(); - + // TRACE(":handle (%p) allocating fd (%d)\n",hand,MSVCRT_fdstart); ret = alloc_fd_from(hand, flag, g_fdstart); - + UNLOCK_FILES(); return ret; } @@ -406,11 +406,11 @@ void free_fd(int fd) { LOCK_FILES(); - - + + fdinfo(fd)->hFile = INVALID_HANDLE_VALUE; fdinfo(fd)->fdflags = 0; - + if (fd < 3) /* don't use 0,1,2 for user files */ { switch (fd) @@ -424,12 +424,12 @@ { if (fd == g_fdend - 1) g_fdend--; - + if (fd < g_fdstart) g_fdstart = fd; } - + UNLOCK_FILES(); } @@ -443,10 +443,10 @@ The _open_osfhandle() function in MSVCRT is expected to take the absence of either _O_TEXT or _O_BINARY to mean _O_BINARY. Currently it defaults to _O_TEXT. - + An example of this is MFC's CStdioFile::Open in binary mode - it passes flags of 0 when it wants to write a binary file - under WINE we do text mode conversions! - + The attached patch ensures that _O_BINARY is set if neither is set in the passed-in flags. @@ -485,7 +485,7 @@ long _get_osfhandle(int fd) { TRACE("_get_osfhandle(%i)",fd); - + if (!is_valid_fd(fd)) { return( -1 ); } @@ -501,29 +501,29 @@ { HANDLE hProcess; BOOL result; - + if (handle1 >= FDINFO_ENTRIES || handle1 < 0 || handle2 >= FDINFO_ENTRIES || handle2 < 0) { __set_errno(EBADF); return -1; } // if (_pioinfo[handle1]->fd == -1) { - if (fdinfo(handle1)->hFile == INVALID_HANDLE_VALUE) { + if (fdinfo(handle1)->hFile == INVALID_HANDLE_VALUE) { __set_errno(EBADF); return -1; } if (handle1 == handle2) return handle1; // if (_pioinfo[handle2]->fd != -1) { - if (fdinfo(handle2)->hFile != INVALID_HANDLE_VALUE) { + if (fdinfo(handle2)->hFile != INVALID_HANDLE_VALUE) { _close(handle2); } hProcess = GetCurrentProcess(); - result = DuplicateHandle(hProcess, - fdinfo(handle1)->hFile, - hProcess, - &fdinfo(handle2)->hFile, - 0, - TRUE, + result = DuplicateHandle(hProcess, + fdinfo(handle1)->hFile, + hProcess, + &fdinfo(handle2)->hFile, + 0, + TRUE, DUPLICATE_SAME_ACCESS); if (result) { // _pioinfo[handle2]->fd = handle2; @@ -539,7 +539,7 @@ SetStdHandle(STD_ERROR_HANDLE, fdinfo(handle2)->hFile); break; } - + return handle1; } else { __set_errno(EMFILE); // Is this the correct error no.? @@ -563,7 +563,7 @@ init_bucket(first_bucket); GetStartupInfoA(&si); - + if (si.cbReserved2 != 0 && si.lpReserved2 != NULL) { char* fdflags_ptr; @@ -584,7 +584,7 @@ return FALSE; } } - + if ((*fdflags_ptr & FOPEN) && *handle_ptr != INVALID_HANDLE_VALUE) { fdinfo(i)->fdflags = *fdflags_ptr; @@ -596,13 +596,13 @@ fdinfo(i)->fdflags = 0; fdinfo(i)->hFile = INVALID_HANDLE_VALUE; } -*/ +*/ fdflags_ptr++; handle_ptr++; } for (g_fdstart = 3; g_fdstart < g_fdend; g_fdstart++) if (fdinfo(g_fdstart)->hFile == INVALID_HANDLE_VALUE) break; } - + InitializeCriticalSection(&g_file_cs); @@ -653,7 +653,7 @@ HANDLE* handle_ptr; TRACE("create_io_inherit_block(%x)",si); - + si->cbReserved2 = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * g_fdend; si->lpReserved2 = calloc(si->cbReserved2, 1); if (!si->lpReserved2) @@ -679,7 +679,7 @@ *handle_ptr = INVALID_HANDLE_VALUE; } fdflags_ptr++; handle_ptr++; - } + } return( TRUE ); } @@ -692,16 +692,16 @@ int _setmode(int fd, int newmode) { int prevmode; - + TRACE("_setmode(%d, %d)", fd, newmode); - + if (!is_valid_fd(fd)) { DPRINT1("_setmode: inval fd (%d)\n",fd); //errno = EBADF; return(-1); } - + if (newmode & ~(_O_TEXT|_O_BINARY)) { DPRINT1("_setmode: fd (%d) mode (0x%08x) unknown\n",fd,newmode); @@ -709,7 +709,7 @@ } prevmode = fdinfo(fd)->fdflags & FTEXT ? _O_TEXT : _O_BINARY; - + if ((newmode & _O_TEXT) == _O_TEXT) { fdinfo(fd)->fdflags |= FTEXT; @@ -721,7 +721,7 @@ */ fdinfo(fd)->fdflags &= ~FTEXT; } - + return(prevmode); } _____ Modified: trunk/reactos/lib/crt/io/read.c --- trunk/reactos/lib/crt/io/read.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/read.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -50,7 +50,7 @@ _dosmaperr(error); return -1; } - + /* text mode */ if (_rbyte && istext) { _____ Modified: trunk/reactos/lib/crt/io/utime.c --- trunk/reactos/lib/crt/io/utime.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/utime.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -12,7 +12,7 @@ { int fn; int ret; - + fn = _open(filename, _O_RDWR); if (fn == -1) { __set_errno(EBADF); _____ Modified: trunk/reactos/lib/crt/io/wmktemp.c --- trunk/reactos/lib/crt/io/wmktemp.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/wmktemp.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -1,6 +1,6 @@ /* * COPYRIGHT: See COPYING in the top level directory - * Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details + * Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details * PROJECT: ReactOS system libraries * FILE: lib/msvcrt/io/mktemp.c * PURPOSE: Makes a temp file based on a template _____ Modified: trunk/reactos/lib/crt/io/wopen.c --- trunk/reactos/lib/crt/io/wopen.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/wopen.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -62,7 +62,7 @@ * * _O_BINARY Opens file in binary (untranslated) mode. (See fopen for a description of binary mode.) * _O_TEXT Opens file in text (translated) mode. (For more information, see Text and Binary Mode File I/O and fopen.) - * + * * _O_APPEND Moves file pointer to end of file before every write operation. */ #if 0 _____ Modified: trunk/reactos/lib/crt/io/write.c --- trunk/reactos/lib/crt/io/write.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/write.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -47,7 +47,7 @@ DPRINT("_write(fd %d, buf %x, nbyte %d)\n", _fd, _buf, _nbyte); if (__fileno_getmode(_fd) & O_TEXT) { - result = _nbyte; + result = _nbyte; tmp = (char*) malloc(BUFSIZE); if (tmp == NULL) { __set_errno(ENOMEM); @@ -80,7 +80,7 @@ if (count == 0 || _nbyte == 0) { if (!WriteFile((HANDLE)_get_osfhandle(_fd), tmp, BUFSIZE - count, &wbyte, NULL)) { _dosmaperr(GetLastError()); - result = -1; + result = -1; break; } if (wbyte < (BUFSIZE - count)) { _____ Modified: trunk/reactos/lib/crt/io/wutime.c --- trunk/reactos/lib/crt/io/wutime.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/io/wutime.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -12,7 +12,7 @@ { int fn; int ret; - + fn = _wopen(filename, _O_RDWR); if (fn == -1) { __set_errno(EBADF); _____ Modified: trunk/reactos/lib/crt/locale/locale.c --- trunk/reactos/lib/crt/locale/locale.c 2005-05-09 01:41:02 UTC (rev 15165) +++ trunk/reactos/lib/crt/locale/locale.c 2005-05-09 01:41:26 UTC (rev 15166) @@ -3,7 +3,7 @@ * * Copyright 2000 Jon Griffiths */ - + #include "precomp.h" #include <stdio.h> #include <locale.h> @@ -65,7 +65,7 @@ | ".code_page" | "" | NULL [truncated at 1000 lines; 2060 more skipped]

1 0

[sedwards] 15165: strip whitespace from end of lines
by sedwards＠svn.reactos.com 09 May '05

09 May '05

strip whitespace from end of lines Modified: trunk/reactos/lib/rtl/acl.c Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/error.c Modified: trunk/reactos/lib/rtl/exception.c Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/i386/exception.c Modified: trunk/reactos/lib/rtl/luid.c Modified: trunk/reactos/lib/rtl/mem.c Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/process.c Modified: trunk/reactos/lib/rtl/random.c Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/security.c Modified: trunk/reactos/lib/rtl/sid.c Modified: trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/rtl/timezone.c Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/acl.c --- trunk/reactos/lib/rtl/acl.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/acl.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -25,7 +25,7 @@ PACE Current; PVOID AclEnd; ULONG i; - + PAGED_CODE_RTL(); Current = (PACE)(Acl + 1); @@ -71,7 +71,7 @@ PACE *Ace) { ULONG i; - + PAGED_CODE_RTL(); *Ace = (PACE)(Acl + 1); @@ -114,7 +114,7 @@ ULONG Type) { PACE Ace; - + PAGED_CODE_RTL(); if (!RtlValidSid(Sid)) @@ -164,7 +164,7 @@ IN PSID Sid) { PAGED_CODE_RTL(); - + return RtlpAddKnownAce (Acl, Revision, 0, @@ -185,7 +185,7 @@ IN PSID Sid) { PAGED_CODE_RTL(); - + return RtlpAddKnownAce (Acl, Revision, Flags, @@ -205,7 +205,7 @@ PSID Sid) { PAGED_CODE_RTL(); - + return RtlpAddKnownAce (Acl, Revision, 0, @@ -226,7 +226,7 @@ IN PSID Sid) { PAGED_CODE_RTL(); - + return RtlpAddKnownAce (Acl, Revision, Flags, @@ -272,7 +272,7 @@ ULONG i; PACE Current; ULONG j; - + PAGED_CODE_RTL(); if (Acl->AclRevision < MIN_ACL_REVISION || @@ -354,7 +354,7 @@ { PACE Ace; ULONG Flags = 0; - + PAGED_CODE_RTL(); if (Success != FALSE) @@ -425,7 +425,7 @@ BOOLEAN Failure) { PACE Ace; - + PAGED_CODE_RTL(); if (Success != FALSE) @@ -513,7 +513,7 @@ { PACE Ace; PACE Current; - + PAGED_CODE_RTL(); if (Acl->AclRevision < MIN_ACL_REVISION || @@ -557,7 +557,7 @@ ULONG AclRevision) { PAGED_CODE_RTL(); - + if (AclSize < 8) { return(STATUS_BUFFER_TOO_SMALL); @@ -595,7 +595,7 @@ ACL_INFORMATION_CLASS InformationClass) { PACE Ace; - + PAGED_CODE_RTL(); if (Acl->AclRevision < MIN_ACL_REVISION || @@ -664,7 +664,7 @@ ACL_INFORMATION_CLASS InformationClass) { PAGED_CODE_RTL(); - + if (Acl->AclRevision < MIN_ACL_REVISION || Acl->AclRevision > MAX_ACL_REVISION) { @@ -707,7 +707,7 @@ { PACE Ace; USHORT Size; - + PAGED_CODE_RTL(); Size = ROUND_UP(Acl->AclSize, 4); _____ Modified: trunk/reactos/lib/rtl/env.c --- trunk/reactos/lib/rtl/env.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/env.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -155,8 +155,8 @@ } else { - /* Process environment variable. */ - + /* Process environment variable. */ + VariableEnd = SourceBuffer + 1; Tail = SourceLength - 1; while (*VariableEnd != L'%' && Tail != 0) @@ -167,7 +167,7 @@ if (Tail != 0) { - Variable.MaximumLength = + Variable.MaximumLength = Variable.Length = (VariableEnd - (SourceBuffer + 1)) * sizeof(WCHAR); Variable.Buffer = SourceBuffer + 1; _____ Modified: trunk/reactos/lib/rtl/error.c --- trunk/reactos/lib/rtl/error.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/error.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -13,7 +13,7 @@ /* * Partially taken from WINE, original copyright: - * + * * Copyright 2000 Alexandre Julliard */ @@ -862,7 +862,7 @@ * RtlNtStatusToDosErrorNoTeb * * DESCRIPTION - * Convert an Executive status ID into a DOS error number + * Convert an Executive status ID into a DOS error number * (winerror.h). * * ARGUMENTS @@ -924,7 +924,7 @@ * RtlNtStatusToDosError * * DESCRIPTION - * Convert an Executive status ID into a DOS error number + * Convert an Executive status ID into a DOS error number * (winerror.h). * * ARGUMENTS @@ -958,17 +958,17 @@ * DESCRIPTION * Convert an Executive status ID into a POSIX error number * (errno.h). - * + * * NOTE * Not present in the legacy WNT (a ReactOS extension to support * the POSIX+ subsystem). - * + * * ARGUMENTS * Status The Executive status ID to convert. * * RETURN VALUE * errno as in errno.h - * + * * REVISIONS * 1999-11-30 ea */ _____ Modified: trunk/reactos/lib/rtl/exception.c --- trunk/reactos/lib/rtl/exception.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/exception.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -32,8 +32,8 @@ NTSTATUS STDCALL RtlDispatchException( - PEXCEPTION_RECORD pExcptRec, - CONTEXT * pContext + PEXCEPTION_RECORD pExcptRec, + CONTEXT * pContext ) { UNIMPLEMENTED; @@ -69,7 +69,7 @@ Status = ZwRaiseException(ExceptionRecord, &Context, TRUE); RtlRaiseException(ExceptionRecord); - RtlRaiseStatus(Status); + RtlRaiseStatus(Status); } _____ Modified: trunk/reactos/lib/rtl/heap.c --- trunk/reactos/lib/rtl/heap.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/heap.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -352,7 +352,7 @@ subheap->heap ); return FALSE; } - + subheap->commitSize -= decommitsize; return TRUE; } @@ -1077,12 +1077,12 @@ /* link it into the per-process heap list */ RtlEnterCriticalSection (&RtlpProcessHeapsListLock); - + heapPtr = subheap->heap; heapPtr->next = (HEAP*)NtCurrentPeb()->ProcessHeaps; NtCurrentPeb()->ProcessHeaps = (HANDLE)heapPtr; NtCurrentPeb()->NumberOfHeaps++; - + RtlLeaveCriticalSection (&RtlpProcessHeapsListLock); return (HANDLE)subheap; @@ -1095,7 +1095,7 @@ * FALSE: Failure * * @implemented - * + * * RETURNS * Success: A NULL HANDLE, if heap is NULL or it was destroyed * Failure: The Heap handle, if heap is the process heap. @@ -1112,17 +1112,17 @@ if (!heapPtr) return heap; - if (heap == NtCurrentPeb()->ProcessHeap) + if (heap == NtCurrentPeb()->ProcessHeap) return heap; /* cannot delete the main process heap */ - + /* remove it from the per-process list */ RtlEnterCriticalSection (&RtlpProcessHeapsListLock); - + pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; while (*pptr && *pptr != heapPtr) pptr = &(*pptr)->next; if (*pptr) *pptr = (*pptr)->next; NtCurrentPeb()->NumberOfHeaps--; - + RtlLeaveCriticalSection (&RtlpProcessHeapsListLock); RtlDeleteCriticalSection( &heapPtr->critSection ); @@ -1715,7 +1715,7 @@ { NTSTATUS Status = STATUS_SUCCESS; HEAP** pptr; - + RtlEnterCriticalSection(&RtlpProcessHeapsListLock); for (pptr = (HEAP**)&NtCurrentPeb()->ProcessHeaps; *pptr; pptr = &(*pptr)->next) @@ -1744,7 +1744,7 @@ RtlEnterCriticalSection(&RtlpProcessHeapsListLock); Result = NtCurrentPeb()->NumberOfHeaps; - + if (NtCurrentPeb()->NumberOfHeaps <= HeapCount) { int i = 0; _____ Modified: trunk/reactos/lib/rtl/i386/exception.c --- trunk/reactos/lib/rtl/i386/exception.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/i386/exception.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -98,7 +98,7 @@ #endif /* NDEBUG */ RegistrationFrame = SehpGetExceptionList(); - + DPRINT("RegistrationFrame is 0x%X\n", RegistrationFrame); while ((ULONG_PTR)RegistrationFrame != -1) @@ -125,7 +125,7 @@ ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID; return ExceptionContinueExecution; } - + // Make sure stack is DWORD aligned if ((ULONG_PTR)RegistrationFrame & 3) { @@ -223,14 +223,14 @@ RegistrationFrame = RegistrationFrame->prev; // Go to previous frame } - + /* No exception handler will handle this exception */ DPRINT("RtlpDispatchException(): Return ExceptionContinueExecution\n"); ExceptionRecord->ExceptionFlags = EXCEPTION_NONCONTINUABLE; - return ExceptionContinueExecution; + return ExceptionContinueExecution; } @@ -245,7 +245,7 @@ { PEXCEPTION_REGISTRATION ERHead; PEXCEPTION_RECORD pExceptRec; - EXCEPTION_RECORD TempER; + EXCEPTION_RECORD TempER; CONTEXT Context; DPRINT("RtlUnwind(). RegistrationFrame 0x%X\n", RegistrationFrame); @@ -255,7 +255,7 @@ #endif /* NDEBUG */ ERHead = SehpGetExceptionList(); - + DPRINT("ERHead is 0x%X\n", ERHead); if (ExceptionRecord == NULL) // The normal case @@ -302,12 +302,12 @@ Context.Esp += 0x10; Context.Eax = EaxValue; - + // Begin traversing the list of EXCEPTION_REGISTRATION while ((ULONG_PTR)ERHead != -1 && ERHead != RegistrationFrame) { EXCEPTION_RECORD er2; - + DPRINT("ERHead 0x%X\n", ERHead); // If there's an exception frame, but it's lower on the stack @@ -320,11 +320,11 @@ er2.ExceptionRecord = pExceptRec; er2.NumberParameters = 0; er2.ExceptionCode = STATUS_INVALID_UNWIND_TARGET; - er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - + er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; + RtlRaiseException(&er2); } - + #if 0 Stack = ERHead + sizeof(EXCEPTION_REGISTRATION); if ( (Teb->Tib.StackBase <= (PVOID)ERHead ) // Make sure that ERHead @@ -337,7 +337,7 @@ PEXCEPTION_REGISTRATION NewERHead; PEXCEPTION_REGISTRATION pCurrExceptReg; EXCEPTION_DISPOSITION ReturnValue; - + DPRINT("Executing handler at 0x%X for unwind\n", ERHead->handler); ReturnValue = RtlpExecuteHandlerForUnwind( @@ -346,7 +346,7 @@ &Context, &NewERHead, ERHead->handler); - + DPRINT("Handler at 0x%X returned 0x%X\n", ERHead->handler, ReturnValue); if (ReturnValue != ExceptionContinueSearch) @@ -358,8 +358,8 @@ er2.ExceptionRecord = pExceptRec; er2.NumberParameters = 0; er2.ExceptionCode = STATUS_INVALID_DISPOSITION; - er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - + er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; + RtlRaiseException(&er2); } else @@ -367,7 +367,7 @@ ERHead = NewERHead; } } - + pCurrExceptReg = ERHead; ERHead = ERHead->prev; @@ -386,8 +386,8 @@ er2.ExceptionRecord = pExceptRec; er2.NumberParameters = 0; er2.ExceptionCode = STATUS_BAD_STACK; - er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - + er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; + RtlRaiseException(&er2); } } _____ Modified: trunk/reactos/lib/rtl/luid.c --- trunk/reactos/lib/rtl/luid.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/luid.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -23,7 +23,7 @@ PLUID LuidSrc) { PAGED_CODE_RTL(); - + LuidDest->LowPart = LuidSrc->LowPart; LuidDest->HighPart = LuidSrc->HighPart; } @@ -38,7 +38,7 @@ PLUID_AND_ATTRIBUTES Dest) { ULONG i; - + PAGED_CODE_RTL(); for (i = 0; i < Count; i++) @@ -58,7 +58,7 @@ PLUID Luid2) { PAGED_CODE_RTL(); - + return (Luid1->LowPart == Luid2->LowPart && Luid1->HighPart == Luid2->HighPart); } _____ Modified: trunk/reactos/lib/rtl/mem.c --- trunk/reactos/lib/rtl/mem.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/mem.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -1,6 +1,6 @@ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/rtl/mem.c _____ Modified: trunk/reactos/lib/rtl/network.c --- trunk/reactos/lib/rtl/network.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/network.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -158,8 +158,8 @@ NTSTATUS STDCALL RtlIpv4StringToAddressW( - IN LPWSTR IpString, - IN ULONG Base, + IN LPWSTR IpString, + IN ULONG Base, OUT PVOID PtrToIpAddr, OUT ULONG IpAddr ) _____ Modified: trunk/reactos/lib/rtl/process.c --- trunk/reactos/lib/rtl/process.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/process.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -30,13 +30,13 @@ OBJECT_ATTRIBUTES ObjectAttributes; PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; NTSTATUS Status; - + hFile = NULL; RtlDeNormalizeProcessParams (Ppb); // DbgPrint("ImagePathName %x\n", Ppb->ImagePathName.Buffer); - + InitializeObjectAttributes(&ObjectAttributes, ImageFileName, Attributes & (OBJ_CASE_INSENSITIVE | OBJ_INHERIT), @@ -44,7 +44,7 @@ SecurityDescriptor); RtlNormalizeProcessParams (Ppb); - + /* * Try to open the executable */ @@ -195,7 +195,7 @@ * - The first thread is created suspended, so it needs a manual resume!!! * - If ParentProcess is NULL, current process is used * - ProcessParameters must be normalized - * - Attributes are object attribute flags used when opening the ImageFileName. + * - Attributes are object attribute flags used when opening the ImageFileName. * Valid flags are OBJ_INHERIT and OBJ_CASE_INSENSITIVE. * * -Gunnar @@ -221,9 +221,9 @@ SECTION_IMAGE_INFORMATION Sii; ULONG ResultLength; PVOID ImageBaseAddress; - + DPRINT("RtlCreateUserProcess\n"); - + Status = RtlpMapFile(ImageFileName, ProcessParameters, Attributes, @@ -250,7 +250,7 @@ ZwClose(hSection); return(Status); } - + /* * Get some information about the process */ @@ -298,7 +298,7 @@ ); ZwClose(hSection); - + if (!NT_SUCCESS(Status)) { DPRINT("Failed to create thread\n"); _____ Modified: trunk/reactos/lib/rtl/random.c --- trunk/reactos/lib/rtl/random.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/random.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -88,7 +88,7 @@ ULONG Rand; int Pos; ULONG Result; - + PAGED_CODE_RTL(); Rand = (*Seed * 0x7fffffed + 0x7fffffc3) % 0x7fffffff; _____ Modified: trunk/reactos/lib/rtl/registry.c --- trunk/reactos/lib/rtl/registry.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/registry.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -55,7 +55,7 @@ DPRINT("ZwDuplicateObject() failed! Status: 0x%x\n", Status); } #endif - + return(Status); } @@ -163,7 +163,7 @@ { HANDLE KeyHandle; NTSTATUS Status; - + PAGED_CODE_RTL(); Status = RtlpGetRegistryHandle(RelativeTo, @@ -188,7 +188,7 @@ { HANDLE KeyHandle; NTSTATUS Status; - + PAGED_CODE_RTL(); Status = RtlpGetRegistryHandle(RelativeTo, @@ -215,7 +215,7 @@ HANDLE KeyHandle; NTSTATUS Status; UNICODE_STRING Name; - + PAGED_CODE_RTL(); Status = RtlpGetRegistryHandle(RelativeTo, @@ -249,7 +249,7 @@ ULONG Length; UNICODE_STRING SidString; NTSTATUS Status; - + PAGED_CODE_RTL(); DPRINT ("RtlFormatCurrentUserKeyPath() called\n"); @@ -334,7 +334,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyPath; NTSTATUS Status; - + PAGED_CODE_RTL(); Status = RtlFormatCurrentUserKeyPath(&KeyPath); @@ -398,7 +398,7 @@ PWSTR ValueName; UNICODE_STRING EnvValue; UNICODE_STRING EnvExpandedValue; - + PAGED_CODE_RTL(); DPRINT("RtlQueryRegistryValues() called\n"); @@ -471,7 +471,7 @@ Status = STATUS_OBJECT_NAME_NOT_FOUND; break; } - + if (QueryEntry->DefaultType == REG_SZ) { PUNICODE_STRING ValueString; @@ -888,7 +888,7 @@ HANDLE KeyHandle; NTSTATUS Status; UNICODE_STRING Name; - + PAGED_CODE_RTL(); Status = RtlpGetRegistryHandle(RelativeTo, _____ Modified: trunk/reactos/lib/rtl/sd.c --- trunk/reactos/lib/rtl/sd.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/sd.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -90,17 +90,17 @@ { *OwnerLength = ((*Owner != NULL) ? ROUND_UP(RtlLengthSid(*Owner), 4) : 0); } - + if (Group != NULL) { *GroupLength = ((*Group != NULL) ? ROUND_UP(RtlLengthSid(*Group), 4) : 0); } - + if (Dacl != NULL) { *DaclLength = ((*Dacl != NULL) ? ROUND_UP((*Dacl)->AclSize, 4) : 0); } - + if (Sacl != NULL) { *SaclLength = ((*Sacl != NULL) ? ROUND_UP((*Sacl)->AclSize, 4) : 0); @@ -138,7 +138,7 @@ ULONG Revision) { PAGED_CODE_RTL(); - + if (Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -165,9 +165,9 @@ PSID Owner, Group; PACL Sacl, Dacl; ULONG Length = sizeof(SECURITY_DESCRIPTOR); - + PAGED_CODE_RTL(); - + RtlpQuerySecurityDescriptorPointers(SecurityDescriptor, &Owner, &Group, @@ -208,7 +208,7 @@ PBOOLEAN DaclDefaulted) { PAGED_CODE_RTL(); - + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -243,7 +243,7 @@ BOOLEAN DaclDefaulted) { PAGED_CODE_RTL(); - + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -281,14 +281,14 @@ { PSID Owner, Group; PACL Sacl, Dacl; - + PAGED_CODE_RTL(); if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return FALSE; } - + RtlpQuerySecurityDescriptorPointers(SecurityDescriptor, &Owner, &Group, @@ -316,7 +316,7 @@ BOOLEAN OwnerDefaulted) { PAGED_CODE_RTL(); - + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -348,7 +348,7 @@ PBOOLEAN OwnerDefaulted) { PAGED_CODE_RTL(); - + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -375,7 +375,7 @@ BOOLEAN GroupDefaulted) { PAGED_CODE_RTL(); - + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -406,7 +406,7 @@ PBOOLEAN GroupDefaulted) { PAGED_CODE_RTL(); - + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -442,7 +442,7 @@ ULONG DaclLength; ULONG TotalLength; ULONG_PTR Current; - + PAGED_CODE_RTL(); RtlpQuerySecurityDescriptor(AbsSD, @@ -467,7 +467,7 @@ RelSD->Revision = AbsSD->Revision; RelSD->Sbz1 = AbsSD->Sbz1; RelSD->Control = AbsSD->Control | SE_SELF_RELATIVE; - + Current = (ULONG_PTR)(RelSD + 1); if (SaclLength != 0) @@ -518,7 +518,7 @@ PULONG BufferLength) { PAGED_CODE_RTL(); - + if (AbsSD->Control & SE_SELF_RELATIVE) { return STATUS_BAD_DESCRIPTOR_FORMAT; @@ -537,7 +537,7 @@ PULONG Revision) { PAGED_CODE_RTL(); - + *Revision = SecurityDescriptor->Revision; if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) @@ -560,7 +560,7 @@ IN SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet) { PAGED_CODE_RTL(); - + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -586,7 +586,7 @@ PBOOLEAN SaclDefaulted) { PAGED_CODE_RTL(); - + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -621,7 +621,7 @@ BOOLEAN SaclDefaulted) { PAGED_CODE_RTL(); - + if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) { return STATUS_UNKNOWN_REVISION; @@ -675,7 +675,7 @@ PSID pGroup; PACL pDacl; PACL pSacl; - + PAGED_CODE_RTL(); if (RelSD->Revision != SECURITY_DESCRIPTOR_REVISION1) @@ -749,7 +749,7 @@ IN SECURITY_INFORMATION RequiredInformation) { PAGED_CODE_RTL(); - + if (SecurityDescriptorLength < sizeof(SECURITY_DESCRIPTOR_RELATIVE) || SecurityDescriptorInput->Revision != SECURITY_DESCRIPTOR_REVISION1 || !(SecurityDescriptorInput->Control & SE_SELF_RELATIVE)) @@ -821,7 +821,7 @@ PUCHAR RMControl) { PAGED_CODE_RTL(); - + if (!(SecurityDescriptor->Control & SE_RM_CONTROL_VALID)) { *RMControl = 0; @@ -842,7 +842,7 @@ PUCHAR RMControl) { PAGED_CODE_RTL(); - + if (RMControl == NULL) { SecurityDescriptor->Control &= ~SE_RM_CONTROL_VALID; @@ -865,7 +865,7 @@ OUT PULONG Revision) { PAGED_CODE_RTL(); - + *Revision = SecurityDescriptor->Revision; if (SecurityDescriptor->Revision != SECURITY_DESCRIPTOR_REVISION1) _____ Modified: trunk/reactos/lib/rtl/security.c --- trunk/reactos/lib/rtl/security.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/security.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -30,7 +30,7 @@ SECURITY_QUALITY_OF_SERVICE Sqos; PAGED_CODE_RTL(); - + Status = NtOpenProcessToken(NtCurrentProcess(), TOKEN_DUPLICATE, &ProcessToken); @@ -39,12 +39,12 @@ DPRINT1("NtOpenProcessToken() failed (Status %lx)\n", Status); return(Status); } - + Sqos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); Sqos.ImpersonationLevel = ImpersonationLevel; Sqos.ContextTrackingMode = 0; Sqos.EffectiveOnly = FALSE; - + InitializeObjectAttributes( &ObjAttr, NULL, @@ -52,9 +52,9 @@ NULL, NULL ); - + ObjAttr.SecurityQualityOfService = &Sqos; - + Status = NtDuplicateToken(ProcessToken, TOKEN_IMPERSONATE, &ObjAttr, @@ -98,7 +98,7 @@ ULONG ReturnLength; HANDLE TokenHandle; NTSTATUS Status; - + PAGED_CODE_RTL(); DPRINT ("RtlAdjustPrivilege() called\n"); _____ Modified: trunk/reactos/lib/rtl/sid.c --- trunk/reactos/lib/rtl/sid.c 2005-05-09 01:38:29 UTC (rev 15164) +++ trunk/reactos/lib/rtl/sid.c 2005-05-09 01:41:02 UTC (rev 15165) @@ -22,9 +22,9 @@ RtlValidSid(IN PSID Sid_) { PISID Sid = Sid_; - + PAGED_CODE_RTL(); - + if ((Sid->Revision != SID_REVISION) || (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES)) { @@ -42,7 +42,7 @@ RtlLengthRequiredSid(IN UCHAR SubAuthorityCount) { PAGED_CODE_RTL(); - + return (sizeof(SID) + (SubAuthorityCount - 1) * sizeof(ULONG)); } @@ -56,9 +56,9 @@ IN UCHAR SubAuthorityCount) { PISID Sid = Sid_; - + PAGED_CODE_RTL(); - + Sid->Revision = SID_REVISION; Sid->SubAuthorityCount = SubAuthorityCount; memcpy(&Sid->IdentifierAuthority, @@ -77,9 +77,9 @@ IN ULONG SubAuthority) { PISID Sid = Sid_; - + PAGED_CODE_RTL(); - + return &Sid->SubAuthority[SubAuthority]; } @@ -91,9 +91,9 @@ [truncated at 1000 lines; 246 more skipped]

1 0

[sedwards] 15164: strip whitespace from end of lines
by sedwards＠svn.reactos.com 09 May '05

09 May '05

strip whitespace from end of lines Modified: trunk/reactos/ntoskrnl/cc/cacheman.c Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/cc/mdl.c Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cm/cm.h Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Modified: trunk/reactos/ntoskrnl/dbgk/debug.c Modified: trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c Modified: trunk/reactos/ntoskrnl/ex/error.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/fmutex.c Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/i386/interlck.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/interlck.c Modified: trunk/reactos/ntoskrnl/ex/list.c Modified: trunk/reactos/ntoskrnl/ex/lookas.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/power.c Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/resource.c Modified: trunk/reactos/ntoskrnl/ex/rundown.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/synch.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/ex/util.c Modified: trunk/reactos/ntoskrnl/ex/uuid.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/ntoskrnl/ex/work.c Modified: trunk/reactos/ntoskrnl/ex/zone.c Modified: trunk/reactos/ntoskrnl/fs/fastio.c Modified: trunk/reactos/ntoskrnl/fs/filelock.c Modified: trunk/reactos/ntoskrnl/fs/mcb.c Modified: trunk/reactos/ntoskrnl/fs/name.c Modified: trunk/reactos/ntoskrnl/fs/notify.c Modified: trunk/reactos/ntoskrnl/fs/oplock.c Modified: trunk/reactos/ntoskrnl/fs/pool.c Modified: trunk/reactos/ntoskrnl/fs/tunnel.c Modified: trunk/reactos/ntoskrnl/fs/unc.c Modified: trunk/reactos/ntoskrnl/fs/util.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/include/internal/callbacks.h Modified: trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/include/internal/debug.h Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/hal.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/ifs.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/internal/kbd.h Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Modified: trunk/reactos/ntoskrnl/include/internal/kdb.h Modified: trunk/reactos/ntoskrnl/include/internal/kdbochs.h Modified: trunk/reactos/ntoskrnl/include/internal/kdgdb.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/include/internal/pool.h Modified: trunk/reactos/ntoskrnl/include/internal/port.h Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/se.h Modified: trunk/reactos/ntoskrnl/include/internal/trap.h Modified: trunk/reactos/ntoskrnl/include/internal/v86m.h Modified: trunk/reactos/ntoskrnl/io/adapter.c Modified: trunk/reactos/ntoskrnl/io/arcname.c Modified: trunk/reactos/ntoskrnl/io/bootlog.c Modified: trunk/reactos/ntoskrnl/io/controller.c Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/deviface.c Modified: trunk/reactos/ntoskrnl/io/disk.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/efi.c Modified: trunk/reactos/ntoskrnl/io/error.c Modified: trunk/reactos/ntoskrnl/io/event.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/fs.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/iowork.c Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/io/irq.c Modified: trunk/reactos/ntoskrnl/io/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpdma.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpnotify.c [truncated at 100 lines; 160 more skipped] _____ Modified: trunk/reactos/ntoskrnl/cc/cacheman.c --- trunk/reactos/ntoskrnl/cc/cacheman.c 2005-05-09 01:14:42 UTC (rev 15163) +++ trunk/reactos/ntoskrnl/cc/cacheman.c 2005-05-09 01:38:29 UTC (rev 15164) @@ -1,5 +1,5 @@ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/cacheman.c @@ -31,7 +31,7 @@ IN BOOLEAN BcbListHeld ) { - LARGE_INTEGER i; + LARGE_INTEGER i; UNIMPLEMENTED; _____ Modified: trunk/reactos/ntoskrnl/cc/copy.c --- trunk/reactos/ntoskrnl/cc/copy.c 2005-05-09 01:14:42 UTC (rev 15163) +++ trunk/reactos/ntoskrnl/cc/copy.c 2005-05-09 01:38:29 UTC (rev 15164) @@ -40,7 +40,7 @@ /* FUNCTIONS *****************************************************************/ -VOID +VOID CcInitCacheZeroPage(VOID) { NTSTATUS Status; @@ -100,7 +100,7 @@ Buffer = pTemp; } #endif - Length = Length - TempLength; + Length = Length - TempLength; previous = current; current = current->NextInChain; CcRosReleaseCacheSegment(Bcb, previous, TRUE, FALSE, FALSE); @@ -126,7 +126,7 @@ current2 = current2->NextInChain; current_size += Bcb->CacheSegmentSize; } - + /* * Create an MDL which contains all their pages. */ @@ -191,7 +191,7 @@ Buffer = pTemp; } #endif - Length = Length - TempLength; + Length = Length - TempLength; CcRosReleaseCacheSegment(Bcb, previous, TRUE, FALSE, FALSE); current_size += Bcb->CacheSegmentSize; } @@ -200,7 +200,7 @@ return(STATUS_SUCCESS); } -NTSTATUS +NTSTATUS ReadCacheSegment(PCACHE_SEGMENT CacheSeg) { ULONG Size; @@ -221,7 +221,7 @@ MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageRead(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, & Event, &IoStatus); + Status = IoPageRead(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, & Event, &IoStatus); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -235,13 +235,13 @@ } if (CacheSeg->Bcb->CacheSegmentSize > Size) { - memset ((char*)CacheSeg->BaseAddress + Size, 0, + memset ((char*)CacheSeg->BaseAddress + Size, 0, CacheSeg->Bcb->CacheSegmentSize - Size); } return STATUS_SUCCESS; } -NTSTATUS +NTSTATUS WriteCacheSegment(PCACHE_SEGMENT CacheSeg) { ULONG Size; @@ -316,7 +316,7 @@ KIRQL oldirql; PLIST_ENTRY current_entry; PCACHE_SEGMENT current; - + DPRINT("CcCopyRead(FileObject %x, FileOffset %x, " "Length %d, Wait %d, Buffer %x, IoStatus %x)\n", FileObject, (ULONG)FileOffset->QuadPart, Length, Wait, @@ -324,7 +324,7 @@ Bcb = FileObject->SectionObjectPointer->SharedCacheMap; ReadOffset = (ULONG)FileOffset->QuadPart; - + DPRINT("AllocationSize %d, FileSize %d\n", (ULONG)Bcb->AllocationSize.QuadPart, (ULONG)Bcb->FileSize.QuadPart); @@ -339,7 +339,7 @@ current_entry = Bcb->BcbSegmentListHead.Flink; while (current_entry != &Bcb->BcbSegmentListHead) { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); if (!current->Valid && current->FileOffset < ReadOffset + Length && current->FileOffset + Bcb->CacheSegmentSize > ReadOffset) @@ -359,7 +359,7 @@ { TempLength = min (Length, Bcb->CacheSegmentSize - TempLength); Status = CcRosRequestCacheSegment(Bcb, - ROUND_DOWN(ReadOffset, + ROUND_DOWN(ReadOffset, Bcb->CacheSegmentSize), &BaseAddress, &Valid, &CacheSeg); if (!NT_SUCCESS(Status)) @@ -380,14 +380,14 @@ return FALSE; } } - memcpy (Buffer, (char*)BaseAddress + ReadOffset % Bcb->CacheSegmentSize, + memcpy (Buffer, (char*)BaseAddress + ReadOffset % Bcb->CacheSegmentSize, TempLength); CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); ReadLength += TempLength; Length -= TempLength; ReadOffset += TempLength; Buffer = (PVOID)((char*)Buffer + TempLength); - } + } while (Length > 0) { TempLength = min(max(Bcb->CacheSegmentSize, MAX_RW_LENGTH), Length); @@ -445,14 +445,14 @@ current_entry = Bcb->BcbSegmentListHead.Flink; while (current_entry != &Bcb->BcbSegmentListHead) { - CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, + CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); if (!CacheSeg->Valid) { - if ((WriteOffset >= CacheSeg->FileOffset && + if ((WriteOffset >= CacheSeg->FileOffset && WriteOffset < CacheSeg->FileOffset + Bcb->CacheSegmentSize) - || (WriteOffset + Length > CacheSeg->FileOffset && - WriteOffset + Length <= CacheSeg->FileOffset + + || (WriteOffset + Length > CacheSeg->FileOffset && + WriteOffset + Length <= CacheSeg->FileOffset + Bcb->CacheSegmentSize)) { KeReleaseSpinLock(&Bcb->BcbLock, oldirql); @@ -484,10 +484,10 @@ return(FALSE); } } - memcpy ((char*)BaseAddress + WriteOffset % Bcb->CacheSegmentSize, + memcpy ((char*)BaseAddress + WriteOffset % Bcb->CacheSegmentSize, Buffer, TempLength); CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, TRUE, FALSE); - + Length -= TempLength; WriteOffset += TempLength; #if defined(__GNUC__) @@ -500,7 +500,7 @@ } #endif } - + while (Length > 0) { TempLength = min (Bcb->CacheSegmentSize, Length); @@ -612,11 +612,11 @@ ULONG i; IO_STATUS_BLOCK Iosb; KEVENT Event; - + DPRINT("CcZeroData(FileObject %x, StartOffset %I64x, EndOffset %I64x, " - "Wait %d)\n", FileObject, StartOffset->QuadPart, EndOffset->QuadPart, + "Wait %d)\n", FileObject, StartOffset->QuadPart, EndOffset->QuadPart, Wait); - + Length = EndOffset->u.LowPart - StartOffset->u.LowPart; WriteOffset.QuadPart = StartOffset->QuadPart; @@ -625,7 +625,7 @@ /* File is not cached */ Mdl = alloca(MmSizeOfMdl(NULL, MAX_ZERO_LENGTH)); - + while (Length > 0) { if (Length + WriteOffset.u.LowPart % PAGE_SIZE > MAX_ZERO_LENGTH) @@ -649,7 +649,7 @@ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = Iosb.Status; } - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); if (!NT_SUCCESS(Status)) { return(FALSE); @@ -675,14 +675,14 @@ current_entry = Bcb->BcbSegmentListHead.Flink; while (current_entry != &Bcb->BcbSegmentListHead) { - CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, + CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); if (!CacheSeg->Valid) { - if ((WriteOffset.u.LowPart >= CacheSeg->FileOffset && + if ((WriteOffset.u.LowPart >= CacheSeg->FileOffset && WriteOffset.u.LowPart < CacheSeg->FileOffset + Bcb->CacheSegmentSize) - || (WriteOffset.u.LowPart + Length > CacheSeg->FileOffset && - WriteOffset.u.LowPart + Length <= + || (WriteOffset.u.LowPart + Length > CacheSeg->FileOffset && + WriteOffset.u.LowPart + Length <= CacheSeg->FileOffset + Bcb->CacheSegmentSize)) { KeReleaseSpinLock(&Bcb->BcbLock, oldirql); @@ -726,7 +726,7 @@ Status = ReadCacheSegment(current); if (!NT_SUCCESS(Status)) { - DPRINT1("ReadCacheSegment failed, status %x\n", + DPRINT1("ReadCacheSegment failed, status %x\n", Status); } } @@ -743,7 +743,7 @@ Length -= TempLength; current = current->NextInChain; - } + } current = CacheSeg; while (current != NULL) _____ Modified: trunk/reactos/ntoskrnl/cc/fs.c --- trunk/reactos/ntoskrnl/cc/fs.c 2005-05-09 01:14:42 UTC (rev 15163) +++ trunk/reactos/ntoskrnl/cc/fs.c 2005-05-09 01:38:29 UTC (rev 15164) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -17,7 +17,7 @@ #ifndef VACB_MAPPING_GRANULARITY #define VACB_MAPPING_GRANULARITY (256 * 1024) #endif - + /* GLOBALS *****************************************************************/ extern FAST_MUTEX ViewLock; @@ -41,7 +41,7 @@ { UNIMPLEMENTED; - LARGE_INTEGER i; + LARGE_INTEGER i; i.QuadPart = 0; return i; } @@ -71,7 +71,7 @@ { UNIMPLEMENTED; - LARGE_INTEGER i; + LARGE_INTEGER i; i.QuadPart = 0; return i; } @@ -136,7 +136,7 @@ LIST_ENTRY FreeListHead; NTSTATUS Status; - DPRINT("CcSetFileSizes(FileObject %x, FileSizes %x)\n", + DPRINT("CcSetFileSizes(FileObject %x, FileSizes %x)\n", FileObject, FileSizes); DPRINT("AllocationSize %d, FileSize %d, ValidDataLength %d\n", (ULONG)FileSizes->AllocationSize.QuadPart, @@ -151,7 +151,7 @@ */ if (Bcb == NULL) return; - + if (FileSizes->AllocationSize.QuadPart < Bcb->AllocationSize.QuadPart) { InitializeListHead(&FreeListHead); @@ -184,7 +184,7 @@ } } } - + Bcb->AllocationSize = FileSizes->AllocationSize; Bcb->FileSize = FileSizes->FileSize; KeReleaseSpinLock(&Bcb->BcbLock, oldirql); _____ Modified: trunk/reactos/ntoskrnl/cc/mdl.c --- trunk/reactos/ntoskrnl/cc/mdl.c 2005-05-09 01:14:42 UTC (rev 15163) +++ trunk/reactos/ntoskrnl/cc/mdl.c 2005-05-09 01:38:29 UTC (rev 15164) @@ -1,5 +1,5 @@ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cc/fs.c @@ -49,13 +49,13 @@ * Used by CcMdlReadComplete@8 and FsRtl * */ -VOID +VOID STDCALL CcMdlReadCompleteDev(IN PMDL MdlChain, IN PFILE_OBJECT FileObject) { PMDL Mdl; - + /* Free MDLs */ while ((Mdl = MdlChain)) { @@ -88,11 +88,11 @@ { PDEVICE_OBJECT DeviceObject = NULL; PFAST_IO_DISPATCH FastDispatch; - + /* Get Fast Dispatch Data */ DeviceObject = IoGetRelatedDeviceObject(FileObject); FastDispatch = DeviceObject->DriverObject->FastIoDispatch; - + /* Check if we support Fast Calls, and check this one */ if (FastDispatch && FastDispatch->MdlReadComplete) { @@ -101,7 +101,7 @@ MdlChain, DeviceObject); } - + /* Use slow path */ CcMdlReadCompleteDev(MdlChain, FileObject); } @@ -117,11 +117,11 @@ { PDEVICE_OBJECT DeviceObject = NULL; PFAST_IO_DISPATCH FastDispatch; - + /* Get Fast Dispatch Data */ DeviceObject = IoGetRelatedDeviceObject(FileObject); FastDispatch = DeviceObject->DriverObject->FastIoDispatch; - + /* Check if we support Fast Calls, and check this one */ if (FastDispatch && FastDispatch->MdlWriteComplete) { @@ -131,7 +131,7 @@ MdlChain, DeviceObject); } - + /* Use slow path */ CcMdlWriteCompleteDev(FileOffset, MdlChain, FileObject); } _____ Modified: trunk/reactos/ntoskrnl/cc/pin.c --- trunk/reactos/ntoskrnl/cc/pin.c 2005-05-09 01:14:42 UTC (rev 15163) +++ trunk/reactos/ntoskrnl/cc/pin.c 2005-05-09 01:38:29 UTC (rev 15164) @@ -40,11 +40,11 @@ NTSTATUS Status; PINTERNAL_BCB iBcb; ULONG ROffset; - + DPRINT("CcMapData(FileObject %x, FileOffset %d, Length %d, Wait %d," " pBcb %x, pBuffer %x)\n", FileObject, (ULONG)FileOffset->QuadPart, Length, Wait, pBcb, pBuffer); - + ReadOffset = (ULONG)FileOffset->QuadPart; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(Bcb); @@ -52,7 +52,7 @@ DPRINT("AllocationSize %d, FileSize %d\n", (ULONG)Bcb->AllocationSize.QuadPart, (ULONG)Bcb->FileSize.QuadPart); - + if (ReadOffset % Bcb->CacheSegmentSize + Length > Bcb->CacheSegmentSize) { return(FALSE); @@ -193,7 +193,7 @@ CcUnpinData (IN PVOID Bcb) { PINTERNAL_BCB iBcb = Bcb; - CcRosReleaseCacheSegment(iBcb->CacheSegment->Bcb, iBcb->CacheSegment, TRUE, + CcRosReleaseCacheSegment(iBcb->CacheSegment->Bcb, iBcb->CacheSegment, TRUE, iBcb->Dirty, FALSE); if (--iBcb->RefCount == 0) { _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-05-09 01:14:42 UTC (rev 15163) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-05-09 01:38:29 UTC (rev 15164) @@ -10,24 +10,24 @@ /* NOTES ********************************************************************** * - * This is not the NT implementation of a file cache nor anything much like - * it. + * This is not the NT implementation of a file cache nor anything much like + * it. * - * The general procedure for a filesystem to implement a read or write + * The general procedure for a filesystem to implement a read or write * dispatch routine is as follows - * + * * (1) If caching for the FCB hasn't been initiated then so do by calling * CcInitializeFileCache. - * + * * (2) For each 4k region which is being read or written obtain a cache page - * by calling CcRequestCachePage. + * by calling CcRequestCachePage. * - * (3) If either the page is being read or not completely written, and it is + * (3) If either the page is being read or not completely written, and it is * not up to date then read its data from the underlying medium. If the read - * fails then call CcReleaseCachePage with VALID as FALSE and return a error. - * + * fails then call CcReleaseCachePage with VALID as FALSE and return a error. + * * (4) Copy the data into or out of the page as necessary. - * + * * (5) Release the cache page */ /* INCLUDES ******************************************************************/ @@ -39,9 +39,9 @@ /* GLOBALS *******************************************************************/ /* - * If CACHE_BITMAP is defined, the cache manager uses one large memory region - * within the kernel address space and allocate/deallocate space from this block - * over a bitmap. If CACHE_BITMAP is used, the size of the mdl mapping region + * If CACHE_BITMAP is defined, the cache manager uses one large memory region + * within the kernel address space and allocate/deallocate space from this block + * over a bitmap. If CACHE_BITMAP is used, the size of the mdl mapping region * must be reduced (ntoskrnl\mm\mdl.c, MI_MDLMAPPING_REGION_SIZE). */ //#define CACHE_BITMAP @@ -148,7 +148,7 @@ } NewTarget = WriteCount[0]; - + Target = max(NewTarget, Target); current_entry = DirtySegmentListHead.Flink; @@ -158,7 +158,7 @@ } while (current_entry != &DirtySegmentListHead && Target > 0) { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, DirtySegmentListEntry); current_entry = current_entry->Flink; Locked = ExTryToAcquireFastMutex(&current->Lock); @@ -174,7 +174,7 @@ } ExReleaseFastMutex(&ViewLock); PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE; - Status = CcRosFlushCacheSegment(current); + Status = CcRosFlushCacheSegment(current); ExReleaseFastMutex(&current->Lock); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { @@ -205,7 +205,7 @@ * ARGUMENTS: * Target - The number of pages to be freed. * Priority - The priority of free (currently unused). - * NrFreed - Points to a variable where the number of pages + * NrFreed - Points to a variable where the number of pages * actually freed is returned. */ { @@ -219,17 +219,17 @@ DPRINT("CcRosTrimCache(Target %d)\n", Target); *NrFreed = 0; - + InitializeListHead(&FreeList); - + ExAcquireFastMutex(&ViewLock); current_entry = CacheSegmentLRUListHead.Flink; while (current_entry != &CacheSegmentLRUListHead && Target > 0) { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, CacheSegmentLRUListEntry); current_entry = current_entry->Flink; - + KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); if (current->ReferenceCount == 0) { @@ -249,7 +249,7 @@ { ULONG i; NTSTATUS Status; - + current->ReferenceCount++; last = current; current->PageOut = TRUE; @@ -281,7 +281,7 @@ while (!IsListEmpty(&FreeList)) { current_entry = RemoveHeadList(&FreeList); - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); CcRosInternalFreeCacheSegment(current); } @@ -290,7 +290,7 @@ return(STATUS_SUCCESS); } -NTSTATUS +NTSTATUS CcRosReleaseCacheSegment(PBCB Bcb, PCACHE_SEGMENT CacheSeg, BOOLEAN Valid, @@ -334,11 +334,11 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); ExReleaseFastMutex(&ViewLock); ExReleaseFastMutex(&CacheSeg->Lock); - + return(STATUS_SUCCESS); } -PCACHE_SEGMENT +PCACHE_SEGMENT CcRosLookupCacheSegment(PBCB Bcb, ULONG FileOffset) { PLIST_ENTRY current_entry; @@ -353,7 +353,7 @@ current_entry = Bcb->BcbSegmentListHead.Flink; while (current_entry != &Bcb->BcbSegmentListHead) { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); if (current->FileOffset <= FileOffset && (current->FileOffset + Bcb->CacheSegmentSize) > FileOffset) @@ -499,14 +499,14 @@ /* There is window between the call to CcRosLookupCacheSegment * and CcRosCreateCacheSegment. We must check if a segment on * the fileoffset exist. If there exist a segment, we release - * our new created segment and return the existing one. + * our new created segment and return the existing one. */ KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); current_entry = Bcb->BcbSegmentListHead.Flink; previous = NULL; while (current_entry != &Bcb->BcbSegmentListHead) { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, + current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); if (current->FileOffset <= FileOffset && (current->FileOffset + Bcb->CacheSegmentSize) > FileOffset) @@ -554,7 +554,7 @@ KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql); StartingOffset = RtlFindClearBitsAndSet(&CiCacheSegMappingRegionAllocMap, Bcb->CacheSegmentSize / PAGE_SIZE, CiCacheSegMappingRegionHint); - + if (StartingOffset == 0xffffffff) { DPRINT1("Out of CacheSeg mapping space\n"); @@ -565,7 +565,7 @@ if (CiCacheSegMappingRegionHint == StartingOffset) { - CiCacheSegMappingRegionHint += Bcb->CacheSegmentSize / PAGE_SIZE; + CiCacheSegMappingRegionHint += Bcb->CacheSegmentSize / PAGE_SIZE; } KeReleaseSpinLock(&CiCacheSegMappingRegionLock, oldIrql); @@ -627,10 +627,10 @@ Length = ROUND_UP(Length, Bcb->CacheSegmentSize); #if defined(__GNUC__) - CacheSegList = alloca(sizeof(PCACHE_SEGMENT) * + CacheSegList = alloca(sizeof(PCACHE_SEGMENT) * (Length / Bcb->CacheSegmentSize)); #elif defined(_MSC_VER) - CacheSegList = _alloca(sizeof(PCACHE_SEGMENT) * + CacheSegList = _alloca(sizeof(PCACHE_SEGMENT) * (Length / Bcb->CacheSegmentSize)); #else #error Unknown compiler for alloca intrinsic stack allocation "function" @@ -668,7 +668,7 @@ } } Previous->NextInChain = NULL; - + return(STATUS_SUCCESS); } @@ -713,7 +713,7 @@ return(STATUS_SUCCESS); } -NTSTATUS STDCALL +NTSTATUS STDCALL CcRosRequestCacheSegment(PBCB Bcb, ULONG FileOffset, PVOID* BaseAddress, @@ -743,8 +743,8 @@ } #ifdef CACHE_BITMAP #else -STATIC VOID -CcFreeCachePage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, +STATIC VOID +CcFreeCachePage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { ASSERT(SwapEntry == 0); @@ -754,7 +754,7 @@ } } #endif -NTSTATUS +NTSTATUS CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg) /* * FUNCTION: Releases a cache segment associated with a BCB @@ -774,7 +774,7 @@ /* Unmap all the pages. */ for (i = 0; i < RegionSize; i++) { - MmDeleteVirtualMapping(NULL, + MmDeleteVirtualMapping(NULL, CacheSeg->BaseAddress + (i * PAGE_SIZE), FALSE, NULL, @@ -785,7 +785,7 @@ KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql); /* Deallocate all the pages used. */ Base = (ULONG)(CacheSeg->BaseAddress - CiCacheSegMappingRegionBase) / PAGE_SIZE; - + RtlClearBits(&CiCacheSegMappingRegionAllocMap, Base, RegionSize); CiCacheSegMappingRegionHint = min (CiCacheSegMappingRegionHint, Base); @@ -858,12 +858,12 @@ { Offset = *FileOffset; } - else + else { Offset.QuadPart = (LONGLONG)0; Length = Bcb->FileSize.u.LowPart; } - + if (IoStatus) { IoStatus->Status = STATUS_SUCCESS; @@ -909,7 +909,7 @@ } } -NTSTATUS +NTSTATUS CcRosDeleteFileCache(PFILE_OBJECT FileObject, PBCB Bcb) /* * FUNCTION: Releases the BCB associated with a file object @@ -938,7 +938,7 @@ Bcb->BcbRemoveListEntry.Flink = NULL; } - FileObject->SectionObjectPointer->SharedCacheMap = NULL; + FileObject->SectionObjectPointer->SharedCacheMap = NULL; /* * Release all cache segments. @@ -960,7 +960,7 @@ } InsertHeadList(&FreeList, &current->BcbSegmentListEntry); } - KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); + KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); ExReleaseFastMutex(&ViewLock); ObDereferenceObject (Bcb->FileObject); @@ -971,7 +971,7 @@ current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); Status = CcRosInternalFreeCacheSegment(current); } - ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); + ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); ExAcquireFastMutex(&ViewLock); } return(STATUS_SUCCESS); @@ -1042,7 +1042,7 @@ ExReleaseFastMutex(&ViewLock); } -NTSTATUS STDCALL +NTSTATUS STDCALL CcRosReleaseFileCache(PFILE_OBJECT FileObject) /* * FUNCTION: Called by the file system when a handle to a file object @@ -1082,7 +1082,7 @@ return(STATUS_SUCCESS); } -NTSTATUS +NTSTATUS CcTryToInitializeFileCache(PFILE_OBJECT FileObject) { PBCB Bcb; @@ -1115,7 +1115,7 @@ } -NTSTATUS STDCALL +NTSTATUS STDCALL CcRosInitializeFileCache(PFILE_OBJECT FileObject, ULONG CacheSegmentSize) /* @@ -1146,9 +1146,9 @@ Bcb->CacheSegmentSize = CacheSegmentSize; if (FileObject->FsContext) { - Bcb->AllocationSize = + Bcb->AllocationSize = ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->AllocationSize; - Bcb->FileSize = + Bcb->FileSize = ((PFSRTL_COMMON_FCB_HEADER)FileObject->FsContext)->FileSize; } KeInitializeSpinLock(&Bcb->BcbLock); @@ -1219,7 +1219,7 @@ DbgPrint("LazyCloseThread: Terminating\n"); break; } - + ExAcquireFastMutex(&ViewLock); CcTimeStamp++; if (CcTimeStamp >= 30) @@ -1250,7 +1250,7 @@ #endif NTSTATUS Status; KPRIORITY Priority; - + DPRINT("CcInitView()\n"); #ifdef CACHE_BITMAP BoundaryAddressMultiple.QuadPart = 0; @@ -1281,7 +1281,7 @@ RtlClearAllBits(&CiCacheSegMappingRegionAllocMap); KeInitializeSpinLock(&CiCacheSegMappingRegionLock); -#endif +#endif InitializeListHead(&CacheSegmentListHead); InitializeListHead(&DirtySegmentListHead); InitializeListHead(&CacheSegmentLRUListHead); @@ -1310,10 +1310,10 @@ 20); MmInitializeMemoryConsumer(MC_CACHE, CcRosTrimCache); - + CcInitCacheZeroPage(); - CcTimeStamp = 0; + CcTimeStamp = 0; LazyCloseThreadShouldTerminate = FALSE; KeInitializeEvent (&LazyCloseThreadEvent, SynchronizationEvent, FALSE); Status = PsCreateSystemThread(&LazyCloseThreadHandle, _____ Modified: trunk/reactos/ntoskrnl/cm/cm.h --- trunk/reactos/ntoskrnl/cm/cm.h 2005-05-09 01:14:42 UTC (rev 15163) +++ trunk/reactos/ntoskrnl/cm/cm.h 2005-05-09 01:38:29 UTC (rev 15164) @@ -356,7 +356,7 @@ /* List entry into the global key object list */ LIST_ENTRY ListEntry; - + /* Time stamp for the last access by the parse routine */ ULONG TimeStamp; } KEY_OBJECT, *PKEY_OBJECT; _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-05-09 01:14:42 UTC (rev 15163) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-05-09 01:38:29 UTC (rev 15164) @@ -1,5 +1,5 @@ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/cm/ntfunc.c @@ -39,11 +39,11 @@ IN OUT PLARGE_INTEGER Cookie) { PREGISTRY_CALLBACK Callback; - + PAGED_CODE(); - + ASSERT(Function && Cookie); - + Callback = ExAllocatePoolWithTag(PagedPool, sizeof(REGISTRY_CALLBACK), TAG('C', 'M', 'c', 'b')); @@ -54,7 +54,7 @@ Callback->Function = Function; Callback->Context = Context; Callback->PendingDelete = FALSE; - + /* add it to the callback list and receive a cookie for the callback */ ExAcquireFastMutex(&CmiCallbackLock); /* FIXME - to receive a unique cookie we'll just return the pointer to the @@ -63,7 +63,7 @@ InsertTailList(&CmiCallbackHead, &Callback->ListEntry); ExReleaseFastMutex(&CmiCallbackLock); - + *Cookie = Callback->Cookie; return STATUS_SUCCESS; } @@ -79,7 +79,7 @@ CmUnRegisterCallback(IN LARGE_INTEGER Cookie) { PLIST_ENTRY CurrentEntry; - + PAGED_CODE(); ExAcquireFastMutex(&CmiCallbackLock); @@ -121,7 +121,7 @@ } } } - + ExReleaseFastMutex(&CmiCallbackLock); return STATUS_UNSUCCESSFUL; @@ -133,9 +133,9 @@ IN PVOID Argument2) { PLIST_ENTRY CurrentEntry; - + PAGED_CODE(); - + ExAcquireFastMutex(&CmiCallbackLock); for(CurrentEntry = CmiCallbackHead.Flink; @@ -149,10 +149,10 @@ ExAcquireRundownProtectionEx(&CurrentCallback->RundownRef, 1)) { NTSTATUS Status; - + /* don't hold locks during the callbacks! */ ExReleaseFastMutex(&CmiCallbackLock); - + Status = CurrentCallback->Function(CurrentCallback->Context, Argument1, Argument2); @@ -169,9 +169,9 @@ ExReleaseRundownProtectionEx(&CurrentCallback->RundownRef, 1); } } - + ExReleaseFastMutex(&CmiCallbackLock); - + return STATUS_SUCCESS; } @@ -191,7 +191,7 @@ PVOID Object; PWSTR Start; unsigned i; - + PAGED_CODE(); DPRINT("NtCreateKey (Name %wZ KeyHandle %x Root %x)\n", @@ -358,7 +358,7 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - + ObDereferenceObject(Object); if (Disposition) @@ -376,11 +376,11 @@ KPROCESSOR_MODE PreviousMode; PKEY_OBJECT KeyObject; NTSTATUS Status; - + PAGED_CODE(); DPRINT1("NtDeleteKey(KeyHandle %x) called\n", KeyHandle); - + PreviousMode = ExGetPreviousMode(); /* Verify that the handle is valid and is a registry key */ @@ -462,9 +462,9 @@ ULONG NameSize, ClassSize; KPROCESSOR_MODE PreviousMode; NTSTATUS Status; - + PAGED_CODE(); - + PreviousMode = ExGetPreviousMode(); DPRINT("KH %x I %d KIC %x KI %x L %d RL %x\n", @@ -687,10 +687,10 @@ Status = STATUS_BUFFER_OVERFLOW; CHECKPOINT; } - else if (Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) - + else if (Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) - NameSize < ClassSize) { - ClassSize = Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) - + ClassSize = Length - FIELD_OFFSET(KEY_NODE_INFORMATION, Name[0]) - NameSize; Status = STATUS_BUFFER_OVERFLOW; CHECKPOINT; @@ -812,7 +812,7 @@ PKEY_VALUE_BASIC_INFORMATION ValueBasicInformation; PKEY_VALUE_PARTIAL_INFORMATION ValuePartialInformation; PKEY_VALUE_FULL_INFORMATION ValueFullInformation; - + [truncated at 1000 lines; 38181 more skipped]

1 0

[ion] 15163: Fix KDBG and enable IRP_NOCACHE for ReadFile. Also disable SEH for Buffer since PRobeForWrite has a bug and cannot probe past a page
by ion＠svn.reactos.com 09 May '05

09 May '05

Fix KDBG and enable IRP_NOCACHE for ReadFile. Also disable SEH for Buffer since PRobeForWrite has a bug and cannot probe past a page Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 01:06:39 UTC (rev 15162) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 01:14:42 UTC (rev 15163) @@ -2457,9 +2457,11 @@ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); + #if 0 ProbeForWrite(Buffer, Length, sizeof(ULONG)); + #endif } _SEH_HANDLE { @@ -2570,17 +2572,8 @@ Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; Irp->Flags |= IRP_READ_OPERATION; + if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) Irp->Flags |= IRP_NOCACHE; - /* FIXME: KDBG is using this flag and not reading from cluster-aligned. Investigate. */ -#if 0 - if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) - { - DbgBreakPoint(); - Irp->Flags |= IRP_NOCACHE; - DPRINT1("It's us: %p\n", FileObject); - } -#endif - /* Setup Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->FileObject = FileObject; _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-05-09 01:06:39 UTC (rev 15162) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c 2005-05-09 01:14:42 UTC (rev 15163) @@ -439,7 +439,7 @@ &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT|FILE_NO_INTERMEDIATE_BUFFERING); + FILE_SYNCHRONOUS_IO_NONALERT); if (!NT_SUCCESS(Status)) { DPRINT("Could not open image file: %wZ\n", &FileName);

1 0

[ion] 15162: Fix uninitailzied variable on dbg=0
by ion＠svn.reactos.com 09 May '05

09 May '05

Fix uninitailzied variable on dbg=0 Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 01:01:18 UTC (rev 15161) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 01:06:39 UTC (rev 15162) @@ -2435,7 +2435,7 @@ IN PLARGE_INTEGER ByteOffset OPTIONAL, /* NOT optional for asynch. operations! */ IN PULONG Key OPTIONAL) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject; PIRP Irp = NULL; PDEVICE_OBJECT DeviceObject; @@ -2571,8 +2571,8 @@ Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; Irp->Flags |= IRP_READ_OPERATION; + /* FIXME: KDBG is using this flag and not reading from cluster-aligned. Investigate. */ #if 0 - /* FIXME: KDBG is using this flag and not reading from cluster-aligned. Investigate */ if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) { DbgBreakPoint();

1 0

[ion] 15161: Grrr..it's getting late or something. CORRECT fix.
by ion＠svn.reactos.com 09 May '05

09 May '05

Grrr..it's getting late or something. CORRECT fix. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 00:41:55 UTC (rev 15160) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 01:01:18 UTC (rev 15161) @@ -2435,21 +2435,20 @@ IN PLARGE_INTEGER ByteOffset OPTIONAL, /* NOT optional for asynch. operations! */ IN PULONG Key OPTIONAL) { - NTSTATUS Status; - PFILE_OBJECT FileObject; - PIRP Irp = NULL; - PDEVICE_OBJECT DeviceObject; - PIO_STACK_LOCATION StackPtr; - KPROCESSOR_MODE PreviousMode; - BOOLEAN LocalEvent = FALSE; - PKEVENT EventObject = NULL; + NTSTATUS Status; + PFILE_OBJECT FileObject; + PIRP Irp = NULL; + PDEVICE_OBJECT DeviceObject; + PIO_STACK_LOCATION StackPtr; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + BOOLEAN LocalEvent = FALSE; + PKEVENT EventObject = NULL; DPRINT("NtReadFile(FileHandle %x Buffer %x Length %x ByteOffset %x, " "IoStatusBlock %x)\n", FileHandle, Buffer, Length, ByteOffset, IoStatusBlock); PAGED_CODE(); - #if 0 /* Validate User-Mode Buffers */ if(PreviousMode != KernelMode) { @@ -2470,7 +2469,6 @@ if(!NT_SUCCESS(Status)) return Status; } - #endif /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, @@ -2573,15 +2571,20 @@ Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; Irp->Flags |= IRP_READ_OPERATION; - /* FIXME: Somethign weird is going on when I enable this. */ - //if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) Irp->Flags |= IRP_NOCACHE; +#if 0 + /* FIXME: KDBG is using this flag and not reading from cluster-aligned. Investigate */ + if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) + { + DbgBreakPoint(); + Irp->Flags |= IRP_NOCACHE; + DPRINT1("It's us: %p\n", FileObject); + } +#endif /* Setup Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->FileObject = FileObject; StackPtr->Parameters.Read.Key = Key ? *Key : 0; - StackPtr->Parameters.Read.Length = Length; - StackPtr->Parameters.Read.ByteOffset = *ByteOffset; /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp);

1 0

[ion] 15160: Sorry, wrong version got commited
by ion＠svn.reactos.com 09 May '05

09 May '05

Sorry, wrong version got commited Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-09 00:38:57 UTC (rev 15159) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-09 00:41:55 UTC (rev 15160) @@ -4,7 +4,8 @@ * FILE: ntoskrnl/io/irp.c * PURPOSE: Handle IRPs * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMERS: Hartmut Birr + * Alex Ionescu (alex(a)relsoft.net) * David Welch (welch(a)mcmail.com) */ @@ -104,7 +105,7 @@ while ((Mdl = Irp->MdlAddress)) { /* Clear all of them */ - Irp->MdlAddress = Mdl->Next; + Irp->MdlAddress = Mdl->Next; IoFreeMdl(Mdl); } @@ -150,10 +151,10 @@ KeSetEvent(UserEvent, 0, FALSE); /* Dereference the Event if this is an ASYNC IRP */ - if (FileObject && !SyncIrp && UserEvent != &FileObject->Event) - { + if (FileObject && !SyncIrp && UserEvent != &FileObject->Event) + { ObDereferenceObject(UserEvent); - } + } } else if (FileObject) { @@ -181,7 +182,7 @@ Irp->UserIosb, NULL, 2); - Irp = NULL; + Irp = NULL; } else if (FileObject && FileObject->CompletionContext) { @@ -192,7 +193,7 @@ Irp->IoStatus.Status, Irp->IoStatus.Information, FALSE); - Irp = NULL; + Irp = NULL; } } else @@ -204,15 +205,15 @@ if (SyncIrp) { /* Set the status in this case only */ - _SEH_TRY - { - *Irp->UserIosb = Irp->IoStatus; - } - _SEH_HANDLE - { - /* Ignore any error */ - } - _SEH_END; + _SEH_TRY + { + *Irp->UserIosb = Irp->IoStatus; + } + _SEH_HANDLE + { + /* Ignore any error */ + } + _SEH_END; /* Signal our event if we have one */ if (UserEvent) @@ -228,16 +229,16 @@ else { #if 1 - /* FIXME: This is necessary to fix bug #609 */ - _SEH_TRY - { - *Irp->UserIosb = Irp->IoStatus; - } - _SEH_HANDLE - { - /* Ignore any error */ - } - _SEH_END; + /* FIXME: This is necessary to fix bug #609 */ + _SEH_TRY + { + *Irp->UserIosb = Irp->IoStatus; + } + _SEH_HANDLE + { + /* Ignore any error */ + } + _SEH_END; #endif /* We'll report the Status to the File Object, not the IRP */ FileObject->FinalStatus = Irp->IoStatus.Status; @@ -260,11 +261,8 @@ /* Dereference the File Object */ if (FileObject) ObDereferenceObject(FileObject); - if (Irp) - { - /* Free the IRP */ - IoFreeIrp(Irp); - } + /* Free the IRP */ + if (Irp) IoFreeIrp(Irp); #else

1 0

[greatlrd] 15159: remove last hardcode string to En.rc
by greatlrd＠svn.reactos.com 09 May '05

09 May '05

remove last hardcode string to En.rc need translate to other langes new strings in En.rc are IDS_DNS_ERROR, IDS_SOCKET_ERROR, IDS_GET_SRV_ERROR, IDS_CON_SRV_ERROR Modified: trunk/reactos/subsys/system/reporterror/En.rc Modified: trunk/reactos/subsys/system/reporterror/reporterror.c Modified: trunk/reactos/subsys/system/reporterror/reporterror.h _____ Modified: trunk/reactos/subsys/system/reporterror/En.rc --- trunk/reactos/subsys/system/reporterror/En.rc 2005-05-09 00:33:23 UTC (rev 15158) +++ trunk/reactos/subsys/system/reporterror/En.rc 2005-05-09 00:38:57 UTC (rev 15159) @@ -52,3 +52,11 @@ IDS_FAILED_TO_LOCATE_SERVER "Failed to contact error reporting server" END +STRINGTABLE +BEGIN +IDS_DNS_ERROR "Could not resolve DNS for %S (windows error code %d)" +IDS_SOCKET_ERROR "Could not create socket (windows error code %d)" +IDS_GET_SRV_ERROR "Could not get service (windows error code %d)" +IDS_CON_SRV_ERROR "Could not connect to server (windows error code %d)" +END + _____ Modified: trunk/reactos/subsys/system/reporterror/reporterror.c --- trunk/reactos/subsys/system/reporterror/reporterror.c 2005-05-09 00:33:23 UTC (rev 15158) +++ trunk/reactos/subsys/system/reporterror/reporterror.c 2005-05-09 00:38:57 UTC (rev 15159) @@ -212,6 +212,7 @@ struct hostent *hp; struct servent *sp; INT error; + WCHAR szMsg[1024]; SOCKET s; *clientSocket = 0; @@ -220,7 +221,10 @@ if (hp == NULL) { error = WSAGetLastError(); - wsprintf(errorMessage, L"Could not resolve DNS for %S (windows error code %d)", host, error); + + //L"Could not resolve DNS for %S (windows error code %d) + LoadString( GetModuleHandle(NULL), IDS_DNS_ERROR, (LPTSTR) szMsg, sizeof(szMsg) / sizeof(WCHAR)); + wsprintf(errorMessage, L"Could not resolve DNS for %S (windows error code %d)", host, error); return error; } @@ -228,7 +232,10 @@ if (s < 0) { error = WSAGetLastError(); - wsprintf(errorMessage, L"Could not create socket (windows error code %d)", error); + + // L"Could not create socket (windows error code %d) + LoadString( GetModuleHandle(NULL), IDS_SOCKET_ERROR, (LPTSTR) szMsg, sizeof(szMsg) / sizeof(WCHAR)); + wsprintf(errorMessage, szMsg, error); return error; } @@ -237,7 +244,10 @@ if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) { error = WSAGetLastError(); - wsprintf(errorMessage, L"Could not resolve DNS for %S (windows error code %d)", host, error); + + //L"Could not resolve DNS for %S (windows error code %d) + LoadString( GetModuleHandle(NULL), IDS_DNS_ERROR, (LPTSTR) szMsg, sizeof(szMsg) / sizeof(WCHAR)); + wsprintf(errorMessage, L"Could not resolve DNS for %S (windows error code %d)", host, error); closesocket(s); return error; } @@ -247,7 +257,11 @@ if (sp == NULL) { error = WSAGetLastError(); - wsprintf(errorMessage, L"Could not get service (windows error code %d)", error); + + //L"Could not get service (windows error code %d)" + + LoadString( GetModuleHandle(NULL), IDS_GET_SRV_ERROR, (LPTSTR) szMsg, sizeof(szMsg) / sizeof(WCHAR)); + wsprintf(errorMessage, szMsg, error); closesocket(s); return error; } @@ -257,7 +271,10 @@ if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) { error = WSAGetLastError(); - wsprintf(errorMessage, L"Could not connect to server (windows error code %d)", error); + + //L"Could not connect to server (windows error code %d)" + LoadString( GetModuleHandle(NULL), IDS_CON_SRV_ERROR, (LPTSTR) szMsg, sizeof(szMsg) / sizeof(WCHAR)); + wsprintf(errorMessage,szMsg , error); closesocket(s); return error; } _____ Modified: trunk/reactos/subsys/system/reporterror/reporterror.h --- trunk/reactos/subsys/system/reporterror/reporterror.h 2005-05-09 00:33:23 UTC (rev 15158) +++ trunk/reactos/subsys/system/reporterror/reporterror.h 2005-05-09 00:38:57 UTC (rev 15159) @@ -41,6 +41,12 @@ #define IDB_WATERMARK 100 #define IDB_HEADER 101 + +#define IDS_DNS_ERROR 600 +#define IDS_SOCKET_ERROR 601 +#define IDS_GET_SRV_ERROR 602 +#define IDS_CON_SRV_ERROR 603 + typedef struct _ERROR_REPORT { LPSTR YourEmail;

1 0

[ion] 15158: Fix a previous bug and fix NtReadFile: Read FileObject Status, Set Read Operation, support IRP_NOCACHE (ReactOS doesn't like this because of some other bug i'm investigating), use right event reqeuested access, add SEH
by ion＠svn.reactos.com 09 May '05

09 May '05

Fix a previous bug and fix NtReadFile: Read FileObject Status, Set Read Operation, support IRP_NOCACHE (ReactOS doesn't like this because of some other bug i'm investigating), use right event reqeuested access, add SEH Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 00:05:15 UTC (rev 15157) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 00:33:23 UTC (rev 15158) @@ -2058,7 +2058,7 @@ PIO_STACK_LOCATION StackPtr; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - BOOLEAN LocalEvent; + BOOLEAN LocalEvent = FALSE; PKEVENT Event = NULL; DPRINT("NtQueryDirectoryFile()\n"); @@ -2435,127 +2435,171 @@ IN PLARGE_INTEGER ByteOffset OPTIONAL, /* NOT optional for asynch. operations! */ IN PULONG Key OPTIONAL) { - NTSTATUS Status; - PFILE_OBJECT FileObject; - PIRP Irp = NULL; - PIO_STACK_LOCATION StackPtr; - KPROCESSOR_MODE PreviousMode; - PKEVENT EventObject = NULL; + NTSTATUS Status; + PFILE_OBJECT FileObject; + PIRP Irp = NULL; + PDEVICE_OBJECT DeviceObject; + PIO_STACK_LOCATION StackPtr; + KPROCESSOR_MODE PreviousMode; + BOOLEAN LocalEvent = FALSE; + PKEVENT EventObject = NULL; - DPRINT("NtReadFile(FileHandle %x Buffer %x Length %x ByteOffset %x, " - "IoStatusBlock %x)\n", FileHandle, Buffer, Length, ByteOffset, - IoStatusBlock); + DPRINT("NtReadFile(FileHandle %x Buffer %x Length %x ByteOffset %x, " + "IoStatusBlock %x)\n", FileHandle, Buffer, Length, ByteOffset, + IoStatusBlock); + PAGED_CODE(); + + #if 0 + /* Validate User-Mode Buffers */ + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + ProbeForWrite(Buffer, + Length, + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - if (IoStatusBlock == NULL) - return STATUS_ACCESS_VIOLATION; + if(!NT_SUCCESS(Status)) return Status; + } + #endif - PreviousMode = ExGetPreviousMode(); + /* Get File Object */ + Status = ObReferenceObjectByHandle(FileHandle, + FILE_READ_DATA, + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Check the Byte Offset */ + if (!ByteOffset || + (ByteOffset->u.LowPart == FILE_USE_FILE_POINTER_POSITION && + ByteOffset->u.HighPart == 0xffffffff)) + { + /* a valid ByteOffset is required if asynch. op. */ + if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) + { + DPRINT1("NtReadFile: missing ByteOffset for asynch. op\n"); + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } - Status = ObReferenceObjectByHandle(FileHandle, - FILE_READ_DATA, - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } + /* Use the Current Byte OFfset */ + ByteOffset = &FileObject->CurrentByteOffset; + } - if (ByteOffset == NULL || - (ByteOffset->u.LowPart == FILE_USE_FILE_POINTER_POSITION && - ByteOffset->u.HighPart == 0xffffffff)) - { - /* a valid ByteOffset is required if asynch. op. */ - if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) + /* Check for event */ + if (Event) { - DPRINT1("NtReadFile: missing ByteOffset for asynch. op\n"); - ObDereferenceObject(FileObject); - return STATUS_INVALID_PARAMETER; + /* Reference it */ + Status = ObReferenceObjectByHandle(Event, + EVENT_MODIFY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID*)&EventObject, + NULL); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + return Status; + } + KeClearEvent(EventObject); } - ByteOffset = &FileObject->CurrentByteOffset; - } + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) + { + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + LocalEvent = TRUE; + } + + /* Create the IRP */ + _SEH_TRY + { + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, + DeviceObject, + Buffer, + Length, + ByteOffset, + EventObject, + IoStatusBlock); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - if (Event != NULL) - { - Status = ObReferenceObjectByHandle(Event, - SYNCHRONIZE, - ExEventObjectType, - PreviousMode, - (PVOID*)&EventObject, - NULL); - if (!NT_SUCCESS(Status)) - { + /* Cleanup if IRP Allocation Failed */ + if (!NT_SUCCESS(Status) || !Irp) + { + if (Event) ObDereferenceObject(EventObject); ObDereferenceObject(FileObject); - return Status; - } + if (Irp) + { + IoFreeIrp(Irp); + } + return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status; + } - KeClearEvent(EventObject); - } + /* Set up IRP Data */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = PreviousMode; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; + Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; + Irp->Flags |= IRP_READ_OPERATION; + + /* FIXME: Somethign weird is going on when I enable this. */ + //if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) Irp->Flags |= IRP_NOCACHE; + + /* Setup Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->FileObject = FileObject; + StackPtr->Parameters.Read.Key = Key ? *Key : 0; + StackPtr->Parameters.Read.Length = Length; + StackPtr->Parameters.Read.ByteOffset = *ByteOffset; - _SEH_TRY - { - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - FileObject->DeviceObject, - Buffer, - Length, - ByteOffset, - EventObject, - IoStatusBlock); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status) || Irp == NULL) - { - if (Event) - { - ObDereferenceObject(&EventObject); - } - ObDereferenceObject(FileObject); - if (Irp) - { - IoFreeIrp(Irp); - } - return NT_SUCCESS(Status) ? STATUS_INSUFFICIENT_RESOURCES : Status; - } - - KeClearEvent(&FileObject->Event); - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - - Irp->RequestorMode = PreviousMode; - - Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; - Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->FileObject = FileObject; - StackPtr->Parameters.Read.Key = Key ? *Key : 0; - - Status = IoCallDriver(FileObject->DeviceObject, Irp); - if (Status == STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO)) - { - Status = KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - if (Status != STATUS_WAIT_0) + /* Call the Driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) { - /* Wait failed. */ - return Status; + if (!LocalEvent) + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = FileObject->FinalStatus; + } } - Status = IoStatusBlock->Status; - } - - return Status; + /* Return the Status */ + return Status; } /*

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