Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[akhaldi] 58686: [PSDK] * Add DEFAULT_UNREACHABLE macro to ntdef.h. * Add break to the last case.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 6 10:36:24 2013 New Revision: 58686 URL: http://svn.reactos.org/svn/reactos?rev=58686&view=rev Log: [PSDK] * Add DEFAULT_UNREACHABLE macro to ntdef.h. * Add break to the last case. Modified: trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Sat Apr 6 10:36:24 2013 @@ -699,6 +699,15 @@ /* C_ASSERT Definition */ #define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] + +/* Eliminate Microsoft C/C++ compiler warning 4715 */ +#if defined(_MSC_VER) && (_MSC_VER > 1200) +# define DEFAULT_UNREACHABLE default: __assume(0) +#elif defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))) +# define DEFAULT_UNREACHABLE default: __builtin_unreachable() +#else +# define DEFAULT_UNREACHABLE default: break +#endif #define VER_WORKSTATION_NT 0x40000000 #define VER_SERVER_NT 0x80000000 Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Apr 6 10:36:24 2013 @@ -422,7 +422,7 @@ #elif defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))) # define DEFAULT_UNREACHABLE default: __builtin_unreachable() #else -# define DEFAULT_UNREACHABLE default: +# define DEFAULT_UNREACHABLE default: break #endif #include "intrin.h"

11 years, 8 months

[akhaldi] 58685: [CMAKE] * Don't set the compiler and linker PDB to the same file (it's the linker's PDB that matters). * No code changes, 12% faster msvc build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Apr 6 10:09:01 2013 New Revision: 58685 URL: http://svn.reactos.org/svn/reactos?rev=58685&view=rev Log: [CMAKE] * Don't set the compiler and linker PDB to the same file (it's the linker's PDB that matters). * No code changes, 12% faster msvc build. Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake Modified: trunk/reactos/cmake/Platform/Windows-MSVC.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-MSV… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-MSVC.cmake [iso-8859-1] Sat Apr 6 10:09:01 2013 @@ -221,7 +221,7 @@ set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "<CMAKE_LINKER> /lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /out:<TARGET> <OBJECTS> ") set(CMAKE_${lang}_COMPILE_OBJECT - "<CMAKE_${lang}_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> /Fo<OBJECT> /Fd<TARGET_PDB> -c <SOURCE>${CMAKE_END_TEMP_FILE}") + "<CMAKE_${lang}_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> /Fo<OBJECT> /Fd<OBJECT_DIR>/ -c <SOURCE>${CMAKE_END_TEMP_FILE}") set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> > <PREPROCESSED_SOURCE> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO}${_COMPILE_${lang}} <FLAGS> <DEFINES> -E <SOURCE>${CMAKE_END_TEMP_FILE}") set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE @@ -229,7 +229,7 @@ set(CMAKE_${lang}_COMPILER_LINKER_OPTION_FLAG_EXECUTABLE "/link") set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 1) - set(CMAKE_${lang}_LINK_EXECUTABLE "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> /Fd<TARGET_PDB> <OBJECTS> /link /implib:<TARGET_IMPLIB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") + set(CMAKE_${lang}_LINK_EXECUTABLE "${_CMAKE_VS_LINK_EXE}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> <OBJECTS> /link /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}") set(CMAKE_${lang}_FLAGS_INIT "") set(CMAKE_${lang}_FLAGS_DEBUG_INIT "")

11 years, 8 months

