Ros-diffs June 2013

ros-diffs@reactos.org

14 participants
274 discussions

[hbelusca] 59404: [CMD] Fix whitespace
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 23:58:48 2013 New Revision: 59404 URL: http://svn.reactos.org/svn/reactos?rev=59404&view=rev Log: [CMD] Fix whitespace Modified: trunk/reactos/base/shell/cmd/error.c Modified: trunk/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/error.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/error.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/error.c [iso-8859-1] Sun Jun 30 23:58:48 2013 @@ -37,9 +37,9 @@ if (szFormat) { - va_start (arg_ptr, szFormat); - _vstprintf (szMessage, szFormat, arg_ptr); - va_end (arg_ptr); + va_start(arg_ptr, szFormat); + _vstprintf(szMessage, szFormat, arg_ptr); + va_end(arg_ptr); } if (FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER,

1 0

[jjones] 59403: Visual Studio support for driver compilation.
by jjones＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: jjones Date: Sun Jun 30 22:38:26 2013 New Revision: 59403 URL: http://svn.reactos.org/svn/reactos?rev=59403&view=rev Log: Visual Studio support for driver compilation. Added: branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj Modified: branches/vs_jc/reactos/ReactOS.sln branches/vs_jc/reactos/drivers/usb/usbuhci/usbuhci.vcxproj [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/vs_jc/reactos/ReactOS.sln URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ReactOS.sln?rev=5… Modified: branches/vs_jc/reactos/drivers/usb/usbuhci/usbuhci.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbuh… Added: branches/vs_jc/reactos/lib/drivers/libusb/libusb.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/drivers/libus…

1 0

[ekohl] 59402: [NETAPI32] NetUserSetInfo: Implement level 1018 and ignore the usriX_max_storage in levels 2-4.
by ekohl＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: ekohl Date: Sun Jun 30 20:18:05 2013 New Revision: 59402 URL: http://svn.reactos.org/svn/reactos?rev=59402&view=rev Log: [NETAPI32] NetUserSetInfo: Implement level 1018 and ignore the usriX_max_storage in levels 2-4. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sun Jun 30 20:18:05 2013 @@ -1323,6 +1323,7 @@ PUSER_INFO_1013 UserInfo1013; PUSER_INFO_1014 UserInfo1014; PUSER_INFO_1017 UserInfo1017; + PUSER_INFO_1018 UserInfo1018; PUSER_INFO_1024 UserInfo1024; PUSER_INFO_1025 UserInfo1025; PUSER_INFO_1051 UserInfo1051; @@ -1472,7 +1473,8 @@ } UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; -// UserInfo2->usri2_max_storage; + // usri2_max_storage ignored + // UserInfo2->usri2_units_per_week; // UserInfo2->usri2_logon_hours; @@ -1573,7 +1575,8 @@ } UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; -// UserInfo3->usri3_max_storage; + // usri3_max_storage ignored + // UserInfo3->usri3_units_per_week; // UserInfo3->usri3_logon_hours; @@ -1696,7 +1699,8 @@ } UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; -// UserInfo3->usri4_max_storage; + // usri4_max_storage ignored + // UserInfo3->usri4_units_per_week; // UserInfo3->usri4_logon_hours; @@ -1851,7 +1855,16 @@ UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; break; -// case 1018: + case 1018: + UserInfo1018 = (PUSER_INFO_1018)UserInfo; + + if (UserInfo1018->usri1018_max_storage != USER_MAXSTORAGE_UNLIMITED) + { + // FIXME: Report error + return ERROR_INVALID_PARAMETER; + } + break; + // case 1020: case 1024:

1 0

[hbelusca] 59401: [CMD] Add a helper function which checks whether we are going to output text to a console handle or to a file handle. Use it in ConWrite and in ConPrintfPaging.
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 19:55:39 2013 New Revision: 59401 URL: http://svn.reactos.org/svn/reactos?rev=59401&view=rev Log: [CMD] Add a helper function which checks whether we are going to output text to a console handle or to a file handle. Use it in ConWrite and in ConPrintfPaging. Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Jun 30 19:55:39 2013 @@ -25,6 +25,29 @@ UINT InputCodePage; UINT OutputCodePage; + +BOOL IsConsoleHandle(HANDLE hHandle) +{ + DWORD dwMode; + + /* Check whether the handle may be that of a console... */ + if ((GetFileType(hHandle) & FILE_TYPE_CHAR) == 0) return FALSE; + + /* + * It may be. Perform another test... The idea comes from the + * MSDN description of the WriteConsole API: + * + * "WriteConsole fails if it is used with a standard handle + * that is redirected to a file. If an application processes + * multilingual output that can be redirected, determine whether + * the output handle is a console handle (one method is to call + * the GetConsoleMode function and check whether it succeeds). + * If the handle is a console handle, call WriteConsole. If the + * handle is not a console handle, the output is redirected and + * you should call WriteFile to perform the I/O." + */ + return GetConsoleMode(hHandle, &dwMode); +} VOID ConInDisable(VOID) { @@ -116,8 +139,12 @@ DWORD dwWritten; HANDLE hOutput = GetStdHandle(nStdHandle); - if (WriteConsole(hOutput, str, len, &dwWritten, NULL)) - return; + /* Check whether we are writing to a console and if so, write to it */ + if (IsConsoleHandle(hOutput)) + { + if (WriteConsole(hOutput, str, len, &dwWritten, NULL)) + return; + } /* We're writing to a file or pipe instead of the console. Convert the * string from TCHARs to the desired output format, if the two differ */ @@ -220,9 +247,8 @@ if (szFormat == NULL) return 0; - //get the size of the visual screen that can be printed too - if (!GetConsoleScreenBufferInfo(hOutput, &csbi)) + if (!IsConsoleHandle(hOutput) || !GetConsoleScreenBufferInfo(hOutput, &csbi)) { // we assuming its a file handle ConPrintf(szFormat, arg_ptr, nStdHandle);

1 0

[hbelusca] 59400: [CONSRV] Improve debug prints.
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 19:21:42 2013 New Revision: 59400 URL: http://svn.reactos.org/svn/reactos?rev=59400&view=rev Log: [CONSRV] Improve debug prints. Modified: trunk/reactos/win32ss/user/consrv/handle.c Modified: trunk/reactos/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/handle… ============================================================================== --- trunk/reactos/win32ss/user/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/handle.c [iso-8859-1] Sun Jun 30 19:21:42 2013 @@ -418,8 +418,7 @@ ASSERT(Object); if (Entry) *Entry = NULL; - // DPRINT("ConSrvGetObject, Object: %x, %x, %x\n", - // Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0); + DPRINT("ConSrvGetObject -- Object: 0x%x, Handle: 0x%x\n", Object, Handle); RtlEnterCriticalSection(&ProcessData->HandleTableLock); @@ -436,7 +435,9 @@ /*(Type != 0 && ObjectEntry->Type != Type)*/ (Type != 0 && (ObjectEntry->Type & Type) == 0) ) { - DPRINT1("ConSrvGetObject returning invalid handle (%x) of type %lu with access %lu ; wanted type %lu with access %lu\n", Handle, ObjectEntry->Type, HandleEntry->Access, Type, Access); + DPRINT1("ConSrvGetObject -- Invalid handle 0x%x of type %lu with access %lu ; retrieved object 0x%x (handle 0x%x) of type %lu with access %lu\n", + Handle, Type, Access, ObjectEntry, HandleEntry, (ObjectEntry ? ObjectEntry->Type : 0), (HandleEntry ? HandleEntry->Access : 0)); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_INVALID_HANDLE; }

1 0

[hbelusca] 59399: [KERNEL32] Code formatting only.
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 18:48:45 2013 New Revision: 59399 URL: http://svn.reactos.org/svn/reactos?rev=59399&view=rev Log: [KERNEL32] Code formatting only. Modified: trunk/reactos/dll/win32/kernel32/client/file/rw.c Modified: trunk/reactos/dll/win32/kernel32/client/file/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/rw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/rw.c [iso-8859-1] Sun Jun 30 18:48:45 2013 @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/kernel32/file/rw.c * PURPOSE: Read/write functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * PROGRAMMER: Ariadne (ariadne(a)xs4all.nl) * UPDATE HISTORY: * Created 01/11/98 */ @@ -23,41 +23,38 @@ BOOL WINAPI WriteFile(IN HANDLE hFile, IN LPCVOID lpBuffer, - IN DWORD nNumberOfBytesToWrite OPTIONAL, - OUT LPDWORD lpNumberOfBytesWritten OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL) -{ - NTSTATUS Status; - - TRACE("WriteFile(hFile %x)\n", hFile); - - if (lpNumberOfBytesWritten != NULL) - { - *lpNumberOfBytesWritten = 0; - } - - hFile = TranslateStdHandle(hFile); - - if (IsConsoleHandle(hFile)) - { - return WriteConsoleA(hFile, + IN DWORD nNumberOfBytesToWrite OPTIONAL, + OUT LPDWORD lpNumberOfBytesWritten OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL) +{ + NTSTATUS Status; + + TRACE("WriteFile(hFile %x)\n", hFile); + + if (lpNumberOfBytesWritten != NULL) *lpNumberOfBytesWritten = 0; + + hFile = TranslateStdHandle(hFile); + + if (IsConsoleHandle(hFile)) + { + return WriteConsoleA(hFile, lpBuffer, nNumberOfBytesToWrite, lpNumberOfBytesWritten, lpOverlapped); - } - - if (lpOverlapped != NULL) - { + } + + if (lpOverlapped != NULL) + { LARGE_INTEGER Offset; PVOID ApcContext; Offset.u.LowPart = lpOverlapped->Offset; Offset.u.HighPart = lpOverlapped->OffsetHigh; - lpOverlapped->Internal = STATUS_PENDING; - ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); - - Status = NtWriteFile(hFile, + lpOverlapped->Internal = STATUS_PENDING; + ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); + + Status = NtWriteFile(hFile, lpOverlapped->hEvent, NULL, ApcContext, @@ -69,18 +66,16 @@ /* return FALSE in case of failure and pending operations! */ if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) - { - BaseSetLastNTError(Status); - return FALSE; - } + { + BaseSetLastNTError(Status); + return FALSE; + } if (lpNumberOfBytesWritten != NULL) - { - *lpNumberOfBytesWritten = lpOverlapped->InternalHigh; - } - } - else - { + *lpNumberOfBytesWritten = lpOverlapped->InternalHigh; + } + else + { IO_STATUS_BLOCK Iosb; Status = NtWriteFile(hFile, @@ -93,34 +88,31 @@ NULL, NULL); - /* wait in case operation is pending */ + /* Wait in case operation is pending */ if (Status == STATUS_PENDING) - { - Status = NtWaitForSingleObject(hFile, - FALSE, - NULL); - if (NT_SUCCESS(Status)) - { - Status = Iosb.Status; - } - } + { + Status = NtWaitForSingleObject(hFile, FALSE, NULL); + if (NT_SUCCESS(Status)) Status = Iosb.Status; + } if (NT_SUCCESS(Status)) - { - /* lpNumberOfBytesWritten must not be NULL here, in fact Win doesn't - check that case either and crashes (only after the operation - completed) */ - *lpNumberOfBytesWritten = Iosb.Information; - } + { + /* + * lpNumberOfBytesWritten must not be NULL here, in fact Win doesn't + * check that case either and crashes (only after the operation + * completed). + */ + *lpNumberOfBytesWritten = Iosb.Information; + } else - { - BaseSetLastNTError(Status); - return FALSE; - } - } - - TRACE("WriteFile() succeeded\n"); - return TRUE; + { + BaseSetLastNTError(Status); + return FALSE; + } + } + + TRACE("WriteFile() succeeded\n"); + return TRUE; } @@ -131,56 +123,49 @@ ReadFile(IN HANDLE hFile, IN LPVOID lpBuffer, IN DWORD nNumberOfBytesToRead, - OUT LPDWORD lpNumberOfBytesRead OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL) -{ - NTSTATUS Status; - - TRACE("ReadFile(hFile %x)\n", hFile); - - if (lpNumberOfBytesRead != NULL) - { - *lpNumberOfBytesRead = 0; - } - - if (!nNumberOfBytesToRead) - { - return TRUE; - } - - hFile = TranslateStdHandle(hFile); - - if (IsConsoleHandle(hFile)) - { + OUT LPDWORD lpNumberOfBytesRead OPTIONAL, + IN LPOVERLAPPED lpOverlapped OPTIONAL) +{ + NTSTATUS Status; + + TRACE("ReadFile(hFile %x)\n", hFile); + + if (lpNumberOfBytesRead != NULL) *lpNumberOfBytesRead = 0; + if (!nNumberOfBytesToRead) return TRUE; + + hFile = TranslateStdHandle(hFile); + + if (IsConsoleHandle(hFile)) + { if (ReadConsoleA(hFile, - lpBuffer, - nNumberOfBytesToRead, - lpNumberOfBytesRead, - NULL)) - { - DWORD dwMode; - GetConsoleMode(hFile, &dwMode); - if ((dwMode & ENABLE_PROCESSED_INPUT) && *(char *)lpBuffer == 0x1a) - { - /* EOF character entered; simulate end-of-file */ - *lpNumberOfBytesRead = 0; - } - return TRUE; - } + lpBuffer, + nNumberOfBytesToRead, + lpNumberOfBytesRead, + NULL)) + { + DWORD dwMode; + GetConsoleMode(hFile, &dwMode); + if ((dwMode & ENABLE_PROCESSED_INPUT) && *(PCHAR)lpBuffer == 0x1a) + { + /* EOF character entered; simulate end-of-file */ + *lpNumberOfBytesRead = 0; + } + return TRUE; + } return FALSE; - } - - if (lpOverlapped != NULL) - { + } + + if (lpOverlapped != NULL) + { LARGE_INTEGER Offset; PVOID ApcContext; Offset.u.LowPart = lpOverlapped->Offset; Offset.u.HighPart = lpOverlapped->OffsetHigh; - lpOverlapped->Internal = STATUS_PENDING; - ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); - - Status = NtReadFile(hFile, + lpOverlapped->Internal = STATUS_PENDING; + ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); + + Status = NtReadFile(hFile, lpOverlapped->hEvent, NULL, ApcContext, @@ -192,24 +177,19 @@ /* return FALSE in case of failure and pending operations! */ if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) - { - if (Status == STATUS_END_OF_FILE && - lpNumberOfBytesRead != NULL) - { - *lpNumberOfBytesRead = 0; - } - - BaseSetLastNTError(Status); - return FALSE; - } + { + if (Status == STATUS_END_OF_FILE && lpNumberOfBytesRead != NULL) + *lpNumberOfBytesRead = 0; + + BaseSetLastNTError(Status); + return FALSE; + } if (lpNumberOfBytesRead != NULL) - { - *lpNumberOfBytesRead = lpOverlapped->InternalHigh; - } - } - else - { + *lpNumberOfBytesRead = lpOverlapped->InternalHigh; + } + else + { IO_STATUS_BLOCK Iosb; Status = NtReadFile(hFile, @@ -222,58 +202,57 @@ NULL, NULL); - /* wait in case operation is pending */ + /* Wait in case operation is pending */ if (Status == STATUS_PENDING) - { - Status = NtWaitForSingleObject(hFile, - FALSE, - NULL); - if (NT_SUCCESS(Status)) - { - Status = Iosb.Status; - } - } + { + Status = NtWaitForSingleObject(hFile, FALSE, NULL); + if (NT_SUCCESS(Status)) Status = Iosb.Status; + } if (Status == STATUS_END_OF_FILE) - { - /* lpNumberOfBytesRead must not be NULL here, in fact Win doesn't - check that case either and crashes (only after the operation - completed) */ - *lpNumberOfBytesRead = 0; - return TRUE; - } + { + /* + * lpNumberOfBytesRead must not be NULL here, in fact Win doesn't + * check that case either and crashes (only after the operation + * completed). + */ + *lpNumberOfBytesRead = 0; + return TRUE; + } if (NT_SUCCESS(Status)) - { - /* lpNumberOfBytesRead must not be NULL here, in fact Win doesn't - check that case either and crashes (only after the operation - completed) */ - *lpNumberOfBytesRead = Iosb.Information; - } + { + /* + * lpNumberOfBytesRead must not be NULL here, in fact Win doesn't + * check that case either and crashes (only after the operation + * completed). + */ + *lpNumberOfBytesRead = Iosb.Information; + } else - { - BaseSetLastNTError(Status); - return FALSE; - } - } - - TRACE("ReadFile() succeeded\n"); - return TRUE; + { + BaseSetLastNTError(Status); + return FALSE; + } + } + + TRACE("ReadFile() succeeded\n"); + return TRUE; } VOID WINAPI ApcRoutine(PVOID ApcContext, - struct _IO_STATUS_BLOCK* IoStatusBlock, - ULONG Reserved) -{ - DWORD dwErrorCode; - LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine = - (LPOVERLAPPED_COMPLETION_ROUTINE)ApcContext; - - dwErrorCode = RtlNtStatusToDosError(IoStatusBlock->Status); - lpCompletionRoutine(dwErrorCode, - IoStatusBlock->Information, - (LPOVERLAPPED)IoStatusBlock); + PIO_STATUS_BLOCK IoStatusBlock, + ULONG Reserved) +{ + DWORD dwErrorCode; + LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine = + (LPOVERLAPPED_COMPLETION_ROUTINE)ApcContext; + + dwErrorCode = RtlNtStatusToDosError(IoStatusBlock->Status); + lpCompletionRoutine(dwErrorCode, + IoStatusBlock->Information, + (LPOVERLAPPED)IoStatusBlock); } @@ -283,71 +262,71 @@ BOOL WINAPI WriteFileEx(IN HANDLE hFile, IN LPCVOID lpBuffer, - IN DWORD nNumberOfBytesToWrite OPTIONAL, + IN DWORD nNumberOfBytesToWrite OPTIONAL, IN LPOVERLAPPED lpOverlapped, IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - LARGE_INTEGER Offset; - NTSTATUS Status; - - Offset.u.LowPart = lpOverlapped->Offset; - Offset.u.HighPart = lpOverlapped->OffsetHigh; - lpOverlapped->Internal = STATUS_PENDING; - - Status = NtWriteFile(hFile, + LARGE_INTEGER Offset; + NTSTATUS Status; + + Offset.u.LowPart = lpOverlapped->Offset; + Offset.u.HighPart = lpOverlapped->OffsetHigh; + lpOverlapped->Internal = STATUS_PENDING; + + Status = NtWriteFile(hFile, + NULL, + ApcRoutine, + lpCompletionRoutine, + (PIO_STATUS_BLOCK)lpOverlapped, + (PVOID)lpBuffer, + nNumberOfBytesToWrite, + &Offset, + NULL); + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL WINAPI +ReadFileEx(IN HANDLE hFile, + IN LPVOID lpBuffer, + IN DWORD nNumberOfBytesToRead OPTIONAL, + IN LPOVERLAPPED lpOverlapped, + IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + LARGE_INTEGER Offset; + NTSTATUS Status; + + Offset.u.LowPart = lpOverlapped->Offset; + Offset.u.HighPart = lpOverlapped->OffsetHigh; + lpOverlapped->Internal = STATUS_PENDING; + + Status = NtReadFile(hFile, NULL, ApcRoutine, lpCompletionRoutine, (PIO_STATUS_BLOCK)lpOverlapped, - (PVOID)lpBuffer, - nNumberOfBytesToWrite, + lpBuffer, + nNumberOfBytesToRead, &Offset, NULL); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -ReadFileEx(IN HANDLE hFile, - IN LPVOID lpBuffer, - IN DWORD nNumberOfBytesToRead OPTIONAL, - IN LPOVERLAPPED lpOverlapped, - IN LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) -{ - LARGE_INTEGER Offset; - NTSTATUS Status; - - Offset.u.LowPart = lpOverlapped->Offset; - Offset.u.HighPart = lpOverlapped->OffsetHigh; - lpOverlapped->Internal = STATUS_PENDING; - - Status = NtReadFile(hFile, - NULL, - ApcRoutine, - lpCompletionRoutine, - (PIO_STATUS_BLOCK)lpOverlapped, - lpBuffer, - nNumberOfBytesToRead, - &Offset, - NULL); - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; }

1 0