[tkreuzer] 58684: [NTDLL_APITEST] Add more tests for NtAllocateVirtualMemory and NtMapViewOfSection, make tests 64 bit compatible.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Apr 5 19:19:14 2013 New Revision: 58684 URL: http://svn.reactos.org/svn/reactos?rev=58684&view=rev Log: [NTDLL_APITEST] Add more tests for NtAllocateVirtualMemory and NtMapViewOfSection, make tests 64 bit compatible. Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c trunk/rostests/apitests/ntdll/NtMapViewOfSection.c Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtAllocate… ============================================================================== --- trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] Fri Apr 5 19:19:14 2013 @@ -207,7 +207,7 @@ SIZE_T Size; /* Reserve memory */ - BaseAddress = UlongToPtr(Base); + BaseAddress = (PVOID)Base; Size = InSize; Status = NtAllocateVirtualMemory(NtCurrentProcess(), &BaseAddress, @@ -216,7 +216,7 @@ MEM_RESERVE, PAGE_NOACCESS); ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); - ok(BaseAddress == UlongToPtr(Base & ~0xFFFF), "Got back wrong base address: %p\n", BaseAddress); + ok(BaseAddress == (PVOID)(Base & ~((ULONG_PTR)0xFFFF)), "Got back wrong base address: %p\n", BaseAddress); ok(Size == ExpectedSize, "Alloc of 0x%Ix: got back wrong size: 0x%Ix, expected 0x%Ix\n", InSize, Size, ExpectedSize); Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); @@ -324,7 +324,7 @@ _SEH2_TRY { - *(int*)UlongToPtr(BaseAddress) = 1; + *(int*)BaseAddress = 1; *(int*)UlongToPtr(0x50004080) = 1; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -401,7 +401,7 @@ PAGE_NOACCESS); ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory should fail!\n"); - /* Allocate a page */ + /* Commit a page */ BaseAddress = UlongToPtr(0x50000000); Size = 0x1000; Status = NtAllocateVirtualMemory(NtCurrentProcess(), @@ -412,7 +412,7 @@ PAGE_READWRITE); ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); - /* Allocate another page */ + /* Commit another page */ BaseAddress = UlongToPtr(0x50002000); Size = 0x1000; Status = NtAllocateVirtualMemory(NtCurrentProcess(), @@ -426,7 +426,6 @@ _SEH2_TRY { *(int*)UlongToPtr(0x50000000) = 1; - //*(int*)UlongToPtr(0x50002000) = 1; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -434,6 +433,17 @@ } _SEH2_END; + _SEH2_TRY + { + (void)*(volatile int*)UlongToPtr(0x50002000); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok(Status = STATUS_ACCESS_VIOLATION, "Should get an exception!\n"); + /* Allocate 3 pages, on top of the previous 2 */ BaseAddress = UlongToPtr(0x50000000); Size = 0x3000; @@ -442,8 +452,19 @@ 0, &Size, MEM_COMMIT, - PAGE_NOACCESS); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + PAGE_READONLY); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + + _SEH2_TRY + { + *(int*)UlongToPtr(0x50000000) = 1; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok(Status = STATUS_ACCESS_VIOLATION, "Should get an exception!\n"); /* Try to free the whole region at once */ BaseAddress = UlongToPtr(0x50000000); @@ -462,6 +483,25 @@ ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); BaseAddress = UlongToPtr(0x50020000); + Size = 0x10000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + + /* Reserve 3 full 64k region */ + BaseAddress = UlongToPtr(0x50000000); + Size = 0x30000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_RESERVE, + PAGE_NOACCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + if (!NT_SUCCESS(Status)) + return; + + /* Release the 64k region in the middle */ + BaseAddress = UlongToPtr(0x50010000); Size = 0x10000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMapViewO… ============================================================================== --- trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] Fri Apr 5 19:19:14 2013 @@ -191,7 +191,7 @@ ok(Status == STATUS_UNABLE_TO_DELETE_SECTION, "NtFreeVirtualMemory failed with wrong Status %lx\n", Status); - BaseAddress = (PVOID)0x40000000; + BaseAddress = UlongToPtr(0x40000000); SectionOffset.QuadPart = 0; ViewSize = 0x1000; Status = NtMapViewOfSection(SectionHandle, @@ -208,7 +208,7 @@ if (!NT_SUCCESS(Status)) return; - ok(BaseAddress == (PVOID)0x40000000, "Invalid BaseAddress: %p", BaseAddress); + ok(BaseAddress == UlongToPtr(0x40000000), "Invalid BaseAddress: %p", BaseAddress); BaseAddress = (PVOID)0x40080000; SectionOffset.QuadPart = 0x10000; @@ -305,13 +305,16 @@ /* Check the original data */ ok(*(ULONG*)DataBase == 0x00905a4d, "Header not ok\n"); - /* Now modify the data in the data section */ + /* Modify the PE header (but do not flush!) */ *(ULONG*)DataBase = 0xdeadbabe; - - /* Check the data */ ok(*(ULONG*)DataBase == 0xdeadbabe, "Header not ok\n"); - /* Now try to create an image section */ + /* Modify data in the .data section (but do not flush!) */ + ok(*(ULONG*)((PUCHAR)DataBase + 0x800) == 0x12345678, + "Data in .data section invalid: 0x%lx!\n", *(ULONG*)((PUCHAR)DataBase + 0x800)); + *(ULONG*)((PUCHAR)DataBase + 0x800) = 0x87654321; + + /* Now try to create an image section (should fail) */ Status = NtCreateSection(&ImageSectionHandle, SECTION_ALL_ACCESS, // DesiredAccess NULL, // ObjectAttributes @@ -321,8 +324,12 @@ FileHandle); ok(Status == STATUS_INVALID_IMAGE_NOT_MZ, "NtCreateSection failed, Status 0x%lx\n", Status); - /* Restore the original data */ + /* Restore the original header */ *(ULONG*)DataBase = 0x00905a4d; + + /* Modify data in the .data section (but do not flush!) */ + ok_hex(*(ULONG*)((PUCHAR)DataBase + 0x800), 0x87654321); + *(ULONG*)((PUCHAR)DataBase + 0x800) = 0xdeadbabe; /* Try to create an image section again */ Status = NtCreateSection(&ImageSectionHandle, @@ -347,18 +354,31 @@ ViewShare, 0, PAGE_READONLY); +#ifdef _M_IX86 ok(Status == STATUS_SUCCESS, "NtMapViewOfSection failed, Status 0x%lx\n", Status); - - /* Check the data */ +#else + ok(Status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH, "NtMapViewOfSection failed, Status 0x%lx\n", Status); +#endif + + /* Check the header */ ok(*(ULONG*)DataBase == 0x00905a4d, "Header not ok\n"); ok(*(ULONG*)ImageBase == 0x00905a4d, "Header not ok\n"); + /* Check the data section. Either of these can be present! */ + ok((*(ULONG*)((PUCHAR)ImageBase + 0x80000) == 0x87654321) || + (*(ULONG*)((PUCHAR)ImageBase + 0x80000) == 0x12345678), + "Wrong value in data section: 0x%lx!\n", *(ULONG*)((PUCHAR)ImageBase + 0x80000)); + /* Now modify the data again */ *(ULONG*)DataBase = 0xdeadbabe; + *(ULONG*)((PUCHAR)DataBase + 0x800) = 0xf00dada; /* Check the data */ ok(*(ULONG*)DataBase == 0xdeadbabe, "Header not ok\n"); ok(*(ULONG*)ImageBase == 0x00905a4d, "Data should not be synced!\n"); + ok((*(ULONG*)((PUCHAR)ImageBase + 0x80000) == 0x87654321) || + (*(ULONG*)((PUCHAR)ImageBase + 0x80000) == 0x12345678), + "Wrong value in data section: 0x%lx!\n", *(ULONG*)((PUCHAR)ImageBase + 0x80000)); /* Flush the view */ ViewSize = 0x1000; @@ -370,21 +390,75 @@ /* Check the data again */ ok(*(ULONG*)ImageBase == 0x00905a4d, "Data should not be synced!\n"); - - /* Restore the original data */ + ok((*(ULONG*)((PUCHAR)ImageBase + 0x80000) == 0x87654321) || + (*(ULONG*)((PUCHAR)ImageBase + 0x80000) == 0x12345678), + "Wrong value in data section: 0x%lx!\n", *(ULONG*)((PUCHAR)ImageBase + 0x80000)); + + /* Restore the original header */ *(ULONG*)DataBase = 0x00905a4d; ok(*(ULONG*)DataBase == 0x00905a4d, "Header not ok\n"); + /* Close the image mapping */ + NtUnmapViewOfSection(NtCurrentProcess(), ImageBase); + NtClose(ImageSectionHandle); + + /* Create an image section again */ + Status = NtCreateSection(&ImageSectionHandle, + SECTION_ALL_ACCESS, // DesiredAccess + NULL, // ObjectAttributes + NULL, // MaximumSize + PAGE_READWRITE, // SectionPageProtection + SEC_IMAGE, // AllocationAttributes + FileHandle); + ok(Status == STATUS_SUCCESS, "NtCreateSection failed, Status 0x%lx\n", Status); + + /* Map the image section again */ + ImageBase = NULL; + ViewSize = 0; + Status = NtMapViewOfSection(ImageSectionHandle, + NtCurrentProcess(), + &ImageBase, + 0, + 0, + NULL, + &ViewSize, + ViewShare, + 0, + PAGE_READONLY); +#ifdef _M_IX86 + ok(Status == STATUS_SUCCESS, "NtMapViewOfSection failed, Status 0x%lx\n", Status); +#else + ok(Status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH, "NtMapViewOfSection failed, Status 0x%lx\n", Status); +#endif + + /* Check the .data section again */ + ok(*(ULONG*)((PUCHAR)ImageBase + 0x80000) == 0xf00dada, + "Data should be synced: 0x%lx!\n", *(ULONG*)((PUCHAR)ImageBase + 0x80000)); + + /* Restore the original data */ + *(ULONG*)((PUCHAR)DataBase + 0x800) = 0x12345678; + + /* Close the data mapping */ + NtUnmapViewOfSection(NtCurrentProcess(), DataBase); + + NtClose(DataSectionHandle); + + /* Try to allocate memory inside the image mapping */ + DataBase = (PUCHAR)ImageBase + 0x20000; + ViewSize = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &DataBase, 0, &ViewSize, MEM_RESERVE, PAGE_NOACCESS); + ok(Status == STATUS_CONFLICTING_ADDRESSES, "Wrong Status: 0x%lx\n", Status); + /* Cleanup */ + NtClose(FileHandle); + NtClose(ImageSectionHandle); NtUnmapViewOfSection(NtCurrentProcess(), ImageBase); - NtUnmapViewOfSection(NtCurrentProcess(), DataBase); - NtClose(ImageSectionHandle); - NtClose(DataSectionHandle); - NtClose(FileHandle); } + START_TEST(NtMapViewOfSection) { - //Test_PageFileSection(); + Test_PageFileSection(); Test_ImageSection(); } +

11 years, 8 months

[zguo] 58683: Merge in revisions 58553, 58561, and 58614 from trunk to fix a few regressions discovered from community testing.

by zguo＠svn.reactos.org