[jjones] 59398: Sync by merging from trunk.
by jjones＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: jjones Date: Sun Jun 30 18:10:06 2013 New Revision: 59398 URL: http://svn.reactos.org/svn/reactos?rev=59398&view=rev Log: Sync by merging from trunk. Added: branches/vs_jc/reactos/base/applications/rapps/rapps/dvdwritenow.txt - copied unchanged from r59397, trunk/reactos/base/applications/rapps/rapps/dvdwritenow.txt branches/vs_jc/reactos/base/applications/rapps/rapps/lazaruside.txt - copied unchanged from r59397, trunk/reactos/base/applications/rapps/rapps/lazaruside.txt branches/vs_jc/reactos/dll/win32/getuname/lang/ - copied from r59397, trunk/reactos/dll/win32/getuname/lang/ branches/vs_jc/reactos/dll/win32/msports/parallel.c - copied unchanged from r59397, trunk/reactos/dll/win32/msports/parallel.c Modified: branches/vs_jc/reactos/base/applications/mmc/rsrc.rc branches/vs_jc/reactos/base/applications/rapps/rapps/7zip.txt branches/vs_jc/reactos/base/applications/rapps/rapps/abyss.txt branches/vs_jc/reactos/base/applications/rapps/rapps/doublecommander.txt branches/vs_jc/reactos/base/applications/rapps/rapps/fap.txt branches/vs_jc/reactos/base/applications/rapps/rapps/firefox5.txt branches/vs_jc/reactos/base/applications/rapps/rapps/freebasic.txt branches/vs_jc/reactos/base/applications/rapps/rapps/irfanview.txt branches/vs_jc/reactos/base/applications/rapps/rapps/irfanviewplugins.txt branches/vs_jc/reactos/base/applications/rapps/rapps/libreoffice.txt branches/vs_jc/reactos/base/applications/rapps/rapps/mirandaim.txt branches/vs_jc/reactos/base/applications/rapps/rapps/mpc.txt branches/vs_jc/reactos/base/applications/rapps/rapps/npp.txt branches/vs_jc/reactos/base/applications/rapps/rapps/openttd.txt branches/vs_jc/reactos/base/applications/rapps/rapps/scite.txt branches/vs_jc/reactos/base/applications/rapps/rapps/scummvm.txt branches/vs_jc/reactos/base/applications/rapps/rapps/thunderbird5.txt branches/vs_jc/reactos/base/applications/rapps/rapps/vlc.txt branches/vs_jc/reactos/base/applications/regedit/childwnd.c branches/vs_jc/reactos/base/applications/regedit/main.h branches/vs_jc/reactos/base/applications/regedit/settings.c branches/vs_jc/reactos/base/applications/regedit/treeview.c branches/vs_jc/reactos/base/services/svchost/svchost.c branches/vs_jc/reactos/base/services/svchost/svchost.h branches/vs_jc/reactos/base/shell/cmd/alias.c branches/vs_jc/reactos/base/shell/cmd/assoc.c branches/vs_jc/reactos/base/shell/cmd/attrib.c branches/vs_jc/reactos/base/shell/cmd/batch.c branches/vs_jc/reactos/base/shell/cmd/batch.h branches/vs_jc/reactos/base/shell/cmd/beep.c branches/vs_jc/reactos/base/shell/cmd/call.c branches/vs_jc/reactos/base/shell/cmd/chcp.c branches/vs_jc/reactos/base/shell/cmd/choice.c branches/vs_jc/reactos/base/shell/cmd/cls.c branches/vs_jc/reactos/base/shell/cmd/cmd.c branches/vs_jc/reactos/base/shell/cmd/cmd.h branches/vs_jc/reactos/base/shell/cmd/cmd.rc branches/vs_jc/reactos/base/shell/cmd/cmdinput.c branches/vs_jc/reactos/base/shell/cmd/cmdtable.c branches/vs_jc/reactos/base/shell/cmd/color.c branches/vs_jc/reactos/base/shell/cmd/console.c branches/vs_jc/reactos/base/shell/cmd/copy.c branches/vs_jc/reactos/base/shell/cmd/date.c branches/vs_jc/reactos/base/shell/cmd/del.c branches/vs_jc/reactos/base/shell/cmd/delay.c branches/vs_jc/reactos/base/shell/cmd/dir.c branches/vs_jc/reactos/base/shell/cmd/dirstack.c branches/vs_jc/reactos/base/shell/cmd/echo.c branches/vs_jc/reactos/base/shell/cmd/error.c branches/vs_jc/reactos/base/shell/cmd/filecomp.c branches/vs_jc/reactos/base/shell/cmd/for.c branches/vs_jc/reactos/base/shell/cmd/free.c branches/vs_jc/reactos/base/shell/cmd/goto.c branches/vs_jc/reactos/base/shell/cmd/history.c branches/vs_jc/reactos/base/shell/cmd/if.c branches/vs_jc/reactos/base/shell/cmd/internal.c branches/vs_jc/reactos/base/shell/cmd/label.c branches/vs_jc/reactos/base/shell/cmd/lang/de-DE.rc branches/vs_jc/reactos/base/shell/cmd/lang/el-GR.rc branches/vs_jc/reactos/base/shell/cmd/lang/en-US.rc branches/vs_jc/reactos/base/shell/cmd/lang/es-ES.rc branches/vs_jc/reactos/base/shell/cmd/lang/fr-FR.rc branches/vs_jc/reactos/base/shell/cmd/lang/hu-HU.rc branches/vs_jc/reactos/base/shell/cmd/lang/id-ID.rc branches/vs_jc/reactos/base/shell/cmd/lang/it-IT.rc branches/vs_jc/reactos/base/shell/cmd/lang/ja-JP.rc branches/vs_jc/reactos/base/shell/cmd/lang/no-NO.rc branches/vs_jc/reactos/base/shell/cmd/lang/pl-PL.rc branches/vs_jc/reactos/base/shell/cmd/lang/ro-RO.rc branches/vs_jc/reactos/base/shell/cmd/lang/ru-RU.rc branches/vs_jc/reactos/base/shell/cmd/lang/sk-SK.rc branches/vs_jc/reactos/base/shell/cmd/lang/sv-SE.rc branches/vs_jc/reactos/base/shell/cmd/lang/uk-UA.rc branches/vs_jc/reactos/base/shell/cmd/lang/zh-CN.rc branches/vs_jc/reactos/base/shell/cmd/locale.c branches/vs_jc/reactos/base/shell/cmd/memory.c branches/vs_jc/reactos/base/shell/cmd/misc.c branches/vs_jc/reactos/base/shell/cmd/mklink.c branches/vs_jc/reactos/base/shell/cmd/move.c branches/vs_jc/reactos/base/shell/cmd/msgbox.c branches/vs_jc/reactos/base/shell/cmd/parser.c branches/vs_jc/reactos/base/shell/cmd/path.c branches/vs_jc/reactos/base/shell/cmd/pause.c branches/vs_jc/reactos/base/shell/cmd/prompt.c branches/vs_jc/reactos/base/shell/cmd/readme.txt branches/vs_jc/reactos/base/shell/cmd/redir.c branches/vs_jc/reactos/base/shell/cmd/ren.c branches/vs_jc/reactos/base/shell/cmd/ren.txt branches/vs_jc/reactos/base/shell/cmd/replace.c branches/vs_jc/reactos/base/shell/cmd/resource.h branches/vs_jc/reactos/base/shell/cmd/screen.c branches/vs_jc/reactos/base/shell/cmd/set.c branches/vs_jc/reactos/base/shell/cmd/setlocal.c branches/vs_jc/reactos/base/shell/cmd/shift.c branches/vs_jc/reactos/base/shell/cmd/start.c branches/vs_jc/reactos/base/shell/cmd/strtoclr.c branches/vs_jc/reactos/base/shell/cmd/time.c branches/vs_jc/reactos/base/shell/cmd/timer.c branches/vs_jc/reactos/base/shell/cmd/title.c branches/vs_jc/reactos/base/shell/cmd/todo.txt branches/vs_jc/reactos/base/shell/cmd/type.c branches/vs_jc/reactos/base/shell/cmd/ver.c branches/vs_jc/reactos/base/shell/cmd/verify.c branches/vs_jc/reactos/base/shell/cmd/vol.c branches/vs_jc/reactos/base/shell/cmd/where.c branches/vs_jc/reactos/base/shell/cmd/window.c branches/vs_jc/reactos/base/shell/explorer/CMakeLists.txt branches/vs_jc/reactos/boot/freeldr/freeldr/ui/tui.c branches/vs_jc/reactos/configure.cmd branches/vs_jc/reactos/dll/cpl/desk/general.c branches/vs_jc/reactos/dll/win32/getuname/CMakeLists.txt branches/vs_jc/reactos/dll/win32/getuname/getuname.c branches/vs_jc/reactos/dll/win32/getuname/getuname.rc branches/vs_jc/reactos/dll/win32/kernel32/client/console/readwrite.c branches/vs_jc/reactos/dll/win32/kernel32/client/path.c branches/vs_jc/reactos/dll/win32/kernel32/client/vdm.c branches/vs_jc/reactos/dll/win32/msports/CMakeLists.txt branches/vs_jc/reactos/dll/win32/msports/lang/bg-BG.rc branches/vs_jc/reactos/dll/win32/msports/lang/de-DE.rc branches/vs_jc/reactos/dll/win32/msports/lang/en-US.rc branches/vs_jc/reactos/dll/win32/msports/lang/he-IL.rc branches/vs_jc/reactos/dll/win32/msports/lang/pl-PL.rc branches/vs_jc/reactos/dll/win32/msports/lang/ro-RO.rc branches/vs_jc/reactos/dll/win32/msports/lang/uk-UA.rc branches/vs_jc/reactos/dll/win32/msports/msports.spec branches/vs_jc/reactos/dll/win32/msports/resource.h branches/vs_jc/reactos/dll/win32/netapi32/CMakeLists.txt branches/vs_jc/reactos/dll/win32/netapi32/netapi32.h branches/vs_jc/reactos/dll/win32/netapi32/user.c branches/vs_jc/reactos/drivers/filesystems/mup/create.c branches/vs_jc/reactos/include/ddk/ntifs.h branches/vs_jc/reactos/include/ndk/lpcfuncs.h branches/vs_jc/reactos/include/reactos/subsys/win/conmsg.h branches/vs_jc/reactos/lib/lsalib/lsa.c branches/vs_jc/reactos/lib/rtl/path.c branches/vs_jc/reactos/lib/sdk/crt/misc/environ.c branches/vs_jc/reactos/lib/sdk/crt/string/scanf.h branches/vs_jc/reactos/ntoskrnl/fsrtl/largemcb.c branches/vs_jc/reactos/ntoskrnl/fstub/fstubex.c branches/vs_jc/reactos/win32ss/user/consrv/condrv/coninput.c branches/vs_jc/reactos/win32ss/user/consrv/condrv/text.c branches/vs_jc/reactos/win32ss/user/consrv/coninput.c branches/vs_jc/reactos/win32ss/user/consrv/conoutput.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/vs_jc/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/applications… Modified: branches/vs_jc/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/services/svc… Modified: branches/vs_jc/reactos/base/services/svchost/svchost.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/services/svc… Modified: branches/vs_jc/reactos/base/shell/cmd/alias.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/al… Modified: branches/vs_jc/reactos/base/shell/cmd/assoc.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/as… Modified: branches/vs_jc/reactos/base/shell/cmd/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/at… Modified: branches/vs_jc/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ba… Modified: branches/vs_jc/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ba… Modified: branches/vs_jc/reactos/base/shell/cmd/beep.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/be… Modified: branches/vs_jc/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ca… Modified: branches/vs_jc/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ch… Modified: branches/vs_jc/reactos/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ch… Modified: branches/vs_jc/reactos/base/shell/cmd/cls.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cl… Modified: branches/vs_jc/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Modified: branches/vs_jc/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Modified: branches/vs_jc/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Modified: branches/vs_jc/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Modified: branches/vs_jc/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/cm… Modified: branches/vs_jc/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/co… Modified: branches/vs_jc/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/co… Modified: branches/vs_jc/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/co… Modified: branches/vs_jc/reactos/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/da… Modified: branches/vs_jc/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/de… Modified: branches/vs_jc/reactos/base/shell/cmd/delay.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/de… Modified: branches/vs_jc/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/di… Modified: branches/vs_jc/reactos/base/shell/cmd/dirstack.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/di… Modified: branches/vs_jc/reactos/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ec… Modified: branches/vs_jc/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/er… Modified: branches/vs_jc/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/fi… Modified: branches/vs_jc/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/fo… Modified: branches/vs_jc/reactos/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/fr… Modified: branches/vs_jc/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/go… Modified: branches/vs_jc/reactos/base/shell/cmd/history.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/hi… Modified: branches/vs_jc/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/if… Modified: branches/vs_jc/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/in… Modified: branches/vs_jc/reactos/base/shell/cmd/label.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/la… Modified: branches/vs_jc/reactos/base/shell/cmd/locale.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/lo… Modified: branches/vs_jc/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/me… Modified: branches/vs_jc/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/mi… Modified: branches/vs_jc/reactos/base/shell/cmd/mklink.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/mk… Modified: branches/vs_jc/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/mo… Modified: branches/vs_jc/reactos/base/shell/cmd/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ms… Modified: branches/vs_jc/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/pa… Modified: branches/vs_jc/reactos/base/shell/cmd/path.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/pa… Modified: branches/vs_jc/reactos/base/shell/cmd/pause.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/pa… Modified: branches/vs_jc/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/pr… Modified: branches/vs_jc/reactos/base/shell/cmd/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/redir.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/ren.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/re… Modified: branches/vs_jc/reactos/base/shell/cmd/screen.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/sc… Modified: branches/vs_jc/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/se… Modified: branches/vs_jc/reactos/base/shell/cmd/setlocal.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/se… Modified: branches/vs_jc/reactos/base/shell/cmd/shift.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/sh… Modified: branches/vs_jc/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/st… Modified: branches/vs_jc/reactos/base/shell/cmd/strtoclr.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/st… Modified: branches/vs_jc/reactos/base/shell/cmd/time.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ti… Modified: branches/vs_jc/reactos/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ti… Modified: branches/vs_jc/reactos/base/shell/cmd/title.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ti… Modified: branches/vs_jc/reactos/base/shell/cmd/todo.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/to… Modified: branches/vs_jc/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ty… Modified: branches/vs_jc/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ve… Modified: branches/vs_jc/reactos/base/shell/cmd/verify.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/ve… Modified: branches/vs_jc/reactos/base/shell/cmd/vol.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/vo… Modified: branches/vs_jc/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/wh… Modified: branches/vs_jc/reactos/base/shell/cmd/window.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/cmd/wi… Modified: branches/vs_jc/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/base/shell/explor… Modified: branches/vs_jc/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/boot/freeldr/free… Modified: branches/vs_jc/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/configure.cmd?rev… Modified: branches/vs_jc/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/cpl/desk/gene… Modified: branches/vs_jc/reactos/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/getunam… Modified: branches/vs_jc/reactos/dll/win32/getuname/getuname.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/getunam… Modified: branches/vs_jc/reactos/dll/win32/getuname/getuname.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/getunam… Modified: branches/vs_jc/reactos/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/kernel3… Modified: branches/vs_jc/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/kernel3… Modified: branches/vs_jc/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/kernel3… Modified: branches/vs_jc/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/msports.spec URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/msports/resource.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/msports… Modified: branches/vs_jc/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/netapi3… Modified: branches/vs_jc/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/netapi3… Modified: branches/vs_jc/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/dll/win32/netapi3… Modified: branches/vs_jc/reactos/drivers/filesystems/mup/create.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/filesyste… Modified: branches/vs_jc/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/ddk/ntifs… Modified: branches/vs_jc/reactos/include/ndk/lpcfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/ndk/lpcfu… Modified: branches/vs_jc/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/include/reactos/s… Modified: branches/vs_jc/reactos/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/lsalib/lsa.c?… Modified: branches/vs_jc/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/rtl/path.c?re… Modified: branches/vs_jc/reactos/lib/sdk/crt/misc/environ.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/crt/misc/… Modified: branches/vs_jc/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/lib/sdk/crt/strin… Modified: branches/vs_jc/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntoskrnl/fsrtl/la… Modified: branches/vs_jc/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ntoskrnl/fstub/fs… Modified: branches/vs_jc/reactos/win32ss/user/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Modified: branches/vs_jc/reactos/win32ss/user/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Modified: branches/vs_jc/reactos/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons… Modified: branches/vs_jc/reactos/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/win32ss/user/cons…

1 0

[jjones] 59397: Visual Studio build support for projects courtesy of Mr. Wang
by jjones＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: jjones Date: Sun Jun 30 18:04:38 2013 New Revision: 59397 URL: http://svn.reactos.org/svn/reactos?rev=59397&view=rev Log: Visual Studio build support for projects courtesy of Mr. Wang Added: branches/vs_jc/reactos/drivers/usb/usbd/usbd.vcxproj branches/vs_jc/reactos/drivers/usb/usbd/usbd.vcxproj.filters branches/vs_jc/reactos/drivers/usb/usbuhci/usbuhci.vcxproj branches/vs_jc/reactos/drivers/usb/usbuhci/usbuhci.vcxproj.filters Modified: branches/vs_jc/reactos/ReactOS.sln branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj branches/vs_jc/reactos/drivers/bus/pci/pci.vcxproj [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/vs_jc/reactos/ReactOS.sln URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/ReactOS.sln?rev=5… Modified: branches/vs_jc/reactos/_IMAGES/CD_Live/CD_Live.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/_IMAGES/CD_Live/C… Modified: branches/vs_jc/reactos/drivers/bus/pci/pci.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/bus/pci/p… Added: branches/vs_jc/reactos/drivers/usb/usbd/usbd.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbd/… Added: branches/vs_jc/reactos/drivers/usb/usbd/usbd.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbd/… Added: branches/vs_jc/reactos/drivers/usb/usbuhci/usbuhci.vcxproj URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbuh… Added: branches/vs_jc/reactos/drivers/usb/usbuhci/usbuhci.vcxproj.filters URL: http://svn.reactos.org/svn/reactos/branches/vs_jc/reactos/drivers/usb/usbuh…