Author: zguo Date: Fri Apr 5 02:14:10 2013 New Revision: 58683 URL: http://svn.reactos.org/svn/reactos?rev=58683&view=rev Log: Merge in revisions 58553, 58561, and 58614 from trunk to fix a few regressions discovered from community testing. Modified: branches/ReactOS-0.3.15/ (props changed) branches/ReactOS-0.3.15/base/shell/cmd/echo.c branches/ReactOS-0.3.15/dll/win32/newdev/wizard.c branches/ReactOS-0.3.15/win32ss/user/user32/windows/cursoricon.c Propchange: branches/ReactOS-0.3.15/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Apr 5 02:14:10 2013 @@ -13,3 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 +/trunk/reactos:58553,58561,58614 Modified: branches/ReactOS-0.3.15/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/base/shell/cmd/e… ============================================================================== --- branches/ReactOS-0.3.15/base/shell/cmd/echo.c [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/base/shell/cmd/echo.c [iso-8859-1] Fri Apr 5 02:14:10 2013 @@ -83,7 +83,7 @@ { /* skip the first character */ ConOutPuts(param + 1); - ConOutPuts(_T("\n")); + ConOutPuts(_T("\r\n")); } return 0; } Modified: branches/ReactOS-0.3.15/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/dll/win32/newdev… ============================================================================== --- branches/ReactOS-0.3.15/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/dll/win32/newdev/wizard.c [iso-8859-1] Fri Apr 5 02:14:10 2013 @@ -493,7 +493,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static void @@ -656,7 +656,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -751,7 +751,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -857,7 +857,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -972,7 +972,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -1051,7 +1051,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -1130,7 +1130,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static INT_PTR CALLBACK @@ -1209,7 +1209,7 @@ break; } - return DefWindowProc(hwndDlg, uMsg, wParam, lParam); + return FALSE; } static HFONT Modified: branches/ReactOS-0.3.15/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/win32ss/user/use… ============================================================================== --- branches/ReactOS-0.3.15/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ branches/ReactOS-0.3.15/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Fri Apr 5 02:14:10 2013 @@ -260,7 +260,7 @@ * The following macro functions account for the irregularities of * accessing cursor and icon resources in files and resource entries. */ -typedef BOOL (*fnGetCIEntry)( LPVOID dir, int n, +typedef BOOL (*fnGetCIEntry)( LPCVOID dir, DWORD size, int n, int *width, int *height, int *bits ); /********************************************************************** @@ -268,7 +268,7 @@ * * Find the icon closest to the requested size and bit depth. */ -static int CURSORICON_FindBestIcon( LPVOID dir, fnGetCIEntry get_entry, +static int CURSORICON_FindBestIcon( LPCVOID dir, DWORD size, fnGetCIEntry get_entry, int width, int height, int depth ) { int i, cx, cy, bits, bestEntry = -1; @@ -278,7 +278,7 @@ /* Find Best Fit */ iTotalDiff = 0xFFFFFFFF; iColorDiff = 0xFFFFFFFF; - for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { iTempXDiff = abs(width - cx); iTempYDiff = abs(height - cy); @@ -292,7 +292,7 @@ } /* Find Best Colors for Best Fit */ - for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { if(abs(width - cx) == iXDiff && abs(height - cy) == iYDiff) { @@ -308,13 +308,15 @@ return bestEntry; } -static BOOL CURSORICON_GetResIconEntry( LPVOID dir, int n, +static BOOL CURSORICON_GetResIconEntry( LPCVOID dir, DWORD size, int n, int *width, int *height, int *bits ) { - CURSORICONDIR *resdir = dir; - ICONRESDIR *icon; + const CURSORICONDIR *resdir = dir; + const ICONRESDIR *icon; if ( resdir->idCount <= n ) + return FALSE; + if ((const char *)&resdir->idEntries[n + 1] - (const char *)dir > size) return FALSE; icon = &resdir->idEntries[n].ResInfo.icon; *width = icon->bWidth; @@ -330,7 +332,7 @@ * * FIXME: parameter 'color' ignored. */ -static int CURSORICON_FindBestCursor( LPVOID dir, fnGetCIEntry get_entry, +static int CURSORICON_FindBestCursor( LPCVOID dir, DWORD size, fnGetCIEntry get_entry, int width, int height, int depth ) { int i, maxwidth, maxheight, cx, cy, bits, bestEntry = -1; @@ -342,7 +344,7 @@ /* First find the largest one smaller than or equal to the requested size*/ maxwidth = maxheight = 0; - for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { if ((cx <= width) && (cy <= height) && (cx > maxwidth) && (cy > maxheight)) @@ -357,7 +359,7 @@ /* Now find the smallest one larger than the requested size */ maxwidth = maxheight = 255; - for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) + for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { if (((cx < maxwidth) && (cy < maxheight)) || (bestEntry == -1)) { @@ -370,13 +372,15 @@ return bestEntry; } -static BOOL CURSORICON_GetResCursorEntry( LPVOID dir, int n, +static BOOL CURSORICON_GetResCursorEntry( LPCVOID dir, DWORD size, int n, int *width, int *height, int *bits ) { - CURSORICONDIR *resdir = dir; - CURSORDIR *cursor; + const CURSORICONDIR *resdir = dir; + const CURSORDIR *cursor; if ( resdir->idCount <= n ) + return FALSE; + if ((const char *)&resdir->idEntries[n + 1] - (const char *)dir > size) return FALSE; cursor = &resdir->idEntries[n].ResInfo.cursor; *width = cursor->wWidth; @@ -385,60 +389,62 @@ return TRUE; } -static CURSORICONDIRENTRY *CURSORICON_FindBestIconRes( CURSORICONDIR * dir, - int width, int height, int depth ) +static CURSORICONDIRENTRY *CURSORICON_FindBestIconRes( CURSORICONDIR * dir, DWORD size, + int width, int height, int depth ) { int n; - n = CURSORICON_FindBestIcon( dir, CURSORICON_GetResIconEntry, + n = CURSORICON_FindBestIcon( dir, size, CURSORICON_GetResIconEntry, width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } -static CURSORICONDIRENTRY *CURSORICON_FindBestCursorRes( CURSORICONDIR *dir, - int width, int height, int depth ) -{ - int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetResCursorEntry, +static CURSORICONDIRENTRY *CURSORICON_FindBestCursorRes( CURSORICONDIR *dir, DWORD size, + int width, int height, int depth ) +{ + int n = CURSORICON_FindBestCursor( dir, size, CURSORICON_GetResCursorEntry, width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } -static BOOL CURSORICON_GetFileEntry( LPVOID dir, int n, +static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, int *width, int *height, int *bits ) { - CURSORICONFILEDIR *filedir = dir; - CURSORICONFILEDIRENTRY *entry; - BITMAPINFOHEADER *info; + const CURSORICONFILEDIR *filedir = dir; + const CURSORICONFILEDIRENTRY *entry; + const BITMAPINFOHEADER *info; if ( filedir->idCount <= n ) return FALSE; + if ((const char *)&filedir->idEntries[n + 1] - (const char *)dir > size) + return FALSE; entry = &filedir->idEntries[n]; - /* FIXME: check against file size */ - info = (BITMAPINFOHEADER *)((char *)dir + entry->dwDIBOffset); + info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); + if ((const char *)(info + 1) - (const char *)dir > size) return FALSE; *width = entry->bWidth; *height = entry->bHeight; *bits = info->biBitCount; return TRUE; } -static CURSORICONFILEDIRENTRY *CURSORICON_FindBestCursorFile( CURSORICONFILEDIR *dir, - int width, int height, int depth ) -{ - int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetFileEntry, +static CURSORICONFILEDIRENTRY *CURSORICON_FindBestCursorFile( CURSORICONFILEDIR *dir, DWORD size, + int width, int height, int depth ) +{ + int n = CURSORICON_FindBestCursor( dir, size, CURSORICON_GetFileEntry, width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } -static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *dir, - int width, int height, int depth ) -{ - int n = CURSORICON_FindBestIcon( dir, CURSORICON_GetFileEntry, +static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *dir, DWORD size, + int width, int height, int depth ) +{ + int n = CURSORICON_FindBestIcon( dir, size, CURSORICON_GetFileEntry, width, height, depth ); if ( n < 0 ) return NULL; @@ -747,7 +753,8 @@ icon_data = fram_chunk.data + (2 * sizeof(DWORD)); entry = CURSORICON_FindBestIconFile( (CURSORICONFILEDIR *) icon_data, - width, height, depth ); + bits + bits_size - icon_data, + width, height, depth ); frame_bits = HeapAlloc( GetProcessHeap(), 0, entry->dwDIBSize ); memcpy( frame_bits, icon_data + entry->dwDIBOffset, entry->dwDIBSize ); @@ -850,9 +857,9 @@ goto end; if ( fCursor ) - entry = CURSORICON_FindBestCursorFile( dir, width, height, depth ); + entry = CURSORICON_FindBestCursorFile( dir, filesize, width, height, depth ); else - entry = CURSORICON_FindBestIconFile( dir, width, height, depth ); + entry = CURSORICON_FindBestIconFile( dir, filesize, width, height, depth ); if ( !entry ) goto end; @@ -887,6 +894,7 @@ HICON hIcon = 0; HRSRC hRsrc; //HRSRC hGroupRsrc; + DWORD size; CURSORICONDIR *dir; CURSORICONDIRENTRY *dirEntry; LPBYTE bits; @@ -915,10 +923,11 @@ if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; if (!(dir = LockResource( handle ))) return 0; + size = SizeofResource( hInstance, hRsrc ); if (fCursor) - dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, depth ); + dirEntry = CURSORICON_FindBestCursorRes( dir, size, width, height, depth ); else - dirEntry = CURSORICON_FindBestIconRes( dir, width, height, depth ); + dirEntry = CURSORICON_FindBestIconRes( dir, size, width, height, depth ); if (!dirEntry) return 0; wResId = dirEntry->wResId; dwBytesInRes = dirEntry->dwBytesInRes; @@ -1285,9 +1294,9 @@ ReleaseDC(0, hdc); if( bIcon ) - entry = CURSORICON_FindBestIconRes( dir, width, height, depth ); + entry = CURSORICON_FindBestIconRes( dir, ~0u, width, height, depth ); else - entry = CURSORICON_FindBestCursorRes( dir, width, height, depth ); + entry = CURSORICON_FindBestCursorRes( dir, ~0u, width, height, depth ); if( entry ) retVal = entry->wResId; }

11 years, 8 months

[hbelusca] 58682: [REACTOS] "isnt" --> "isn't" and "arent" --> "aren't"

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 4 20:26:36 2013 New Revision: 58682 URL: http://svn.reactos.org/svn/reactos?rev=58682&view=rev Log: [REACTOS] "isnt" --> "isn't" and "arent" --> "aren't" Modified: trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/del.c trunk/reactos/base/shell/cmd/readme2.txt trunk/reactos/base/shell/cmd/ren.c trunk/reactos/base/shell/cmd/ren.txt trunk/reactos/base/shell/cmd/todo.txt trunk/reactos/drivers/ksfilter/ks/api.c 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] Thu Apr 4 20:26:36 2013 @@ -785,7 +785,7 @@ _tcscpy(tmpDestPath, szDestPath); _tcscat(tmpDestPath, _T("\\")); - /* Can't put a file into a folder that isnt there */ + /* Can't put a file into a folder that isn't there */ if (_tcscmp(tmpDestPath, _T("\\\\.\\")) && !IsExistingDirectory(tmpDestPath)) { Modified: trunk/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/del.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/del.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/del.c [iso-8859-1] Thu Apr 4 20:26:36 2013 @@ -107,7 +107,7 @@ { /*setting file to normal, not saving old attrs first because the file is going to be deleted anyways - so the only thing that matters is that it isnt + so the only thing that matters is that it isn't read only.*/ SetFileAttributes(lpFileName,FILE_ATTRIBUTE_NORMAL); } @@ -513,7 +513,7 @@ for (i = 0; i < args && !(dwFiles & 0x80000000); i++) { - /*this checks to see if it isnt a flag, if it isnt, we assume it is a file name*/ + /*this checks to see if it is a flag; if it isn't, we assume it is a file name*/ if((*arg[i] == _T('/')) || (*arg[i] == _T('-'))) continue; Modified: trunk/reactos/base/shell/cmd/readme2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/readme2.txt… ============================================================================== --- trunk/reactos/base/shell/cmd/readme2.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/readme2.txt [iso-8859-1] Thu Apr 4 20:26:36 2013 @@ -4,7 +4,7 @@ This can cause a problem on older machines and that is why we have our own custom _CommandLineToArgvW to help this along. We pull in the launch directory as the initial dir and set that in _tchdir. We make a handle to the default console out using CreateFile. -Then we call Initialize(). Here we need to load ntdll.dll if it isnt loaded(windows 9x machines). +Then we call Initialize(). Here we need to load ntdll.dll if it isn't loaded (windows 9x machines). We also setup some global vars like default io handles and nErrorLevel and set %prompt% to $P$G. This is where all command lines switches given to cmd on startup are done. @@ -32,7 +32,7 @@ Some useful functions that are used a lot: -split() - splits a string into an array of string on spaces that arent inside quotes. which you need to call freep() on later t clean up. +split() - splits a string into an array of string on spaces that aren't inside quotes. which you need to call freep() on later t clean up. //Split it´s used to take the Arguments from Command Line,it´s the best option for almost all the cases. //If the Command has special needs as Dir, it´s better to make a Parser INSIDE that Command(as DIR has) //Dont get mad(as i did): Split() can be find in Misc.c file.Really easy to follow. 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] Thu Apr 4 20:26:36 2013 @@ -223,7 +223,7 @@ } - if (!_tcschr(srcPattern, _T('\\'))) //If srcPattern isnt a Path but a name: + if (!_tcschr(srcPattern, _T('\\'))) //If srcPattern isn't a Path but a name: { srcFILE=srcPattern; if(_tcschr(dstPattern, _T('\\'))) Modified: trunk/reactos/base/shell/cmd/ren.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.txt?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/ren.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ren.txt [iso-8859-1] Thu Apr 4 20:26:36 2013 @@ -28,7 +28,7 @@ 3)Syntax errors: -Way #1 with different Subdirectories path: ren c:\ie\hello.txt c:\hi\hi.txt, this is not possible.Since ren doesnt move files,just rename them. --Way #2 semi path in destiny: ren hello.txt c:\ie\hi.txt. This feature isnt available. +-Way #2 semi path in destiny: ren hello.txt c:\ie\hi.txt. This feature isn't available. ************************************************** Modified: trunk/reactos/base/shell/cmd/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/todo.txt?re… ============================================================================== --- trunk/reactos/base/shell/cmd/todo.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/todo.txt [iso-8859-1] Thu Apr 4 20:26:36 2013 @@ -7,7 +7,7 @@ Not sure what is wrong with it, put probably more then just one thing blocking this. For sure pipes break when it is compiled as unicode. *Move.c code clean up -It works, but it needs to be cleaned up, the code is long and overly complex for what it needs to do. Also, we can remove the hack to cover for MoveFileEx bug as it isnt a bug anymore. +It works, but it needs to be cleaned up, the code is long and overly complex for what it needs to do. Also, we can remove the hack to cover for MoveFileEx bug as it isn't a bug anymore. *If rewrite It works decent but looks _awful_. Very hard to maintain and/or understand what the hell is going on. Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Thu Apr 4 20:26:36 2013 @@ -2060,7 +2060,7 @@ /* set counter */ Count = AutomationTableA->MethodSetsCount; - /* now copy entries which arent available in the dominant table */ + /* now copy entries which aren't available in the dominant table */ for(Index = 0; Index < AutomationTableB->MethodSetsCount; Index++) { /* set found to false */ @@ -2200,7 +2200,7 @@ /* set counter */ Count = AutomationTableA->PropertySetsCount; - /* now copy entries which arent available in the dominant table */ + /* now copy entries which aren't available in the dominant table */ for(Index = 0; Index < AutomationTableB->PropertySetsCount; Index++) { /* set found to false */ @@ -2265,7 +2265,7 @@ /* set counter */ Count = AutomationTableA->EventSetsCount; - /* now copy entries which arent available in the dominant table */ + /* now copy entries which aren't available in the dominant table */ for(Index = 0; Index < AutomationTableB->EventSetsCount; Index++) { /* set found to false */