1 0

[hbelusca] 59396: [CMD] Yet again some whitespace fixes.
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 16:10:54 2013 New Revision: 59396 URL: http://svn.reactos.org/svn/reactos?rev=59396&view=rev Log: [CMD] Yet again some whitespace fixes. Modified: trunk/reactos/base/shell/cmd/assoc.c trunk/reactos/base/shell/cmd/choice.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmdinput.c trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/error.c trunk/reactos/base/shell/cmd/filecomp.c trunk/reactos/base/shell/cmd/history.c trunk/reactos/base/shell/cmd/internal.c trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/move.c trunk/reactos/base/shell/cmd/prompt.c trunk/reactos/base/shell/cmd/ren.c trunk/reactos/base/shell/cmd/replace.c trunk/reactos/base/shell/cmd/screen.c trunk/reactos/base/shell/cmd/set.c trunk/reactos/base/shell/cmd/start.c trunk/reactos/base/shell/cmd/strtoclr.c trunk/reactos/base/shell/cmd/timer.c trunk/reactos/base/shell/cmd/vol.c trunk/reactos/base/shell/cmd/window.c Modified: trunk/reactos/base/shell/cmd/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/assoc.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/assoc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/assoc.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -32,7 +32,7 @@ return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); - if(return_val != ERROR_SUCCESS) + if (return_val != ERROR_SUCCESS) { RegCloseKey(hKey); return -1; @@ -40,7 +40,7 @@ return_val = RegOpenKeyEx(hKey, extension, 0, KEY_READ, &hInsideKey); - if(return_val != ERROR_SUCCESS) + if (return_val != ERROR_SUCCESS) { RegCloseKey(hKey); RegCloseKey(hInsideKey); @@ -50,14 +50,14 @@ /* obtain string length */ return_val = RegQueryValueEx(hInsideKey, NULL, NULL, NULL, NULL, &fileTypeLength); - if(return_val == ERROR_FILE_NOT_FOUND) /* no default value, don't display */ + if (return_val == ERROR_FILE_NOT_FOUND) /* no default value, don't display */ { RegCloseKey(hInsideKey); RegCloseKey(hKey); return 0; } - if(return_val != ERROR_SUCCESS) + if (return_val != ERROR_SUCCESS) { RegCloseKey(hInsideKey); RegCloseKey(hKey); @@ -72,18 +72,18 @@ RegCloseKey(hInsideKey); RegCloseKey(hKey); - if(return_val != ERROR_SUCCESS) + if (return_val != ERROR_SUCCESS) { cmd_free(fileType); return -2; } - if(fileTypeLength != 0) /* if there is a default key, display relevant information */ + if (fileTypeLength != 0) /* if there is a default key, display relevant information */ { ConOutPrintf(_T("%s=%s\r\n"), extension, fileType); } - if(fileTypeLength) + if (fileTypeLength) cmd_free(fileType); return 1; @@ -102,7 +102,7 @@ return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); - if(return_val != ERROR_SUCCESS) + if (return_val != ERROR_SUCCESS) { RegCloseKey(hKey); return -1; @@ -110,7 +110,7 @@ return_val = RegQueryInfoKey(hKey, NULL, NULL, NULL, &numKeys, &extLength, NULL, NULL, NULL, NULL, NULL, NULL); - if(return_val != ERROR_SUCCESS) + if (return_val != ERROR_SUCCESS) { RegCloseKey(hKey); return -2; @@ -123,9 +123,9 @@ DWORD buffer_size = extLength; return_val = RegEnumKeyEx(hKey, keyCtr, extName, &buffer_size, NULL, NULL, NULL, NULL); - if(return_val == ERROR_SUCCESS || return_val == ERROR_MORE_DATA) - { - if(*extName == _T('.')) + if (return_val == ERROR_SUCCESS || return_val == ERROR_MORE_DATA) + { + if (*extName == _T('.')) PrintAssociation(extName); } else @@ -138,7 +138,7 @@ RegCloseKey(hKey); - if(extName) + if (extName) cmd_free(extName); return numKeys; @@ -152,12 +152,12 @@ return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); - if(return_val != ERROR_SUCCESS) + if (return_val != ERROR_SUCCESS) return -1; return_val = RegCreateKeyEx(hKey, extension, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &insideKey, NULL); - if(return_val != ERROR_SUCCESS) + if (return_val != ERROR_SUCCESS) { RegCloseKey(hKey); return -1; @@ -165,7 +165,7 @@ return_val = RegSetValueEx(insideKey, NULL, 0, REG_SZ, (LPBYTE)type, (_tcslen(type) + 1) * sizeof(TCHAR)); - if(return_val != ERROR_SUCCESS) + if (return_val != ERROR_SUCCESS) { RegCloseKey(insideKey); RegCloseKey(hKey); @@ -186,12 +186,12 @@ return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); - if(return_val != ERROR_SUCCESS) + if (return_val != ERROR_SUCCESS) return -1; return_val = RegDeleteKey(hKey, extension); - if(return_val != ERROR_SUCCESS) + if (return_val != ERROR_SUCCESS) { RegCloseKey(hKey); return -2; @@ -214,12 +214,12 @@ nErrorLevel = 0; - if(_tcslen(param) == 0) + if (_tcslen(param) == 0) PrintAllAssociations(); else { LPTSTR lpEqualSign = _tcschr(param, _T('=')); - if(lpEqualSign != NULL) + if (lpEqualSign != NULL) { LPTSTR fileType = lpEqualSign + 1; LPTSTR extension = cmd_alloc((lpEqualSign - param + 1) * sizeof(TCHAR)); @@ -227,7 +227,7 @@ _tcsncpy(extension, param, lpEqualSign - param); extension[lpEqualSign - param] = (TCHAR)0; - if(_tcslen(fileType) == 0) + if (_tcslen(fileType) == 0) /* if the equal sign is the last character in the string, then delete the key */ { @@ -247,7 +247,7 @@ /* no equal sign, print all associations */ INT retval = PrintAssociation(param); - if(retval == 0) /* if nothing printed out */ + if (retval == 0) /* if nothing printed out */ ConOutResPrintf(STRING_ASSOC_ERROR, param); } } Modified: trunk/reactos/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/choice.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/choice.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/choice.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -230,7 +230,7 @@ ConInFlush (); - if(!bTimeout) + if (!bTimeout) { while (TRUE) { Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -310,7 +310,7 @@ * Rest - rest of command line */ static INT -Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd) +Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd) { TCHAR szFullName[MAX_PATH]; TCHAR *first, *rest, *dot; @@ -415,8 +415,8 @@ stui.wShowWindow = SW_SHOWDEFAULT; // return console to standard mode - SetConsoleMode (GetStdHandle(STD_INPUT_HANDLE), - ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT ); + SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), + ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT); if (CreateProcess (szFullName, szFullCmdLine, @@ -1439,7 +1439,7 @@ } else { - if(SelfGenerated) + if (SelfGenerated) { SelfGenerated = FALSE; return TRUE; @@ -1539,7 +1539,7 @@ KEY_READ, &hkey) == ERROR_SUCCESS) { - if(RegQueryValueEx(hkey, + if (RegQueryValueEx(hkey, _T("AutoRun"), 0, 0, Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -112,7 +112,7 @@ static VOID -ClearCommandLine (LPTSTR str, INT maxlen, SHORT orgx, SHORT orgy) +ClearCommandLine(LPTSTR str, INT maxlen, SHORT orgx, SHORT orgy) { INT count; @@ -125,7 +125,7 @@ /* read in a command line */ -BOOL ReadCommand (LPTSTR str, INT maxlen) +BOOL ReadCommand(LPTSTR str, INT maxlen) { CONSOLE_SCREEN_BUFFER_INFO csbi; SHORT orgx; /* origin x/y */ @@ -182,9 +182,7 @@ do { - bReturn = FALSE; - ConInKey (&ir); if (ir.Event.KeyEvent.dwControlKeyState & @@ -360,21 +358,21 @@ /*if second TAB, list matches*/ if (ShowCompletionMatches (str, charcount)) { - PrintPrompt (); - GetCursorXY (&orgx, &orgy); - ConOutPrintf (_T("%s"), str); + PrintPrompt(); + GetCursorXY(&orgx, &orgy); + ConOutPrintf(_T("%s"), str); /* set cursor position */ - SetCursorXY ((orgx + current) % maxx, - orgy + (orgx + current) / maxx); - GetCursorXY (&curx, &cury); + SetCursorXY((orgx + current) % maxx, + orgy + (orgx + current) / maxx); + GetCursorXY(&curx, &cury); } } } else { - MessageBeep (-1); + MessageBeep(-1); } #endif #ifdef FEATURE_4NT_FILENAME_COMPLETION @@ -396,24 +394,24 @@ _tcscpy(str,szPath); /* Figure out where cusor is going to be after we print it */ - charcount = _tcslen (str); + charcount = _tcslen(str); current = charcount; - SetCursorXY (orgx, orgy); + SetCursorXY(orgx, orgy); /* Print out what we have now */ - ConOutPrintf (_T("%s"), str); + ConOutPrintf(_T("%s"), str); /* Move cursor accordingly */ - if(tempscreen > charcount) - { - GetCursorXY (&curx, &cury); + if (tempscreen > charcount) + { + GetCursorXY(&curx, &cury); for(count = tempscreen - charcount; count--; ) - ConOutChar (_T(' ')); - SetCursorXY (curx, cury); + ConOutChar(_T(' ')); + SetCursorXY(curx, cury); } else { - if(((charcount + orgx) / maxx) + orgy > maxy - 1) + if (((charcount + orgx) / maxx) + orgy > maxy - 1) orgy += maxy - ((charcount + orgx) / maxx + orgy + 1); } SetCursorXY((short)(((int)orgx + current) % maxx), (short)((int)orgy + ((int)orgx + current) / maxx)); @@ -425,7 +423,7 @@ case _T('C'): /* ^M does the same as return */ bCharInput = TRUE; - if(!(ir.Event.KeyEvent.dwControlKeyState & + if (!(ir.Event.KeyEvent.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) { break; Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -26,37 +26,37 @@ UINT OutputCodePage; -VOID ConInDisable (VOID) -{ - HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); +VOID ConInDisable(VOID) +{ + HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE); DWORD dwMode; - GetConsoleMode (hInput, &dwMode); + GetConsoleMode(hInput, &dwMode); dwMode &= ~ENABLE_PROCESSED_INPUT; - SetConsoleMode (hInput, dwMode); -} - - -VOID ConInEnable (VOID) -{ - HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); + SetConsoleMode(hInput, dwMode); +} + + +VOID ConInEnable(VOID) +{ + HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE); DWORD dwMode; - GetConsoleMode (hInput, &dwMode); + GetConsoleMode(hInput, &dwMode); dwMode |= ENABLE_PROCESSED_INPUT; - SetConsoleMode (hInput, dwMode); + SetConsoleMode(hInput, dwMode); } VOID ConInFlush (VOID) { - FlushConsoleInputBuffer (GetStdHandle (STD_INPUT_HANDLE)); -} - - -VOID ConInKey (PINPUT_RECORD lpBuffer) -{ - HANDLE hInput = GetStdHandle (STD_INPUT_HANDLE); + FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE)); +} + + +VOID ConInKey(PINPUT_RECORD lpBuffer) +{ + HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE); DWORD dwRead; if (hInput == INVALID_HANDLE_VALUE) @@ -64,7 +64,7 @@ do { - ReadConsoleInput (hInput, lpBuffer, 1, &dwRead); + ReadConsoleInput(hInput, lpBuffer, 1, &dwRead); if ((lpBuffer->EventType == KEY_EVENT) && (lpBuffer->Event.KeyEvent.bKeyDown == TRUE)) break; @@ -73,7 +73,7 @@ } -VOID ConInString (LPTSTR lpInput, DWORD dwLength) +VOID ConInString(LPTSTR lpInput, DWORD dwLength) { DWORD dwOldMode; DWORD dwRead = 0; @@ -87,13 +87,13 @@ #else pBuf = lpInput; #endif - ZeroMemory (lpInput, dwLength * sizeof(TCHAR)); - hFile = GetStdHandle (STD_INPUT_HANDLE); - GetConsoleMode (hFile, &dwOldMode); - - SetConsoleMode (hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); - - ReadFile (hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); + ZeroMemory(lpInput, dwLength * sizeof(TCHAR)); + hFile = GetStdHandle(STD_INPUT_HANDLE); + GetConsoleMode(hFile, &dwOldMode); + + SetConsoleMode(hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + + ReadFile(hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); #ifdef _UNICODE MultiByteToWideChar(InputCodePage, 0, pBuf, dwRead, lpInput, dwLength - 1); @@ -108,7 +108,7 @@ } } - SetConsoleMode (hFile, dwOldMode); + SetConsoleMode(hFile, dwOldMode); } static VOID ConWrite(TCHAR *str, DWORD len, DWORD nStdHandle) @@ -213,7 +213,7 @@ int from = 0, i = 0; - if(NewPage == TRUE) + if (NewPage == TRUE) LineCount = 0; /* rest LineCount and return if no string have been given */ @@ -233,7 +233,7 @@ CharSL = csbi.dwCursorPosition.X; //make sure they didnt make the screen to small - if(ScreenLines<4) + if (ScreenLines<4) { ConPrintf(szFormat, arg_ptr, nStdHandle); return 0; @@ -250,12 +250,12 @@ LineCount++; CharSL=0; - if(LineCount >= ScreenLines) + if (LineCount >= ScreenLines) { WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); from = i; - if(PagePrompt() != PROMPT_YES) + if (PagePrompt() != PROMPT_YES) { return 1; } @@ -286,7 +286,7 @@ &arg_ptr); va_end (arg_ptr); - if(ret > 0) + if (ret > 0) { ConErrPuts (text); LocalFree(text); @@ -315,7 +315,7 @@ &arg_ptr); va_end (arg_ptr); - if(ret > 0) + if (ret > 0) { ConErrPuts (text); LocalFree(text); Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/copy.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -68,12 +68,12 @@ SYSTEMTIME CurrentTime; /* Check Breaker */ - if(CheckCtrlBreak(BREAK_INPUT)) + if (CheckCtrlBreak(BREAK_INPUT)) return 0; TRACE ("checking mode\n"); - if(bTouch) + if (bTouch) { hFileSrc = CreateFile (source, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); @@ -86,7 +86,7 @@ GetSystemTime(&CurrentTime); SystemTimeToFileTime(&CurrentTime, &NewFileTime); - if(SetFileTime(hFileSrc,(LPFILETIME) NULL, (LPFILETIME) NULL, &NewFileTime)) + if (SetFileTime(hFileSrc,(LPFILETIME) NULL, (LPFILETIME) NULL, &NewFileTime)) { CloseHandle(hFileSrc); nErrorLevel = 1; @@ -120,7 +120,7 @@ /* Check to see if /D or /Z are true, if so we need a middle man to copy the file too to allow us to use CopyFileEx later */ - if(lpdwFlags & COPY_DECRYPT) + if (lpdwFlags & COPY_DECRYPT) { GetEnvironmentVariable(_T("TEMP"),TempSrc,MAX_PATH); _tcscat(TempSrc,_T("\\")); @@ -134,7 +134,7 @@ which would error when it tried to open the handles for ReadFile and WriteFile */ _tcscat(TempSrc,_T(".decrypt")); - if(!CopyFileEx(source, TempSrc, NULL, NULL, FALSE, COPY_FILE_ALLOW_DECRYPTED_DESTINATION)) + if (!CopyFileEx(source, TempSrc, NULL, NULL, FALSE, COPY_FILE_ALLOW_DECRYPTED_DESTINATION)) { nErrorLevel = 1; return 0; @@ -143,7 +143,7 @@ } - if(lpdwFlags & COPY_RESTART) + if (lpdwFlags & COPY_RESTART) { _tcscpy(TrueDest, dest); GetEnvironmentVariable(_T("TEMP"),dest,MAX_PATH); @@ -260,9 +260,9 @@ SetFileAttributes (dest, dwAttrib); /* Now finish off the copy if needed with CopyFileEx */ - if(lpdwFlags & COPY_RESTART) - { - if(!CopyFileEx(dest, TrueDest, NULL, NULL, FALSE, COPY_FILE_RESTARTABLE)) + if (lpdwFlags & COPY_RESTART) + { + if (!CopyFileEx(dest, TrueDest, NULL, NULL, FALSE, COPY_FILE_RESTARTABLE)) { nErrorLevel = 1; DeleteFile(dest); @@ -273,7 +273,7 @@ } - if(lpdwFlags & COPY_DECRYPT) + if (lpdwFlags & COPY_DECRYPT) DeleteFile(TempSrc); return 1; @@ -480,8 +480,8 @@ break; case _T('-'): - if(_tcslen(arg[i]) >= 3) - if(_totupper(arg[i][2]) == _T('Y')) + if (_tcslen(arg[i]) >= 3) + if (_totupper(arg[i][2]) == _T('Y')) { dwFlags &= ~COPY_NO_PROMPT; dwFlags |= COPY_PROMPT; @@ -538,7 +538,7 @@ bMoreFiles = FALSE; } - else if(nDes == -1) + else if (nDes == -1) { nDes = i; } @@ -825,7 +825,7 @@ _tcscat (tmpSrcPath, findBuffer.cFileName); /* Check to see if the file is the same file */ - if(!bTouch && !_tcscmp(tmpSrcPath, tmpDestPath)) + if (!bTouch && !_tcscmp(tmpSrcPath, tmpDestPath)) { ConOutResPrintf(STRING_COPY_ERROR2); @@ -846,7 +846,7 @@ dwFlags |= COPY_NO_PROMPT; /* Tell weather the copy was successful or not */ - if(copy(tmpSrcPath,tmpDestPath, bAppend, dwFlags, bTouch)) + if (copy(tmpSrcPath,tmpDestPath, bAppend, dwFlags, bTouch)) { nFiles++; //LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -372,12 +372,12 @@ /* Copy it to the entries list */ temp = cmd_alloc((ptrEnd - ptrStart + 1) * sizeof (TCHAR)); - if(!temp) + if (!temp) return FALSE; memcpy(temp, ptrStart, (ptrEnd - ptrStart) * sizeof (TCHAR)); temp[ptrEnd - ptrStart] = _T('\0'); StripQuotes(temp); - if(!add_entry(entries, params, temp)) + if (!add_entry(entries, params, temp)) { cmd_free(temp); freep(*params); @@ -404,9 +404,9 @@ switch(cCurSwitch) { case _T('A'): /* Switch parameters for /A (attributes filter) */ - if(cCurChar == _T('-')) + if (cCurChar == _T('-')) bPNegative = TRUE; - else if(cCurUChar == _T('D')) + else if (cCurUChar == _T('D')) { lpFlags->stAttribs.dwAttribMask |= FILE_ATTRIBUTE_DIRECTORY; if (bPNegative) @@ -414,7 +414,7 @@ else lpFlags->stAttribs.dwAttribVal |= FILE_ATTRIBUTE_DIRECTORY; } - else if(cCurUChar == _T('R')) + else if (cCurUChar == _T('R')) { lpFlags->stAttribs.dwAttribMask |= FILE_ATTRIBUTE_READONLY; if (bPNegative) @@ -422,7 +422,7 @@ else lpFlags->stAttribs.dwAttribVal |= FILE_ATTRIBUTE_READONLY; } - else if(cCurUChar == _T('H')) + else if (cCurUChar == _T('H')) { lpFlags->stAttribs.dwAttribMask |= FILE_ATTRIBUTE_HIDDEN; if (bPNegative) @@ -430,7 +430,7 @@ else lpFlags->stAttribs.dwAttribVal |= FILE_ATTRIBUTE_HIDDEN; } - else if(cCurUChar == _T('A')) + else if (cCurUChar == _T('A')) { lpFlags->stAttribs.dwAttribMask |= FILE_ATTRIBUTE_ARCHIVE; if (bPNegative) @@ -438,7 +438,7 @@ else lpFlags->stAttribs.dwAttribVal |= FILE_ATTRIBUTE_ARCHIVE; } - else if(cCurUChar == _T('S')) + else if (cCurUChar == _T('S')) { lpFlags->stAttribs.dwAttribMask |= FILE_ATTRIBUTE_SYSTEM; if (bPNegative) @@ -453,11 +453,11 @@ } break; case _T('T'): /* Switch parameters for /T (time field) */ - if(cCurUChar == _T('C')) + if (cCurUChar == _T('C')) lpFlags->stTimeField.eTimeField= TF_CREATIONDATE ; - else if(cCurUChar == _T('A')) + else if (cCurUChar == _T('A')) lpFlags->stTimeField.eTimeField= TF_LASTACCESSEDDATE ; - else if(cCurUChar == _T('W')) + else if (cCurUChar == _T('W')) lpFlags->stTimeField.eTimeField= TF_MODIFIEDDATE ; else { @@ -465,37 +465,37 @@ return FALSE; } break; - case _T('O'): /* Switch parameters for /O (order) */ + case _T('O'): /* Switch parameters for /O (order) */ /* Ok a switch parameter was given */ bOrderByNoPar = FALSE; - if(cCurChar == _T('-')) + if (cCurChar == _T('-')) bPNegative = TRUE; - else if(cCurUChar == _T('N')) + else if (cCurUChar == _T('N')) { if (lpFlags->stOrderBy.sCriteriaCount < 3) lpFlags->stOrderBy.sCriteriaCount++; lpFlags->stOrderBy.bCriteriaRev[lpFlags->stOrderBy.sCriteriaCount - 1] = bPNegative; lpFlags->stOrderBy.eCriteria[lpFlags->stOrderBy.sCriteriaCount - 1] = ORDER_NAME; } - else if(cCurUChar == _T('S')) + else if (cCurUChar == _T('S')) { if (lpFlags->stOrderBy.sCriteriaCount < 3) lpFlags->stOrderBy.sCriteriaCount++; lpFlags->stOrderBy.bCriteriaRev[lpFlags->stOrderBy.sCriteriaCount - 1] = bPNegative; lpFlags->stOrderBy.eCriteria[lpFlags->stOrderBy.sCriteriaCount - 1] = ORDER_SIZE; } - else if(cCurUChar == _T('G')) + else if (cCurUChar == _T('G')) { if (lpFlags->stOrderBy.sCriteriaCount < 3) lpFlags->stOrderBy.sCriteriaCount++; lpFlags->stOrderBy.bCriteriaRev[lpFlags->stOrderBy.sCriteriaCount - 1] = bPNegative; lpFlags->stOrderBy.eCriteria[lpFlags->stOrderBy.sCriteriaCount - 1] = ORDER_DIRECTORY; } - else if(cCurUChar == _T('E')) + else if (cCurUChar == _T('E')) { if (lpFlags->stOrderBy.sCriteriaCount < 3) lpFlags->stOrderBy.sCriteriaCount++; lpFlags->stOrderBy.bCriteriaRev[lpFlags->stOrderBy.sCriteriaCount - 1] = bPNegative; lpFlags->stOrderBy.eCriteria[lpFlags->stOrderBy.sCriteriaCount - 1] = ORDER_EXTENSION; } - else if(cCurUChar == _T('D')) + else if (cCurUChar == _T('D')) { if (lpFlags->stOrderBy.sCriteriaCount < 3) lpFlags->stOrderBy.sCriteriaCount++; lpFlags->stOrderBy.bCriteriaRev[lpFlags->stOrderBy.sCriteriaCount - 1] = bPNegative; @@ -1111,12 +1111,12 @@ /* Bare format */ DirPrintBareList(ptrFiles, dwCount, szCurPath, lpFlags); } - else if(lpFlags->bShortName) + else if (lpFlags->bShortName) { /* New list style / Short names */ DirPrintNewList(ptrFiles, dwCount, szCurPath, lpFlags); } - else if(lpFlags->bWideListColSort || lpFlags->bWideList) + else if (lpFlags->bWideListColSort || lpFlags->bWideList) { /* Wide list */ DirPrintWideList(ptrFiles, dwCount, szCurPath, lpFlags); @@ -1348,7 +1348,7 @@ do { /*If retrieved FileName has extension,and szPath doesnt have extension then JUMP the retrieved FileName*/ - if(_tcschr(wfdFileInfo.cFileName,_T('.'))&&(fPoint==TRUE)) + if (_tcschr(wfdFileInfo.cFileName,_T('.'))&&(fPoint==TRUE)) { continue; /* Here we filter all the specified attributes */ Modified: trunk/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/error.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/error.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/error.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -47,7 +47,7 @@ (LPTSTR)&szError, 0, NULL)) { ConErrPrintf (_T("%s %s\n"), szError, szMessage); - if(szError) + if (szError) LocalFree (szError); return; } Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -169,7 +169,7 @@ _tcscat (&str[start], maxmatch); } - if(!perfectmatch) + if (!perfectmatch) { MessageBeep (-1); } @@ -381,12 +381,12 @@ /* Count number of " */ for(i = 0; i < _tcslen(str); i++) { - if(str[i] == _T('\"')) + if (str[i] == _T('\"')) nQuotes++; } /* Find the prefix and suffix */ - if(nQuotes % 2 && nQuotes >= 1) + if (nQuotes % 2 && nQuotes >= 1) { /* Odd number of quotes. Just start from the last " */ /* THis is the way MS does it, and is an easy way out */ @@ -398,9 +398,9 @@ szSearch1 = _tcsrchr(str, _T('\"')); szSearch2 = _tcsrchr(str, _T('\\')); szSearch3 = _tcsrchr(str, _T('.')); - if(szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) + if (szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) szSearch = szSearch2; - else if(szSearch3 != NULL && _tcslen(szSearch1) > _tcslen(szSearch3)) + else if (szSearch3 != NULL && _tcslen(szSearch1) > _tcslen(szSearch3)) szSearch = szSearch3; else szSearch = szSearch1; @@ -412,13 +412,13 @@ } - if(!_tcschr(str, _T(' '))) + if (!_tcschr(str, _T(' '))) { /* No spaces, everything goes to Suffix */ _tcscpy(szSuffix,str); /* look for a slash just in case */ szSearch = _tcsrchr(str, _T('\\')); - if(szSearch) + if (szSearch) { szSearch++; szSearch[0] = _T('\0'); @@ -431,7 +431,7 @@ return; } - if(!nQuotes) + if (!nQuotes) { /* No quotes, and there is a space*/ /* Take it after the last space */ @@ -443,9 +443,9 @@ szSearch1 = _tcsrchr(str, _T(' ')); szSearch2 = _tcsrchr(str, _T('\\')); szSearch3 = _tcsrchr(str, _T('/')); - if(szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) + if (szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2)) szSearch = szSearch2; - else if(szSearch3 != NULL && _tcslen(szSearch1) > _tcslen(szSearch3)) + else if (szSearch3 != NULL && _tcslen(szSearch1) > _tcslen(szSearch3)) szSearch = szSearch3; else szSearch = szSearch1; @@ -460,11 +460,11 @@ not inside a quotes */ for(i = 0; i < _tcslen(str); i++) { - if(str[i] == _T('\"')) + if (str[i] == _T('\"')) bInside = !bInside; - if(str[i] == _T(' ') && !bInside) + if (str[i] == _T(' ') && !bInside) SBreak = i; - if((str[i] == _T(' ') || str[i] == _T('\\')) && !bInside) + if ((str[i] == _T(' ') || str[i] == _T('\\')) && !bInside) PBreak = i; } SBreak++; @@ -493,7 +493,7 @@ return 0; File2 = cmd_alloc(sizeof(FileName)); - if(!File2) + if (!File2) { cmd_free(File1); return 0; @@ -583,7 +583,7 @@ while (_istspace (*line)) line++; - if(!_tcsnicmp (line, _T("rd "), 3) || !_tcsnicmp (line, _T("cd "), 3)) + if (!_tcsnicmp (line, _T("rd "), 3) || !_tcsnicmp (line, _T("cd "), 3)) ShowAll = FALSE; /* Copy the string, str can be edited and orginal should not be */ @@ -591,17 +591,17 @@ _tcscpy(szOrginal,strIN); /* Look to see if the cusor is not at the end of the string */ - if((cusor + 1) < _tcslen(str)) + if ((cusor + 1) < _tcslen(str)) str[cusor] = _T('\0'); /* Look to see if they hit tab again, if so cut off the diff length */ - if(_tcscmp(str,LastReturned) || !_tcslen(str)) + if (_tcscmp(str,LastReturned) || !_tcslen(str)) { /* We need to know how many chars we added from the start */ StartLength = _tcslen(str); /* no string, we need all files in that directory */ - if(!StartLength) + if (!StartLength) { _tcscat(str,_T("*")); } @@ -618,7 +618,7 @@ /* Strip quotes */ for(i = 0; i < _tcslen(szBaseWord); ) { - if(szBaseWord[i] == _T('\"')) + if (szBaseWord[i] == _T('\"')) memmove(&szBaseWord[i],&szBaseWord[i + 1], _tcslen(&szBaseWord[i]) * sizeof(TCHAR)); else i++; @@ -639,7 +639,7 @@ _tcscat(szSearchPath, szBaseWord); } - if(StartLength > 0) + if (StartLength > 0) { _tcscat(szSearchPath,_T("*")); } @@ -654,7 +654,7 @@ } /* search for the files it might be */ hFile = FindFirstFile (szSearchPath, &file); - if(hFile == INVALID_HANDLE_VALUE) + if (hFile == INVALID_HANDLE_VALUE) { /* Assemble the orginal string and return */ _tcscpy(strOut,szOrginal); @@ -666,12 +666,12 @@ { FileName * oldFileList = FileList; - if(!_tcscmp (file.cFileName, _T(".")) || + if (!_tcscmp (file.cFileName, _T(".")) || !_tcscmp (file.cFileName, _T(".."))) continue; /* Don't show files when they are doing 'cd' or 'rd' */ - if(!ShowAll && + if (!ShowAll && file.dwFileAttributes != 0xFFFFFFFF && !(file.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { @@ -681,7 +681,7 @@ /* Add the file to the list of files */ FileList = cmd_realloc(FileList, ++FileListSize * sizeof(FileName)); - if(FileList == NULL) + if (FileList == NULL) { /* Don't leak old buffer */ cmd_free(oldFileList); @@ -700,10 +700,10 @@ /* Check the size of the list to see if we found any matches */ - if(FileListSize == 0) + if (FileListSize == 0) { _tcscpy(strOut,szOrginal); - if(FileList != NULL) + if (FileList != NULL) cmd_free(FileList); return; @@ -712,18 +712,18 @@ qsort(FileList,FileListSize,sizeof(FileName), compare); /* Find the next/previous */ - if(!_tcscmp(szOrginal,LastReturned)) - { - if(bNext) - { - if(FileListSize - 1 == Sel) + if (!_tcscmp(szOrginal,LastReturned)) + { + if (bNext) + { + if (FileListSize - 1 == Sel) Sel = 0; else Sel++; } else { - if(!Sel) + if (!Sel) Sel = FileListSize - 1; else Sel--; @@ -750,24 +750,24 @@ /* Find the place to put the " at the start */ for(i = 0; i < _tcslen(szPrefix); i++) { - if(szPrefix[i] == _T('\"')) + if (szPrefix[i] == _T('\"')) bInside = !bInside; - if(szPrefix[i] == _T(' ') && !bInside) + if (szPrefix[i] == _T(' ') && !bInside) LastSpace = i; } /* insert the quotation and move things around */ - if(szPrefix[LastSpace + 1] != _T('\"') && LastSpace != -1) + if (szPrefix[LastSpace + 1] != _T('\"') && LastSpace != -1) { memmove ( &szPrefix[LastSpace+1], &szPrefix[LastSpace], (_tcslen(szPrefix)-LastSpace+1) * sizeof(TCHAR) ); - if((UINT)(LastSpace + 1) == _tcslen(szPrefix)) + if ((UINT)(LastSpace + 1) == _tcslen(szPrefix)) { _tcscat(szPrefix,_T("\"")); } szPrefix[LastSpace + 1] = _T('\"'); } - else if(LastSpace == -1) + else if (LastSpace == -1) { /* Add quotation only if none exists already */ if (szPrefix[0] != _T('\"')) @@ -783,22 +783,22 @@ _tcscat(strOut,FileList[Sel].Name); /* check for odd number of quotes means we need to close them */ - if(!NeededQuote) + if (!NeededQuote) { for(i = 0; i < _tcslen(strOut); i++) { - if(strOut[i] == _T('\"')) + if (strOut[i] == _T('\"')) NeededQuote = !NeededQuote; } } - if(szPrefix[_tcslen(szPrefix) - 1] == _T('\"') || NeededQuote) + if (szPrefix[_tcslen(szPrefix) - 1] == _T('\"') || NeededQuote) _tcscat(strOut,_T("\"")); _tcscpy(LastReturned,strOut); //EndLength = _tcslen(strOut); //DiffLength = EndLength - StartLength; - if(FileList != NULL) + if (FileList != NULL) cmd_free(FileList); } #endif Modified: trunk/reactos/base/shell/cmd/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/history.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/history.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/history.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -219,8 +219,8 @@ return; /*if new entry is the same than the last do not add it*/ - if(size) - if(_tcscmp(string,Bottom->next->string)==0) + if (size) + if (_tcscmp(string,Bottom->next->string)==0) return; /*fill bottom with string, it will become Bottom->next*/ @@ -287,7 +287,7 @@ VOID History (INT dir, LPTSTR commandline) { - if(dir==0) + if (dir==0) { add_at_bottom(commandline); curr_ptr=Bottom; @@ -300,7 +300,7 @@ return; } - if(dir<0)/*key up*/ + if (dir<0)/*key up*/ { if (curr_ptr->next==Top || curr_ptr==Top) { @@ -314,11 +314,11 @@ } curr_ptr = curr_ptr->next; - if(curr_ptr->string) + if (curr_ptr->string) _tcscpy(commandline,curr_ptr->string); } - if(dir>0) + if (dir>0) { if (curr_ptr->prev==Bottom || curr_ptr==Bottom) { @@ -332,7 +332,7 @@ } curr_ptr=curr_ptr->prev; - if(curr_ptr->string) + if (curr_ptr->string) _tcscpy(commandline,curr_ptr->string); } } Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -297,7 +297,7 @@ n = p ? p++ - DirPath : _tcslen(DirPath); _tcsncpy(path, DirPath, n); path[n] = _T('\0'); - if( !CreateDirectory(path, NULL) && + if ( !CreateDirectory(path, NULL) && (GetLastError() != ERROR_ALREADY_EXISTS)) { return FALSE; @@ -334,7 +334,7 @@ { if (!MakeFullPath(p[i])) { - if(GetLastError() == ERROR_PATH_NOT_FOUND) + if (GetLastError() == ERROR_PATH_NOT_FOUND) { ConErrResPuts(STRING_MD_ERROR2); } @@ -376,12 +376,12 @@ _tcscpy(TempFileName,Base); _tcscat(TempFileName,f.cFileName); - if(f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) DeleteFolder(TempFileName); else { SetFileAttributes(TempFileName,FILE_ATTRIBUTE_NORMAL); - if(!DeleteFile(TempFileName)) + if (!DeleteFile(TempFileName)) return 0; } Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -94,16 +94,16 @@ for(i = 0; i < _tcslen(Path); i++) { - if(Path[i] != _T('\\')) + if (Path[i] != _T('\\')) { _tcsncat(TempPath, &Path[i], 1); - if(i != _tcslen(Path) - 1) + if (i != _tcslen(Path) - 1) continue; } /* Handle the base part of the path different. Because if you put it into findfirstfile, it will return your current folder */ - if(_tcslen(TempPath) == 2 && TempPath[1] == _T(':')) + if (_tcslen(TempPath) == 2 && TempPath[1] == _T(':')) { _tcscat(OutPath, TempPath); _tcscat(OutPath, _T("\\")); @@ -112,7 +112,7 @@ else { hFind = FindFirstFile(TempPath,&FindFileData); - if(hFind == INVALID_HANDLE_VALUE) + if (hFind == INVALID_HANDLE_VALUE) { _tcscpy(OutPath, Path); return; @@ -533,25 +533,25 @@ return TRUE; } -INT PagePrompt (VOID) +INT PagePrompt(VOID) { INPUT_RECORD ir; ConOutResPuts(STRING_MISC_HELP1); - RemoveBreakHandler (); - ConInDisable (); + RemoveBreakHandler(); + ConInDisable(); do { - ConInKey (&ir); + ConInKey(&ir); } while ((ir.Event.KeyEvent.wVirtualKeyCode == VK_SHIFT) || (ir.Event.KeyEvent.wVirtualKeyCode == VK_MENU) || (ir.Event.KeyEvent.wVirtualKeyCode == VK_CONTROL)); - AddBreakHandler (); - ConInEnable (); + AddBreakHandler(); + ConInEnable(); if ((ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) || ((ir.Event.KeyEvent.wVirtualKeyCode == _T('C')) && @@ -600,8 +600,8 @@ /* unfinished solution */ #if 0 - RemoveBreakHandler (); - ConInDisable (); + RemoveBreakHandler(); + ConInDisable(); do { @@ -616,8 +616,8 @@ (ir.Event.KeyEvent.wVirtualKeyCode == VK_MENU) || (ir.Event.KeyEvent.wVirtualKeyCode == VK_CONTROL)); - AddBreakHandler (); - ConInEnable (); + AddBreakHandler(); + ConInEnable(); if ((ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) || ((ir.Event.KeyEvent.wVirtualKeyCode == 'C') && @@ -666,8 +666,8 @@ /* unfinished solution */ #if 0 - RemoveBreakHandler (); - ConInDisable (); + RemoveBreakHandler(); + ConInDisable(); do { @@ -680,8 +680,8 @@ (ir.Event.KeyEvent.wVirtualKeyCode == VK_MENU) || (ir.Event.KeyEvent.wVirtualKeyCode == VK_CONTROL)); - AddBreakHandler (); - ConInEnable (); + AddBreakHandler(); + ConInEnable(); if ((ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) || ((ir.Event.KeyEvent.wVirtualKeyCode == _T('C')) && Modified: trunk/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/move.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/move.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/move.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -283,7 +283,7 @@ ~MOVE_SRC_CURRENT_IS_DIR & ~MOVE_DEST_EXISTS; _tcscpy(szFullSrcPath,szSrcDirPath); - if(szFullSrcPath[_tcslen(szFullSrcPath) - 1] != _T('\\')) + if (szFullSrcPath[_tcslen(szFullSrcPath) - 1] != _T('\\')) _tcscat (szFullSrcPath, _T("\\")); _tcscat(szFullSrcPath,findBuffer.cFileName); _tcscpy(szSrcPath, szFullSrcPath); @@ -311,7 +311,7 @@ /*build the dest string(accounts for *)*/ _tcscpy (szFullDestPath, szDestPath); /*check to see if there is an ending slash, if not add one*/ - if(szFullDestPath[_tcslen(szFullDestPath) - 1] != _T('\\')) + if (szFullDestPath[_tcslen(szFullDestPath) - 1] != _T('\\')) _tcscat (szFullDestPath, _T("\\")); _tcscat (szFullDestPath, findBuffer.cFileName); @@ -365,10 +365,10 @@ } /*checks to make sure user wanted/wants the override*/ - if((dwFlags & MOVE_OVER_NO) && + if ((dwFlags & MOVE_OVER_NO) && (dwMoveStatusFlags & MOVE_DEST_EXISTS)) continue; - if(!(dwFlags & MOVE_OVER_YES) && + if (!(dwFlags & MOVE_OVER_YES) && (dwMoveStatusFlags & MOVE_DEST_EXISTS)) nOverwrite = MoveOverwrite (szFullDestPath); if (nOverwrite == PROMPT_NO || nOverwrite == PROMPT_BREAK) @@ -440,9 +440,9 @@ nDiff = _tcslen(szMoveDest) - _tcslen(szTempPath); pszDestDirPointer = pszDestDirPointer - nDiff; _tcscpy(pszDestDirPointer,_T("")); - if(szMoveSrc[_tcslen(szMoveSrc) - 1] != _T('\\')) + if (szMoveSrc[_tcslen(szMoveSrc) - 1] != _T('\\')) _tcscat (szMoveSrc, _T("\\")); - if(szMoveDest[_tcslen(szMoveDest) - 1] != _T('\\')) + if (szMoveDest[_tcslen(szMoveDest) - 1] != _T('\\')) _tcscat (szMoveDest, _T("\\")); pszDestDirPointer = szMoveDest + _tcslen(szMoveDest); pszSrcDirPointer = szMoveSrc + _tcslen(szMoveSrc); Modified: trunk/reactos/base/shell/cmd/prompt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/prompt.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/prompt.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -57,7 +57,7 @@ TCHAR szPrompt[256]; LPTSTR pr; - if (GetEnvironmentVariable (_T("PROMPT"), szPrompt, 256)) + if (GetEnvironmentVariable(_T("PROMPT"), szPrompt, 256)) pr = szPrompt; else pr = default_pr; @@ -66,24 +66,24 @@ { if (*pr != _T('$')) { - ConOutChar (*pr); + ConOutChar(*pr); } else { pr++; - switch (_totupper (*pr)) + switch (_totupper(*pr)) { case _T('A'): - ConOutChar (_T('&')); + ConOutChar(_T('&')); break; case _T('B'): - ConOutChar (_T('|')); + ConOutChar(_T('|')); break; case _T('C'): - ConOutChar (_T('(')); + ConOutChar(_T('(')); break; case _T('D'): @@ -91,49 +91,49 @@ break; case _T('E'): - ConOutChar (_T('\x1B')); + ConOutChar(_T('\x1B')); break; case _T('F'): - ConOutChar (_T(')')); + ConOutChar(_T(')')); break; case _T('G'): - ConOutChar (_T('>')); + ConOutChar(_T('>')); break; case _T('H'): - ConOutChar (_T('\x08')); - ConOutChar (_T(' ')); - ConOutChar (_T('\x08')); + ConOutChar(_T('\x08')); + ConOutChar(_T(' ')); + ConOutChar(_T('\x08')); break; case _T('L'): - ConOutChar (_T('<')); + ConOutChar(_T('<')); break; case _T('N'): { TCHAR szPath[MAX_PATH]; - GetCurrentDirectory (MAX_PATH, szPath); - ConOutChar (szPath[0]); + GetCurrentDirectory(MAX_PATH, szPath); + ConOutChar(szPath[0]); } break; case _T('P'): { TCHAR szPath[MAX_PATH]; - GetCurrentDirectory (MAX_PATH, szPath); - ConOutPrintf (_T("%s"), szPath); + GetCurrentDirectory(MAX_PATH, szPath); + ConOutPrintf(_T("%s"), szPath); } break; case _T('Q'): - ConOutChar (_T('=')); - break; - - case _T('S'): - ConOutChar (_T(' ')); + ConOutChar(_T('=')); + break; + + case _T('S'): + ConOutChar(_T(' ')); break; case _T('T'): @@ -146,25 +146,25 @@ case VER_PLATFORM_WIN32_WINDOWS: if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 1) - ConOutPrintf (_T("Windows 98")); + ConOutPrintf(_T("Windows 98")); else - ConOutPrintf (_T("Windows 95")); + ConOutPrintf(_T("Windows 95")); break; case VER_PLATFORM_WIN32_NT: - ConOutPrintf (_T("Windows NT Version %lu.%lu"), - osvi.dwMajorVersion, osvi.dwMinorVersion); + ConOutPrintf(_T("Windows NT Version %lu.%lu"), + osvi.dwMajorVersion, osvi.dwMinorVersion); break; } break; case _T('_'): - ConOutChar (_T('\n')); + ConOutChar(_T('\n')); break; case '$': - ConOutChar (_T('$')); + ConOutChar(_T('$')); break; #ifdef FEATURE_DIRECTORY_STACK @@ -172,7 +172,7 @@ { INT i; for (i = 0; i < GetDirectoryStackDepth (); i++) - ConOutChar (_T('+')); + ConOutChar(_T('+')); } break; #endif Modified: trunk/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/ren.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ren.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -171,24 +171,24 @@ while(_tcschr(srcFILE, _T('\\'))) { srcFILE++; - if(*srcFILE==_T('\\')) nSlash++ ; - if(!_tcschr(srcFILE, _T('\\'))) break; + if (*srcFILE==_T('\\')) nSlash++ ; + if (!_tcschr(srcFILE, _T('\\'))) break; } _tcsncpy(srcPath,srcPattern,_tcslen(srcPattern)-_tcslen(srcFILE)); - if(_tcschr(dstPattern, _T('\\'))) //Checking if the Destiny (dstPattern)is also a Path.And splitting dstPattern in dstPath and srcPath. + if (_tcschr(dstPattern, _T('\\'))) //Checking if the Destiny (dstPattern)is also a Path.And splitting dstPattern in dstPath and srcPath. { dstFILE = _tcschr(dstPattern, _T('\\')); nSlash=0; while(_tcschr(dstFILE, _T('\\'))) { dstFILE++; - if(*dstFILE==_T('\\')) nSlash++ ; - if(!_tcschr(dstFILE, _T('\\'))) break; + if (*dstFILE==_T('\\')) nSlash++ ; + if (!_tcschr(dstFILE, _T('\\'))) break; } _tcsncpy(dstPath,dstPattern,_tcslen(dstPattern)-_tcslen(dstFILE)); - if((_tcslen(dstPath)!=_tcslen(srcPath))||(_tcsncmp(srcPath,dstPath,_tcslen(srcPath))!=0)) //If it has a Path,then MUST be equal than srcPath + if ((_tcslen(dstPath)!=_tcslen(srcPath))||(_tcsncmp(srcPath,dstPath,_tcslen(srcPath))!=0)) //If it has a Path,then MUST be equal than srcPath { error_syntax(dstPath); freep(arg); @@ -205,7 +205,7 @@ if (!_tcschr(srcPattern, _T('\\'))) //If srcPattern isn't a Path but a name: { srcFILE=srcPattern; - if(_tcschr(dstPattern, _T('\\'))) + if (_tcschr(dstPattern, _T('\\'))) { error_syntax(dstPattern); freep(arg); @@ -286,7 +286,7 @@ } *r = 0; //Well we have splitted the Paths,so now we have to paste them again(if needed),thanks bPath. - if(bPath == TRUE) + if (bPath == TRUE) { _tcscpy(srcFinal,srcPath); _tcscat(srcFinal,f.cFileName); Modified: trunk/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/replace.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -36,7 +36,7 @@ /* retrives the pathe dependen om the input file name */ void getPath(TCHAR* out, LPTSTR in) { - if(_tcslen(in) == 2 && in[1] == _T(':')) + if (_tcslen(in) == 2 && in[1] == _T(':')) GetRootPath(in,out,MAX_PATH); else GetFullPathName (in, MAX_PATH, out, NULL); @@ -83,7 +83,7 @@ */ dwAttrib = GetFileAttributes (source); - if(IsExistingFile (dest)) + if (IsExistingFile (dest)) { /* * Resets the attributes to avoid probles with read only files, @@ -94,7 +94,7 @@ * Is the update flas set? The time has to be controled so that * only older files are replaced. */ - if(dwFlags & REPLACE_UPDATE) + if (dwFlags & REPLACE_UPDATE) { /* Read destination time */ hFileDest = CreateFile(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, @@ -108,7 +108,7 @@ /* Compare time */ GetFileTime (hFileDest, &destCreationTime, &destLastAccessTime, &destLastWriteTime); - if(!((srcLastWriteTime.dwHighDateTime > destLastWriteTime.dwHighDateTime) || + if (!((srcLastWriteTime.dwHighDateTime > destLastWriteTime.dwHighDateTime) || (srcLastWriteTime.dwHighDateTime == destLastWriteTime.dwHighDateTime && srcLastWriteTime.dwLowDateTime > destLastWriteTime.dwLowDateTime))) { @@ -123,25 +123,25 @@ } /* Check confirm flag, and take appropriate action */ - if(dwFlags & REPLACE_CONFIRM) + if (dwFlags & REPLACE_CONFIRM) { /* Output depending on add flag */ - if(dwFlags & REPLACE_ADD) + if (dwFlags & REPLACE_ADD) ConOutResPrintf(STRING_REPLACE_HELP9, dest); else ConOutResPrintf(STRING_REPLACE_HELP10, dest); - if( !FilePromptYNA (0)) + if ( !FilePromptYNA (0)) return 0; } /* Output depending on add flag */ - if(dwFlags & REPLACE_ADD) + if (dwFlags & REPLACE_ADD) ConOutResPrintf(STRING_REPLACE_HELP11, dest); else ConOutResPrintf(STRING_REPLACE_HELP5, dest); /* Make sure source and destination is not the same */ - if(!_tcscmp(s, d)) + if (!_tcscmp(s, d)) { ConOutResPaging(TRUE, STRING_REPLACE_ERROR7); CloseHandle (hFileSrc); @@ -229,7 +229,7 @@ */ for(i = (_tcslen(szSrcPath) - 1); i > -1; i--) { - if(szSrcPath[i] != _T('\\')) + if (szSrcPath[i] != _T('\\')) szSrcPath[i] = _T('\0'); else break; @@ -238,17 +238,17 @@ /* Go through all the soursfiles and copy/replace them */ do { - if(CheckCtrlBreak(BREAK_INPUT)) + if (CheckCtrlBreak(BREAK_INPUT)) { return filesReplaced; } /* Problem with file handler */ - if(hFile == INVALID_HANDLE_VALUE) + if (hFile == INVALID_HANDLE_VALUE) return filesReplaced; /* We do not want to replace any .. . ocr directory */ - if(!_tcscmp (findBuffer.cFileName, _T(".")) || + if (!_tcscmp (findBuffer.cFileName, _T(".")) || !_tcscmp (findBuffer.cFileName, _T(".."))|| findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; @@ -259,23 +259,23 @@ dwAttrib = GetFileAttributes(tmpDestPath); /* Check add flag */ - if(dwFlags & REPLACE_ADD) - { - if(IsExistingFile(tmpDestPath)) + if (dwFlags & REPLACE_ADD) + { + if (IsExistingFile(tmpDestPath)) continue; else dwAttrib = 0; } else { - if(!IsExistingFile(tmpDestPath)) + if (!IsExistingFile(tmpDestPath)) continue; } /* Check if file is read only, if so check if that should be ignored */ - if(dwAttrib & FILE_ATTRIBUTE_READONLY) - { - if(!(dwFlags & REPLACE_READ_ONLY)) + if (dwAttrib & FILE_ATTRIBUTE_READONLY) + { + if (!(dwFlags & REPLACE_READ_ONLY)) { ConOutResPrintf(STRING_REPLACE_ERROR5, tmpDestPath); *doMore = FALSE; @@ -288,7 +288,7 @@ _tcscat (tmpSrcPath, findBuffer.cFileName); /* Make the replace */ - if(replace(tmpSrcPath,tmpDestPath, dwFlags, doMore)) + if (replace(tmpSrcPath,tmpDestPath, dwFlags, doMore)) { filesReplaced++; } @@ -329,7 +329,7 @@ /* Remove the star added earlyer to dest path */ for(i = (_tcslen(szDestPath) - 1); i > -1; i--) { - if(szDestPath[i] != _T('\\')) + if (szDestPath[i] != _T('\\')) szDestPath[i] = _T('\0'); else break; @@ -341,7 +341,7 @@ /* Save the source path so that it will not be wrecked */ _tcscpy(tmpSrcPath,szSrcPath); /* Check for reading problems */ - if(hFile == INVALID_HANDLE_VALUE) + if (hFile == INVALID_HANDLE_VALUE) { ConOutFormatMessage (GetLastError(), tmpSrcPath); return filesReplaced; @@ -351,7 +351,7 @@ * Check if the we should enter the dir or if it is a file * or . or .. if so thake the next object to process. */ - if(!_tcscmp (findBuffer.cFileName, _T(".")) || + if (!_tcscmp (findBuffer.cFileName, _T(".")) || !_tcscmp (findBuffer.cFileName, _T(".."))|| IsExistingFile(findBuffer.cFileName)) continue; @@ -359,20 +359,20 @@ _tcscpy(tmpDestPath,szDestPath); _tcscat (tmpDestPath, findBuffer.cFileName); /* Make sure that we have a directory */ - if(IsExistingDirectory(tmpDestPath)) + if (IsExistingDirectory(tmpDestPath)) { /* Add a \ to the end or the path */ - if(szDestPath[_tcslen(tmpDestPath) - 1] != _T('\\')) + if (szDestPath[_tcslen(tmpDestPath) - 1] != _T('\\')) _tcscat(tmpDestPath, _T("\\")); /* Call the function to replace files in the new directory */ filesReplaced += recReplace(dwFlags, tmpSrcPath, tmpDestPath, doMore); /* If there were problems break e.g. read-only file */ - if(!*doMore) + if (!*doMore) break; _tcscpy(tmpSrcPath,szSrcPath); /* Controle the next level of subdirs */ filesReplaced += recFindSubDirs(dwFlags,tmpSrcPath,tmpDestPath, doMore); - if(!*doMore) + if (!*doMore) break; } /* Get the next handle */ @@ -442,11 +442,11 @@ } else { - if(srcIndex == -1) + if (srcIndex == -1) { srcIndex = i; } - else if(destIndex == -1) + else if (destIndex == -1) { destIndex = i; } @@ -468,7 +468,7 @@ return 1; } /* Check so that not both update and add switch is added and subdir */ - if((dwFlags & REPLACE_UPDATE || dwFlags & REPLACE_SUBDIR) && (dwFlags & REPLACE_ADD)) + if ((dwFlags & REPLACE_UPDATE || dwFlags & REPLACE_SUBDIR) && (dwFlags & REPLACE_ADD)) { ConOutResPaging(TRUE,STRING_REPLACE_ERROR4); ConOutResPaging(TRUE,STRING_REPLACE_HELP7); @@ -477,9 +477,9 @@ } /* If we have a destination get the full path */ - if(destIndex != -1) - { - if(_tcslen(arg[destIndex]) == 2 && arg[destIndex][1] == ':') + if (destIndex != -1) + { + if (_tcslen(arg[destIndex]) == 2 && arg[destIndex][1] == ':') GetRootPath(arg[destIndex],szDestPath,MAX_PATH); else { @@ -494,7 +494,7 @@ } getPath(szDestPath, arg[destIndex]); /* Make sure that destination exists */ - if(!IsExistingDirectory(szDestPath)) + if (!IsExistingDirectory(szDestPath)) { ConOutResPrintf(STRING_REPLACE_ERROR2, szDestPath); ConOutResPaging(TRUE,STRING_REPLACE_HELP3); @@ -510,7 +510,7 @@ } /* Get the full source path */ - if(!(_tcslen(arg[srcIndex]) == 2 && arg[srcIndex][1] == ':')) + if (!(_tcslen(arg[srcIndex]) == 2 && arg[srcIndex][1] == ':')) getPath(szSrcPath, arg[srcIndex]); else _tcscpy(szSrcPath,arg[srcIndex]); @@ -520,7 +520,7 @@ _tcschr (arg[srcIndex], _T('?')) == NULL) { /* Check so that source is not a directory, because that is not allowed */ - if(IsExistingDirectory(szSrcPath)) + if (IsExistingDirectory(szSrcPath)) { ConOutResPrintf(STRING_REPLACE_ERROR6, szSrcPath); ConOutResPaging(TRUE,STRING_REPLACE_HELP3); @@ -528,7 +528,7 @@ return 1; } /* Check if the file exists */ - if(!IsExistingFile(szSrcPath)) + if (!IsExistingFile(szSrcPath)) { ConOutResPaging(TRUE,STRING_REPLACE_HELP3); freep(arg); @@ -536,14 +536,14 @@ } } /* /w switch is set so wait for any key to be pressed */ - if(dwFlags & REPLACE_DISK) + if (dwFlags & REPLACE_DISK) { msg_pause(); cgetchar(); } /* Add an extra \ to the destination path if needed */ - if(szDestPath[_tcslen(szDestPath) - 1] != _T('\\')) + if (szDestPath[_tcslen(szDestPath) - 1] != _T('\\')) _tcscat(szDestPath, _T("\\")); /* Save source path */ @@ -551,19 +551,19 @@ /* Replace in dest dir */ filesReplaced += recReplace(dwFlags, tmpSrcPath, szDestPath, &doMore); /* If subdir switch is set replace in the subdirs to */ - if(dwFlags & REPLACE_SUBDIR && doMore) + if (dwFlags & REPLACE_SUBDIR && doMore) { filesReplaced += recFindSubDirs(dwFlags, szSrcPath, szDestPath, &doMore); } /* If source == dest write no more */ - if(filesReplaced != -1) + if (filesReplaced != -1) { /* No files replaced */ - if(filesReplaced==0) + if (filesReplaced==0) { /* Add switch dependent output */ - if(dwFlags & REPLACE_ADD) + if (dwFlags & REPLACE_ADD) ConOutResPaging(TRUE,STRING_REPLACE_HELP7); else ConOutResPaging(TRUE,STRING_REPLACE_HELP3); @@ -572,7 +572,7 @@ else { /* Add switch dependent output */ - if(dwFlags & REPLACE_ADD) + if (dwFlags & REPLACE_ADD) ConOutResPrintf(STRING_REPLACE_HELP8, filesReplaced); else ConOutResPrintf(STRING_REPLACE_HELP4, filesReplaced); Modified: trunk/reactos/base/shell/cmd/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/screen.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/screen.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/screen.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -33,7 +33,7 @@ while(_istspace(*param)) param++; - if(!(*param)) + if (!(*param)) { error_req_param_missing (); return 1; @@ -48,7 +48,7 @@ } //get col - if(!(param = _tcschr(param,_T(' ')))) + if (!(param = _tcschr(param,_T(' ')))) { error_req_param_missing (); return 1; @@ -57,7 +57,7 @@ while(_istspace(*param)) param++; - if(!(*param)) + if (!(*param)) { error_req_param_missing (); return 1; @@ -71,7 +71,7 @@ } //get text - if(!(param = _tcschr(param,_T(' ')))) + if (!(param = _tcschr(param,_T(' ')))) { bSkipText = TRUE; } @@ -80,7 +80,7 @@ while(_istspace(*param)) param++; - if(!(*param)) + if (!(*param)) { bSkipText = TRUE; } @@ -88,13 +88,13 @@ bIgnoreEcho = TRUE; - if(bSkipText) + if (bSkipText) x=0; SetCursorXY(x,y); - if(!(bSkipText)) + if (!(bSkipText)) ConOutPuts(param); return 0; Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/set.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/set.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -110,7 +110,7 @@ BOOL Success; StripQuotes(param); Success = seta_eval ( skip_ws(param+2) ); - if(!Success) + if (!Success) { /* might seem random but this is what windows xp does */ nErrorLevel = 9165; Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -185,7 +185,7 @@ } SetLastError(0); size = GetEnvironmentVariable (_T("COMSPEC"), comspec, MAX_PATH); - if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) + if (GetLastError() == ERROR_ENVVAR_NOT_FOUND) { _tcscpy(comspec, _T("cmd")); } Modified: trunk/reactos/base/shell/cmd/strtoclr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/strtoclr.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/strtoclr.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/strtoclr.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -94,10 +94,10 @@ { LPTSTR str; str = _tcschr(*arg_str,_T(' ')); - if(!str) + if (!str) { str = _tcschr (*arg_str, _T('\0')); - if(str != NULL) + if (str != NULL) *arg_str=str; return CP_BLANK_NOT_FOUND; } @@ -129,13 +129,13 @@ ch = str[1]; - if(_istdigit(ch)) + if (_istdigit(ch)) ret = ch-_T('0'); else { ch=_totupper(ch); - if( ch >= _T('A') && ch <= _T('F') ) + if ( ch >= _T('A') && ch <= _T('F') ) ret = ch-_T('A')+10; else return (WORD)-1; @@ -143,13 +143,13 @@ ch = str[0]; - if(_istdigit(ch)) + if (_istdigit(ch)) ret |= (ch-_T('0')) << 4; else { ch=_totupper(ch); - if( ch >= _T('A') && ch <= _T('F') ) + if ( ch >= _T('A') && ch <= _T('F') ) ret |= (ch-_T('A')+10) <<4; else return (WORD)-1; @@ -215,15 +215,15 @@ /* background */ bBri = FALSE; - if(_tcsnicmp(str,_T("bri"),3) == 0 ) + if (_tcsnicmp(str,_T("bri"),3) == 0 ) { bBri = TRUE; - if(chop_blank(&str)) - return (WORD)-1; - } - - if( (tmp_clr = txt_clr(str)) == (WORD)-1 ) + if (chop_blank(&str)) + return (WORD)-1; + } + + if ( (tmp_clr = txt_clr(str)) == (WORD)-1 ) return (WORD)-1; chop_blank(&str); Modified: trunk/reactos/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/timer.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/timer.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -143,7 +143,7 @@ } // do stuff (start/stop/read timer) - if(NewClkStatus == NCS_ON) + if (NewClkStatus == NCS_ON) { cT=GetTickCount(); cS=TRUE; @@ -154,9 +154,9 @@ return 0; } - if(bS) - { - if(cS) + if (bS) + { + if (cS) { ConOutResPrintf (STRING_TIMER_TIME,clk_n,cS?_T("ON"):_T("OFF")); ConOutPrintf(_T("%s\n"), GetTimeString()); Modified: trunk/reactos/base/shell/cmd/vol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/vol.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/vol.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/vol.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -32,7 +32,7 @@ DWORD dwSerialNr; /* get the volume information of the drive */ - if(!GetVolumeInformation(pszRootPath, + if (!GetVolumeInformation(pszRootPath, szVolName, 80, &dwSerialNr, Modified: trunk/reactos/base/shell/cmd/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/window.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/window.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/window.c [iso-8859-1] Sun Jun 30 16:10:54 2013 @@ -85,7 +85,7 @@ tmp++; pos.left= _ttoi(tmp); - if(!(tmp=_tcschr(tmp, _T(',')))) + if (!(tmp=_tcschr(tmp, _T(',')))) { error_invalid_parameter_format(p[i]); freep(p); @@ -93,7 +93,7 @@ } pos.top = _ttoi (++tmp); - if(!(tmp=_tcschr(tmp, _T(',')))) + if (!(tmp=_tcschr(tmp, _T(',')))) { error_invalid_parameter_format(p[i]); freep(p); @@ -198,25 +198,25 @@ return 0; } - if(!(*param)) + if (!(*param)) return 1; /* Split the user input into array */ arg = split (param, &argc, FALSE); - if(argc < 2) - { - if(arg != NULL) + if (argc < 2) + { + if (arg != NULL) freep(arg); } hwnd = FindWindow(NULL, arg[0]); if (hwnd == NULL) { - if(arg != NULL) + if (arg != NULL) freep(arg); ConErrResPuts(STRING_WINDOW_ERROR1); return 1; } - if(arg != NULL) + if (arg != NULL) freep(arg); return ServiceActivate(param, hwnd);

1 0

[hbelusca] 59395: [CMD] Fix the "TYPE" command (now behaves as on Windows)
by hbelusca＠svn.reactos.org 30 Jun '13

30 Jun '13

Author: hbelusca Date: Sun Jun 30 15:28:40 2013 New Revision: 59395 URL: http://svn.reactos.org/svn/reactos?rev=59395&view=rev Log: [CMD] Fix the "TYPE" command (now behaves as on Windows) Modified: trunk/reactos/base/shell/cmd/type.c Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/type.c [iso-8859-1] Sun Jun 30 15:28:40 2013 @@ -128,12 +128,10 @@ } } - ConOutPuts(_T("\n")); CloseHandle(hFile); } - freep (argv); - + freep(argv); return 0; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2013