11 years, 8 months

[hbelusca] 58681: [REACTOS] Fix a remaining "initialize" misspelling here, too.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 4 20:15:34 2013 New Revision: 58681 URL: http://svn.reactos.org/svn/reactos?rev=58681&view=rev Log: [REACTOS] Fix a remaining "initialize" misspelling here, too. Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.mc Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.mc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/lang/de-DE.mc [iso-8859-1] Thu Apr 4 20:15:34 2013 @@ -1917,7 +1917,7 @@ Facility=System SymbolicName=ERROR_APP_INIT_FAILURE Language=German -ERROR_APP_INIT_FAILURE - Das Programm konnte nicht richtig initalisiert werden (0x%lx). Klicken Sie auf OK, um das Programm zu beenden. +ERROR_APP_INIT_FAILURE - Das Programm konnte nicht richtig initialisiert werden (0x%lx). Klicken Sie auf OK, um das Programm zu beenden. . MessageId=576

11 years, 8 months

[hbelusca] 58680: [ROSAPPS] Fix remaining "initialize" misspellings.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 4 20:13:05 2013 New Revision: 58680 URL: http://svn.reactos.org/svn/reactos?rev=58680&view=rev Log: [ROSAPPS] Fix remaining "initialize" misspellings. Modified: trunk/rostests/apitests/user32/InitializeLpkHooks.c Modified: trunk/rostests/apitests/user32/InitializeLpkHooks.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/Initializ… ============================================================================== --- trunk/rostests/apitests/user32/InitializeLpkHooks.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/InitializeLpkHooks.c [iso-8859-1] Thu Apr 4 20:13:05 2013 @@ -56,19 +56,19 @@ } -typedef struct _USER32_INTERN_INITALIZEHOOKS +typedef struct _USER32_INTERN_INITIALIZEHOOKS { PVOID fpLpkTabbedTextOut; PVOID fpLpkPSMTextOut; PVOID fpLpkDrawTextEx; PLPK_LPEDITCONTROL_LIST fpListLpkEditControl; -} USER32_INTERN_INITALIZEHOOKS, *PUSER32_INTERN_INITALIZEHOOKS; +} USER32_INTERN_INITIALIZEHOOKS, *PUSER32_INTERN_INITIALIZEHOOKS; -VOID WINAPI InitializeLpkHooks (PUSER32_INTERN_INITALIZEHOOKS); +VOID WINAPI InitializeLpkHooks (PUSER32_INTERN_INITIALIZEHOOKS); void Test_InitializeLpkHooks() { - USER32_INTERN_INITALIZEHOOKS setup; + USER32_INTERN_INITIALIZEHOOKS setup; HMODULE lib = LoadLibrary("LPK.DLL"); ok(lib != NULL, "lib = 0\n");

11 years, 8 months

[hbelusca] 58679: [REACTOS] Fix TOO MANY !! :(((( "initialize" misspellings. Note1: One remains in subsystems/csr/csrsrv/init.c, but will be corrected in my future csrss branch merging. Note2: In n...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 4 20:11:17 2013 New Revision: 58679 URL: http://svn.reactos.org/svn/reactos?rev=58679&view=rev Log: [REACTOS] Fix TOO MANY !! :(((( "initialize" misspellings. Note1: One remains in subsystems/csr/csrsrv/init.c, but will be corrected in my future csrss branch merging. Note2: In ntoskrnl/se/semgr.c, one tries to create the "LSA_AUTHENTICATION_INITALIZED" event. This is ROS-SPECIFIC !!!! In the sense that it doesn't exist on Windows. Instead, the "LSA_AUTHENTICATION_INITIALIZED" exists. Correct that fact. Modified: trunk/reactos/base/shell/cmd/readme2.txt trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c trunk/reactos/dll/win32/shell32/dde.cpp trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/mup/mup.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.c trunk/reactos/drivers/multimedia/audio/sound/sb16.c trunk/reactos/drivers/multimedia/audio/sound/sound.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/parallel/parallel/parallel.c trunk/reactos/drivers/storage/class/class2/class2.c trunk/reactos/drivers/storage/classpnp/obsolete.c trunk/reactos/drivers/storage/classpnp/power.c trunk/reactos/hal/halppc/generic/display.c trunk/reactos/hal/halppc/generic/dma.c trunk/reactos/hal/halppc/up/halinit_up.c trunk/reactos/hal/halx86/apic/apic.c trunk/reactos/hal/halx86/apic/halinit_apic.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/mp/halinit_mp.c trunk/reactos/hal/halx86/up/halinit_mini.c trunk/reactos/hal/halx86/up/halinit_up.c trunk/reactos/hal/halx86/xbox/halinit_xbox.c trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/lib/smlib/smclient.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/zone.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/util.c trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/timerobj.c trunk/reactos/ntoskrnl/se/semgr.c trunk/reactos/win32ss/drivers/font/ftfd/font.c trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/base/shell/cmd/readme2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/readme2.txt… ============================================================================== --- trunk/reactos/base/shell/cmd/readme2.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/readme2.txt [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -1,8 +1,8 @@ -General Overview of How THings Work +General Overview of How Things Work ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ First it comes into _main in cmd.c(1811). The command line params are taking in and if it is unicode it uses CommandLineToArgvW. This can cause a problem on older machines and that is why we have our own custom _CommandLineToArgvW to help this along. -We pull in the launch directory as the inital dir and set that in _tchdir. We make a handle to the default console out using CreateFile. +We pull in the launch directory as the initial dir and set that in _tchdir. We make a handle to the default console out using CreateFile. Then we call Initialize(). Here we need to load ntdll.dll if it isnt loaded(windows 9x machines). We also setup some global vars like default io handles and nErrorLevel and set %prompt% to $P$G. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -343,7 +343,7 @@ /* Disable Interrupts */ _disable(); - /* Re-initalize EFLAGS */ + /* Re-initialize EFLAGS */ __writeeflags(0); /* Set the new PML4 */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -429,7 +429,7 @@ // Disable Interrupts _disable(); - // Re-initalize EFLAGS + // Re-initialize EFLAGS __writeeflags(0); // Set the PDBR Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -672,7 +672,7 @@ * FrLdrMapKernel * INTERNAL * - * Maps the Kernel into memory, does PE Section Mapping, initalizes the + * Maps the Kernel into memory, does PE Section Mapping, initializes the * uninitialized data sections, and relocates the image. * * Params: Modified: trunk/reactos/dll/win32/shell32/dde.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dde.cpp?… ============================================================================== --- trunk/reactos/dll/win32/shell32/dde.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dde.cpp [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -122,7 +122,7 @@ * can use them. * * PARAMS - * bInit [I] TRUE to initialize the services, FALSE to uninitalize. + * bInit [I] TRUE to initialize the services, FALSE to uninitialize. * * RETURNS * Nothing. Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -43,7 +43,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* - * FUNCTION: Called by the system to initalize the driver + * FUNCTION: Called by the system to initialize the driver * ARGUMENTS: * DriverObject = object describing this driver * RegistryPath = path to our configuration entries Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -37,7 +37,7 @@ /* FUNCTIONS ****************************************************************/ /* - * FUNCTION: Called by the system to initalize the driver + * FUNCTION: Called by the system to initialize the driver * ARGUMENTS: * DriverObject = object describing this driver * RegistryPath = path to our configuration entries Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -42,7 +42,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* - * FUNCTION: Called by the system to initalize the driver + * FUNCTION: Called by the system to initialize the driver * ARGUMENTS: * DriverObject = object describing this driver * RegistryPath = path to our configuration entries Modified: trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/m… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/mpu401_nt4/mpu401.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -361,7 +361,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* - * FUNCTION: Called by the system to initalize the driver + * FUNCTION: Called by the system to initialize the driver * ARGUMENTS: * DriverObject = object describing this driver * RegistryPath = path to our configuration entries Modified: trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sndblst.old/sndblst.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -420,7 +420,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* - * FUNCTION: Called by the system to initalize the driver + * FUNCTION: Called by the system to initialize the driver * ARGUMENTS: * DriverObject = object describing this driver * RegistryPath = path to our configuration entries Modified: trunk/reactos/drivers/multimedia/audio/sound/sb16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sound/sb16.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sound/sb16.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -24,7 +24,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* - * FUNCTION: Called by the system to initalize the driver + * FUNCTION: Called by the system to initialize the driver * ARGUMENTS: * DriverObject = object describing this driver * RegistryPath = path to our configuration entries Modified: trunk/reactos/drivers/multimedia/audio/sound/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/audio/s… ============================================================================== --- trunk/reactos/drivers/multimedia/audio/sound/sound.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/audio/sound/sound.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -71,7 +71,7 @@ NTSTATUS ModuleEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* - * FUNCTION: Called by the system to initalize the driver + * FUNCTION: Called by the system to initialize the driver * ARGUMENTS: * DriverObject = object describing this driver * RegistryPath = path to our configuration entries Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -705,7 +705,7 @@ //NDIS_STATUS NdisStatus; IP_ADDRESS DefaultMask; - /* Initalize the default unspecified address (0.0.0.0) */ + /* Initialize the default unspecified address (0.0.0.0) */ AddrInitIPv4(&DefaultMask, 0); if (Context->State == LAN_STATE_STARTED && !Context->Adapter->CompletingReset) Modified: trunk/reactos/drivers/parallel/parallel/parallel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parallel/… ============================================================================== --- trunk/reactos/drivers/parallel/parallel/parallel.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parallel/parallel.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -122,7 +122,7 @@ NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) /* - * FUNCTION: Called by the system to initalize the driver + * FUNCTION: Called by the system to initialize the driver * ARGUMENTS: * DriverObject = object describing this driver * RegistryPath = path to our configuration entries Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -3104,7 +3104,7 @@ Routine Description: - This routine reinitalizes the necessary fields, and sends the request + This routine reinitializes the necessary fields, and sends the request to the port driver. Arguments: Modified: trunk/reactos/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/o… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -316,7 +316,7 @@ Routine Description: This is a wrapper around the delayed retry DPC routine, RetryRequestDPC. - This reinitalizes the necessary fields, queues the request, and sets + This reinitializes the necessary fields, queues the request, and sets a timer to call the DPC if someone hasn't already done so. Arguments: Modified: trunk/reactos/drivers/storage/classpnp/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/p… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/power.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -1494,7 +1494,7 @@ Routine Description: - This routine reinitalizes the necessary fields, and sends the request + This routine reinitializes the necessary fields, and sends the request to the lower driver. Arguments: Modified: trunk/reactos/hal/halppc/generic/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/display… ============================================================================== --- trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/display.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -221,7 +221,7 @@ VOID FASTCALL HalInitializeDisplay (PROS_LOADER_PARAMETER_BLOCK LoaderBlock) /* - * FUNCTION: Initalize the display + * FUNCTION: Initialize the display * ARGUMENTS: * InitParameters = Parameters setup by the boot loader */ Modified: trunk/reactos/hal/halppc/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -1688,7 +1688,7 @@ * transfer start. * PhysicalAddress is physical address corresponding to the transfer * start page and offset. - * TransferLength is the inital length of the transfer, which is reminder + * TransferLength is the initial length of the transfer, which is reminder * of the first page. The actual value is calculated below. * * Note that all the variables can change during the processing which Modified: trunk/reactos/hal/halppc/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halinit_up.c… ============================================================================== --- trunk/reactos/hal/halppc/up/halinit_up.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/up/halinit_up.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/hal/x86/halinit.c - * PURPOSE: Initalize the x86 hal + * PURPOSE: Initialize the x86 hal * PROGRAMMER: David Welch (welch(a)cwcom.net) * UPDATE HISTORY: * 11/06/98: Created Modified: trunk/reactos/hal/halx86/apic/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -365,7 +365,7 @@ LvtEntry.Mask = 1; LvtEntry.TimerMode = 0; - /* Initalize and mask LVTs */ + /* Initialize and mask LVTs */ ApicWrite(APIC_TMRLVTR, LvtEntry.Long); ApicWrite(APIC_THRMLVTR, LvtEntry.Long); ApicWrite(APIC_PCLVTR, LvtEntry.Long); Modified: trunk/reactos/hal/halx86/apic/halinit_apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/halinit_ap… ============================================================================== --- trunk/reactos/hal/halx86/apic/halinit_apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/halinit_apic.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/hal/x86/halinit.c - * PURPOSE: Initalize the x86 hal + * PURPOSE: Initialize the x86 hal * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -1850,7 +1850,7 @@ * transfer start. * PhysicalAddress is physical address corresponding to the transfer * start page and offset. - * TransferLength is the inital length of the transfer, which is reminder + * TransferLength is the initial length of the transfer, which is reminder * of the first page. The actual value is calculated below. * * Note that all the variables can change during the processing which Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halinit_mp.c… ============================================================================== --- trunk/reactos/hal/halx86/mp/halinit_mp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/halinit_mp.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: hal/halx86/mp/halinit_mp.c - * PURPOSE: Initalize the x86 mp hal + * PURPOSE: Initialize the x86 mp hal * PROGRAMMER: David Welch (welch(a)cwcom.net) * UPDATE HISTORY: * 11/06/98: Created Modified: trunk/reactos/hal/halx86/up/halinit_mini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halinit_mini… ============================================================================== --- trunk/reactos/hal/halx86/up/halinit_mini.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/halinit_mini.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/hal/x86/halinit.c - * PURPOSE: Initalize the x86 hal + * PURPOSE: Initialize the x86 hal * PROGRAMMER: David Welch (welch(a)cwcom.net) * UPDATE HISTORY: * 11/06/98: Created Modified: trunk/reactos/hal/halx86/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halinit_up.c… ============================================================================== --- trunk/reactos/hal/halx86/up/halinit_up.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/halinit_up.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/hal/x86/halinit.c - * PURPOSE: Initalize the x86 hal + * PURPOSE: Initialize the x86 hal * PROGRAMMER: David Welch (welch(a)cwcom.net) * UPDATE HISTORY: * 11/06/98: Created Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halinit_xb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/hal/x86/halinit.c - * PURPOSE: Initalize the x86 hal + * PURPOSE: Initialize the x86 hal * PROGRAMMER: David Welch (welch(a)cwcom.net) * UPDATE HISTORY: * 11/06/98: Created Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=5… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -83,7 +83,7 @@ /** * @name HvpCreateHive * - * Internal helper function to initalize hive descriptor structure for + * Internal helper function to initialize hive descriptor structure for * newly created hive. * * @see HvInitialize @@ -126,7 +126,7 @@ /** * @name HvpInitializeMemoryHive * - * Internal helper function to initalize hive descriptor structure for + * Internal helper function to initialize hive descriptor structure for * a hive stored in memory. The data of the hive are copied and it is * prepared for read/write access. * @@ -246,7 +246,7 @@ /** * @name HvpInitializeMemoryInplaceHive * - * Internal helper function to initalize hive descriptor structure for + * Internal helper function to initialize hive descriptor structure for * a hive stored in memory. The in-memory data of the hive are directly * used and it is read-only accessible. * Modified: trunk/reactos/lib/smlib/smclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/smclient.c?rev=5… ============================================================================== --- trunk/reactos/lib/smlib/smclient.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/smclient.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -37,7 +37,7 @@ SmApiMsg.h.u1.s1.DataLength = sizeof(SM_EXEC_PGM_MSG) + 8; SmApiMsg.h.u1.s1.TotalLength = sizeof(SmApiMsg); - /* Initalize this specific API's parameters */ + /* Initialize this specific API's parameters */ SmApiMsg.ApiNumber = SmExecPgmApi; RtlCopyMemory(&SmApiMsg.u.ExecPgm.ProcessInformation, ProcessInformation, Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=58… ============================================================================== --- trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/event.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -142,7 +142,7 @@ /* Check for Success */ if (NT_SUCCESS(Status)) { - /* Initalize the Event */ + /* Initialize the Event */ KeInitializeEvent(Event, EventType, InitialState); Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/evtpair.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -101,7 +101,7 @@ /* Check for Success */ if (NT_SUCCESS(Status)) { - /* Initalize the Event */ + /* Initialize the Event */ DPRINT("Initializing EventPair\n"); KeInitializeEventPair(EventPair); Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -123,7 +123,7 @@ /* Check for success */ if(NT_SUCCESS(Status)) { - /* Initalize the Kernel Mutant */ + /* Initialize the Kernel Mutant */ DPRINT("Initializing the Mutant\n"); KeInitializeMutant(Mutant, InitialOwner); Modified: trunk/reactos/ntoskrnl/ex/zone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/zone.c?rev=586… ============================================================================== --- trunk/reactos/ntoskrnl/ex/zone.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/zone.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -90,7 +90,7 @@ } /* - * FUNCTION: Initalizes a zone header + * FUNCTION: Initializes a zone header * ARGUMENTS: * Zone = zone header to be initialized * BlockSize = Size (in bytes) of the allocation size of the zone Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -436,7 +436,7 @@ /* * IopInitializeDriverModule * - * Initalize a loaded driver. + * Initialize a loaded driver. * * Parameters * DeviceNode Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -171,17 +171,17 @@ PAGED_CODE(); - /* Length of the rest. Inital equal to EaLength */ + /* Length of the rest */ IntEaLength = EaLength; - - /* Inital EaBuffer equal to EaBuffer */ EaBufferEnd = EaBuffer; /* The rest length of the buffer */ while (IntEaLength >= FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName[0])) { - /* rest of buffer must greater then the - sizeof(FILE_FULL_EA_INFORMATION) + buffer */ + /* + * The rest of buffer must greater than + * sizeof(FILE_FULL_EA_INFORMATION) + buffer + */ NextEaBufferOffset = EaBufferEnd->EaNameLength + EaBufferEnd->EaValueLength + FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName[0]) + 1; @@ -203,18 +203,21 @@ } else { - /* From the MSDN - http://msdn2.microsoft.com/en-us/library/ms795740.aspx - For all entries except the last, the value of - NextEntryOffset must be greater than zero and - must fall on a ULONG boundary + /* + * From MSDN: + * http://msdn2.microsoft.com/en-us/library/ms795740.aspx + * For all entries except the last one, the value of + * NextEntryOffset must be greater than zero and + * must fall on a ULONG boundary. */ NextEaBufferOffset = ((NextEaBufferOffset + 3) & ~3); if ((EaBufferEnd->NextEntryOffset == NextEaBufferOffset) && ((LONG)EaBufferEnd->NextEntryOffset > 0)) { - /* Rest of buffer must be greater then the - next offset */ + /* + * The rest of buffer must be greater + * than the following offset. + */ IntEaLength = IntEaLength - EaBufferEnd->NextEntryOffset; Modified: trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/krnlinit… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/krnlinit.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -30,7 +30,7 @@ VOID NTAPI -KiInitalizeHandBuiltThread( +KiInitializeHandBuiltThread( IN PKTHREAD Thread, IN PKPROCESS Process, IN PVOID Stack) @@ -92,7 +92,7 @@ else { /* Initialize the startup thread */ - KiInitalizeHandBuiltThread(Thread, Process, KernelStack); + KiInitializeHandBuiltThread(Thread, Process, KernelStack); /* Initialize cpu with HAL */ if (!HalInitSystem(0, LoaderBlock)) @@ -212,7 +212,7 @@ InitProcess->QuantumReset = MAXCHAR; /* Initialize the startup thread */ - KiInitalizeHandBuiltThread(InitThread, InitProcess, IdleStack); + KiInitializeHandBuiltThread(InitThread, InitProcess, IdleStack); /* Initialize the Kernel Executive */ ExpInitializeExecutive(0, LoaderBlock); Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall_… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -59,7 +59,7 @@ /* load the address of the callout frame into ecx */ lea ecx, [esp - 12] - /* Allocate space for the inital stack */ + /* Allocate space for the initial stack */ sub esp, 12 + NPX_FRAME_LENGTH + KTRAP_FRAME_LENGTH + 16 call @KiUserModeCallout@4 Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -772,7 +772,7 @@ PKTIMER Timer; NTSTATUS Status; - /* Initalize the Dispatcher Header */ + /* Initialize the Dispatcher Header */ Thread->Header.Type = ThreadObject; Thread->Header.ThreadControlFlags = 0; Thread->Header.DebugActive = FALSE; @@ -862,7 +862,7 @@ Status = STATUS_SUCCESS; _SEH2_TRY { - /* Initalize the Thread Context */ + /* Initialize the Thread Context */ KiInitializeContextThread(Thread, SystemRoutine, StartRoutine, @@ -884,7 +884,7 @@ } _SEH2_END; - /* Set the Thread to initalized */ + /* Set the Thread to initialized */ Thread->State = Initialized; return Status; } Modified: trunk/reactos/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timerobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/timerobj.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -256,7 +256,7 @@ Timer->Header.SignalState = 0; InitializeListHead(&(Timer->Header.WaitListHead)); - /* Initalize the Other data */ + /* Initialize the Other data */ Timer->DueTime.QuadPart = 0; Timer->Period = 0; } Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=58… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -181,8 +181,7 @@ NTSTATUS Status; /* Create '\Security' directory */ - RtlInitUnicodeString(&Name, - L"\\Security"); + RtlInitUnicodeString(&Name, L"\\Security"); InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_PERMANENT, @@ -197,9 +196,8 @@ return FALSE; } - /* Create 'LSA_AUTHENTICATION_INITALIZED' event */ - RtlInitUnicodeString(&Name, - L"\\LSA_AUTHENTICATION_INITALIZED"); + /* Create 'LSA_AUTHENTICATION_INITIALIZED' event */ + RtlInitUnicodeString(&Name, L"\\LSA_AUTHENTICATION_INITIALIZED"); InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_PERMANENT, @@ -212,7 +210,7 @@ FALSE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create 'LSA_AUTHENTICATION_INITALIZED' event!\n"); + DPRINT1("Failed to create 'LSA_AUTHENTICATION_INITIALIZED' event!\n"); NtClose(DirectoryHandle); return FALSE; } Modified: trunk/reactos/win32ss/drivers/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/ftfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/ftfd/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/ftfd/font.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -382,7 +382,7 @@ return NULL; } - /* Get inital value for cGlyphs from ftface */ + /* Get initial value for cGlyphs from ftface */ cGlyphs = ftface->num_glyphs + 1; /* Allocate a buffer for the char codes and glyph indexes */ Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Thu Apr 4 20:11:17 2013 @@ -23,7 +23,7 @@ /* Full path to WindowStations directory */ UNICODE_STRING gustrWindowStationsDir; -/* INITALIZATION FUNCTIONS ****************************************************/ +/* INITIALIZATION FUNCTIONS ****************************************************/ INIT_FUNCTION NTSTATUS

11 years, 8 months

[hbelusca] 58678: [ROSTESTS] Correct spelling and Co.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 4 19:47:42 2013 New Revision: 58678 URL: http://svn.reactos.org/svn/reactos?rev=58678&view=rev Log: [ROSTESTS] Correct spelling and Co. Modified: trunk/rostests/drivers/csqtest/csqtest.c trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp Modified: trunk/rostests/drivers/csqtest/csqtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/csqtest/csqtest.c… ============================================================================== --- trunk/rostests/drivers/csqtest/csqtest.c [iso-8859-1] (original) +++ trunk/rostests/drivers/csqtest/csqtest.c [iso-8859-1] Thu Apr 4 19:47:42 2013 @@ -194,9 +194,9 @@ CsqAcquireLock, CsqReleaseLock, CsqCompleteCancelledIrp); if(Status != STATUS_SUCCESS) - KdPrint(("csqtest: IoCsqInitalize failed: 0x%x\n", Status)); + KdPrint(("csqtest: IoCsqInitialize failed: 0x%x\n", Status)); else - KdPrint(("csqtest: IoCsqInitalize succeeded\n")); + KdPrint(("csqtest: IoCsqInitialize succeeded\n")); InitializeListHead(&IrpQueue); KeInitializeSpinLock(&IrpQueueLock); Modified: trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/ntoskrnl/IoEaTest… ============================================================================== --- trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp [iso-8859-1] (original) +++ trunk/rostests/drivers/ntoskrnl/IoEaTest.cpp [iso-8859-1] Thu Apr 4 19:47:42 2013 @@ -34,16 +34,16 @@ ULONG NextEaBufferOffset; UINT IntEaLength; - /* Length of the rest. Inital equal to EaLength */ + /* Length of the rest. Initialize it to EaLength */ IntEaLength = EaLength; - /* Inital EaBuffer equal to EaBuffer */ + /* Initialize EaBuffer to EaBuffer */ EaBufferEnd = EaBuffer; /* The rest length of the buffer */ /* 8 = sizeof(ULONG) + sizeof(UCHAR) + sizeof(UCHAR) + sizeof(USHORT) */ while (IntEaLength >= 8) { - /* rest of buffer must greater then the sizeof(FILE_FULL_EA_INFORMATION) + buffer */ + /* The rest of the buffer must be greater than sizeof(FILE_FULL_EA_INFORMATION) + buffer */ NextEaBufferOffset = EaBufferEnd->EaNameLength+EaBufferEnd->EaValueLength + 9; if (IntEaLength >= NextEaBufferOffset) { @@ -63,14 +63,14 @@ else { /* - From the MSDN (http://msdn2.microsoft.com/en-us/library/ms795740.aspx). + From MSDN (http://msdn2.microsoft.com/en-us/library/ms795740.aspx). For all entries except the last, the value of NextEntryOffset must be greater than zero and must fall on a ULONG boundary. */ NextEaBufferOffset = ((NextEaBufferOffset + 3) & 0xFFFFFFFC); if ((EaBufferEnd->NextEntryOffset == NextEaBufferOffset) && (EaBufferEnd->NextEntryOffset>0)) { - /* rest of buffer must be greater then the next offset */ + /* The rest of the buffer must be greater than the next offset */ IntEaLength = IntEaLength - EaBufferEnd->NextEntryOffset; if (IntEaLength>=0) { @@ -86,7 +86,7 @@ if (ErrorOffset != NULL) { - /* calculate the error offset. Or in */ + /* calculate the error offset. */ *ErrorOffset = (ULONG)((ULONG_PTR)EaBufferEnd - (ULONG_PTR)EaBuffer); }

11 years, 8 months

[hbelusca] 58677: [ROSAPPS] Fix "initialize" misspelling.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Apr 4 19:44:23 2013 New Revision: 58677 URL: http://svn.reactos.org/svn/reactos?rev=58677&view=rev Log: [ROSAPPS] Fix "initialize" misspelling. Modified: trunk/rosapps/applications/devutils/genguid/genguid.c trunk/rosapps/templates/template/template.c Modified: trunk/rosapps/applications/devutils/genguid/genguid.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/geng… ============================================================================== --- trunk/rosapps/applications/devutils/genguid/genguid.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/genguid/genguid.c [iso-8859-1] Thu Apr 4 19:44:23 2013 @@ -45,7 +45,7 @@ } if (CoInitialize(NULL) != S_OK) { - printf("Unable to initalize OLE libraries\n"); + printf("Unable to initialize OLE libraries\n"); return 1; } result = CoCreateGuid(&m_guid); Modified: trunk/rosapps/templates/template/template.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/template/templat… ============================================================================== --- trunk/rosapps/templates/template/template.c [iso-8859-1] (original) +++ trunk/rosapps/templates/template/template.c [iso-8859-1] Thu Apr 4 19:44:23 2013 @@ -239,7 +239,7 @@ DriverEntry(PDRIVER_OBJECT _DriverObject, PUNICODE_STRING RegistryPath) /* - * FUNCTION: Called by the system to initalize the driver + * FUNCTION: Called by the system to initialize the driver * ARGUMENTS: * DriverObject = object describing this driver * RegistryPath = path to our configuration entries

11 years, 8 months

← Newer
1
...
19
20
21
22
23
24
25
26
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013